The clients now distinguish between the memory and alpha/beta data-type

7 files changed, 56 insertions, 28 deletions

diff --git a/test/performance/routines/xaxpy.cc b/test/performance/routines/xaxpy.cc
index 3ced80ed..6a2b96c1 100644
--- a/test/performance/routines/xaxpy.cc
+++ b/test/performance/routines/xaxpy.cc
@@ -16,19 +16,23 @@
 
 // =================================================================================================
 
+// 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[]) {
   switch(clblast::GetPrecision(argc, argv)) {
     case clblast::Precision::kHalf:
       throw std::runtime_error("Unsupported precision mode");
     case clblast::Precision::kSingle:
-      clblast::RunClient<clblast::TestXaxpy<float>, float>(argc, argv); break;
+      clblast::RunClient<clblast::TestXaxpy<float>, float, float>(argc, argv); break;
     case clblast::Precision::kDouble:
-      clblast::RunClient<clblast::TestXaxpy<double>, double>(argc, argv); break;
+      clblast::RunClient<clblast::TestXaxpy<double>, double, double>(argc, argv); break;
     case clblast::Precision::kComplexSingle:
-      clblast::RunClient<clblast::TestXaxpy<clblast::float2>, clblast::float2>(argc, argv); break;
+      clblast::RunClient<clblast::TestXaxpy<float2>, float2, float2>(argc, argv); break;
     case clblast::Precision::kComplexDouble:
-      clblast::RunClient<clblast::TestXaxpy<clblast::double2>, clblast::double2>(argc, argv); break;
+      clblast::RunClient<clblast::TestXaxpy<double2>, double2, double2>(argc, argv); break;
   }
   return 0;
 }
diff --git a/test/performance/routines/xgemm.cc b/test/performance/routines/xgemm.cc
index 36c74b9a..9a02e595 100644
--- a/test/performance/routines/xgemm.cc
+++ b/test/performance/routines/xgemm.cc
@@ -16,19 +16,23 @@
 
 // =================================================================================================
 
+// 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[]) {
   switch(clblast::GetPrecision(argc, argv)) {
     case clblast::Precision::kHalf:
       throw std::runtime_error("Unsupported precision mode");
     case clblast::Precision::kSingle:
-      clblast::RunClient<clblast::TestXgemm<float>, float>(argc, argv); break;
+      clblast::RunClient<clblast::TestXgemm<float>, float, float>(argc, argv); break;
     case clblast::Precision::kDouble:
-      clblast::RunClient<clblast::TestXgemm<double>, double>(argc, argv); break;
+      clblast::RunClient<clblast::TestXgemm<double>, double, double>(argc, argv); break;
     case clblast::Precision::kComplexSingle:
-      clblast::RunClient<clblast::TestXgemm<clblast::float2>, clblast::float2>(argc, argv); break;
+      clblast::RunClient<clblast::TestXgemm<float2>, float2, float2>(argc, argv); break;
     case clblast::Precision::kComplexDouble:
-      clblast::RunClient<clblast::TestXgemm<clblast::double2>, clblast::double2>(argc, argv); break;
+      clblast::RunClient<clblast::TestXgemm<double2>, double2, double2>(argc, argv); break;
   }
   return 0;
 }
diff --git a/test/performance/routines/xgemv.cc b/test/performance/routines/xgemv.cc
index 183dd4a1..6f69ef21 100644
--- a/test/performance/routines/xgemv.cc
+++ b/test/performance/routines/xgemv.cc
@@ -16,19 +16,23 @@
 
 // =================================================================================================
 
+// 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[]) {
   switch(clblast::GetPrecision(argc, argv)) {
     case clblast::Precision::kHalf:
       throw std::runtime_error("Unsupported precision mode");
     case clblast::Precision::kSingle:
-      clblast::RunClient<clblast::TestXgemv<float>, float>(argc, argv); break;
+      clblast::RunClient<clblast::TestXgemv<float>, float, float>(argc, argv); break;
     case clblast::Precision::kDouble:
-      clblast::RunClient<clblast::TestXgemv<double>, double>(argc, argv); break;
+      clblast::RunClient<clblast::TestXgemv<double>, double, double>(argc, argv); break;
     case clblast::Precision::kComplexSingle:
-      clblast::RunClient<clblast::TestXgemv<clblast::float2>, clblast::float2>(argc, argv); break;
+      clblast::RunClient<clblast::TestXgemv<float2>, float2, float2>(argc, argv); break;
     case clblast::Precision::kComplexDouble:
-      clblast::RunClient<clblast::TestXgemv<clblast::double2>, clblast::double2>(argc, argv); break;
+      clblast::RunClient<clblast::TestXgemv<double2>, double2, double2>(argc, argv); break;
   }
   return 0;
 }
diff --git a/test/performance/routines/xsymm.cc b/test/performance/routines/xsymm.cc
index 0c7f5e1e..8738ceda 100644
--- a/test/performance/routines/xsymm.cc
+++ b/test/performance/routines/xsymm.cc
@@ -16,19 +16,23 @@
 
 // =================================================================================================
 
