Subzero: Enable Non-SFI vector cross tests.

crosstest/test_arith_main.cpp

 //===- subzero/crosstest/test_arith_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 crosstesting arithmetic operations
@@ skipping 10 matching lines @@
 #include <limits>
 #include <cfloat>
 #include <cmath>   // fmodf
 #include <cstring> // memcmp
 #include <iostream>
 
 // Include test_arith.h twice - once normally, and once within the
 // Subzero_ namespace, corresponding to the llc and Subzero translated
 // object files, respectively.
 #include "test_arith.h"
-#include "xdefs.h"
 
 namespace Subzero_ {
 #include "test_arith.h"
 }
 
+#include "insertelement.h"
+#include "xdefs.h"
+
 template <class T> bool inputsMayTriggerException(T Value1, T Value2) {
   // Avoid HW divide-by-zero exception.
   if (Value2 == 0)
     return true;
   // Avoid HW overflow exception (on x86-32).  TODO: adjust
   // for other architecture.
   if (Value1 == std::numeric_limits<T>::min() && Value2 == -1)
     return true;
   return false;
 }
@@ skipping 108 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);
   volatile unsigned Values[] = INT_VALUE_ARRAY;
   const static size_t NumValues = sizeof(Values) / sizeof(*Values);
@@ skipping 29 matching lines @@
       // Initialize the test vectors.
       TypeUnsigned Value1, Value2;
       for (size_t j = 0; j < NumElementsInType; ++j) {
         ElementTypeUnsigned Element1 = Values[Index() % NumValues];
         ElementTypeUnsigned Element2 = Values[Index() % NumValues];
         if (Funcs[f].ExcludeDivExceptions &&
             inputsMayTriggerException<ElementTypeSigned>(Element1, Element2))
           continue;
         if (Funcs[f].MaskShiftOperations)
           Element2 &= CHAR_BIT * sizeof(ElementTypeUnsigned) - 1;
-        Value1[j] = Element1;
-        Value2[j] = Element2;
+        setElement<TypeUnsigned, ElementTypeUnsigned>(Value1, j, Element1);

[John, 2016/01/06 15:24:26]

Do you need the template parameters? I would guess the compiler would infer
TypeUnsigned, and ElementTypeUnsigned, from Value1 and Element1

[Jim Stichnoth, 2016/01/06 17:34:30]

Done.

+        setElement<TypeUnsigned, ElementTypeUnsigned>(Value2, j, Element2);
       }
       // Perform the test.
       TypeUnsigned ResultSz, ResultLlc;
       ++TotalTests;
       if (Funcs[f].FuncSzUnsigned) {
         ResultSz = Funcs[f].FuncSzUnsigned(Value1, Value2);
         ResultLlc = Funcs[f].FuncLlcUnsigned(Value1, Value2);
       } else {
         ResultSz = Funcs[f].FuncSzSigned(Value1, Value2);
         ResultLlc = Funcs[f].FuncLlcSigned(Value1, Value2);
       }
       if (!memcmp(&ResultSz, &ResultLlc, sizeof(ResultSz))) {
         ++Passes;
       } else {
         ++Failures;
         std::cout << "test" << Funcs[f].Name << "v" << NumElementsInType << "i"
                   << (CHAR_BIT * sizeof(ElementTypeUnsigned)) << "("
                   << vectAsString<TypeUnsignedLabel>(Value1) << ","
                   << vectAsString<TypeUnsignedLabel>(Value2)
                   << "): sz=" << vectAsString<TypeUnsignedLabel>(ResultSz)
                   << " llc=" << vectAsString<TypeUnsignedLabel>(ResultLlc)
                   << "\n";
       }
     }
   }
