Subzero: Be more strict about i1 calculations.

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
 //
 //===----------------------------------------------------------------------===//
 
-/* crosstest.py --test=test_arith.cpp --test=test_arith_frem.ll \
-   --test=test_arith_sqrt.ll --driver=test_arith_main.cpp \
+/* crosstest.py --test=test_arith.cpp --test=test_arith_bool.ll \
+   --test=test_arith_frem.ll --test=test_arith_sqrt.ll          \
+   --driver=test_arith_main.cpp                                 \
    --prefix=Subzero_ --output=test_arith */
 
 #include <stdint.h>
 
 #include <climits> // CHAR_BIT
 #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"
 namespace Subzero_ {
 #include "test_arith.h"
 }
 
-template <class T> bool inputsMayTriggerException(T Value1, T Value2) {
+template <class T>
+bool inputsMayTriggerException(T Value1, T Value2, bool IsReallyBool = false) {
+  if (IsReallyBool) {
+    Value1 &= 1;
+    Value2 &= 1;
+  }
   // 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;
 }
 
 template <typename TypeUnsigned, typename TypeSigned>
 void testsInt(size_t &TotalTests, size_t &Passes, size_t &Failures) {
   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);
   static struct {
     // For functions that operate on unsigned values, the
     // FuncLlcSigned and FuncSzSigned fields are NULL.  For functions
     // that operate on signed values, the FuncLlcUnsigned and
     // FuncSzUnsigned fields are NULL.
     const char *Name;
     FuncTypeUnsigned FuncLlcUnsigned;
     FuncTypeUnsigned FuncSzUnsigned;
     FuncTypeSigned FuncLlcSigned;
     FuncTypeSigned FuncSzSigned;
     bool ExcludeDivExceptions; // for divide related tests
+    bool IsReallyBool;
   } Funcs[] = {
 #define X(inst, op, isdiv, isshift)                                            \
-  { STR(inst), test##inst, Subzero_::test##inst, NULL, NULL, isdiv }           \
-  ,
+  {                                                                            \
+    "Bool" STR(inst), testBool##inst, Subzero_::testBool##inst, NULL, NULL,    \
+        isdiv, true                                                            \
+  }                                                                            \
+  , { STR(inst), test##inst, Subzero_::test##inst, NULL, NULL, isdiv, false },
       UINTOP_TABLE
 #undef X
 #define X(inst, op, isdiv, isshift)                                            \
-  { STR(inst), NULL, NULL, test##inst, Subzero_::test##inst, isdiv }           \
+  { STR(inst), NULL, NULL, test##inst, Subzero_::test##inst, isdiv, false }    \
   ,
-      SINTOP_TABLE
+          SINTOP_TABLE
 #undef X
-  };
+    };
   const static size_t NumFuncs = sizeof(Funcs) / sizeof(*Funcs);
 
   if (sizeof(TypeUnsigned) <= sizeof(uint32_t)) {
     // This is the "normal" version of the loop nest, for 32-bit or
     // narrower types.
     for (size_t f = 0; f < NumFuncs; ++f) {
       for (size_t i = 0; i < NumValues; ++i) {
         for (size_t j = 0; j < NumValues; ++j) {
           TypeUnsigned Value1 = Values[i];
           TypeUnsigned Value2 = Values[j];
           // Avoid HW divide-by-zero exception.
           if (Funcs[f].ExcludeDivExceptions &&
-              inputsMayTriggerException<TypeSigned>(Value1, Value2))
+              inputsMayTriggerException<TypeSigned>(Value1, Value2,
+                                                    Funcs[f].IsReallyBool))
             continue;
           ++TotalTests;
           TypeUnsigned ResultSz, ResultLlc;
           if (Funcs[f].FuncSzUnsigned) {
+            ResultLlc = Funcs[f].FuncLlcUnsigned(Value1, Value2);
             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 (ResultSz == ResultLlc) {
             ++Passes;
           } else {
             ++Failures;
             std::cout << "test" << Funcs[f].Name
-                      << (CHAR_BIT * sizeof(TypeUnsigned)) << "(" << Value1
-                      << ", " << Value2 << "): sz=" << (unsigned)ResultSz
+                      << (CHAR_BIT * sizeof(TypeUnsigned)) << "("
+                      << (unsigned)Value1 << ", " << (unsigned)Value2
+                      << "): sz=" << (unsigned)ResultSz
                       << " llc=" << (unsigned)ResultLlc << "\n";
           }
         }
       }
     }
   } else {
     // This is the 64-bit version.  Test values are synthesized from
     // the 32-bit values in Values[].
     for (size_t f = 0; f < NumFuncs; ++f) {
       for (size_t iLo = 0; iLo < NumValues; ++iLo) {
@@ skipping 241 matching lines @@
   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;
 }