Removing the printing of unit test parameters

Changing unit tests to only print test parameters on unit test failures.

Author: Kent Knox

src/tests/correctness/corr-asum.cpp

@@ -167,6 +167,14 @@ asumCorrectnessTest(TestParams *params)
     releaseMemObjects(bufX, bufAsum, scratchBuff);
 
     compareMatrices<T2>(clblasColumnMajor, 1 , 1, (blasAsum), (clblasAsum+params->offa), 1);
+
+    if (::testing::Test::HasFailure())
+    {
+        printTestParams(params->N, params->offBX, params->incx);
+        ::std::cerr << "offAsum = " << params->offa << ::std::endl;
+        ::std::cerr << "queues = " << params->numCommandQueues << ::std::endl;
+    }
+
     deleteBuffers<T1>(blasX);
     deleteBuffers<T2>(blasAsum, clblasAsum);
     delete[] events;

src/tests/correctness/corr-axpy.cpp

@@ -170,6 +170,13 @@ axpyCorrectnessTest(TestParams *params)
     releaseMemObjects(bufX, bufY);
 
     compareMatrices<T>(clblasRowMajor, lengthY , 1, (blasY + params->offCY), (Y + params->offCY), 1);
+
+    if (::testing::Test::HasFailure())
+    {
+        printTestParams(params->N, params->alpha, params->offBX, params->incx, params->offCY, params->incy);
+        ::std::cerr << "queues = " << params->numCommandQueues << ::std::endl;
+    }
+
     deleteBuffers<T>(X, Y, blasX, blasY);
     delete[] events;
 }

src/tests/correctness/corr-copy.cpp

@@ -165,6 +165,13 @@ copyCorrectnessTest(TestParams *params)
     releaseMemObjects(bufX, bufY);
 
     compareMatrices<T>(clblasColumnMajor, lengthY , 1, (blasY + params->offCY), (clblasY + params->offCY), lengthY, NULL);
+
+    if (::testing::Test::HasFailure())
+    {
+        printTestParams(params->N, params->offBX, params->incx, params->offCY, params->incy);
+        ::std::cerr << "queues = " << params->numCommandQueues << ::std::endl;
+    }
+
     deleteBuffers<T>(blasX, blasY, clblasY);
     delete[] events;
 }

src/tests/correctness/corr-dot.cpp

@@ -173,6 +173,14 @@ dotCorrectnessTest(TestParams *params)
     releaseMemObjects(bufX, bufY, bufDP, scratchBuff);
 
     compareMatrices<T>(clblasColumnMajor, 1 , 1, (blasDP), (clblasDP+params->offa), 1);
+
+    if (::testing::Test::HasFailure())
+    {
+        printTestParams(params->N, params->offBX, params->incx, params->offCY, params->incy);
+        ::std::cerr << "offDP = " << params->offa << ::std::endl;
+        ::std::cerr << "queues = " << params->numCommandQueues << ::std::endl;
+    }
+
     deleteBuffers<T>(blasX, blasY, blasDP, clblasDP);
     delete[] events;
 }

src/tests/correctness/corr-dotc.cpp

@@ -173,6 +173,14 @@ dotcCorrectnessTest(TestParams *params)
     releaseMemObjects(bufX, bufY, bufDP, scratchBuff);
 
     compareMatrices<T>(clblasColumnMajor, 1 , 1, (blasDP), (clblasDP+params->offa), 1);
+
+    if (::testing::Test::HasFailure())
+    {
+        printTestParams(params->N, params->offBX, params->incx, params->offCY, params->incy);
+        ::std::cerr << "offDP = " << params->offa << ::std::endl;
+        ::std::cerr << "queues = " << params->numCommandQueues << ::std::endl;
+    }
+
     deleteBuffers<T>(blasX, blasY, blasDP, clblasDP);
     delete[] events;
 }

src/tests/correctness/corr-gbmv.cpp

@@ -203,6 +203,15 @@ gbmvCorrectnessTest(TestParams *params)
     releaseMemObjects(bufA, bufX, bufY);
     compareMatrices<T>(clblasColumnMajor, lengthY , 1, (blasY + params->offCY), (clblasY + params->offCY),
                        lengthY);
