From 249bdaa8e9a111573f5c3a821230bba6437817c7 Mon Sep 17 00:00:00 2001 From: Cedric Nugteren Date: Mon, 18 Dec 2017 21:34:07 +0100 Subject: Reformatted tuning code to make compilation faster --- src/tuning/kernels/xger.cpp | 158 +++++++++++++++++++++----------------------- 1 file changed, 77 insertions(+), 81 deletions(-) (limited to 'src/tuning/kernels/xger.cpp') diff --git a/src/tuning/kernels/xger.cpp b/src/tuning/kernels/xger.cpp index 745e553f..a88fb5d6 100644 --- a/src/tuning/kernels/xger.cpp +++ b/src/tuning/kernels/xger.cpp @@ -20,87 +20,83 @@ namespace clblast { // ================================================================================================= -// See comment at top of file for a description of the class -template -class TuneXger { - 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 &args) { - auto settings = TunerSettings(); +// Settings for this kernel (general) +template +TunerSettings GetTunerSettings(const int, const Arguments &args) { + auto settings = TunerSettings(); - // Identification of the kernel - settings.kernel_family = "xger"; - settings.kernel_name = "Xger"; - settings.sources = + // Identification of the kernel + settings.kernel_family = "xger"; + settings.kernel_name = "Xger"; + settings.sources = #include "../src/kernels/level2/level2.opencl" #include "../src/kernels/level2/xger.opencl" - ; - - // Buffer sizes - settings.size_x = args.m; - settings.size_y = args.n; - settings.size_a = args.m * args.n; - - // Inputs and outputs IDs (X:0, Y:1, A:2, B:3, C:4, temp:5) - settings.inputs = {0, 1, 2}; - settings.outputs = {2}; - - // 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 = {{"WGS1", "WGS2"}}; - settings.div_global = {{"WPT", "WPT"}}; - - // Sets the tuning parameters and their possible values - settings.parameters = { - {"WGS1", {4, 8, 16, 32, 64, 128, 256, 512}}, - {"WGS2", {1, 2, 4, 8, 16, 32, 64, 128, 256}}, - {"WPT", {1, 2, 4}}, - }; - - // Describes how to compute the performance metrics - settings.metric_amount = (2*args.m*args.n + args.m + args.n) * GetBytes(args.precision); - settings.performance_unit = "GB/s"; - - return settings; - } + ; + + // Buffer sizes + settings.size_x = args.m; + settings.size_y = args.n; + settings.size_a = args.m * args.n; + + // Inputs and outputs IDs (X:0, Y:1, A:2, B:3, C:4, temp:5) + settings.inputs = {0, 1, 2}; + settings.outputs = {2}; + + // 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 = {{"WGS1", "WGS2"}}; + settings.div_global = {{"WPT", "WPT"}}; + + // Sets the tuning parameters and their possible values + settings.parameters = { + {"WGS1", {4, 8, 16, 32, 64, 128, 256, 512}}, + {"WGS2", {1, 2, 4, 8, 16, 32, 64, 128, 256}}, + {"WPT", {1, 2, 4}}, + }; + + // Describes how to compute the performance metrics + settings.metric_amount = (2*args.m*args.n + args.m + args.n) * GetBytes(args.precision); + settings.performance_unit = "GB/s"; + + return settings; +} - // Tests for valid arguments - static void TestValidArguments(const Arguments &) { } - static std::vector SetConstraints() { return {}; } - - // Sets the kernel's arguments - static void SetArguments(Kernel &kernel, const Arguments &args, - std::vector>& buffers) { - kernel.SetArgument(0, static_cast(args.m)); - kernel.SetArgument(1, static_cast(args.n)); - kernel.SetArgument(2, GetRealArg(args.alpha)); - kernel.SetArgument(3, buffers[0]()); // 0 == X vector - kernel.SetArgument(4, 0); // x_offset - kernel.SetArgument(5, 1); // x_increment - kernel.SetArgument(6, buffers[1]()); // 1 == Y vector - kernel.SetArgument(7, 0); // y_offset - kernel.SetArgument(8, 1); // y_increment - kernel.SetArgument(9, buffers[2]()); // 2 == A matrix - kernel.SetArgument(10, 0); // a_offset - kernel.SetArgument(11, static_cast(args.m)); // a_ld - kernel.SetArgument(12, 0); // a_is_rowmajor - } -}; +// Tests for valid arguments +template +void TestValidArguments(const int, const Arguments &) { } +std::vector SetConstraints(const int) { return {}; } + +// Sets the kernel's arguments +template +void SetArguments(const int, Kernel &kernel, const Arguments &args, std::vector>& buffers) { + kernel.SetArgument(0, static_cast(args.m)); + kernel.SetArgument(1, static_cast(args.n)); + kernel.SetArgument(2, GetRealArg(args.alpha)); + kernel.SetArgument(3, buffers[0]()); // 0 == X vector + kernel.SetArgument(4, 0); // x_offset + kernel.SetArgument(5, 1); // x_increment + kernel.SetArgument(6, buffers[1]()); // 1 == Y vector + kernel.SetArgument(7, 0); // y_offset + kernel.SetArgument(8, 1); // y_increment + kernel.SetArgument(9, buffers[2]()); // 2 == A matrix + kernel.SetArgument(10, 0); // a_offset + kernel.SetArgument(11, static_cast(args.m)); // a_ld + kernel.SetArgument(12, 0); // a_is_rowmajor +} // ================================================================================================= } // namespace clblast @@ -114,11 +110,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, half>(argc, argv); break; - case clblast::Precision::kSingle: clblast::Tuner, float>(argc, argv); break; - case clblast::Precision::kDouble: clblast::Tuner, double>(argc, argv); break; - case clblast::Precision::kComplexSingle: clblast::Tuner, float2>(argc, argv); break; - case clblast::Precision::kComplexDouble: clblast::Tuner, double2>(argc, argv); break; + case clblast::Precision::kHalf: clblast::Tuner(argc, argv, 0, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; + case clblast::Precision::kSingle: clblast::Tuner(argc, argv, 0, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; + case clblast::Precision::kDouble: clblast::Tuner(argc, argv, 0, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; + case clblast::Precision::kComplexSingle: clblast::Tuner(argc, argv, 0, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; + case clblast::Precision::kComplexDouble: clblast::Tuner(argc, argv, 0, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; } return 0; } -- cgit v1.2.3