Subzero: Fix a debugging string in the test_icmp crosstest.

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 28 matching lines @@
 void testsInt(size_t &TotalTests, size_t &Passes, size_t &Failures) {
   typedef bool (*FuncTypeUnsigned)(TypeUnsigned, TypeUnsigned);
   typedef bool (*FuncTypeSigned)(TypeSigned, TypeSigned);
   static struct {
     const char *Name;
     FuncTypeUnsigned FuncLlc;
     FuncTypeUnsigned FuncSz;
   } Funcs[] = {
 #define X(cmp, op)                                                             \
   {                                                                            \
-    STR(inst), (FuncTypeUnsigned)icmp##cmp,                                    \
+    STR(cmp), (FuncTypeUnsigned)icmp##cmp,                                     \
         (FuncTypeUnsigned)Subzero_::icmp##cmp                                  \
   }                                                                            \
   ,
         ICMP_U_TABLE
 #undef X
 #define X(cmp, op)                                                             \
   {                                                                            \
-    STR(inst), (FuncTypeUnsigned)(FuncTypeSigned)icmp##cmp,                    \
+    STR(cmp), (FuncTypeUnsigned)(FuncTypeSigned)icmp##cmp,                     \
         (FuncTypeUnsigned)(FuncTypeSigned)Subzero_::icmp##cmp                  \
   }                                                                            \
   ,
         ICMP_S_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
@@ skipping 58 matching lines @@
   typedef typename Vectors<TypeSignedLabel>::Ty TypeSigned;
   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(inst), (FuncTypeUnsigned)icmp##cmp,                                    \
+    STR(cmp), (FuncTypeUnsigned)icmp##cmp,                                     \
         (FuncTypeUnsigned)Subzero_::icmp##cmp                                  \
   }                                                                            \
   ,
         ICMP_U_TABLE
 #undef X
 #define X(cmp, op)                                                             \
   {                                                                            \
-    STR(inst), (FuncTypeUnsigned)(FuncTypeSigned)icmp##cmp,                    \
+    STR(cmp), (FuncTypeUnsigned)(FuncTypeSigned)icmp##cmp,                     \
         (FuncTypeUnsigned)(FuncTypeSigned)Subzero_::icmp##cmp                  \
   }                                                                            \
   ,
         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;
@@ skipping 42 matching lines @@
 template <typename T>
 void testsVecI1(size_t &TotalTests, size_t &Passes, size_t &Failures) {
   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(inst), (FuncType)icmpi1##cmp, (FuncType)Subzero_::icmpi1##cmp }        \
+  { STR(cmp), (FuncType)icmpi1##cmp, (FuncType)Subzero_::icmpi1##cmp }         \
   ,
         ICMP_U_TABLE
         ICMP_S_TABLE
   };
   const static size_t NumFuncs = sizeof(Funcs) / sizeof(*Funcs);
   const static size_t NumElements = Vectors<T>::NumElements;
   const static size_t MAX_NUMBER_OF_ELEMENTS_FOR_EXHAUSTIVE_TESTING = 8;
 
   // Check if the type is small enough to try all possible input pairs.
   if (NumElements <= MAX_NUMBER_OF_ELEMENTS_FOR_EXHAUSTIVE_TESTING) {
@@ skipping 62 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;
 }