+
+    if (::testing::Test::HasFailure())
+    {
+        printTestParams(params->order, params->transA, params->M, params->N, params->KL, params->KU, params->alpha, params->offA,
+            params->lda, params->offBX, params->incx, params->beta, params->offCY, params->incy);
+        ::std::cerr << "seed = " << params->seed << ::std::endl;
+        ::std::cerr << "queues = " << params->numCommandQueues << ::std::endl;
+    }
+
     deleteBuffers<T>(A, X, blasY, clblasY);
     delete[] events;
 }

src/tests/correctness/corr-gemm.cpp

@@ -103,12 +103,10 @@ gemmCorrectnessTest(TestParams *params)
         beta = convertMultiplier<T>(params->beta);
     }
 
-    //::std::cerr << "Generating input data... ";
     randomGemmMatrices<T>(params->order, params->transA, params->transB,
         params->M, params->N, params->K, useAlpha, &alpha, A, params->lda,
         B, params->ldb, useBeta, &beta, blasC, params->ldc);
     memcpy(clblasC, blasC, params->rowsC * params->columnsC * sizeof(*blasC));
-    //::std::cerr << "Done" << ::std::endl;
 
     if (params->order == clblasColumnMajor) {
         ::clMath::blas::gemm(clblasColumnMajor, params->transA, params->transB,
@@ -193,6 +191,16 @@ gemmCorrectnessTest(TestParams *params)
     releaseMemObjects(bufA, bufB, bufC);
     compareMatrices<T>(params->order, params->M, params->N, blasC, clblasC,
                        params->ldc);
+
+    if (::testing::Test::HasFailure( ) )
+    {
+        printTestParams(params->order, params->transA, params->transB, params->M, params->N, params->K, base->useAlpha(),
+            base->alpha(), params->offA, params->lda, params->offBX, params->ldb, base->useBeta(),
+            base->beta(), params->offCY, params->ldc);
+        ::std::cerr << "             seed = " << params->seed << ", "
+            << "queues = " << params->numCommandQueues << ", ";
+    }
+
     deleteBuffers<T>(A, B, blasC, clblasC);
     delete[] events;
 }

src/tests/correctness/corr-gemm2.cpp

@@ -215,6 +215,16 @@ gemm2CorrectnessTest(TestParams *params)
     releaseMemObjects(bufA, bufB, bufC);
     compareMatrices<T>(params->order, params->M, params->N, blasC, clblasC,
                        params->ldc);
+
+    if (::testing::Test::HasFailure())
+    {
+        printTestParams(params->order, params->transA, params->transB, params->M, params->N, params->K, base->useAlpha(),
+            base->alpha(), params->offA, params->lda, params->offBX, params->ldb, base->useBeta(),
+            base->beta(), params->offCY, params->ldc);
+        ::std::cerr << "seed = " << params->seed << ::std::endl;
+        ::std::cerr << "queues = " << params->numCommandQueues << ::std::endl;
+    }
+
     deleteBuffers<T>(A, B, blasC, clblasC);
     delete[] events;
 }

src/tests/correctness/corr-gemv.cpp

@@ -202,6 +202,14 @@ gemvCorrectnessTest(TestParams *params)
     compareVectors(params->offCY, lenY, abs(params->incy),
                    params->columnsC * params->rowsC, blasC, clblasC);
 
+    if (::testing::Test::HasFailure())
+    {
+        printTestParams(params->order, params->transA, params->M, params->N, base->useAlpha(), base->alpha(), params->offA,
+            params->lda, params->incx, base->useBeta(), base->beta(), params->incy);
+        ::std::cerr << "seed = " << params->seed << ::std::endl;
+        ::std::cerr << "queues = " << params->numCommandQueues << ::std::endl;
+    }
+
     deleteBuffers<T>(A, B, blasC, clblasC);
     delete[] events;
 }

src/tests/correctness/corr-ger.cpp

@@ -218,6 +218,17 @@ gerCorrectnessTest(TestParams *params)
 
     // handle lda correctly based on row-major/col-major..
     compareMatrices<T>(params->order, params->M , params->N, A+ params->offa, backA + params->offa, params->lda);
+
+    if (::testing::Test::HasFailure())
+    {
+        printTestParams(params->order, params->M, params->N, useAlpha,
+            base->alpha(),
+            params->lda, params->incx, params->incy, params->offa, params->offBX, params->offCY);
+
+        ::std::cerr << "seed = " << params->seed << ::std::endl;
+        ::std::cerr << "queues = " << params->numCommandQueues << ::std::endl;
+    }
+
     deleteBuffers<T>(A, x, y, backA);
     delete[] events;
 }