Refactored the correctness tests

1 files changed, 7 insertions, 56 deletions

diff --git a/test/correctness/routines/level1/xaxpy.cc b/test/correctness/routines/level1/xaxpy.cc
index ac44caec..1bb10f7b 100644
--- a/test/correctness/routines/level1/xaxpy.cc
+++ b/test/correctness/routines/level1/xaxpy.cc
@@ -14,67 +14,18 @@
 #include "correctness/testblas.h"
 #include "routines/level1/xaxpy.h"
 
-namespace clblast {
 // =================================================================================================
 
-// The correctness tester
-template <typename T>
-void RunTest(int argc, char *argv[], const bool silent, const std::string &name) {
-
-  // Creates a tester
-  TestBlas<T,T> tester{argc, argv, silent, name, TestXaxpy<T>::GetOptions(),
-                       TestXaxpy<T>::RunRoutine, TestXaxpy<T>::RunReference,
-                       TestXaxpy<T>::DownloadResult, TestXaxpy<T>::GetResultIndex,
-                       TestXaxpy<T>::ResultID1, TestXaxpy<T>::ResultID2};
-
-  // This variable holds the arguments relevant for this routine
-  auto args = Arguments<T>{};
-
-  // Creates the arguments vector for the regular tests
-  auto regular_test_vector = std::vector<Arguments<T>>{};
-  for (auto &n: tester.kVectorDims) { args.n = n;
-    for (auto &x_inc: tester.kIncrements) { args.x_inc = x_inc;
-      for (auto &x_offset: tester.kOffsets) { args.x_offset = x_offset;
-        for (auto &y_inc: tester.kIncrements) { args.y_inc = y_inc;
-          for (auto &y_offset: tester.kOffsets) { args.y_offset = y_offset;
-            for (auto &alpha: tester.kAlphaValues) { args.alpha = alpha;
-              args.x_size = TestXaxpy<T>::GetSizeX(args);
-              args.y_size = TestXaxpy<T>::GetSizeY(args);
-              if (args.x_size<1 || args.y_size<1) { continue; }
-              regular_test_vector.push_back(args);
-            }
-          }
-        }
-      }
-    }
-  }
-
-  // Creates the arguments vector for the invalid-buffer tests
-  auto invalid_test_vector = std::vector<Arguments<T>>{};
-  args.n = tester.kBufferSize;
-  args.x_inc = args.y_inc = 1;
-  args.x_offset = args.y_offset = 0;
-  for (auto &x_size: tester.kVecSizes) { args.x_size = x_size;
-    for (auto &y_size: tester.kVecSizes) { args.y_size = y_size;
-      invalid_test_vector.push_back(args);
-    }
-  }
-
-  // Runs the tests
-  const auto case_name = "default";
-  tester.TestRegular(regular_test_vector, case_name);
-  tester.TestInvalid(invalid_test_vector, case_name);
-}
-
-// =================================================================================================
-} // namespace clblast
+// Shortcuts to the clblast namespace
+using float2 = clblast::float2;
+using double2 = clblast::double2;
 
 // Main function (not within the clblast namespace)
 int main(int argc, char *argv[]) {
-  clblast::RunTest<float>(argc, argv, false, "SAXPY");
-  clblast::RunTest<double>(argc, argv, true, "DAXPY");
-  clblast::RunTest<clblast::float2>(argc, argv, true, "CAXPY");
-  clblast::RunTest<clblast::double2>(argc, argv, true, "ZAXPY");
+  clblast::RunTests<clblast::TestXaxpy<float>, float, float>(argc, argv, false, "SAXPY");
+  clblast::RunTests<clblast::TestXaxpy<double>, double, double>(argc, argv, true, "DAXPY");
+  clblast::RunTests<clblast::TestXaxpy<float2>, float2, float2>(argc, argv, true, "CAXPY");
+  clblast::RunTests<clblast::TestXaxpy<double2>, double2, double2>(argc, argv, true, "ZAXPY");
   return 0;
 }