Subzero: Enable Non-SFI vector cross tests.

crosstest/test_icmp_main.cpp

 //===- subzero/crosstest/test_icmp_main.cpp - Driver for tests. -----------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // Driver for cross testing the icmp bitcode instruction
@@ skipping 10 matching lines @@
 
 // Include test_icmp.h twice - once normally, and once within the
 // Subzero_ namespace, corresponding to the llc and Subzero translated
 // object files, respectively.
 #include "test_icmp.h"
 
 namespace Subzero_ {
 #include "test_icmp.h"
 }
 
+#include "insertelement.h"
 #include "xdefs.h"
 
 volatile unsigned Values[] = {
     0x0,        0x1,        0x7ffffffe, 0x7fffffff, 0x80000000, 0x80000001,
     0xfffffffe, 0xffffffff, 0x7e,       0x7f,       0x80,       0x81,
     0xfe,       0xff,       0x100,      0x101,      0x7ffe,     0x7fff,
     0x8000,     0x8001,     0xfffe,     0xffff,     0x10000,    0x10001,
 };
 const static size_t NumValues = sizeof(Values) / sizeof(*Values);
 
@@ skipping 149 matching lines @@
         }
       }
     }
   }
 }
 
 const static size_t MaxTestsPerFunc = 100000;
 
 template <typename TypeUnsignedLabel, typename TypeSignedLabel>
 void testsVecInt(size_t &TotalTests, size_t &Passes, size_t &Failures) {
-#if !defined(ARM32) && !defined(NONSFI)
+#if !defined(ARM32)
   // TODO(jpp): remove this once vector support is implemented.
   typedef typename Vectors<TypeUnsignedLabel>::Ty TypeUnsigned;
   typedef typename Vectors<TypeSignedLabel>::Ty TypeSigned;
+  typedef typename Vectors<TypeUnsignedLabel>::ElementTy ElementTypeUnsigned;
+  typedef typename Vectors<TypeSignedLabel>::ElementTy ElementTypeSigned;
   typedef TypeUnsigned (*FuncTypeUnsigned)(TypeUnsigned, TypeUnsigned);
   typedef TypeSigned (*FuncTypeSigned)(TypeSigned, TypeSigned);
   static struct {
     const char *Name;
     FuncTypeUnsigned FuncLlc;
     FuncTypeUnsigned FuncSz;
   } Funcs[] = {
 #define X(cmp, op)                                                             \
   {                                                                            \
     STR(cmp), (FuncTypeUnsigned)icmp##cmp,                                     \
@@ skipping 11 matching lines @@
           ICMP_S_TABLE
 #undef X
   };
   const static size_t NumFuncs = sizeof(Funcs) / sizeof(*Funcs);
   const static size_t NumElementsInType = Vectors<TypeUnsigned>::NumElements;
   for (size_t f = 0; f < NumFuncs; ++f) {
     PRNG Index;
     for (size_t i = 0; i < MaxTestsPerFunc; ++i) {
       // Initialize the test vectors.
       TypeUnsigned Value1, Value2;
-      for (size_t j = 0; j < NumElementsInType;) {
-        Value1[j] = Values[Index() % NumValues];
-        Value2[j] = Values[Index() % NumValues];
-        ++j;
+      for (size_t j = 0; j < NumElementsInType; ++j) {
+        setElement<TypeUnsigned, ElementTypeUnsigned>(
+            Value1, j, Values[Index() % NumValues]);
+        setElement<TypeUnsigned, ElementTypeUnsigned>(
+            Value2, j, Values[Index() % NumValues]);
       }
       // Perform the test.
       TypeUnsigned ResultSz = Funcs[f].FuncSz(Value1, Value2);
       TypeUnsigned ResultLlc = Funcs[f].FuncLlc(Value1, Value2);
       ++TotalTests;
       if (!memcmp(&ResultSz, &ResultLlc, sizeof(ResultSz))) {
         ++Passes;
       } else {
         ++Failures;
         std::cout << "test" << Funcs[f].Name
                   << Vectors<TypeUnsignedLabel>::TypeName << "("
                   << vectAsString<TypeUnsignedLabel>(Value1) << ","
                   << vectAsString<TypeUnsignedLabel>(Value2)
                   << "): sz=" << vectAsString<TypeUnsignedLabel>(ResultSz)
                   << " llc=" << vectAsString<TypeUnsignedLabel>(ResultLlc)
                   << "\n";
       }
     }
   }
-#endif // !ARM32 && !NONSFI
+#endif // !ARM32
 }
 
 // Return true on wraparound
-template <typename T> bool incrementI1Vector(typename Vectors<T>::Ty &Vect) {
+template <typename T>
+bool __attribute__((noinline))
+incrementI1Vector(typename Vectors<T>::Ty &Vect) {
   size_t Pos = 0;
   const static size_t NumElements = Vectors<T>::NumElements;
   for (Pos = 0; Pos < NumElements; ++Pos) {
     if (Vect[Pos] == 0) {
       Vect[Pos] = 1;
       break;
     }
     Vect[Pos] = 0;
   }
   return (Pos == NumElements);
 }
 
 template <typename T>
 void testsVecI1(size_t &TotalTests, size_t &Passes, size_t &Failures) {
-#if !defined(ARM32) && !defined(NONSFI)
+#if !defined(ARM32)
   // TODO(jpp): remove this once vector support is implemented.
   typedef typename Vectors<T>::Ty Ty;
   typedef Ty (*FuncType)(Ty, Ty);
   static struct {
     const char *Name;
     FuncType FuncLlc;
     FuncType FuncSz;
   } Funcs[] = {
 #define X(cmp, op)                                                             \
   { STR(cmp), (FuncType)icmpi1##cmp, (FuncType)Subzero_::icmpi1##cmp }         \
@@ skipping 29 matching lines @@
         }
       }
     }
   } else {
     for (size_t f = 0; f < NumFuncs; ++f) {
       PRNG Index;
       for (size_t i = 0; i < MaxTestsPerFunc; ++i) {
         Ty Value1, Value2;
         // Initialize the test vectors.
         for (size_t j = 0; j < NumElements; ++j) {
-          Value1[j] = Index() % 2;
-          Value2[j] = Index() % 2;
+          setElement<Ty, bool>(Value1, j, Index() % 2);
+          setElement<Ty, bool>(Value2, j, Index() % 2);
         }
         // Perform the test.
         Ty ResultSz = Funcs[f].FuncSz(Value1, Value2);
         Ty ResultLlc = Funcs[f].FuncLlc(Value1, Value2);
         ++TotalTests;
         if (!memcmp(&ResultSz, &ResultLlc, sizeof(ResultSz))) {
           ++Passes;
         } else {
           ++Failures;
           std::cout << "test" << Funcs[f].Name << Vectors<T>::TypeName << "("
                     << vectAsString<T>(Value1) << "," << vectAsString<T>(Value2)
                     << "): sz=" << vectAsString<T>(ResultSz)
                     << " llc=" << vectAsString<T>(ResultLlc) << "\n";
         }
       }
     }
   }
-#endif // !ARM32 && !NONSFI
+#endif // !ARM32
 }
 
 #ifdef X8664_STACK_HACK
 extern "C" int wrapped_main(int argc, char *argv[]) {
 #else  // !defined(X8664_STACK_HACK)
 int main(int argc, char *argv[]) {
 #endif // X8664_STACK_HACK
   size_t TotalTests = 0;
   size_t Passes = 0;
   size_t Failures = 0;
@@ skipping 10 matching lines @@
   testsVecInt<v8ui16, v8si16>(TotalTests, Passes, Failures);
   testsVecInt<v16ui8, v16si8>(TotalTests, Passes, Failures);
   testsVecI1<v4i1>(TotalTests, Passes, Failures);
   testsVecI1<v8i1>(TotalTests, Passes, Failures);
   testsVecI1<v16i1>(TotalTests, Passes, Failures);
 
   std::cout << "TotalTests=" << TotalTests << " Passes=" << Passes
             << " Failures=" << Failures << "\n";
   return Failures;
 }