Reformatted tuning code to make compilation faster

1 files changed, 75 insertions, 79 deletions

diff --git a/src/tuning/kernels/transpose_pad.cpp b/src/tuning/kernels/transpose_pad.cpp
index 087f8e67..ed24fb04 100644
--- a/src/tuning/kernels/transpose_pad.cpp
+++ b/src/tuning/kernels/transpose_pad.cpp
@@ -20,85 +20,81 @@
 namespace clblast {
 // =================================================================================================
 
-// See comment at top of file for a description of the class
-template <typename T>
-class TunePadTranspose {
- public:
-
-  // Settings for this kernel (default command-line arguments)
-  static TunerDefaults GetTunerDefaults() {
-    auto settings = TunerDefaults();
-    settings.options = {kArgM, kArgN, kArgAlpha};
-    settings.default_m = 1024;
-    settings.default_n = 1024;
-    return settings;
-  }
+// Settings for this kernel (default command-line arguments)
+TunerDefaults GetTunerDefaults(const int) {
+  auto settings = TunerDefaults();
+  settings.options = {kArgM, kArgN, kArgAlpha};
+  settings.default_m = 1024;
+  settings.default_n = 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 = "padtranspose";
-    settings.kernel_name = "TransposePadMatrix";
-    settings.sources =
+  // Identification of the kernel
+  settings.kernel_family = "padtranspose";
+  settings.kernel_name = "TransposePadMatrix";
+  settings.sources =
 #include "../src/kernels/level3/level3.opencl"
 #include "../src/kernels/level3/transpose_pad.opencl"
-    ;
-
-    // Buffer sizes
-    settings.size_a = args.m * args.n;
-    settings.size_b = args.m * args.n;
-
-    // Inputs and outputs IDs (X:0, Y:1, A:2, B:3, C:4, temp:5)
-    settings.inputs = {2, 3};
-    settings.outputs = {3};
-
-    // Sets the base thread configuration
-    settings.global_size = {args.m, args.n};
-    settings.global_size_ref = settings.global_size;
-    settings.local_size = {1, 1};
-    settings.local_size_ref = {8, 8};
-
-    // Transforms the thread configuration based on the parameters
-    settings.mul_local = {{"PADTRA_TILE", "PADTRA_TILE"}};
-    settings.div_global = {{"PADTRA_WPT", "PADTRA_WPT"}};
-
-    // Sets the tuning parameters and their possible values
-    settings.parameters = {
-      {"PADTRA_TILE", {8, 16, 32, 64}},
-      {"PADTRA_WPT", {1, 2, 4, 8, 16}},
-      {"PADTRA_PAD", {0, 1}},
-    };
-
-    // Describes how to compute the performance metrics
-    settings.metric_amount = 2 * args.m * args.n * GetBytes(args.precision);
-    settings.performance_unit = "GB/s";
-
-    return settings;
-  }
+  ;
+
+  // Buffer sizes
+  settings.size_a = args.m * args.n;
+  settings.size_b = args.m * args.n;
+
+  // Inputs and outputs IDs (X:0, Y:1, A:2, B:3, C:4, temp:5)
+  settings.inputs = {2, 3};
+  settings.outputs = {3};
+
+  // Sets the base thread configuration
+  settings.global_size = {args.m, args.n};
+  settings.global_size_ref = settings.global_size;
+  settings.local_size = {1, 1};
+  settings.local_size_ref = {8, 8};
+
+  // Transforms the thread configuration based on the parameters
+  settings.mul_local = {{"PADTRA_TILE", "PADTRA_TILE"}};
+  settings.div_global = {{"PADTRA_WPT", "PADTRA_WPT"}};
+
+  // Sets the tuning parameters and their possible values
+  settings.parameters = {
+    {"PADTRA_TILE", {8, 16, 32, 64}},
+    {"PADTRA_WPT", {1, 2, 4, 8, 16}},
+    {"PADTRA_PAD", {0, 1}},
+  };
+
+  // Describes how to compute the performance metrics
+  settings.metric_amount = 2 * args.m * args.n * GetBytes(args.precision);
+  settings.performance_unit = "GB/s";
+
+  return settings;
+}
 
-  // Tests for valid arguments
-  static void TestValidArguments(const Arguments<T> &) { }
-  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.m));
-    kernel.SetArgument(1, static_cast<int>(args.n));
-    kernel.SetArgument(2, static_cast<int>(args.m));
-    kernel.SetArgument(3, 0);
-    kernel.SetArgument(4, buffers[2]()); // 2 == A matrix
-    kernel.SetArgument(5, static_cast<int>(args.n));
-    kernel.SetArgument(6, static_cast<int>(args.m));
-    kernel.SetArgument(7, static_cast<int>(args.n));
-    kernel.SetArgument(8, 0);
-    kernel.SetArgument(9, buffers[3]()); // 3 == B matrix
-    kernel.SetArgument(10, GetRealArg(args.alpha));
-    kernel.SetArgument(11, 0);
-  }
-};
+// Tests for valid arguments
+template <typename T>
+void TestValidArguments(const int, const Arguments<T> &) { }
+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.m));
+  kernel.SetArgument(1, static_cast<int>(args.n));
+  kernel.SetArgument(2, static_cast<int>(args.m));
+  kernel.SetArgument(3, 0);
+  kernel.SetArgument(4, buffers[2]()); // 2 == A matrix
+  kernel.SetArgument(5, static_cast<int>(args.n));
+  kernel.SetArgument(6, static_cast<int>(args.m));
+  kernel.SetArgument(7, static_cast<int>(args.n));
+  kernel.SetArgument(8, 0);
+  kernel.SetArgument(9, buffers[3]()); // 3 == B matrix
+  kernel.SetArgument(10, GetRealArg(args.alpha));
+  kernel.SetArgument(11, 0);
+}
 
 // =================================================================================================
 } // namespace clblast
@@ -112,11 +108,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::TunePadTranspose<half>, half>(argc, argv); break;
-    case clblast::Precision::kSingle: clblast::Tuner<clblast::TunePadTranspose<float>, float>(argc, argv); break;
-    case clblast::Precision::kDouble: clblast::Tuner<clblast::TunePadTranspose<double>, double>(argc, argv); break;
-    case clblast::Precision::kComplexSingle: clblast::Tuner<clblast::TunePadTranspose<float2>, float2>(argc, argv); break;
-    case clblast::Precision::kComplexDouble: clblast::Tuner<clblast::TunePadTranspose<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;
 }