Reformatted tuning code to make compilation faster

1 files changed, 69 insertions, 73 deletions

diff --git a/src/tuning/kernels/xaxpy.cpp b/src/tuning/kernels/xaxpy.cpp
index d843ea78..dd44018c 100644
--- a/src/tuning/kernels/xaxpy.cpp
+++ b/src/tuning/kernels/xaxpy.cpp
@@ -20,80 +20,76 @@
 namespace clblast {
 // =================================================================================================
 
-// See comment at top of file for a description of the class
-template <typename T>
-class TuneXaxpy {
- public:
-
-  // Settings for this kernel (default command-line arguments)
-  static TunerDefaults GetTunerDefaults() {
-    auto settings = TunerDefaults();
-    settings.options = {kArgN, kArgAlpha};
-    settings.default_n = 4096*1024;
-    return settings;
-  }
+// Settings for this kernel (default command-line arguments)
+TunerDefaults GetTunerDefaults(const int) {
+  auto settings = TunerDefaults();
+  settings.options = {kArgN, kArgAlpha};
+  settings.default_n = 4096*1024;
+  return settings;
+}
 
-  // Settings for this kernel (general)
-  static TunerSettings GetTunerSettings(const Arguments<T> &args) {
-    auto settings = TunerSettings();
+// Settings for this kernel (general)
+template <typename T>
+TunerSettings GetTunerSettings(const int, const Arguments<T> &args) {
+  auto settings = TunerSettings();
 
-    // Identification of the kernel
-    settings.kernel_family = "xaxpy";
-    settings.kernel_name = "XaxpyFastest";
-    settings.sources =
+  // Identification of the kernel
+  settings.kernel_family = "xaxpy";
+  settings.kernel_name = "XaxpyFastest";
+  settings.sources =
 #include "../src/kernels/level1/level1.opencl"
 #include "../src/kernels/level1/xaxpy.opencl"
-    ;
-
-    // Buffer sizes
-    settings.size_x = args.n;
-    settings.size_y = args.n;
-
-    // Inputs and outputs IDs (X:0, Y:1, A:2, B:3, C:4, temp:5)
-    settings.inputs = {0, 1};
-    settings.outputs = {1};
-
-    // Sets the base thread configuration
-    settings.global_size = {args.n};
-    settings.global_size_ref = settings.global_size;
-    settings.local_size = {1};
-    settings.local_size_ref = {64};
-
-    // Transforms the thread configuration based on the parameters
-    settings.mul_local = {{"WGS"}};
-    settings.div_global = {{"WPT"},{"VW"}};
-
-    // Sets the tuning parameters and their possible values
-    settings.parameters = {
-      {"WGS", {64, 128, 256, 512, 1024, 2048}},
-      {"WPT", {1, 2, 4, 8}},
-      {"VW", {1, 2, 4, 8}},
-    };
-
-    // Describes how to compute the performance metrics
-    settings.metric_amount = 3 * args.n * GetBytes(args.precision);
-    settings.performance_unit = "GB/s";
-
-    return settings;
-  }
+  ;
+
+  // Buffer sizes
+  settings.size_x = args.n;
+  settings.size_y = args.n;
+
+  // Inputs and outputs IDs (X:0, Y:1, A:2, B:3, C:4, temp:5)
+  settings.inputs = {0, 1};
+  settings.outputs = {1};
+
+  // Sets the base thread configuration
+  settings.global_size = {args.n};
+  settings.global_size_ref = settings.global_size;
+  settings.local_size = {1};
+  settings.local_size_ref = {64};
+
+  // Transforms the thread configuration based on the parameters
+  settings.mul_local = {{"WGS"}};
+  settings.div_global = {{"WPT"},{"VW"}};
+
+  // Sets the tuning parameters and their possible values
+  settings.parameters = {
+    {"WGS", {64, 128, 256, 512, 1024, 2048}},
+    {"WPT", {1, 2, 4, 8}},
+    {"VW", {1, 2, 4, 8}},
+  };
+
+  // Describes how to compute the performance metrics
+  settings.metric_amount = 3 * args.n * GetBytes(args.precision);
+  settings.performance_unit = "GB/s";
+
+  return settings;
+}
 
-  // Tests for valid arguments
-  static void TestValidArguments(const Arguments<T> &args) {
-    if (!IsMultiple(args.n, 64)) {
-      throw std::runtime_error("'XaxpyFastest' requires 'n' to be a multiple of WGS*WPT*VW");
-    }
-  }
-  static std::vector<Constraint> SetConstraints() { return {}; }
-
-  // Sets the kernel's arguments
-  static void SetArguments(Kernel &kernel, const Arguments<T> &args,
-                           std::vector<Buffer<T>>& buffers) {
-    kernel.SetArgument(0, static_cast<int>(args.n));
-    kernel.SetArgument(1, GetRealArg(args.alpha));
-    kernel.SetArgument(2, buffers[0]()); // 0 == X vector
-    kernel.SetArgument(3, buffers[1]()); // 1 == Y vector
+// Tests for valid arguments
+template <typename T>
+void TestValidArguments(const int, const Arguments<T> &args) {
+  if (!IsMultiple(args.n, 64)) {
+    throw std::runtime_error("'XaxpyFastest' requires 'n' to be a multiple of WGS*WPT*VW");
   }
-};
+}
+std::vector<Constraint> SetConstraints(const int) { return {}; }
+
+// Sets the kernel's arguments
+template <typename T>
+void SetArguments(const int, Kernel &kernel, const Arguments<T> &args, std::vector<Buffer<T>>& buffers) {
+  kernel.SetArgument(0, static_cast<int>(args.n));
+  kernel.SetArgument(1, GetRealArg(args.alpha));
+  kernel.SetArgument(2, buffers[0]()); // 0 == X vector
+  kernel.SetArgument(3, buffers[1]()); // 1 == Y vector
+}
 
 // =================================================================================================
 } // namespace clblast
@@ -107,11 +103,11 @@ using double2 = clblast::double2;
 int main(int argc, char *argv[]) {
   const auto command_line_args = clblast::RetrieveCommandLineArguments(argc, argv);
   switch(clblast::GetPrecision(command_line_args)) {
-    case clblast::Precision::kHalf: clblast::Tuner<clblast::TuneXaxpy<half>, half>(argc, argv); break;
-    case clblast::Precision::kSingle: clblast::Tuner<clblast::TuneXaxpy<float>, float>(argc, argv); break;
-    case clblast::Precision::kDouble: clblast::Tuner<clblast::TuneXaxpy<double>, double>(argc, argv); break;
-    case clblast::Precision::kComplexSingle: clblast::Tuner<clblast::TuneXaxpy<float2>, float2>(argc, argv); break;
-    case clblast::Precision::kComplexDouble: clblast::Tuner<clblast::TuneXaxpy<double2>, double2>(argc, argv); break;
+    case clblast::Precision::kHalf: clblast::Tuner<half>(argc, argv, 0, clblast::GetTunerDefaults, clblast::GetTunerSettings<half>, clblast::TestValidArguments<half>, clblast::SetConstraints, clblast::SetArguments<half>); break;
+    case clblast::Precision::kSingle: clblast::Tuner<float>(argc, argv, 0, clblast::GetTunerDefaults, clblast::GetTunerSettings<float>, clblast::TestValidArguments<float>, clblast::SetConstraints, clblast::SetArguments<float>); break;
+    case clblast::Precision::kDouble: clblast::Tuner<double>(argc, argv, 0, clblast::GetTunerDefaults, clblast::GetTunerSettings<double>, clblast::TestValidArguments<double>, clblast::SetConstraints, clblast::SetArguments<double>); break;
+    case clblast::Precision::kComplexSingle: clblast::Tuner<float2>(argc, argv, 0, clblast::GetTunerDefaults, clblast::GetTunerSettings<float2>, clblast::TestValidArguments<float2>, clblast::SetConstraints, clblast::SetArguments<float2>); break;
+    case clblast::Precision::kComplexDouble: clblast::Tuner<double2>(argc, argv, 0, clblast::GetTunerDefaults, clblast::GetTunerSettings<double2>, clblast::TestValidArguments<double2>, clblast::SetConstraints, clblast::SetArguments<double2>); break;
   }
   return 0;
 }