-#endif // !ARM32 && !NONSFI
+#endif // !ARM32
 }
 
 template <typename Type>
 void testsFp(size_t &TotalTests, size_t &Passes, size_t &Failures) {
   static const Type NegInf = -1.0 / 0.0;
   static const Type PosInf = 1.0 / 0.0;
   static const Type Nan = 0.0 / 0.0;
   static const Type NegNan = -0.0 / 0.0;
   volatile Type Values[] = FP_VALUE_ARRAY(NegInf, PosInf, NegNan, Nan);
   const static size_t NumValues = sizeof(Values) / sizeof(*Values);
@@ skipping 55 matching lines @@
     } else {
       ++Failures;
       std::cout << std::fixed << "test_fabs" << (CHAR_BIT * sizeof(Type)) << "("
                 << Value << "): sz=" << ResultSz << " llc=" << ResultLlc
                 << "\n";
     }
   }
 }
 
 void testsVecFp(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.
   static const float NegInf = -1.0 / 0.0;
   static const float PosInf = 1.0 / 0.0;
   static const float Nan = 0.0 / 0.0;
   static const float NegNan = -0.0 / 0.0;
   volatile float Values[] = FP_VALUE_ARRAY(NegInf, PosInf, NegNan, Nan);
   const static size_t NumValues = sizeof(Values) / sizeof(*Values);
   typedef v4f32 (*FuncType)(v4f32, v4f32);
   static struct {
     const char *Name;
     FuncType FuncLlc;
     FuncType FuncSz;
   } Funcs[] = {
 #define X(inst, op, func)                                                      \
   { STR(inst), (FuncType)test##inst, (FuncType)Subzero_::test##inst }          \
   ,
       FPOP_TABLE
 #undef X
   };
   const static size_t NumFuncs = sizeof(Funcs) / sizeof(*Funcs);
   const static size_t NumElementsInType = 4;
   for (size_t f = 0; f < NumFuncs; ++f) {
     PRNG Index;
     for (size_t i = 0; i < MaxTestsPerFunc; ++i) {
       // Initialize the test vectors.
       v4f32 Value1, Value2;
       for (size_t j = 0; j < NumElementsInType; ++j) {
-        Value1[j] = Values[Index() % NumValues];
-        Value2[j] = Values[Index() % NumValues];
+        setElement<v4f32, float>(Value1, j, Values[Index() % NumValues]);
+        setElement<v4f32, float>(Value2, j, Values[Index() % NumValues]);
       }
       // Perform the test.
       v4f32 ResultSz = Funcs[f].FuncSz(Value1, Value2);
       v4f32 ResultLlc = Funcs[f].FuncLlc(Value1, Value2);
       ++TotalTests;
       if (!memcmp(&ResultSz, &ResultLlc, sizeof(ResultSz))) {
         ++Passes;
       } else {
         ++Failures;
         std::cout << "test" << Funcs[f].Name << "v4f32"
@@ skipping 10 matching lines @@
         ++Passes;
       } else {
         ++Failures;
         std::cout << "test_fabs_v4f32"
                   << "(" << vectAsString<v4f32>(Value1)
                   << "): sz=" << vectAsString<v4f32>(ResultSz) << " llc"
                   << vectAsString<v4f32>(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;
 
   testsInt<bool, bool>(TotalTests, Passes, Failures);
   testsInt<uint8_t, myint8_t>(TotalTests, Passes, Failures);
   testsInt<uint16_t, int16_t>(TotalTests, Passes, Failures);
   testsInt<uint32_t, int32_t>(TotalTests, Passes, Failures);
   testsInt<uint64, int64>(TotalTests, Passes, Failures);
   testsVecInt<v4ui32, v4si32>(TotalTests, Passes, Failures);
   testsVecInt<v8ui16, v8si16>(TotalTests, Passes, Failures);
   testsVecInt<v16ui8, v16si8>(TotalTests, Passes, Failures);
   testsFp<float>(TotalTests, Passes, Failures);
   testsFp<double>(TotalTests, Passes, Failures);
   testsVecFp(TotalTests, Passes, Failures);
 
   std::cout << "TotalTests=" << TotalTests << " Passes=" << Passes
             << " Failures=" << Failures << "\n";
   return Failures;
 }