Subzero: Fix and clean up some cross tests.

crosstest/test_vector_ops_main.cpp

 //===- subzero/crosstest/test_vector_ops_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 insertelement and extractelement operations
@@ skipping 35 matching lines @@
   Ty Max;
   for (int I = 0; I < VectorOps<T>::NumElements; ++I)
     Max[I] = std::numeric_limits<ElementTy>::max();
   Ty TestVectors[] = {Zero, Incr, Decr, Min, Max};
 
   NumTestVectors = sizeof(TestVectors) / sizeof(Ty);
 
   const size_t VECTOR_ALIGNMENT = 16;
   void *Dest;
   if (posix_memalign(&Dest, VECTOR_ALIGNMENT, sizeof(TestVectors))) {
-    std::cerr << "memory allocation error" << std::endl;
+    std::cerr << "memory allocation error" << "\n";

[wala, 2014/08/05 05:16:34]

Nit: Could fold the last two string arguments to "memory allocation error\n".
Two adjacent string literals as stream arguments look somewhat unnecessary. LLVM
code seems to de facto prefer "...\n" or "..." << '\n'.

[Jim Stichnoth, 2014/08/06 16:14:26]

Thanks.  This was the result of blind search/replace, and I didn't notice the
redundancy.

     abort();
   }
 
   memcpy(Dest, TestVectors, sizeof(TestVectors));
 
   return static_cast<Ty *>(Dest);
 }
 
 template <typename T>
 void testInsertElement(size_t &TotalTests, size_t &Passes, size_t &Failures) {
@@ skipping 15 matching lines @@
         Ty ResultLlc = VectorOps<T>::insertelement(Vect, Elt, I);
         Ty ResultSz = VectorOps<T>::Subzero_insertelement(Vect, Elt, I);
         ++TotalTests;
         if (!memcmp(&ResultLlc, &ResultSz, sizeof(ResultLlc))) {
           ++Passes;
         } else {
           ++Failures;
           std::cout << "insertelement<" << VectorOps<T>::TypeName << ">(Vect=";
           std::cout << vectAsString<T>(Vect)
                     << ", Element=" << (typename VectorOps<T>::CastTy)Elt
-                    << ", Pos=" << I << ")" << std::endl;
-          std::cout << "llc=" << vectAsString<T>(ResultLlc) << std::endl;
-          std::cout << "sz =" << vectAsString<T>(ResultSz) << std::endl;
+                    << ", Pos=" << I << ")" << "\n";

[wala, 2014/08/05 05:16:34]

See above.

[Jim Stichnoth, 2014/08/06 16:14:26]

Done.

+          std::cout << "llc=" << vectAsString<T>(ResultLlc) << "\n";
+          std::cout << "sz =" << vectAsString<T>(ResultSz) << "\n";
         }
       }
     }
   }
 
   free(TestVectors);
 }
 
 template <typename T>
 void testExtractElement(size_t &TotalTests, size_t &Passes, size_t &Failures) {
   typedef typename VectorOps<T>::Ty Ty;
   typedef typename VectorOps<T>::ElementTy ElementTy;
   typedef typename VectorOps<T>::CastTy CastTy;
 
   size_t NumTestVectors;
   Ty *TestVectors = getTestVectors<T>(NumTestVectors);
 
   for (size_t VI = 0; VI < NumTestVectors; ++VI) {
     Ty Vect = TestVectors[VI];
     for (size_t I = 0; I < VectorOps<T>::NumElements; ++I) {
       CastTy ResultLlc = VectorOps<T>::extractelement(Vect, I);
       CastTy ResultSz = VectorOps<T>::Subzero_extractelement(Vect, I);
       ++TotalTests;
       if (!memcmp(&ResultLlc, &ResultSz, sizeof(ResultLlc))) {
         ++Passes;
       } else {
         ++Failures;
         std::cout << "extractelement<" << VectorOps<T>::TypeName << ">(Vect=";
-        std::cout << vectAsString<T>(Vect) << ", Pos=" << I << ")" << std::endl;
-        std::cout << "llc=" << ResultLlc << std::endl;
-        std::cout << "sz =" << ResultSz << std::endl;
+        std::cout << vectAsString<T>(Vect) << ", Pos=" << I << ")" << "\n";

[wala, 2014/08/05 05:16:34]

See above.

[Jim Stichnoth, 2014/08/06 16:14:26]

Done.

+        std::cout << "llc=" << ResultLlc << "\n";
+        std::cout << "sz =" << ResultSz << "\n";
       }
     }
   }
 
   free(TestVectors);
 }
 
 int main(int argc, char *argv[]) {
   size_t TotalTests = 0;
   size_t Passes = 0;
@@ skipping 23 matching lines @@
 
   std::cout << "TotalTests=" << TotalTests << " Passes=" << Passes
             << " Failures=" << Failures << "\n";
 
   return Failures;
 }
 
 extern "C" {
 
 void ice_unreachable(void) {
-  std::cerr << "\"unreachable\" instruction encountered" << std::endl;
+  std::cerr << "\"unreachable\" instruction encountered" << "\n";

[wala, 2014/08/05 05:16:34]

See above.

[Jim Stichnoth, 2014/08/06 16:14:26]

Done.

   abort();
 }
 }