+// 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[]) {
   switch(clblast::GetPrecision(argc, argv)) {
     case clblast::Precision::kHalf:
       throw std::runtime_error("Unsupported precision mode");
     case clblast::Precision::kSingle:
-      clblast::RunClient<clblast::TestXsymm<float>, float>(argc, argv); break;
+      clblast::RunClient<clblast::TestXsymm<float>, float, float>(argc, argv); break;
     case clblast::Precision::kDouble:
-      clblast::RunClient<clblast::TestXsymm<double>, double>(argc, argv); break;
+      clblast::RunClient<clblast::TestXsymm<double>, double, double>(argc, argv); break;
     case clblast::Precision::kComplexSingle:
-      clblast::RunClient<clblast::TestXsymm<clblast::float2>, clblast::float2>(argc, argv); break;
+      clblast::RunClient<clblast::TestXsymm<float2>, float2, float2>(argc, argv); break;
     case clblast::Precision::kComplexDouble:
-      clblast::RunClient<clblast::TestXsymm<clblast::double2>, clblast::double2>(argc, argv); break;
+      clblast::RunClient<clblast::TestXsymm<double2>, double2, double2>(argc, argv); break;
   }
   return 0;
 }
diff --git a/test/performance/routines/xsyr2k.cc b/test/performance/routines/xsyr2k.cc
index 63b50df6..e4c76229 100644
--- a/test/performance/routines/xsyr2k.cc
+++ b/test/performance/routines/xsyr2k.cc
@@ -16,19 +16,23 @@
 
 // =================================================================================================
 
+// 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[]) {
   switch(clblast::GetPrecision(argc, argv)) {
     case clblast::Precision::kHalf:
       throw std::runtime_error("Unsupported precision mode");
     case clblast::Precision::kSingle:
-      clblast::RunClient<clblast::TestXsyr2k<float>, float>(argc, argv); break;
+      clblast::RunClient<clblast::TestXsyr2k<float>, float, float>(argc, argv); break;
     case clblast::Precision::kDouble:
-      clblast::RunClient<clblast::TestXsyr2k<double>, double>(argc, argv); break;
+      clblast::RunClient<clblast::TestXsyr2k<double>, double, double>(argc, argv); break;
     case clblast::Precision::kComplexSingle:
-      clblast::RunClient<clblast::TestXsyr2k<clblast::float2>, clblast::float2>(argc, argv); break;
+      clblast::RunClient<clblast::TestXsyr2k<float2>, float2, float2>(argc, argv); break;
     case clblast::Precision::kComplexDouble:
-      clblast::RunClient<clblast::TestXsyr2k<clblast::double2>, clblast::double2>(argc, argv); break;
+      clblast::RunClient<clblast::TestXsyr2k<double2>, double2, double2>(argc, argv); break;
   }
   return 0;
 }
diff --git a/test/performance/routines/xsyrk.cc b/test/performance/routines/xsyrk.cc
index 9022d4f8..53fecb69 100644
--- a/test/performance/routines/xsyrk.cc
+++ b/test/performance/routines/xsyrk.cc
@@ -16,19 +16,23 @@
 
 // =================================================================================================
 
+// 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[]) {
   switch(clblast::GetPrecision(argc, argv)) {
     case clblast::Precision::kHalf:
       throw std::runtime_error("Unsupported precision mode");
     case clblast::Precision::kSingle:
-      clblast::RunClient<clblast::TestXsyrk<float>, float>(argc, argv); break;
+      clblast::RunClient<clblast::TestXsyrk<float>, float, float>(argc, argv); break;
     case clblast::Precision::kDouble:
-      clblast::RunClient<clblast::TestXsyrk<double>, double>(argc, argv); break;
+      clblast::RunClient<clblast::TestXsyrk<double>, double, double>(argc, argv); break;
     case clblast::Precision::kComplexSingle:
-      clblast::RunClient<clblast::TestXsyrk<clblast::float2>, clblast::float2>(argc, argv); break;
+      clblast::RunClient<clblast::TestXsyrk<float2>, float2, float2>(argc, argv); break;
     case clblast::Precision::kComplexDouble:
-      clblast::RunClient<clblast::TestXsyrk<clblast::double2>, clblast::double2>(argc, argv); break;
+      clblast::RunClient<clblast::TestXsyrk<double2>, double2, double2>(argc, argv); break;
   }
   return 0;
 }
diff --git a/test/performance/routines/xtrmm.cc b/test/performance/routines/xtrmm.cc
index 91dcbd07..2ab9ce77 100644
--- a/test/performance/routines/xtrmm.cc
+++ b/test/performance/routines/xtrmm.cc
@@ -16,19 +16,23 @@
 
 // =================================================================================================
 
+// 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[]) {
   switch(clblast::GetPrecision(argc, argv)) {
     case clblast::Precision::kHalf:
       throw std::runtime_error("Unsupported precision mode");
     case clblast::Precision::kSingle:
-      clblast::RunClient<clblast::TestXtrmm<float>, float>(argc, argv); break;
+      clblast::RunClient<clblast::TestXtrmm<float>, float, float>(argc, argv); break;
     case clblast::Precision::kDouble:
-      clblast::RunClient<clblast::TestXtrmm<double>, double>(argc, argv); break;
+      clblast::RunClient<clblast::TestXtrmm<double>, double, double>(argc, argv); break;
     case clblast::Precision::kComplexSingle:
-      clblast::RunClient<clblast::TestXtrmm<clblast::float2>, clblast::float2>(argc, argv); break;
+      clblast::RunClient<clblast::TestXtrmm<float2>, float2, float2>(argc, argv); break;
     case clblast::Precision::kComplexDouble:
-      clblast::RunClient<clblast::TestXtrmm<clblast::double2>, clblast::double2>(argc, argv); break;
+      clblast::RunClient<clblast::TestXtrmm<double2>, double2, double2>(argc, argv); break;
   }
   return 0;
 }