From a1cedf36e357f0ce19eba67e1e031c3fd2647fae Mon Sep 17 00:00:00 2001 From: Cedric Nugteren Date: Sat, 3 Mar 2018 16:37:31 +0100 Subject: Separate kernel tuners in .cpp with main and .hpp with settings --- src/tuning/kernels/copy_fast.cpp | 81 +---------------- src/tuning/kernels/copy_fast.hpp | 93 +++++++++++++++++++ src/tuning/kernels/copy_pad.cpp | 89 +----------------- src/tuning/kernels/copy_pad.hpp | 101 +++++++++++++++++++++ src/tuning/kernels/invert.cpp | 94 +------------------ src/tuning/kernels/invert.hpp | 106 ++++++++++++++++++++++ src/tuning/kernels/transpose_fast.cpp | 81 +---------------- src/tuning/kernels/transpose_fast.hpp | 93 +++++++++++++++++++ src/tuning/kernels/transpose_pad.cpp | 88 +----------------- src/tuning/kernels/transpose_pad.hpp | 100 +++++++++++++++++++++ src/tuning/kernels/xaxpy.cpp | 83 +---------------- src/tuning/kernels/xaxpy.hpp | 95 ++++++++++++++++++++ src/tuning/kernels/xdot.cpp | 89 +----------------- src/tuning/kernels/xdot.hpp | 102 +++++++++++++++++++++ src/tuning/kernels/xgemm.cpp | 155 +------------------------------- src/tuning/kernels/xgemm.hpp | 165 ++++++++++++++++++++++++++++++++++ src/tuning/kernels/xgemm_direct.cpp | 152 +------------------------------ src/tuning/kernels/xgemm_direct.hpp | 162 +++++++++++++++++++++++++++++++++ src/tuning/kernels/xgemv.cpp | 128 +------------------------- src/tuning/kernels/xgemv.hpp | 138 ++++++++++++++++++++++++++++ src/tuning/kernels/xger.cpp | 90 +------------------ src/tuning/kernels/xger.hpp | 122 +++++++++++++++++++++++++ 22 files changed, 1291 insertions(+), 1116 deletions(-) create mode 100644 src/tuning/kernels/copy_fast.hpp create mode 100644 src/tuning/kernels/copy_pad.hpp create mode 100644 src/tuning/kernels/invert.hpp create mode 100644 src/tuning/kernels/transpose_fast.hpp create mode 100644 src/tuning/kernels/transpose_pad.hpp create mode 100644 src/tuning/kernels/xaxpy.hpp create mode 100644 src/tuning/kernels/xdot.hpp create mode 100644 src/tuning/kernels/xgemm.hpp create mode 100644 src/tuning/kernels/xgemm_direct.hpp create mode 100644 src/tuning/kernels/xgemv.hpp create mode 100644 src/tuning/kernels/xger.hpp (limited to 'src/tuning/kernels') diff --git a/src/tuning/kernels/copy_fast.cpp b/src/tuning/kernels/copy_fast.cpp index d046c9e9..a71dd083 100644 --- a/src/tuning/kernels/copy_fast.cpp +++ b/src/tuning/kernels/copy_fast.cpp @@ -11,86 +11,7 @@ // // ================================================================================================= -#include -#include - -#include "utilities/utilities.hpp" -#include "tuning/tuning.hpp" - -namespace clblast { -// ================================================================================================= - -// 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) -template -TunerSettings GetTunerSettings(const int, const Arguments &args) { - auto settings = TunerSettings(); - - // Identification of the kernel - settings.kernel_family = "copy"; - settings.kernel_name = "CopyMatrixFast"; - settings.sources = -#include "../src/kernels/level3/level3.opencl" -#include "../src/kernels/level3/copy_fast.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 = {{"COPY_DIMX", "COPY_DIMY"}}; - settings.div_global = {{"COPY_VW", "COPY_WPT"}}; - - // Sets the tuning parameters and their possible values - settings.parameters = { - {"COPY_DIMX", {8, 16, 32}}, - {"COPY_DIMY", {8, 16, 32}}, - {"COPY_WPT", {1, 2, 4, 8}}, - {"COPY_VW", {1, 2, 4, 8}}, - }; - - // 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 -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, buffers[2]()); // 2 == A matrix - kernel.SetArgument(2, buffers[3]()); // 3 == B matrix - kernel.SetArgument(3, GetRealArg(args.alpha)); -} - -// ================================================================================================= -} // namespace clblast +#include "tuning/kernels/copy_fast.hpp" // Shortcuts to the clblast namespace using half = clblast::half; diff --git a/src/tuning/kernels/copy_fast.hpp b/src/tuning/kernels/copy_fast.hpp new file mode 100644 index 00000000..eab1c7dd --- /dev/null +++ b/src/tuning/kernels/copy_fast.hpp @@ -0,0 +1,93 @@ + +// ================================================================================================= +// This file is part of the CLBlast project. The project is licensed under Apache Version 2.0. This +// project loosely follows the Google C++ styleguide and uses a tab-size of two spaces and a max- +// width of 100 characters per line. +// +// Author(s): +// Cedric Nugteren +// +// This file uses the auto-tuner to tune the copy OpenCL kernels. +// +// ================================================================================================= + +#include +#include + +#include "utilities/utilities.hpp" +#include "tuning/tuning.hpp" + +namespace clblast { +// ================================================================================================= + +// 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) +template +TunerSettings GetTunerSettings(const int, const Arguments &args) { + auto settings = TunerSettings(); + + // Identification of the kernel + settings.kernel_family = "copy"; + settings.kernel_name = "CopyMatrixFast"; + settings.sources = +#include "../src/kernels/level3/level3.opencl" +#include "../src/kernels/level3/copy_fast.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 = {{"COPY_DIMX", "COPY_DIMY"}}; + settings.div_global = {{"COPY_VW", "COPY_WPT"}}; + + // Sets the tuning parameters and their possible values + settings.parameters = { + {"COPY_DIMX", {8, 16, 32}}, + {"COPY_DIMY", {8, 16, 32}}, + {"COPY_WPT", {1, 2, 4, 8}}, + {"COPY_VW", {1, 2, 4, 8}}, + }; + + // 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 +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, buffers[2]()); // 2 == A matrix + kernel.SetArgument(2, buffers[3]()); // 3 == B matrix + kernel.SetArgument(3, GetRealArg(args.alpha)); +} + +// ================================================================================================= +} // namespace clblast diff --git a/src/tuning/kernels/copy_pad.cpp b/src/tuning/kernels/copy_pad.cpp index 1b483e86..e32a5746 100644 --- a/src/tuning/kernels/copy_pad.cpp +++ b/src/tuning/kernels/copy_pad.cpp @@ -11,94 +11,7 @@ // // ================================================================================================= -#include -#include - -#include "utilities/utilities.hpp" -#include "tuning/tuning.hpp" - -namespace clblast { -// ================================================================================================= - -// 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) -template -TunerSettings GetTunerSettings(const int, const Arguments &args) { - auto settings = TunerSettings(); - - // Identification of the kernel - settings.kernel_family = "pad"; - settings.kernel_name = "CopyPadMatrix"; - settings.sources = -#include "../src/kernels/level3/level3.opencl" -#include "../src/kernels/level3/copy_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 = {{"PAD_DIMX", "PAD_DIMY"}}; - settings.div_global = {{"PAD_WPTX", "PAD_WPTY"}}; - - // Sets the tuning parameters and their possible values - settings.parameters = { - {"PAD_DIMX", {8, 16, 32}}, - {"PAD_DIMY", {8, 16, 32}}, - {"PAD_WPTX", {1, 2, 4}}, - {"PAD_WPTY", {1, 2, 4}}, - }; - - // 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 -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, static_cast(args.m)); - kernel.SetArgument(3, 0); - kernel.SetArgument(4, buffers[2]()); // 2 == A matrix - kernel.SetArgument(5, static_cast(args.m)); - kernel.SetArgument(6, static_cast(args.n)); - kernel.SetArgument(7, static_cast(args.m)); - kernel.SetArgument(8, 0); - kernel.SetArgument(9, buffers[3]()); // 3 == B matrix - kernel.SetArgument(10, GetRealArg(args.alpha)); - kernel.SetArgument(11, 0); -} - -// ================================================================================================= -} // namespace clblast +#include "tuning/kernels/copy_pad.hpp" // Shortcuts to the clblast namespace using half = clblast::half; diff --git a/src/tuning/kernels/copy_pad.hpp b/src/tuning/kernels/copy_pad.hpp new file mode 100644 index 00000000..b39c0318 --- /dev/null +++ b/src/tuning/kernels/copy_pad.hpp @@ -0,0 +1,101 @@ + +// ================================================================================================= +// This file is part of the CLBlast project. The project is licensed under Apache Version 2.0. This +// project loosely follows the Google C++ styleguide and uses a tab-size of two spaces and a max- +// width of 100 characters per line. +// +// Author(s): +// Cedric Nugteren +// +// This file uses the auto-tuner to tune the pad OpenCL kernels. +// +// ================================================================================================= + +#include +#include + +#include "utilities/utilities.hpp" +#include "tuning/tuning.hpp" + +namespace clblast { +// ================================================================================================= + +// 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) +template +TunerSettings GetTunerSettings(const int, const Arguments &args) { + auto settings = TunerSettings(); + + // Identification of the kernel + settings.kernel_family = "pad"; + settings.kernel_name = "CopyPadMatrix"; + settings.sources = +#include "../src/kernels/level3/level3.opencl" +#include "../src/kernels/level3/copy_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 = {{"PAD_DIMX", "PAD_DIMY"}}; + settings.div_global = {{"PAD_WPTX", "PAD_WPTY"}}; + + // Sets the tuning parameters and their possible values + settings.parameters = { + {"PAD_DIMX", {8, 16, 32}}, + {"PAD_DIMY", {8, 16, 32}}, + {"PAD_WPTX", {1, 2, 4}}, + {"PAD_WPTY", {1, 2, 4}}, + }; + + // 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 +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, static_cast(args.m)); + kernel.SetArgument(3, 0); + kernel.SetArgument(4, buffers[2]()); // 2 == A matrix + kernel.SetArgument(5, static_cast(args.m)); + kernel.SetArgument(6, static_cast(args.n)); + kernel.SetArgument(7, static_cast(args.m)); + kernel.SetArgument(8, 0); + kernel.SetArgument(9, buffers[3]()); // 3 == B matrix + kernel.SetArgument(10, GetRealArg(args.alpha)); + kernel.SetArgument(11, 0); +} + +// ================================================================================================= +} // namespace clblast diff --git a/src/tuning/kernels/invert.cpp b/src/tuning/kernels/invert.cpp index d846fdf7..ecd51199 100644 --- a/src/tuning/kernels/invert.cpp +++ b/src/tuning/kernels/invert.cpp @@ -11,99 +11,7 @@ // // ================================================================================================= -#include -#include - -#include "utilities/utilities.hpp" -#include "tuning/tuning.hpp" - -namespace clblast { -// ================================================================================================= - -// Settings for this kernel (default command-line arguments) -TunerDefaults GetTunerDefaults(const int) { - auto settings = TunerDefaults(); - settings.options = {kArgN, kArgM, kArgK}; - settings.default_n = 128; // dimension of input matrix 'n' - settings.default_m = 64; // block size - settings.default_k = 16; // current size - return settings; -} - -// Settings for this kernel (general) -template -TunerSettings GetTunerSettings(const int, const Arguments &args) { - auto settings = TunerSettings(); - - // Identification of the kernel - settings.kernel_family = "invert"; - settings.kernel_name = "TripleMatMul16Part1Lower"; - settings.sources = -"#define ROUTINE_INVERT" -#include "../src/kernels/level3/invert_diagonal_blocks_part1.opencl" -#include "../src/kernels/level3/invert_diagonal_blocks_part2.opencl" - ; - - // Buffer sizes - settings.size_a = args.n * args.n + args.a_offset; - settings.size_b = Ceil(args.n, args.m) * args.m; // Ceil(n, block_size) * block_size - - // 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 - const auto num_pages = CeilDiv(args.n, args.k * 2); // CeilDiv(n, current_size*2) - settings.global_size = {args.k / 4, num_pages * (args.k / 16) * 4}; - settings.global_size_ref = settings.global_size; - settings.local_size = {1, 1}; - settings.local_size_ref = {4, 4}; - - // Transforms the thread configuration based on the parameters - settings.mul_local = {{"TMMWGSX", "TMMWGSY"}}; - settings.div_global = {{}}; - - // Sets the tuning parameters and their possible values - // TODO: Make these actually tunable, apart from LOCALPAD - settings.parameters = { - {"INTERNAL_BLOCK_SIZE", {16}}, - {"LOCALPAD", {0, 1}}, - {"TMMWGSX", {4}}, - {"TMMWGSY", {4}}, - }; - - // Describes how to compute the performance metrics - settings.metric_amount = 1 * GetBytes(args.precision); - settings.performance_unit = "N/A"; - - return settings; -} - -// Tests for valid arguments -template -void TestValidArguments(const int, const Arguments &args) { - if (!(args.k == 16)) { - throw std::runtime_error("'TripleMatMul16Part1Lower' requires 'k' to be 16"); - } -} -std::vector SetConstraints(const int) { return {}; } - -// Sets the kernel's arguments -template -void SetArguments(const int, Kernel &kernel, const Arguments &args, std::vector>& buffers) { - const auto num_pages = CeilDiv(args.n, args.k * 2); // CeilDiv(n, current_size*2) - kernel.SetArgument(0, static_cast(args.n)); // n - kernel.SetArgument(1, buffers[2]()); // 2 == A matrix - kernel.SetArgument(2, 0); // a_offset - kernel.SetArgument(3, static_cast(args.n)); // a_ld - kernel.SetArgument(4, buffers[3]()); // 3 == B matrix - kernel.SetArgument(5, static_cast(args.k)); // current_size - kernel.SetArgument(6, static_cast(num_pages)); // num_pages - kernel.SetArgument(7, static_cast(args.m)); // block_size -} - -// ================================================================================================= -} // namespace clblast +#include "tuning/kernels/invert.hpp" // Shortcuts to the clblast namespace using half = clblast::half; diff --git a/src/tuning/kernels/invert.hpp b/src/tuning/kernels/invert.hpp new file mode 100644 index 00000000..0178a2aa --- /dev/null +++ b/src/tuning/kernels/invert.hpp @@ -0,0 +1,106 @@ + +// ================================================================================================= +// This file is part of the CLBlast project. The project is licensed under Apache Version 2.0. This +// project loosely follows the Google C++ styleguide and uses a tab-size of two spaces and a max- +// width of 100 characters per line. +// +// Author(s): +// Cedric Nugteren +// +// This file uses the auto-tuner to tune the invert OpenCL kernels. +// +// ================================================================================================= + +#include +#include + +#include "utilities/utilities.hpp" +#include "tuning/tuning.hpp" + +namespace clblast { +// ================================================================================================= + +// Settings for this kernel (default command-line arguments) +TunerDefaults GetTunerDefaults(const int) { + auto settings = TunerDefaults(); + settings.options = {kArgN, kArgM, kArgK}; + settings.default_n = 128; // dimension of input matrix 'n' + settings.default_m = 64; // block size + settings.default_k = 16; // current size + return settings; +} + +// Settings for this kernel (general) +template +TunerSettings GetTunerSettings(const int, const Arguments &args) { + auto settings = TunerSettings(); + + // Identification of the kernel + settings.kernel_family = "invert"; + settings.kernel_name = "TripleMatMul16Part1Lower"; + settings.sources = +"#define ROUTINE_INVERT" +#include "../src/kernels/level3/invert_diagonal_blocks_part1.opencl" +#include "../src/kernels/level3/invert_diagonal_blocks_part2.opencl" + ; + + // Buffer sizes + settings.size_a = args.n * args.n + args.a_offset; + settings.size_b = Ceil(args.n, args.m) * args.m; // Ceil(n, block_size) * block_size + + // 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 + const auto num_pages = CeilDiv(args.n, args.k * 2); // CeilDiv(n, current_size*2) + settings.global_size = {args.k / 4, num_pages * (args.k / 16) * 4}; + settings.global_size_ref = settings.global_size; + settings.local_size = {1, 1}; + settings.local_size_ref = {4, 4}; + + // Transforms the thread configuration based on the parameters + settings.mul_local = {{"TMMWGSX", "TMMWGSY"}}; + settings.div_global = {{}}; + + // Sets the tuning parameters and their possible values + // TODO: Make these actually tunable, apart from LOCALPAD + settings.parameters = { + {"INTERNAL_BLOCK_SIZE", {16}}, + {"LOCALPAD", {0, 1}}, + {"TMMWGSX", {4}}, + {"TMMWGSY", {4}}, + }; + + // Describes how to compute the performance metrics + settings.metric_amount = 1 * GetBytes(args.precision); + settings.performance_unit = "N/A"; + + return settings; +} + +// Tests for valid arguments +template +void TestValidArguments(const int, const Arguments &args) { + if (!(args.k == 16)) { + throw std::runtime_error("'TripleMatMul16Part1Lower' requires 'k' to be 16"); + } +} +std::vector SetConstraints(const int) { return {}; } + +// Sets the kernel's arguments +template +void SetArguments(const int, Kernel &kernel, const Arguments &args, std::vector>& buffers) { + const auto num_pages = CeilDiv(args.n, args.k * 2); // CeilDiv(n, current_size*2) + kernel.SetArgument(0, static_cast(args.n)); // n + kernel.SetArgument(1, buffers[2]()); // 2 == A matrix + kernel.SetArgument(2, 0); // a_offset + kernel.SetArgument(3, static_cast(args.n)); // a_ld + kernel.SetArgument(4, buffers[3]()); // 3 == B matrix + kernel.SetArgument(5, static_cast(args.k)); // current_size + kernel.SetArgument(6, static_cast(num_pages)); // num_pages + kernel.SetArgument(7, static_cast(args.m)); // block_size +} + +// ================================================================================================= +} // namespace clblast diff --git a/src/tuning/kernels/transpose_fast.cpp b/src/tuning/kernels/transpose_fast.cpp index 5b701a5b..2144f23f 100644 --- a/src/tuning/kernels/transpose_fast.cpp +++ b/src/tuning/kernels/transpose_fast.cpp @@ -11,86 +11,7 @@ // // ================================================================================================= -#include -#include - -#include "utilities/utilities.hpp" -#include "tuning/tuning.hpp" - -namespace clblast { -// ================================================================================================= - -// 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) -template -TunerSettings GetTunerSettings(const int, const Arguments &args) { - auto settings = TunerSettings(); - - // Identification of the kernel - settings.kernel_family = "transpose"; - settings.kernel_name = "TransposeMatrixFast"; - settings.sources = -#include "../src/kernels/level3/level3.opencl" -#include "../src/kernels/level3/transpose_fast.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 = {{"TRA_DIM", "TRA_DIM"}}; - settings.div_global = {{"TRA_WPT", "TRA_WPT"}}; - - // Sets the tuning parameters and their possible values - settings.parameters = { - {"TRA_DIM", {4, 8, 16, 32, 64}}, - {"TRA_WPT", {1, 2, 4, 8, 16}}, - {"TRA_PAD", {0, 1}}, - {"TRA_SHUFFLE", {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 -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, buffers[2]()); // 2 == A matrix - kernel.SetArgument(2, buffers[3]()); // 3 == B matrix - kernel.SetArgument(3, GetRealArg(args.alpha)); -} - -// ================================================================================================= -} // namespace clblast +#include "tuning/kernels/transpose_fast.hpp" // Shortcuts to the clblast namespace using half = clblast::half; diff --git a/src/tuning/kernels/transpose_fast.hpp b/src/tuning/kernels/transpose_fast.hpp new file mode 100644 index 00000000..47859f7a --- /dev/null +++ b/src/tuning/kernels/transpose_fast.hpp @@ -0,0 +1,93 @@ + +// ================================================================================================= +// This file is part of the CLBlast project. The project is licensed under Apache Version 2.0. This +// project loosely follows the Google C++ styleguide and uses a tab-size of two spaces and a max- +// width of 100 characters per line. +// +// Author(s): +// Cedric Nugteren +// +// This file uses the auto-tuner to tune the transpose OpenCL kernels. +// +// ================================================================================================= + +#include +#include + +#include "utilities/utilities.hpp" +#include "tuning/tuning.hpp" + +namespace clblast { +// ================================================================================================= + +// 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) +template +TunerSettings GetTunerSettings(const int, const Arguments &args) { + auto settings = TunerSettings(); + + // Identification of the kernel + settings.kernel_family = "transpose"; + settings.kernel_name = "TransposeMatrixFast"; + settings.sources = +#include "../src/kernels/level3/level3.opencl" +#include "../src/kernels/level3/transpose_fast.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 = {{"TRA_DIM", "TRA_DIM"}}; + settings.div_global = {{"TRA_WPT", "TRA_WPT"}}; + + // Sets the tuning parameters and their possible values + settings.parameters = { + {"TRA_DIM", {4, 8, 16, 32, 64}}, + {"TRA_WPT", {1, 2, 4, 8, 16}}, + {"TRA_PAD", {0, 1}}, + {"TRA_SHUFFLE", {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 +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, buffers[2]()); // 2 == A matrix + kernel.SetArgument(2, buffers[3]()); // 3 == B matrix + kernel.SetArgument(3, GetRealArg(args.alpha)); +} + +// ================================================================================================= +} // namespace clblast diff --git a/src/tuning/kernels/transpose_pad.cpp b/src/tuning/kernels/transpose_pad.cpp index ed24fb04..ce39d857 100644 --- a/src/tuning/kernels/transpose_pad.cpp +++ b/src/tuning/kernels/transpose_pad.cpp @@ -11,93 +11,7 @@ // // ================================================================================================= -#include -#include - -#include "utilities/utilities.hpp" -#include "tuning/tuning.hpp" - -namespace clblast { -// ================================================================================================= - -// 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) -template -TunerSettings GetTunerSettings(const int, const Arguments &args) { - auto settings = TunerSettings(); - - // 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; -} - -// 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, static_cast(args.m)); - kernel.SetArgument(3, 0); - kernel.SetArgument(4, buffers[2]()); // 2 == A matrix - kernel.SetArgument(5, static_cast(args.n)); - kernel.SetArgument(6, static_cast(args.m)); - kernel.SetArgument(7, static_cast(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 +#include "tuning/kernels/transpose_pad.hpp" // Shortcuts to the clblast namespace using half = clblast::half; diff --git a/src/tuning/kernels/transpose_pad.hpp b/src/tuning/kernels/transpose_pad.hpp new file mode 100644 index 00000000..c9ce983e --- /dev/null +++ b/src/tuning/kernels/transpose_pad.hpp @@ -0,0 +1,100 @@ + +// ================================================================================================= +// This file is part of the CLBlast project. The project is licensed under Apache Version 2.0. This +// project loosely follows the Google C++ styleguide and uses a tab-size of two spaces and a max- +// width of 100 characters per line. +// +// Author(s): +// Cedric Nugteren +// +// This file uses the auto-tuner to tune the pad-transpose OpenCL kernels. +// +// ================================================================================================= + +#include +#include + +#include "utilities/utilities.hpp" +#include "tuning/tuning.hpp" + +namespace clblast { +// ================================================================================================= + +// 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) +template +TunerSettings GetTunerSettings(const int, const Arguments &args) { + auto settings = TunerSettings(); + + // 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; +} + +// 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, static_cast(args.m)); + kernel.SetArgument(3, 0); + kernel.SetArgument(4, buffers[2]()); // 2 == A matrix + kernel.SetArgument(5, static_cast(args.n)); + kernel.SetArgument(6, static_cast(args.m)); + kernel.SetArgument(7, static_cast(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 diff --git a/src/tuning/kernels/xaxpy.cpp b/src/tuning/kernels/xaxpy.cpp index dd44018c..a290b6c1 100644 --- a/src/tuning/kernels/xaxpy.cpp +++ b/src/tuning/kernels/xaxpy.cpp @@ -11,88 +11,7 @@ // // ================================================================================================= -#include -#include - -#include "utilities/utilities.hpp" -#include "tuning/tuning.hpp" - -namespace clblast { -// ================================================================================================= - -// 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) -template -TunerSettings GetTunerSettings(const int, const Arguments &args) { - auto settings = TunerSettings(); - - // 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; -} - -// Tests for valid arguments -template -void TestValidArguments(const int, const Arguments &args) { - if (!IsMultiple(args.n, 64)) { - throw std::runtime_error("'XaxpyFastest' requires 'n' to be a multiple of WGS*WPT*VW"); - } -} -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.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 +#include "tuning/kernels/xaxpy.hpp" // Shortcuts to the clblast namespace using half = clblast::half; diff --git a/src/tuning/kernels/xaxpy.hpp b/src/tuning/kernels/xaxpy.hpp new file mode 100644 index 00000000..266a671b --- /dev/null +++ b/src/tuning/kernels/xaxpy.hpp @@ -0,0 +1,95 @@ + +// ================================================================================================= +// This file is part of the CLBlast project. The project is licensed under Apache Version 2.0. This +// project loosely follows the Google C++ styleguide and uses a tab-size of two spaces and a max- +// width of 100 characters per line. +// +// Author(s): +// Cedric Nugteren +// +// This file uses the auto-tuner to tune the xaxpy OpenCL kernels. +// +// ================================================================================================= + +#include +#include + +#include "utilities/utilities.hpp" +#include "tuning/tuning.hpp" + +namespace clblast { +// ================================================================================================= + +// 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) +template +TunerSettings GetTunerSettings(const int, const Arguments &args) { + auto settings = TunerSettings(); + + // 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; +} + +// Tests for valid arguments +template +void TestValidArguments(const int, const Arguments &args) { + if (!IsMultiple(args.n, 64)) { + throw std::runtime_error("'XaxpyFastest' requires 'n' to be a multiple of WGS*WPT*VW"); + } +} +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.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 diff --git a/src/tuning/kernels/xdot.cpp b/src/tuning/kernels/xdot.cpp index 635d012a..10126392 100644 --- a/src/tuning/kernels/xdot.cpp +++ b/src/tuning/kernels/xdot.cpp @@ -12,94 +12,7 @@ // // ================================================================================================= -#include -#include - -#include "utilities/utilities.hpp" -#include "tuning/tuning.hpp" - -namespace clblast { -// ================================================================================================= - -// Settings for this kernel (default command-line arguments) -TunerDefaults GetTunerDefaults(const int) { - auto settings = TunerDefaults(); - settings.options = {kArgN}; - settings.default_n = 2*1024*1024; - return settings; -} - -// Settings for this kernel (general) -template -TunerSettings GetTunerSettings(const int V, const Arguments &args) { - auto settings = TunerSettings(); - - // Identification of the kernel - settings.kernel_family = "xdot_"+std::to_string(V); - settings.kernel_name = (V==1) ? "Xdot" : "XdotEpilogue"; - settings.sources = -#include "../src/kernels/level1/xdot.opencl" - ; - - // Buffer sizes - settings.size_x = args.n; - settings.size_y = args.n; - settings.size_temp = args.n; // Worst case - - // Inputs and outputs IDs (X:0, Y:1, A:2, B:3, C:4, temp:5) - settings.inputs = {0, 1, 5}; - settings.outputs = {}; // no output checking - - // Sets the base thread configuration - settings.global_size = (V==1) ? std::vector{2*64} : std::vector{1}; - settings.global_size_ref = (V==1) ? std::vector{2*64*64} : std::vector{64}; - settings.local_size = {1}; - settings.local_size_ref = {64}; - - // Transforms the thread configuration based on the parameters - settings.mul_local = (V==1) ? TransformVector{{"WGS1"}} : TransformVector{{"WGS2"}}; - settings.mul_global = (V==1) ? TransformVector{{"WGS1"}} : TransformVector{{"WGS2"}}; - - // Sets the tuning parameters and their possible values - settings.parameters = { - {"WGS"+std::to_string(V), {32, 64, 128, 256, 512, 1024}}, - }; - - // Describes how to compute the performance metrics - settings.metric_amount = (V==1) ? (2*args.n + 1) * GetBytes(args.precision) : 1 * GetBytes(args.precision); - settings.performance_unit = (V==1) ? "GB/s" : "N/A"; - - return settings; -} - -// 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 V, Kernel &kernel, const Arguments &args, std::vector>& buffers) { - if (V == 1) { - kernel.SetArgument(0, static_cast(args.n)); - kernel.SetArgument(1, buffers[0]()); // 0 == X vector - kernel.SetArgument(2, 0); - kernel.SetArgument(3, 1); - kernel.SetArgument(4, buffers[1]()); // 1 == Y vector - kernel.SetArgument(5, 0); - kernel.SetArgument(6, 1); - kernel.SetArgument(7, buffers[5]()); // 5 == temp; no output checking - size varies - kernel.SetArgument(8, static_cast(false)); - } - else { - kernel.SetArgument(0, buffers[5]()); // 5 == temp - kernel.SetArgument(1, buffers[0]()); // 0 == X vector; no output checking - size varies - kernel.SetArgument(2, 0); - } -} - -// ================================================================================================= -} // namespace clblast +#include "tuning/kernels/xdot.hpp" // Shortcuts to the clblast namespace using half = clblast::half; diff --git a/src/tuning/kernels/xdot.hpp b/src/tuning/kernels/xdot.hpp new file mode 100644 index 00000000..456baea4 --- /dev/null +++ b/src/tuning/kernels/xdot.hpp @@ -0,0 +1,102 @@ + +// ================================================================================================= +// This file is part of the CLBlast project. The project is licensed under Apache Version 2.0. This +// project loosely follows the Google C++ styleguide and uses a tab-size of two spaces and a max- +// width of 100 characters per line. +// +// Author(s): +// Cedric Nugteren +// +// This file uses the auto-tuner to tune the xdot OpenCL kernels. Note that the results are +// not verified, since the result is not final and depends on the WGS2 parameter. +// +// ================================================================================================= + +#include +#include + +#include "utilities/utilities.hpp" +#include "tuning/tuning.hpp" + +namespace clblast { +// ================================================================================================= + +// Settings for this kernel (default command-line arguments) +TunerDefaults GetTunerDefaults(const int) { + auto settings = TunerDefaults(); + settings.options = {kArgN}; + settings.default_n = 2*1024*1024; + return settings; +} + +// Settings for this kernel (general) +template +TunerSettings GetTunerSettings(const int V, const Arguments &args) { + auto settings = TunerSettings(); + + // Identification of the kernel + settings.kernel_family = "xdot_"+std::to_string(V); + settings.kernel_name = (V==1) ? "Xdot" : "XdotEpilogue"; + settings.sources = +#include "../src/kernels/level1/xdot.opencl" + ; + + // Buffer sizes + settings.size_x = args.n; + settings.size_y = args.n; + settings.size_temp = args.n; // Worst case + + // Inputs and outputs IDs (X:0, Y:1, A:2, B:3, C:4, temp:5) + settings.inputs = {0, 1, 5}; + settings.outputs = {}; // no output checking + + // Sets the base thread configuration + settings.global_size = (V==1) ? std::vector{2*64} : std::vector{1}; + settings.global_size_ref = (V==1) ? std::vector{2*64*64} : std::vector{64}; + settings.local_size = {1}; + settings.local_size_ref = {64}; + + // Transforms the thread configuration based on the parameters + settings.mul_local = (V==1) ? TransformVector{{"WGS1"}} : TransformVector{{"WGS2"}}; + settings.mul_global = (V==1) ? TransformVector{{"WGS1"}} : TransformVector{{"WGS2"}}; + + // Sets the tuning parameters and their possible values + settings.parameters = { + {"WGS"+std::to_string(V), {32, 64, 128, 256, 512, 1024}}, + }; + + // Describes how to compute the performance metrics + settings.metric_amount = (V==1) ? (2*args.n + 1) * GetBytes(args.precision) : 1 * GetBytes(args.precision); + settings.performance_unit = (V==1) ? "GB/s" : "N/A"; + + return settings; +} + +// 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 V, Kernel &kernel, const Arguments &args, std::vector>& buffers) { + if (V == 1) { + kernel.SetArgument(0, static_cast(args.n)); + kernel.SetArgument(1, buffers[0]()); // 0 == X vector + kernel.SetArgument(2, 0); + kernel.SetArgument(3, 1); + kernel.SetArgument(4, buffers[1]()); // 1 == Y vector + kernel.SetArgument(5, 0); + kernel.SetArgument(6, 1); + kernel.SetArgument(7, buffers[5]()); // 5 == temp; no output checking - size varies + kernel.SetArgument(8, static_cast(false)); + } + else { + kernel.SetArgument(0, buffers[5]()); // 5 == temp + kernel.SetArgument(1, buffers[0]()); // 0 == X vector; no output checking - size varies + kernel.SetArgument(2, 0); + } +} + +// ================================================================================================= +} // namespace clblast diff --git a/src/tuning/kernels/xgemm.cpp b/src/tuning/kernels/xgemm.cpp index 5c242757..f388c76c 100644 --- a/src/tuning/kernels/xgemm.cpp +++ b/src/tuning/kernels/xgemm.cpp @@ -7,162 +7,11 @@ // Author(s): // Cedric Nugteren // -// This file uses the auto-tuner to tune the xgemm OpenCL kernels. There are two variations: -// - V==1: This tests some limited set of tuning parameters exhaustively. -// - V==2: This tests a much larger set of tuning parameters by randomly sampling a subset. +// This file uses the auto-tuner to tune the xgemm OpenCL kernels. // // ================================================================================================= -#include -#include - -#include "utilities/utilities.hpp" -#include "tuning/tuning.hpp" - -namespace clblast { -// ================================================================================================= - -// Settings for this kernel (default command-line arguments) -TunerDefaults GetTunerDefaults(const int V) { - auto settings = TunerDefaults(); - settings.options = {kArgM, kArgN, kArgK, kArgAlpha, kArgBeta, kArgFraction, - kArgHeuristicSelection, kArgPsoSwarmSize, - kArgPsoInfGlobal, kArgPsoInfLocal, kArgPsoInfRandom}; - settings.default_m = 1024; - settings.default_n = 1024; - settings.default_k = 1024; - settings.default_fraction = (V==1) ? 1.0 : 512.0; // test all or sample randomly - settings.default_num_runs = 2; - return settings; -} - -// Settings for this kernel (general) -template -TunerSettings GetTunerSettings(const int V, const Arguments &args) { - auto settings = TunerSettings(); - - // Identification of the kernel - settings.kernel_family = (V==1) ? "xgemm_1" : "xgemm_2"; - settings.kernel_name = "Xgemm"; - settings.sources = -#include "../src/kernels/level3/xgemm_part1.opencl" -#include "../src/kernels/level3/xgemm_part2.opencl" -#include "../src/kernels/level3/xgemm_part3.opencl" -#include "../src/kernels/level3/xgemm_part4.opencl" - ; - - // Buffer sizes - settings.size_a = args.m * args.k; - settings.size_b = args.n * args.k; - settings.size_c = args.m * args.n; - - // Inputs and outputs IDs (X:0, Y:1, A:2, B:3, C:4, temp:5) - settings.inputs = {2, 3, 4}; - settings.outputs = {4}; - - // 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 = {{"MDIMC", "NDIMC"}}; - settings.mul_global = {{"MDIMC", "NDIMC"}}; - settings.div_global = {{"MWG", "NWG"}}; - - // Sets the tuning parameters and their possible values - if (V==1) { // limited subset of tuning parameters - but explorable exhaustively - settings.parameters = { - {"MWG", {16, 32, 64}}, - {"NWG", {16, 32, 64}}, - {"KWG", {32}}, - {"MDIMC", {8, 16, 32}}, - {"NDIMC", {8, 16, 32}}, - {"MDIMA", {8, 16, 32}}, - {"NDIMB", {8, 16, 32}}, - {"KWI", {2}}, - {"VWM", {1, 2, 4}}, - {"VWN", {1, 2, 4}}, - {"STRM", {0}}, - {"STRN", {0}}, - {"SA", {0, 1}}, - {"SB", {0, 1}}, - }; - } - else { // a lot more tuning parameters - has to be sampled randomly, too much to test all - settings.parameters = { - {"MWG", {16, 32, 64, 128}}, - {"NWG", {16, 32, 64, 128}}, - {"KWG", {16, 32}}, - {"MDIMC", {8, 16, 32}}, - {"NDIMC", {8, 16, 32}}, - {"MDIMA", {8, 16, 32}}, - {"NDIMB", {8, 16, 32}}, - {"KWI", {2}}, - {"VWM", {1, 2, 4, 8}}, - {"VWN", {1, 2, 4, 8}}, - {"STRM", {0, 1}}, - {"STRN", {0, 1}}, - {"SA", {0, 1}}, - {"SB", {0, 1}}, - }; - } - - // Describes how to compute the performance metrics - settings.metric_amount = 2 * args.m * args.n * args.k; - settings.performance_unit = "GFLOPS"; - - return settings; -} - -// Tests for valid arguments -template -void TestValidArguments(const int, const Arguments &) { } -std::vector SetConstraints(const int V) { - auto constraints = std::vector(); - auto MultipleOfX = [] (std::vector v) { return IsMultiple(v[0], v[1]); }; - auto MultipleOfXMulY = [] (std::vector v) { return IsMultiple(v[0], v[1]*v[2]); }; - auto MultipleOfXMulYDivZ = [] (std::vector v) { return IsMultiple(v[0], (v[1]*v[2])/v[3]); }; - // Requirement for unrolling the KWG loop - constraints.push_back({MultipleOfX, {"KWG", "KWI"}}); - // Required for integer MWI and NWI - constraints.push_back({MultipleOfXMulY, {"MWG", "MDIMC", "VWM"}}); - constraints.push_back({MultipleOfXMulY, {"NWG", "NDIMC", "VWN"}}); - // Required for integer MWIA and NWIB - constraints.push_back({MultipleOfXMulY, {"MWG", "MDIMA", "VWM"}}); - constraints.push_back({MultipleOfXMulY, {"NWG", "NDIMB", "VWN"}}); - // KWG has to be a multiple of KDIMA = ((MDIMC*NDIMC)/(MDIMA)) and KDIMB = (...) - constraints.push_back({MultipleOfXMulYDivZ, {"KWG", "MDIMC", "NDIMC", "MDIMA"}}); - constraints.push_back({MultipleOfXMulYDivZ, {"KWG", "MDIMC", "NDIMC", "NDIMB"}}); - - // Extra constraints for variation 1 to limit the set of options significantly - if (V==1) { - auto IsEqual = [] (std::vector v) { return v[0] == v[1]; }; - constraints.push_back({IsEqual, {"MDIMC", "MDIMA"}}); - constraints.push_back({IsEqual, {"NDIMC", "NDIMB"}}); - constraints.push_back({IsEqual, {"SA", "SB"}}); - } - return constraints; -} - -// 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, static_cast(args.k)); - kernel.SetArgument(3, GetRealArg(args.alpha)); - kernel.SetArgument(4, GetRealArg(args.beta)); - kernel.SetArgument(5, buffers[2]()); // 2 == A matrix - kernel.SetArgument(6, buffers[3]()); // 3 == B matrix - kernel.SetArgument(7, buffers[4]()); // 4 == C matrix - kernel.SetArgument(8, 0); - kernel.SetArgument(9, 0); -} - -// ================================================================================================= -} // namespace clblast +#include "tuning/kernels/xgemm.hpp" // Shortcuts to the clblast namespace using half = clblast::half; diff --git a/src/tuning/kernels/xgemm.hpp b/src/tuning/kernels/xgemm.hpp new file mode 100644 index 00000000..09ebe91d --- /dev/null +++ b/src/tuning/kernels/xgemm.hpp @@ -0,0 +1,165 @@ + +// ================================================================================================= +// This file is part of the CLBlast project. The project is licensed under Apache Version 2.0. This +// project loosely follows the Google C++ styleguide and uses a tab-size of two spaces and a max- +// width of 100 characters per line. +// +// Author(s): +// Cedric Nugteren +// +// This file uses the auto-tuner to tune the xgemm OpenCL kernels. There are two variations: +// - V==1: This tests some limited set of tuning parameters exhaustively. +// - V==2: This tests a much larger set of tuning parameters by randomly sampling a subset. +// +// ================================================================================================= + +#include +#include + +#include "utilities/utilities.hpp" +#include "tuning/tuning.hpp" + +namespace clblast { +// ================================================================================================= + +// Settings for this kernel (default command-line arguments) +TunerDefaults GetTunerDefaults(const int V) { + auto settings = TunerDefaults(); + settings.options = {kArgM, kArgN, kArgK, kArgAlpha, kArgBeta, kArgFraction, + kArgHeuristicSelection, kArgPsoSwarmSize, + kArgPsoInfGlobal, kArgPsoInfLocal, kArgPsoInfRandom}; + settings.default_m = 1024; + settings.default_n = 1024; + settings.default_k = 1024; + settings.default_fraction = (V==1) ? 1.0 : 512.0; // test all or sample randomly + settings.default_num_runs = 2; + return settings; +} + +// Settings for this kernel (general) +template +TunerSettings GetTunerSettings(const int V, const Arguments &args) { + auto settings = TunerSettings(); + + // Identification of the kernel + settings.kernel_family = (V==1) ? "xgemm_1" : "xgemm_2"; + settings.kernel_name = "Xgemm"; + settings.sources = +#include "../src/kernels/level3/xgemm_part1.opencl" +#include "../src/kernels/level3/xgemm_part2.opencl" +#include "../src/kernels/level3/xgemm_part3.opencl" +#include "../src/kernels/level3/xgemm_part4.opencl" + ; + + // Buffer sizes + settings.size_a = args.m * args.k; + settings.size_b = args.n * args.k; + settings.size_c = args.m * args.n; + + // Inputs and outputs IDs (X:0, Y:1, A:2, B:3, C:4, temp:5) + settings.inputs = {2, 3, 4}; + settings.outputs = {4}; + + // 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 = {{"MDIMC", "NDIMC"}}; + settings.mul_global = {{"MDIMC", "NDIMC"}}; + settings.div_global = {{"MWG", "NWG"}}; + + // Sets the tuning parameters and their possible values + if (V==1) { // limited subset of tuning parameters - but explorable exhaustively + settings.parameters = { + {"MWG", {16, 32, 64}}, + {"NWG", {16, 32, 64}}, + {"KWG", {32}}, + {"MDIMC", {8, 16, 32}}, + {"NDIMC", {8, 16, 32}}, + {"MDIMA", {8, 16, 32}}, + {"NDIMB", {8, 16, 32}}, + {"KWI", {2}}, + {"VWM", {1, 2, 4}}, + {"VWN", {1, 2, 4}}, + {"STRM", {0}}, + {"STRN", {0}}, + {"SA", {0, 1}}, + {"SB", {0, 1}}, + }; + } + else { // a lot more tuning parameters - has to be sampled randomly, too much to test all + settings.parameters = { + {"MWG", {16, 32, 64, 128}}, + {"NWG", {16, 32, 64, 128}}, + {"KWG", {16, 32}}, + {"MDIMC", {8, 16, 32}}, + {"NDIMC", {8, 16, 32}}, + {"MDIMA", {8, 16, 32}}, + {"NDIMB", {8, 16, 32}}, + {"KWI", {2}}, + {"VWM", {1, 2, 4, 8}}, + {"VWN", {1, 2, 4, 8}}, + {"STRM", {0, 1}}, + {"STRN", {0, 1}}, + {"SA", {0, 1}}, + {"SB", {0, 1}}, + }; + } + + // Describes how to compute the performance metrics + settings.metric_amount = 2 * args.m * args.n * args.k; + settings.performance_unit = "GFLOPS"; + + return settings; +} + +// Tests for valid arguments +template +void TestValidArguments(const int, const Arguments &) { } +std::vector SetConstraints(const int V) { + auto constraints = std::vector(); + auto MultipleOfX = [] (std::vector v) { return IsMultiple(v[0], v[1]); }; + auto MultipleOfXMulY = [] (std::vector v) { return IsMultiple(v[0], v[1]*v[2]); }; + auto MultipleOfXMulYDivZ = [] (std::vector v) { return IsMultiple(v[0], (v[1]*v[2])/v[3]); }; + // Requirement for unrolling the KWG loop + constraints.push_back({MultipleOfX, {"KWG", "KWI"}}); + // Required for integer MWI and NWI + constraints.push_back({MultipleOfXMulY, {"MWG", "MDIMC", "VWM"}}); + constraints.push_back({MultipleOfXMulY, {"NWG", "NDIMC", "VWN"}}); + // Required for integer MWIA and NWIB + constraints.push_back({MultipleOfXMulY, {"MWG", "MDIMA", "VWM"}}); + constraints.push_back({MultipleOfXMulY, {"NWG", "NDIMB", "VWN"}}); + // KWG has to be a multiple of KDIMA = ((MDIMC*NDIMC)/(MDIMA)) and KDIMB = (...) + constraints.push_back({MultipleOfXMulYDivZ, {"KWG", "MDIMC", "NDIMC", "MDIMA"}}); + constraints.push_back({MultipleOfXMulYDivZ, {"KWG", "MDIMC", "NDIMC", "NDIMB"}}); + + // Extra constraints for variation 1 to limit the set of options significantly + if (V==1) { + auto IsEqual = [] (std::vector v) { return v[0] == v[1]; }; + constraints.push_back({IsEqual, {"MDIMC", "MDIMA"}}); + constraints.push_back({IsEqual, {"NDIMC", "NDIMB"}}); + constraints.push_back({IsEqual, {"SA", "SB"}}); + } + return constraints; +} + +// 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, static_cast(args.k)); + kernel.SetArgument(3, GetRealArg(args.alpha)); + kernel.SetArgument(4, GetRealArg(args.beta)); + kernel.SetArgument(5, buffers[2]()); // 2 == A matrix + kernel.SetArgument(6, buffers[3]()); // 3 == B matrix + kernel.SetArgument(7, buffers[4]()); // 4 == C matrix + kernel.SetArgument(8, 0); + kernel.SetArgument(9, 0); +} + +// ================================================================================================= +} // namespace clblast diff --git a/src/tuning/kernels/xgemm_direct.cpp b/src/tuning/kernels/xgemm_direct.cpp index 0bd2e94d..b059ad62 100644 --- a/src/tuning/kernels/xgemm_direct.cpp +++ b/src/tuning/kernels/xgemm_direct.cpp @@ -7,159 +7,11 @@ // Author(s): // Cedric Nugteren // -// This file uses the auto-tuner to tune the direct xgemm kernels. There are two variations: -// - V==1: This tests some limited set of tuning parameters exhaustively. -// - V==2: This tests a much larger set of tuning parameters by randomly sampling a subset. +// This file uses the auto-tuner to tune the direct xgemm kernels. // // ================================================================================================= -#include -#include - -#include "utilities/utilities.hpp" -#include "tuning/tuning.hpp" - -namespace clblast { -// ================================================================================================= - -// Settings for this kernel (default command-line arguments) -TunerDefaults GetTunerDefaults(const int V) { - auto settings = TunerDefaults(); - settings.options = {kArgM, kArgN, kArgK, kArgAlpha, kArgBeta, kArgFraction, - kArgHeuristicSelection, kArgPsoSwarmSize, - kArgPsoInfGlobal, kArgPsoInfLocal, kArgPsoInfRandom}; - settings.default_m = 256; - settings.default_n = 256; - settings.default_k = 256; - settings.default_fraction = (V==1) ? 1.0 : 64.0; // test all or sample randomly - settings.default_num_runs = 4; - return settings; -} - -// Settings for this kernel (general) -template -TunerSettings GetTunerSettings(const int V, const Arguments &args) { - auto settings = TunerSettings(); - - // Identification of the kernel - settings.kernel_family = (V==1) ? "xgemm_direct_1" : "xgemm_direct_2"; - settings.kernel_name = "XgemmDirectTN"; - settings.sources = -#include "../src/kernels/level3/xgemm_direct_part1.opencl" -#include "../src/kernels/level3/xgemm_direct_part2.opencl" -#include "../src/kernels/level3/xgemm_direct_part3.opencl" - ; - - // Buffer sizes - settings.size_a = args.m * args.k; - settings.size_b = args.n * args.k; - settings.size_c = args.m * args.n; - - // Inputs and outputs IDs (X:0, Y:1, A:2, B:3, C:4, temp:5) - settings.inputs = {2, 3, 4}; - settings.outputs = {4}; - - // 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 = {{"MDIMCD", "NDIMCD"}}; - settings.mul_global = {{"MDIMCD", "NDIMCD"}}; - settings.div_global = {{"WGD", "WGD"}}; - - // Sets the tuning parameters and their possible values - if (V==1) { // limited subset of tuning parameters - but explorable exhaustively - settings.parameters = { - {"WGD", {8, 16, 32}}, - {"MDIMCD", {8, 16, 32}}, - {"NDIMCD", {8, 16, 32}}, - {"MDIMAD", {8, 16, 32}}, - {"NDIMBD", {8, 16, 32}}, - {"KWID", {2}}, - {"VWMD", {1, 2, 4, 8}}, - {"VWND", {1, 2, 4, 8}}, - {"PADA", {1}}, - {"PADB", {1}}, - }; - } - else { // a lot more tuning parameters - has to be sampled randomly, too much to test all - settings.parameters = { - {"WGD", {8, 16, 32, 64}}, - {"MDIMCD", {8, 16, 32}}, - {"NDIMCD", {8, 16, 32}}, - {"MDIMAD", {8, 16, 32}}, - {"NDIMBD", {8, 16, 32}}, - {"KWID", {2, 8, 16}}, - {"VWMD", {1, 2, 4, 8}}, - {"VWND", {1, 2, 4, 8}}, - {"PADA", {0, 1}}, - {"PADB", {0, 1}}, - }; - } - - // Describes how to compute the performance metrics - settings.metric_amount = 2 * args.m * args.n * args.k; - settings.performance_unit = "GFLOPS"; - - return settings; -} - -// Tests for valid arguments -template -void TestValidArguments(const int, const Arguments &) { } -std::vector SetConstraints(const int V) { - auto constraints = std::vector(); - auto MultipleOfX = [] (std::vector v) { return IsMultiple(v[0], v[1]); }; - auto MultipleOfXMulY = [] (std::vector v) { return IsMultiple(v[0], v[1]*v[2]); }; - auto MultipleOfXMulYDivZ = [] (std::vector v) { return IsMultiple(v[0], (v[1]*v[2])/v[3]); }; - // Requirement for unrolling the WGD loop - constraints.push_back({MultipleOfX, {"WGD", "KWID"}}); - // Required for integer MWID and NWID - constraints.push_back({MultipleOfXMulY, {"WGD", "MDIMCD", "VWMD"}}); - constraints.push_back({MultipleOfXMulY, {"WGD", "NDIMCD", "VWND"}}); - // Required for integer MWIAD and NWIBD - constraints.push_back({MultipleOfXMulY, {"WGD", "MDIMAD", "VWMD"}}); - constraints.push_back({MultipleOfXMulY, {"WGD", "NDIMBD", "VWND"}}); - // WGD has to be a multiple of KDIMAD = ((MDIMCD*NDIMCD)/(MDIMAD)) and KDIMBD = (...) - constraints.push_back({MultipleOfXMulYDivZ, {"WGD", "MDIMCD", "NDIMCD", "MDIMAD"}}); - constraints.push_back({MultipleOfXMulYDivZ, {"WGD", "MDIMCD", "NDIMCD", "NDIMBD"}}); - - // Extra constraints for variation 1 to limit the set of options significantly - if (V==1) { - auto IsEqual = [] (std::vector v) { return v[0] == v[1]; }; - constraints.push_back({IsEqual, {"MDIMCD", "MDIMAD"}}); - constraints.push_back({IsEqual, {"NDIMCD", "NDIMBD"}}); - } - return constraints; -} - -// 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, static_cast(args.k)); - kernel.SetArgument(3, GetRealArg(args.alpha)); - kernel.SetArgument(4, GetRealArg(args.beta)); - kernel.SetArgument(5, buffers[2]()); // 2 == A matrix - kernel.SetArgument(6, 0); // a_offset - kernel.SetArgument(7, static_cast(args.k)); // a_ld - kernel.SetArgument(8, buffers[3]()); // 3 == B matrix - kernel.SetArgument(9, 0); // b_offset - kernel.SetArgument(10, static_cast(args.n)); // b_ld - kernel.SetArgument(11, buffers[4]()); // 4 == C matrix - kernel.SetArgument(12, 0); // c_offset - kernel.SetArgument(13, static_cast(args.n)); // c_ld - kernel.SetArgument(14, 1); // c_do_transpose - kernel.SetArgument(15, 0); // a_conjugate - kernel.SetArgument(16, 0); // b_conjugate -} - -// ================================================================================================= -} // namespace clblast +#include "tuning/kernels/xgemm_direct.hpp" // Shortcuts to the clblast namespace using half = clblast::half; diff --git a/src/tuning/kernels/xgemm_direct.hpp b/src/tuning/kernels/xgemm_direct.hpp new file mode 100644 index 00000000..7cc9f654 --- /dev/null +++ b/src/tuning/kernels/xgemm_direct.hpp @@ -0,0 +1,162 @@ + +// ================================================================================================= +// This file is part of the CLBlast project. The project is licensed under Apache Version 2.0. This +// project loosely follows the Google C++ styleguide and uses a tab-size of two spaces and a max- +// width of 100 characters per line. +// +// Author(s): +// Cedric Nugteren +// +// This file uses the auto-tuner to tune the direct xgemm kernels. There are two variations: +// - V==1: This tests some limited set of tuning parameters exhaustively. +// - V==2: This tests a much larger set of tuning parameters by randomly sampling a subset. +// +// ================================================================================================= + +#include +#include + +#include "utilities/utilities.hpp" +#include "tuning/tuning.hpp" + +namespace clblast { +// ================================================================================================= + +// Settings for this kernel (default command-line arguments) +TunerDefaults GetTunerDefaults(const int V) { + auto settings = TunerDefaults(); + settings.options = {kArgM, kArgN, kArgK, kArgAlpha, kArgBeta, kArgFraction, + kArgHeuristicSelection, kArgPsoSwarmSize, + kArgPsoInfGlobal, kArgPsoInfLocal, kArgPsoInfRandom}; + settings.default_m = 256; + settings.default_n = 256; + settings.default_k = 256; + settings.default_fraction = (V==1) ? 1.0 : 64.0; // test all or sample randomly + settings.default_num_runs = 4; + return settings; +} + +// Settings for this kernel (general) +template +TunerSettings GetTunerSettings(const int V, const Arguments &args) { + auto settings = TunerSettings(); + + // Identification of the kernel + settings.kernel_family = (V==1) ? "xgemm_direct_1" : "xgemm_direct_2"; + settings.kernel_name = "XgemmDirectTN"; + settings.sources = +#include "../src/kernels/level3/xgemm_direct_part1.opencl" +#include "../src/kernels/level3/xgemm_direct_part2.opencl" +#include "../src/kernels/level3/xgemm_direct_part3.opencl" + ; + + // Buffer sizes + settings.size_a = args.m * args.k; + settings.size_b = args.n * args.k; + settings.size_c = args.m * args.n; + + // Inputs and outputs IDs (X:0, Y:1, A:2, B:3, C:4, temp:5) + settings.inputs = {2, 3, 4}; + settings.outputs = {4}; + + // 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 = {{"MDIMCD", "NDIMCD"}}; + settings.mul_global = {{"MDIMCD", "NDIMCD"}}; + settings.div_global = {{"WGD", "WGD"}}; + + // Sets the tuning parameters and their possible values + if (V==1) { // limited subset of tuning parameters - but explorable exhaustively + settings.parameters = { + {"WGD", {8, 16, 32}}, + {"MDIMCD", {8, 16, 32}}, + {"NDIMCD", {8, 16, 32}}, + {"MDIMAD", {8, 16, 32}}, + {"NDIMBD", {8, 16, 32}}, + {"KWID", {2}}, + {"VWMD", {1, 2, 4, 8}}, + {"VWND", {1, 2, 4, 8}}, + {"PADA", {1}}, + {"PADB", {1}}, + }; + } + else { // a lot more tuning parameters - has to be sampled randomly, too much to test all + settings.parameters = { + {"WGD", {8, 16, 32, 64}}, + {"MDIMCD", {8, 16, 32}}, + {"NDIMCD", {8, 16, 32}}, + {"MDIMAD", {8, 16, 32}}, + {"NDIMBD", {8, 16, 32}}, + {"KWID", {2, 8, 16}}, + {"VWMD", {1, 2, 4, 8}}, + {"VWND", {1, 2, 4, 8}}, + {"PADA", {0, 1}}, + {"PADB", {0, 1}}, + }; + } + + // Describes how to compute the performance metrics + settings.metric_amount = 2 * args.m * args.n * args.k; + settings.performance_unit = "GFLOPS"; + + return settings; +} + +// Tests for valid arguments +template +void TestValidArguments(const int, const Arguments &) { } +std::vector SetConstraints(const int V) { + auto constraints = std::vector(); + auto MultipleOfX = [] (std::vector v) { return IsMultiple(v[0], v[1]); }; + auto MultipleOfXMulY = [] (std::vector v) { return IsMultiple(v[0], v[1]*v[2]); }; + auto MultipleOfXMulYDivZ = [] (std::vector v) { return IsMultiple(v[0], (v[1]*v[2])/v[3]); }; + // Requirement for unrolling the WGD loop + constraints.push_back({MultipleOfX, {"WGD", "KWID"}}); + // Required for integer MWID and NWID + constraints.push_back({MultipleOfXMulY, {"WGD", "MDIMCD", "VWMD"}}); + constraints.push_back({MultipleOfXMulY, {"WGD", "NDIMCD", "VWND"}}); + // Required for integer MWIAD and NWIBD + constraints.push_back({MultipleOfXMulY, {"WGD", "MDIMAD", "VWMD"}}); + constraints.push_back({MultipleOfXMulY, {"WGD", "NDIMBD", "VWND"}}); + // WGD has to be a multiple of KDIMAD = ((MDIMCD*NDIMCD)/(MDIMAD)) and KDIMBD = (...) + constraints.push_back({MultipleOfXMulYDivZ, {"WGD", "MDIMCD", "NDIMCD", "MDIMAD"}}); + constraints.push_back({MultipleOfXMulYDivZ, {"WGD", "MDIMCD", "NDIMCD", "NDIMBD"}}); + + // Extra constraints for variation 1 to limit the set of options significantly + if (V==1) { + auto IsEqual = [] (std::vector v) { return v[0] == v[1]; }; + constraints.push_back({IsEqual, {"MDIMCD", "MDIMAD"}}); + constraints.push_back({IsEqual, {"NDIMCD", "NDIMBD"}}); + } + return constraints; +} + +// 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, static_cast(args.k)); + kernel.SetArgument(3, GetRealArg(args.alpha)); + kernel.SetArgument(4, GetRealArg(args.beta)); + kernel.SetArgument(5, buffers[2]()); // 2 == A matrix + kernel.SetArgument(6, 0); // a_offset + kernel.SetArgument(7, static_cast(args.k)); // a_ld + kernel.SetArgument(8, buffers[3]()); // 3 == B matrix + kernel.SetArgument(9, 0); // b_offset + kernel.SetArgument(10, static_cast(args.n)); // b_ld + kernel.SetArgument(11, buffers[4]()); // 4 == C matrix + kernel.SetArgument(12, 0); // c_offset + kernel.SetArgument(13, static_cast(args.n)); // c_ld + kernel.SetArgument(14, 1); // c_do_transpose + kernel.SetArgument(15, 0); // a_conjugate + kernel.SetArgument(16, 0); // b_conjugate +} + +// ================================================================================================= +} // namespace clblast diff --git a/src/tuning/kernels/xgemv.cpp b/src/tuning/kernels/xgemv.cpp index 965fc53d..165c5628 100644 --- a/src/tuning/kernels/xgemv.cpp +++ b/src/tuning/kernels/xgemv.cpp @@ -7,135 +7,11 @@ // Author(s): // Cedric Nugteren // -// This file uses the auto-tuner to tune the xgemv OpenCL kernels. Three variants are tuned: -// 1: The full version of the kernel -// 2: The fast version for non-transposed matrices -// 3: The fast version for transposed matrices +// This file uses the auto-tuner to tune the xgemv OpenCL kernels. // // ================================================================================================= -#include -#include - -#include "utilities/utilities.hpp" -#include "tuning/tuning.hpp" - -namespace clblast { -// ================================================================================================= - -// Settings for this kernel (default command-line arguments) -TunerDefaults GetTunerDefaults(const int) { - auto settings = TunerDefaults(); - settings.options = {kArgM, kArgN, kArgAlpha, kArgBeta}; - settings.default_m = 2048; - settings.default_n = 2048; - settings.default_num_runs = 4; - return settings; -} - -// Settings for this kernel (general) -template -TunerSettings GetTunerSettings(const int V, const Arguments &args) { - auto settings = TunerSettings(); - - // Identification of the kernel - settings.kernel_family = (V==1) ? "xgemv" : ((V==2) ? "xgemv_fast" : "xgemv_fast_rot"); - settings.kernel_name = (V==1) ? "Xgemv" : ((V==2) ? "XgemvFast" : "XgemvFastRot"); - settings.sources = -#include "../src/kernels/level2/xgemv.opencl" -#include "../src/kernels/level2/xgemv_fast.opencl" - ; - - // Buffer sizes - settings.size_x = args.n; - settings.size_y = args.m; - 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 = {1}; - - // Sets the base thread configuration - settings.global_size = {args.m}; - 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"+std::to_string(V)}}; - settings.div_global = (V==1 || V==2) ? TransformVector{{"WPT"+std::to_string(V)}} : TransformVector{}; - - // Sets the tuning parameters and their possible values - if (V==1) { - settings.parameters = { - {"WGS"+std::to_string(V), {32, 64, 128, 256}}, - {"WPT"+std::to_string(V), {1, 2, 4}}, - }; - } - if (V==2) { - settings.parameters = { - {"WGS"+std::to_string(V), {16, 32, 64, 128, 256}}, - {"WPT"+std::to_string(V), {1, 2, 4}}, - {"VW"+std::to_string(V), {1, 2, 4, 8}}, - }; - } - if (V==3) { - settings.parameters = { - {"WGS"+std::to_string(V), {16, 32, 64, 128}}, - {"WPT"+std::to_string(V), {1, 2, 4, 8, 16, 32}}, - {"VW"+std::to_string(V), {1, 2, 4, 8}}, - }; - } - - // Describes how to compute the performance metrics - settings.metric_amount = (args.m*args.n + 2*args.m + args.n) * GetBytes(args.precision); - settings.performance_unit = "GB/s"; - - return settings; -} - -// Tests for valid arguments -template -void TestValidArguments(const int, const Arguments &) { } -std::vector SetConstraints(const int V) { - auto constraints = std::vector(); - if (V==2 || V==3) { - auto MultipleOfX = [] (std::vector v) { return IsMultiple(v[0], v[1]); }; - constraints.push_back({MultipleOfX, {"WPT"+std::to_string(V), "VW"+std::to_string(V)}}); - } - if (V==3) { - auto LargerOrEqual = [] (std::vector v) { return v[0] >= v[1]; }; - constraints.push_back({LargerOrEqual, {"WGS"+std::to_string(V), "WPT"+std::to_string(V)}}); - } - return constraints; -} - -// Sets the kernel's arguments -template -void SetArguments(const int V, Kernel &kernel, const Arguments &args, std::vector>& buffers) { - auto a_rotated = (V==3) ? 1 : 0; - kernel.SetArgument(0, static_cast(args.m)); - kernel.SetArgument(1, static_cast(args.n)); - kernel.SetArgument(2, GetRealArg(args.alpha)); - kernel.SetArgument(3, GetRealArg(args.beta)); - kernel.SetArgument(4, a_rotated); - kernel.SetArgument(5, buffers[2]()); // 2 == A matrix - kernel.SetArgument(6, 0); - kernel.SetArgument(7, static_cast(args.m)); - kernel.SetArgument(8, buffers[0]()); // 0 == X vector - kernel.SetArgument(9, 0); - kernel.SetArgument(10, 1); - kernel.SetArgument(11, buffers[1]()); // 1 == Y vector - kernel.SetArgument(12, 0); - kernel.SetArgument(13, 1); - kernel.SetArgument(14, 0); // Conjugate transpose - kernel.SetArgument(15, 0); // Additional parameter - kernel.SetArgument(16, 0); // Banded 'kl' - kernel.SetArgument(17, 0); // Banded 'ku' -} - -// ================================================================================================= -} // namespace clblast +#include "tuning/kernels/xgemv.hpp" // Shortcuts to the clblast namespace using half = clblast::half; diff --git a/src/tuning/kernels/xgemv.hpp b/src/tuning/kernels/xgemv.hpp new file mode 100644 index 00000000..87186195 --- /dev/null +++ b/src/tuning/kernels/xgemv.hpp @@ -0,0 +1,138 @@ + +// ================================================================================================= +// This file is part of the CLBlast project. The project is licensed under Apache Version 2.0. This +// project loosely follows the Google C++ styleguide and uses a tab-size of two spaces and a max- +// width of 100 characters per line. +// +// Author(s): +// Cedric Nugteren +// +// This file uses the auto-tuner to tune the xgemv OpenCL kernels. Three variants are tuned: +// 1: The full version of the kernel +// 2: The fast version for non-transposed matrices +// 3: The fast version for transposed matrices +// +// ================================================================================================= + +#include +#include + +#include "utilities/utilities.hpp" +#include "tuning/tuning.hpp" + +namespace clblast { +// ================================================================================================= + +// Settings for this kernel (default command-line arguments) +TunerDefaults GetTunerDefaults(const int) { + auto settings = TunerDefaults(); + settings.options = {kArgM, kArgN, kArgAlpha, kArgBeta}; + settings.default_m = 2048; + settings.default_n = 2048; + settings.default_num_runs = 4; + return settings; +} + +// Settings for this kernel (general) +template +TunerSettings GetTunerSettings(const int V, const Arguments &args) { + auto settings = TunerSettings(); + + // Identification of the kernel + settings.kernel_family = (V==1) ? "xgemv" : ((V==2) ? "xgemv_fast" : "xgemv_fast_rot"); + settings.kernel_name = (V==1) ? "Xgemv" : ((V==2) ? "XgemvFast" : "XgemvFastRot"); + settings.sources = +#include "../src/kernels/level2/xgemv.opencl" +#include "../src/kernels/level2/xgemv_fast.opencl" + ; + + // Buffer sizes + settings.size_x = args.n; + settings.size_y = args.m; + 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 = {1}; + + // Sets the base thread configuration + settings.global_size = {args.m}; + 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"+std::to_string(V)}}; + settings.div_global = (V==1 || V==2) ? TransformVector{{"WPT"+std::to_string(V)}} : TransformVector{}; + + // Sets the tuning parameters and their possible values + if (V==1) { + settings.parameters = { + {"WGS"+std::to_string(V), {32, 64, 128, 256}}, + {"WPT"+std::to_string(V), {1, 2, 4}}, + }; + } + if (V==2) { + settings.parameters = { + {"WGS"+std::to_string(V), {16, 32, 64, 128, 256}}, + {"WPT"+std::to_string(V), {1, 2, 4}}, + {"VW"+std::to_string(V), {1, 2, 4, 8}}, + }; + } + if (V==3) { + settings.parameters = { + {"WGS"+std::to_string(V), {16, 32, 64, 128}}, + {"WPT"+std::to_string(V), {1, 2, 4, 8, 16, 32}}, + {"VW"+std::to_string(V), {1, 2, 4, 8}}, + }; + } + + // Describes how to compute the performance metrics + settings.metric_amount = (args.m*args.n + 2*args.m + args.n) * GetBytes(args.precision); + settings.performance_unit = "GB/s"; + + return settings; +} + +// Tests for valid arguments +template +void TestValidArguments(const int, const Arguments &) { } +std::vector SetConstraints(const int V) { + auto constraints = std::vector(); + if (V==2 || V==3) { + auto MultipleOfX = [] (std::vector v) { return IsMultiple(v[0], v[1]); }; + constraints.push_back({MultipleOfX, {"WPT"+std::to_string(V), "VW"+std::to_string(V)}}); + } + if (V==3) { + auto LargerOrEqual = [] (std::vector v) { return v[0] >= v[1]; }; + constraints.push_back({LargerOrEqual, {"WGS"+std::to_string(V), "WPT"+std::to_string(V)}}); + } + return constraints; +} + +// Sets the kernel's arguments +template +void SetArguments(const int V, Kernel &kernel, const Arguments &args, std::vector>& buffers) { + auto a_rotated = (V==3) ? 1 : 0; + kernel.SetArgument(0, static_cast(args.m)); + kernel.SetArgument(1, static_cast(args.n)); + kernel.SetArgument(2, GetRealArg(args.alpha)); + kernel.SetArgument(3, GetRealArg(args.beta)); + kernel.SetArgument(4, a_rotated); + kernel.SetArgument(5, buffers[2]()); // 2 == A matrix + kernel.SetArgument(6, 0); + kernel.SetArgument(7, static_cast(args.m)); + kernel.SetArgument(8, buffers[0]()); // 0 == X vector + kernel.SetArgument(9, 0); + kernel.SetArgument(10, 1); + kernel.SetArgument(11, buffers[1]()); // 1 == Y vector + kernel.SetArgument(12, 0); + kernel.SetArgument(13, 1); + kernel.SetArgument(14, 0); // Conjugate transpose + kernel.SetArgument(15, 0); // Additional parameter + kernel.SetArgument(16, 0); // Banded 'kl' + kernel.SetArgument(17, 0); // Banded 'ku' +} + +// ================================================================================================= +} // namespace clblast diff --git a/src/tuning/kernels/xger.cpp b/src/tuning/kernels/xger.cpp index a88fb5d6..8a90f340 100644 --- a/src/tuning/kernels/xger.cpp +++ b/src/tuning/kernels/xger.cpp @@ -11,95 +11,7 @@ // // ================================================================================================= -#include -#include - -#include "utilities/utilities.hpp" -#include "tuning/tuning.hpp" - -namespace clblast { -// ================================================================================================= - -// 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) -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 = -#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; -} - -// 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 +#include "tuning/kernels/xger.hpp" // Shortcuts to the clblast namespace using half = clblast::half; diff --git a/src/tuning/kernels/xger.hpp b/src/tuning/kernels/xger.hpp new file mode 100644 index 00000000..a88fb5d6 --- /dev/null +++ b/src/tuning/kernels/xger.hpp @@ -0,0 +1,122 @@ + +// ================================================================================================= +// This file is part of the CLBlast project. The project is licensed under Apache Version 2.0. This +// project loosely follows the Google C++ styleguide and uses a tab-size of two spaces and a max- +// width of 100 characters per line. +// +// Author(s): +// Cedric Nugteren +// +// This file uses the auto-tuner to tune the xger OpenCL kernels. +// +// ================================================================================================= + +#include +#include + +#include "utilities/utilities.hpp" +#include "tuning/tuning.hpp" + +namespace clblast { +// ================================================================================================= + +// 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) +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 = +#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; +} + +// 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 + +// Shortcuts to the clblast namespace +using half = clblast::half; +using float2 = clblast::float2; +using double2 = clblast::double2; + +// Main function (not within the clblast namespace) +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(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 From 49cc8b31ff65a6fff29146d98b16f717e0a84213 Mon Sep 17 00:00:00 2001 From: Cedric Nugteren Date: Tue, 6 Mar 2018 20:59:23 +0100 Subject: Fixed compilation issue in Xger tuner --- src/tuning/kernels/xger.hpp | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/tuning/kernels') diff --git a/src/tuning/kernels/xger.hpp b/src/tuning/kernels/xger.hpp index a88fb5d6..01d85c9e 100644 --- a/src/tuning/kernels/xger.hpp +++ b/src/tuning/kernels/xger.hpp @@ -100,23 +100,3 @@ void SetArguments(const int, Kernel &kernel, const Arguments &args, std::vect // ================================================================================================= } // namespace clblast - -// Shortcuts to the clblast namespace -using half = clblast::half; -using float2 = clblast::float2; -using double2 = clblast::double2; - -// Main function (not within the clblast namespace) -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(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 From 3d2ef9331bd01bfc31d6725576c8ccb4eadbbc1c Mon Sep 17 00:00:00 2001 From: Cedric Nugteren Date: Sat, 10 Mar 2018 14:35:11 +0100 Subject: Fixed a few things for the new tuning API --- include/clblast.h | 11 ++++++ scripts/generator/generator.py | 2 +- src/tuning/kernels/copy_fast.cpp | 10 +++--- src/tuning/kernels/copy_fast.hpp | 10 +++--- src/tuning/kernels/copy_pad.cpp | 10 +++--- src/tuning/kernels/copy_pad.hpp | 10 +++--- src/tuning/kernels/invert.cpp | 10 +++--- src/tuning/kernels/invert.hpp | 10 +++--- src/tuning/kernels/transpose_fast.cpp | 10 +++--- src/tuning/kernels/transpose_fast.hpp | 10 +++--- src/tuning/kernels/transpose_pad.cpp | 10 +++--- src/tuning/kernels/transpose_pad.hpp | 10 +++--- src/tuning/kernels/xaxpy.cpp | 10 +++--- src/tuning/kernels/xaxpy.hpp | 10 +++--- src/tuning/kernels/xdot.cpp | 10 +++--- src/tuning/kernels/xdot.hpp | 10 +++--- src/tuning/kernels/xgemm.cpp | 10 +++--- src/tuning/kernels/xgemm.hpp | 10 +++--- src/tuning/kernels/xgemm_direct.cpp | 10 +++--- src/tuning/kernels/xgemm_direct.hpp | 10 +++--- src/tuning/kernels/xgemv.cpp | 10 +++--- src/tuning/kernels/xgemv.hpp | 10 +++--- src/tuning/kernels/xger.cpp | 10 +++--- src/tuning/kernels/xger.hpp | 10 +++--- src/tuning/tuning_api.cpp | 67 ++++++++++++++++++++--------------- 25 files changed, 160 insertions(+), 140 deletions(-) (limited to 'src/tuning/kernels') diff --git a/include/clblast.h b/include/clblast.h index 34efc746..5129022e 100644 --- a/include/clblast.h +++ b/include/clblast.h @@ -705,46 +705,57 @@ StatusCode PUBLIC_API OverrideParameters(const cl_device_id device, const std::s // ================================================================================================= +// Tunes the "Xaxpy" kernel, used for many level-1 routines such as XAXPY, XCOPY, and XSWAP template StatusCode PUBLIC_API TuneXaxpy(cl_command_queue* queue, const size_t n, const double fraction, std::unordered_map ¶meters); +// Tunes the "Xdot" kernel, used for level-1 reduction routines such as XDOT, XMAX, and XSUM template StatusCode PUBLIC_API TuneXdot(cl_command_queue* queue, const size_t n, const double fraction, std::unordered_map ¶meters); +// Tunes the "Xgemv" kernel, used for matrix-vector level-2 routines such as XGEMV, XGBMV, and XHEMV template StatusCode PUBLIC_API TuneXgemv(cl_command_queue* queue, const size_t m, const size_t n, const double fraction, std::unordered_map ¶meters); +// Tunes the "Xger" kernel, used for matrix update level-2 routines such as XGER, XHER, and XSYR2 template StatusCode PUBLIC_API TuneXger(cl_command_queue* queue, const size_t m, const size_t n, const double fraction, std::unordered_map ¶meters); +// Tunes the "Xgemm" kernel, used for most level-3 routines such as XGEMM, XSYMM, and XHER2K template StatusCode PUBLIC_API TuneXgemm(cl_command_queue* queue, const size_t m, const size_t n, const size_t k, const double fraction, std::unordered_map ¶meters); +// Tunes the "XgemmDiret" kernel, used for most level-3 routines such as XGEMM, XSYMM, and XHER2K template StatusCode PUBLIC_API TuneXgemmDirect(cl_command_queue* queue, const size_t m, const size_t n, const size_t k, const double fraction, std::unordered_map ¶meters); +// Tunes the "Copy" kernel, used for most level-3 routines such as XGEMM, XSYMM, and XHER2K template StatusCode PUBLIC_API TuneCopy(cl_command_queue* queue, const size_t m, const size_t n, const double fraction, std::unordered_map ¶meters); +// Tunes the "Pad" kernel, used for most level-3 routines such as XGEMM, XSYMM, and XHER2K template StatusCode PUBLIC_API TunePad(cl_command_queue* queue, const size_t m, const size_t n, const double fraction, std::unordered_map ¶meters); +// Tunes the "Transpose" kernel, used for most level-3 routines such as XGEMM, XSYMM, and XHER2K template StatusCode PUBLIC_API TuneTranspose(cl_command_queue* queue, const size_t m, const size_t n, const double fraction, std::unordered_map ¶meters); +// Tunes the "Padtranspose" kernel, used for most level-3 routines such as XGEMM, XSYMM, and XHER2K template StatusCode PUBLIC_API TunePadtranspose(cl_command_queue* queue, const size_t m, const size_t n, const double fraction, std::unordered_map ¶meters); +// Tunes the "Xgemm" kernel, used for the level-3 routine XTRSM template StatusCode PUBLIC_API TuneInvert(cl_command_queue* queue, const size_t m, const size_t n, const size_t k, const double fraction, std::unordered_map ¶meters); diff --git a/scripts/generator/generator.py b/scripts/generator/generator.py index 5ead9b73..1884eca4 100755 --- a/scripts/generator/generator.py +++ b/scripts/generator/generator.py @@ -50,7 +50,7 @@ FILES = [ "/src/pyclblast/src/pyclblast.pyx" ] HEADER_LINES = [123, 21, 127, 24, 29, 41, 29, 65, 32, 95, 21, 288] -FOOTER_LINES = [41, 56, 112, 275, 6, 6, 6, 9, 2, 41, 55, 1] +FOOTER_LINES = [98, 56, 112, 275, 6, 6, 6, 9, 2, 41, 55, 1] HEADER_LINES_DOC = 0 FOOTER_LINES_DOC = 158 diff --git a/src/tuning/kernels/copy_fast.cpp b/src/tuning/kernels/copy_fast.cpp index a71dd083..0314113c 100644 --- a/src/tuning/kernels/copy_fast.cpp +++ b/src/tuning/kernels/copy_fast.cpp @@ -22,11 +22,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(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; + case clblast::Precision::kHalf: clblast::Tuner(argc, argv, 0, clblast::CopyGetTunerDefaults, clblast::CopyGetTunerSettings, clblast::CopyTestValidArguments, clblast::CopySetConstraints, clblast::CopySetArguments); break; + case clblast::Precision::kSingle: clblast::Tuner(argc, argv, 0, clblast::CopyGetTunerDefaults, clblast::CopyGetTunerSettings, clblast::CopyTestValidArguments, clblast::CopySetConstraints, clblast::CopySetArguments); break; + case clblast::Precision::kDouble: clblast::Tuner(argc, argv, 0, clblast::CopyGetTunerDefaults, clblast::CopyGetTunerSettings, clblast::CopyTestValidArguments, clblast::CopySetConstraints, clblast::CopySetArguments); break; + case clblast::Precision::kComplexSingle: clblast::Tuner(argc, argv, 0, clblast::CopyGetTunerDefaults, clblast::CopyGetTunerSettings, clblast::CopyTestValidArguments, clblast::CopySetConstraints, clblast::CopySetArguments); break; + case clblast::Precision::kComplexDouble: clblast::Tuner(argc, argv, 0, clblast::CopyGetTunerDefaults, clblast::CopyGetTunerSettings, clblast::CopyTestValidArguments, clblast::CopySetConstraints, clblast::CopySetArguments); break; } return 0; } diff --git a/src/tuning/kernels/copy_fast.hpp b/src/tuning/kernels/copy_fast.hpp index eab1c7dd..f9a58bc7 100644 --- a/src/tuning/kernels/copy_fast.hpp +++ b/src/tuning/kernels/copy_fast.hpp @@ -21,7 +21,7 @@ namespace clblast { // ================================================================================================= // Settings for this kernel (default command-line arguments) -TunerDefaults GetTunerDefaults(const int) { +TunerDefaults CopyGetTunerDefaults(const int) { auto settings = TunerDefaults(); settings.options = {kArgM, kArgN, kArgAlpha}; settings.default_m = 1024; @@ -31,7 +31,7 @@ TunerDefaults GetTunerDefaults(const int) { // Settings for this kernel (general) template -TunerSettings GetTunerSettings(const int, const Arguments &args) { +TunerSettings CopyGetTunerSettings(const int, const Arguments &args) { auto settings = TunerSettings(); // Identification of the kernel @@ -77,12 +77,12 @@ TunerSettings GetTunerSettings(const int, const Arguments &args) { // Tests for valid arguments template -void TestValidArguments(const int, const Arguments &) { } -std::vector SetConstraints(const int) { return {}; } +void CopyTestValidArguments(const int, const Arguments &) { } +std::vector CopySetConstraints(const int) { return {}; } // Sets the kernel's arguments template -void SetArguments(const int, Kernel &kernel, const Arguments &args, std::vector>& buffers) { +void CopySetArguments(const int, Kernel &kernel, const Arguments &args, std::vector>& buffers) { kernel.SetArgument(0, static_cast(args.m)); kernel.SetArgument(1, buffers[2]()); // 2 == A matrix kernel.SetArgument(2, buffers[3]()); // 3 == B matrix diff --git a/src/tuning/kernels/copy_pad.cpp b/src/tuning/kernels/copy_pad.cpp index e32a5746..909a71c8 100644 --- a/src/tuning/kernels/copy_pad.cpp +++ b/src/tuning/kernels/copy_pad.cpp @@ -22,11 +22,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(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; + case clblast::Precision::kHalf: clblast::Tuner(argc, argv, 0, clblast::PadGetTunerDefaults, clblast::PadGetTunerSettings, clblast::PadTestValidArguments, clblast::PadSetConstraints, clblast::PadSetArguments); break; + case clblast::Precision::kSingle: clblast::Tuner(argc, argv, 0, clblast::PadGetTunerDefaults, clblast::PadGetTunerSettings, clblast::PadTestValidArguments, clblast::PadSetConstraints, clblast::PadSetArguments); break; + case clblast::Precision::kDouble: clblast::Tuner(argc, argv, 0, clblast::PadGetTunerDefaults, clblast::PadGetTunerSettings, clblast::PadTestValidArguments, clblast::PadSetConstraints, clblast::PadSetArguments); break; + case clblast::Precision::kComplexSingle: clblast::Tuner(argc, argv, 0, clblast::PadGetTunerDefaults, clblast::PadGetTunerSettings, clblast::PadTestValidArguments, clblast::PadSetConstraints, clblast::PadSetArguments); break; + case clblast::Precision::kComplexDouble: clblast::Tuner(argc, argv, 0, clblast::PadGetTunerDefaults, clblast::PadGetTunerSettings, clblast::PadTestValidArguments, clblast::PadSetConstraints, clblast::PadSetArguments); break; } return 0; } diff --git a/src/tuning/kernels/copy_pad.hpp b/src/tuning/kernels/copy_pad.hpp index b39c0318..e612ca9e 100644 --- a/src/tuning/kernels/copy_pad.hpp +++ b/src/tuning/kernels/copy_pad.hpp @@ -21,7 +21,7 @@ namespace clblast { // ================================================================================================= // Settings for this kernel (default command-line arguments) -TunerDefaults GetTunerDefaults(const int) { +TunerDefaults PadGetTunerDefaults(const int) { auto settings = TunerDefaults(); settings.options = {kArgM, kArgN, kArgAlpha}; settings.default_m = 1024; @@ -31,7 +31,7 @@ TunerDefaults GetTunerDefaults(const int) { // Settings for this kernel (general) template -TunerSettings GetTunerSettings(const int, const Arguments &args) { +TunerSettings PadGetTunerSettings(const int, const Arguments &args) { auto settings = TunerSettings(); // Identification of the kernel @@ -77,12 +77,12 @@ TunerSettings GetTunerSettings(const int, const Arguments &args) { // Tests for valid arguments template -void TestValidArguments(const int, const Arguments &) { } -std::vector SetConstraints(const int) { return {}; } +void PadTestValidArguments(const int, const Arguments &) { } +std::vector PadSetConstraints(const int) { return {}; } // Sets the kernel's arguments template -void SetArguments(const int, Kernel &kernel, const Arguments &args, std::vector>& buffers) { +void PadSetArguments(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, static_cast(args.m)); diff --git a/src/tuning/kernels/invert.cpp b/src/tuning/kernels/invert.cpp index ecd51199..3dfeb508 100644 --- a/src/tuning/kernels/invert.cpp +++ b/src/tuning/kernels/invert.cpp @@ -22,11 +22,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(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; + case clblast::Precision::kHalf: clblast::Tuner(argc, argv, 0, clblast::InvertGetTunerDefaults, clblast::InvertGetTunerSettings, clblast::InvertTestValidArguments, clblast::InvertSetConstraints, clblast::InvertSetArguments); break; + case clblast::Precision::kSingle: clblast::Tuner(argc, argv, 0, clblast::InvertGetTunerDefaults, clblast::InvertGetTunerSettings, clblast::InvertTestValidArguments, clblast::InvertSetConstraints, clblast::InvertSetArguments); break; + case clblast::Precision::kDouble: clblast::Tuner(argc, argv, 0, clblast::InvertGetTunerDefaults, clblast::InvertGetTunerSettings, clblast::InvertTestValidArguments, clblast::InvertSetConstraints, clblast::InvertSetArguments); break; + case clblast::Precision::kComplexSingle: clblast::Tuner(argc, argv, 0, clblast::InvertGetTunerDefaults, clblast::InvertGetTunerSettings, clblast::InvertTestValidArguments, clblast::InvertSetConstraints, clblast::InvertSetArguments); break; + case clblast::Precision::kComplexDouble: clblast::Tuner(argc, argv, 0, clblast::InvertGetTunerDefaults, clblast::InvertGetTunerSettings, clblast::InvertTestValidArguments, clblast::InvertSetConstraints, clblast::InvertSetArguments); break; } return 0; } diff --git a/src/tuning/kernels/invert.hpp b/src/tuning/kernels/invert.hpp index 0178a2aa..0a0c9ce2 100644 --- a/src/tuning/kernels/invert.hpp +++ b/src/tuning/kernels/invert.hpp @@ -21,7 +21,7 @@ namespace clblast { // ================================================================================================= // Settings for this kernel (default command-line arguments) -TunerDefaults GetTunerDefaults(const int) { +TunerDefaults InvertGetTunerDefaults(const int) { auto settings = TunerDefaults(); settings.options = {kArgN, kArgM, kArgK}; settings.default_n = 128; // dimension of input matrix 'n' @@ -32,7 +32,7 @@ TunerDefaults GetTunerDefaults(const int) { // Settings for this kernel (general) template -TunerSettings GetTunerSettings(const int, const Arguments &args) { +TunerSettings InvertGetTunerSettings(const int, const Arguments &args) { auto settings = TunerSettings(); // Identification of the kernel @@ -81,16 +81,16 @@ TunerSettings GetTunerSettings(const int, const Arguments &args) { // Tests for valid arguments template -void TestValidArguments(const int, const Arguments &args) { +void InvertTestValidArguments(const int, const Arguments &args) { if (!(args.k == 16)) { throw std::runtime_error("'TripleMatMul16Part1Lower' requires 'k' to be 16"); } } -std::vector SetConstraints(const int) { return {}; } +std::vector InvertSetConstraints(const int) { return {}; } // Sets the kernel's arguments template -void SetArguments(const int, Kernel &kernel, const Arguments &args, std::vector>& buffers) { +void InvertSetArguments(const int, Kernel &kernel, const Arguments &args, std::vector>& buffers) { const auto num_pages = CeilDiv(args.n, args.k * 2); // CeilDiv(n, current_size*2) kernel.SetArgument(0, static_cast(args.n)); // n kernel.SetArgument(1, buffers[2]()); // 2 == A matrix diff --git a/src/tuning/kernels/transpose_fast.cpp b/src/tuning/kernels/transpose_fast.cpp index 2144f23f..6b37a31d 100644 --- a/src/tuning/kernels/transpose_fast.cpp +++ b/src/tuning/kernels/transpose_fast.cpp @@ -22,11 +22,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(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; + case clblast::Precision::kHalf: clblast::Tuner(argc, argv, 0, clblast::TransposeGetTunerDefaults, clblast::TransposeGetTunerSettings, clblast::TransposeTestValidArguments, clblast::TransposeSetConstraints, clblast::TransposeSetArguments); break; + case clblast::Precision::kSingle: clblast::Tuner(argc, argv, 0, clblast::TransposeGetTunerDefaults, clblast::TransposeGetTunerSettings, clblast::TransposeTestValidArguments, clblast::TransposeSetConstraints, clblast::TransposeSetArguments); break; + case clblast::Precision::kDouble: clblast::Tuner(argc, argv, 0, clblast::TransposeGetTunerDefaults, clblast::TransposeGetTunerSettings, clblast::TransposeTestValidArguments, clblast::TransposeSetConstraints, clblast::TransposeSetArguments); break; + case clblast::Precision::kComplexSingle: clblast::Tuner(argc, argv, 0, clblast::TransposeGetTunerDefaults, clblast::TransposeGetTunerSettings, clblast::TransposeTestValidArguments, clblast::TransposeSetConstraints, clblast::TransposeSetArguments); break; + case clblast::Precision::kComplexDouble: clblast::Tuner(argc, argv, 0, clblast::TransposeGetTunerDefaults, clblast::TransposeGetTunerSettings, clblast::TransposeTestValidArguments, clblast::TransposeSetConstraints, clblast::TransposeSetArguments); break; } return 0; } diff --git a/src/tuning/kernels/transpose_fast.hpp b/src/tuning/kernels/transpose_fast.hpp index 47859f7a..e8917ad2 100644 --- a/src/tuning/kernels/transpose_fast.hpp +++ b/src/tuning/kernels/transpose_fast.hpp @@ -21,7 +21,7 @@ namespace clblast { // ================================================================================================= // Settings for this kernel (default command-line arguments) -TunerDefaults GetTunerDefaults(const int) { +TunerDefaults TransposeGetTunerDefaults(const int) { auto settings = TunerDefaults(); settings.options = {kArgM, kArgN, kArgAlpha}; settings.default_m = 1024; @@ -31,7 +31,7 @@ TunerDefaults GetTunerDefaults(const int) { // Settings for this kernel (general) template -TunerSettings GetTunerSettings(const int, const Arguments &args) { +TunerSettings TransposeGetTunerSettings(const int, const Arguments &args) { auto settings = TunerSettings(); // Identification of the kernel @@ -77,12 +77,12 @@ TunerSettings GetTunerSettings(const int, const Arguments &args) { // Tests for valid arguments template -void TestValidArguments(const int, const Arguments &) { } -std::vector SetConstraints(const int) { return {}; } +void TransposeTestValidArguments(const int, const Arguments &) { } +std::vector TransposeSetConstraints(const int) { return {}; } // Sets the kernel's arguments template -void SetArguments(const int, Kernel &kernel, const Arguments &args, std::vector>& buffers) { +void TransposeSetArguments(const int, Kernel &kernel, const Arguments &args, std::vector>& buffers) { kernel.SetArgument(0, static_cast(args.m)); kernel.SetArgument(1, buffers[2]()); // 2 == A matrix kernel.SetArgument(2, buffers[3]()); // 3 == B matrix diff --git a/src/tuning/kernels/transpose_pad.cpp b/src/tuning/kernels/transpose_pad.cpp index ce39d857..fc7244f6 100644 --- a/src/tuning/kernels/transpose_pad.cpp +++ b/src/tuning/kernels/transpose_pad.cpp @@ -22,11 +22,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(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; + case clblast::Precision::kHalf: clblast::Tuner(argc, argv, 0, clblast::PadtransposeGetTunerDefaults, clblast::PadtransposeGetTunerSettings, clblast::PadtransposeTestValidArguments, clblast::PadtransposeSetConstraints, clblast::PadtransposeSetArguments); break; + case clblast::Precision::kSingle: clblast::Tuner(argc, argv, 0, clblast::PadtransposeGetTunerDefaults, clblast::PadtransposeGetTunerSettings, clblast::PadtransposeTestValidArguments, clblast::PadtransposeSetConstraints, clblast::PadtransposeSetArguments); break; + case clblast::Precision::kDouble: clblast::Tuner(argc, argv, 0, clblast::PadtransposeGetTunerDefaults, clblast::PadtransposeGetTunerSettings, clblast::PadtransposeTestValidArguments, clblast::PadtransposeSetConstraints, clblast::PadtransposeSetArguments); break; + case clblast::Precision::kComplexSingle: clblast::Tuner(argc, argv, 0, clblast::PadtransposeGetTunerDefaults, clblast::PadtransposeGetTunerSettings, clblast::PadtransposeTestValidArguments, clblast::PadtransposeSetConstraints, clblast::PadtransposeSetArguments); break; + case clblast::Precision::kComplexDouble: clblast::Tuner(argc, argv, 0, clblast::PadtransposeGetTunerDefaults, clblast::PadtransposeGetTunerSettings, clblast::PadtransposeTestValidArguments, clblast::PadtransposeSetConstraints, clblast::PadtransposeSetArguments); break; } return 0; } diff --git a/src/tuning/kernels/transpose_pad.hpp b/src/tuning/kernels/transpose_pad.hpp index c9ce983e..8d24a0dc 100644 --- a/src/tuning/kernels/transpose_pad.hpp +++ b/src/tuning/kernels/transpose_pad.hpp @@ -21,7 +21,7 @@ namespace clblast { // ================================================================================================= // Settings for this kernel (default command-line arguments) -TunerDefaults GetTunerDefaults(const int) { +TunerDefaults PadtransposeGetTunerDefaults(const int) { auto settings = TunerDefaults(); settings.options = {kArgM, kArgN, kArgAlpha}; settings.default_m = 1024; @@ -31,7 +31,7 @@ TunerDefaults GetTunerDefaults(const int) { // Settings for this kernel (general) template -TunerSettings GetTunerSettings(const int, const Arguments &args) { +TunerSettings PadtransposeGetTunerSettings(const int, const Arguments &args) { auto settings = TunerSettings(); // Identification of the kernel @@ -76,12 +76,12 @@ TunerSettings GetTunerSettings(const int, const Arguments &args) { // Tests for valid arguments template -void TestValidArguments(const int, const Arguments &) { } -std::vector SetConstraints(const int) { return {}; } +void PadtransposeTestValidArguments(const int, const Arguments &) { } +std::vector PadtransposeSetConstraints(const int) { return {}; } // Sets the kernel's arguments template -void SetArguments(const int, Kernel &kernel, const Arguments &args, std::vector>& buffers) { +void PadtransposeSetArguments(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, static_cast(args.m)); diff --git a/src/tuning/kernels/xaxpy.cpp b/src/tuning/kernels/xaxpy.cpp index a290b6c1..6a95600d 100644 --- a/src/tuning/kernels/xaxpy.cpp +++ b/src/tuning/kernels/xaxpy.cpp @@ -22,11 +22,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(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; + case clblast::Precision::kHalf: clblast::Tuner(argc, argv, 0, clblast::XaxpyGetTunerDefaults, clblast::XaxpyGetTunerSettings, clblast::XaxpyTestValidArguments, clblast::XaxpySetConstraints, clblast::XaxpySetArguments); break; + case clblast::Precision::kSingle: clblast::Tuner(argc, argv, 0, clblast::XaxpyGetTunerDefaults, clblast::XaxpyGetTunerSettings, clblast::XaxpyTestValidArguments, clblast::XaxpySetConstraints, clblast::XaxpySetArguments); break; + case clblast::Precision::kDouble: clblast::Tuner(argc, argv, 0, clblast::XaxpyGetTunerDefaults, clblast::XaxpyGetTunerSettings, clblast::XaxpyTestValidArguments, clblast::XaxpySetConstraints, clblast::XaxpySetArguments); break; + case clblast::Precision::kComplexSingle: clblast::Tuner(argc, argv, 0, clblast::XaxpyGetTunerDefaults, clblast::XaxpyGetTunerSettings, clblast::XaxpyTestValidArguments, clblast::XaxpySetConstraints, clblast::XaxpySetArguments); break; + case clblast::Precision::kComplexDouble: clblast::Tuner(argc, argv, 0, clblast::XaxpyGetTunerDefaults, clblast::XaxpyGetTunerSettings, clblast::XaxpyTestValidArguments, clblast::XaxpySetConstraints, clblast::XaxpySetArguments); break; } return 0; } diff --git a/src/tuning/kernels/xaxpy.hpp b/src/tuning/kernels/xaxpy.hpp index 266a671b..24550ed9 100644 --- a/src/tuning/kernels/xaxpy.hpp +++ b/src/tuning/kernels/xaxpy.hpp @@ -21,7 +21,7 @@ namespace clblast { // ================================================================================================= // Settings for this kernel (default command-line arguments) -TunerDefaults GetTunerDefaults(const int) { +TunerDefaults XaxpyGetTunerDefaults(const int) { auto settings = TunerDefaults(); settings.options = {kArgN, kArgAlpha}; settings.default_n = 4096*1024; @@ -30,7 +30,7 @@ TunerDefaults GetTunerDefaults(const int) { // Settings for this kernel (general) template -TunerSettings GetTunerSettings(const int, const Arguments &args) { +TunerSettings XaxpyGetTunerSettings(const int, const Arguments &args) { auto settings = TunerSettings(); // Identification of the kernel @@ -75,16 +75,16 @@ TunerSettings GetTunerSettings(const int, const Arguments &args) { // Tests for valid arguments template -void TestValidArguments(const int, const Arguments &args) { +void XaxpyTestValidArguments(const int, const Arguments &args) { if (!IsMultiple(args.n, 64)) { throw std::runtime_error("'XaxpyFastest' requires 'n' to be a multiple of WGS*WPT*VW"); } } -std::vector SetConstraints(const int) { return {}; } +std::vector XaxpySetConstraints(const int) { return {}; } // Sets the kernel's arguments template -void SetArguments(const int, Kernel &kernel, const Arguments &args, std::vector>& buffers) { +void XaxpySetArguments(const int, Kernel &kernel, const Arguments &args, std::vector>& buffers) { kernel.SetArgument(0, static_cast(args.n)); kernel.SetArgument(1, GetRealArg(args.alpha)); kernel.SetArgument(2, buffers[0]()); // 0 == X vector diff --git a/src/tuning/kernels/xdot.cpp b/src/tuning/kernels/xdot.cpp index 10126392..6d10c4d8 100644 --- a/src/tuning/kernels/xdot.cpp +++ b/src/tuning/kernels/xdot.cpp @@ -24,11 +24,11 @@ template void StartVariation(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(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; - case clblast::Precision::kSingle: clblast::Tuner(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; - case clblast::Precision::kDouble: clblast::Tuner(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; - case clblast::Precision::kComplexSingle: clblast::Tuner(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; - case clblast::Precision::kComplexDouble: clblast::Tuner(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; + case clblast::Precision::kHalf: clblast::Tuner(argc, argv, V, clblast::XdotGetTunerDefaults, clblast::XdotGetTunerSettings, clblast::XdotTestValidArguments, clblast::XdotSetConstraints, clblast::XdotSetArguments); break; + case clblast::Precision::kSingle: clblast::Tuner(argc, argv, V, clblast::XdotGetTunerDefaults, clblast::XdotGetTunerSettings, clblast::XdotTestValidArguments, clblast::XdotSetConstraints, clblast::XdotSetArguments); break; + case clblast::Precision::kDouble: clblast::Tuner(argc, argv, V, clblast::XdotGetTunerDefaults, clblast::XdotGetTunerSettings, clblast::XdotTestValidArguments, clblast::XdotSetConstraints, clblast::XdotSetArguments); break; + case clblast::Precision::kComplexSingle: clblast::Tuner(argc, argv, V, clblast::XdotGetTunerDefaults, clblast::XdotGetTunerSettings, clblast::XdotTestValidArguments, clblast::XdotSetConstraints, clblast::XdotSetArguments); break; + case clblast::Precision::kComplexDouble: clblast::Tuner(argc, argv, V, clblast::XdotGetTunerDefaults, clblast::XdotGetTunerSettings, clblast::XdotTestValidArguments, clblast::XdotSetConstraints, clblast::XdotSetArguments); break; } } diff --git a/src/tuning/kernels/xdot.hpp b/src/tuning/kernels/xdot.hpp index 456baea4..15673c79 100644 --- a/src/tuning/kernels/xdot.hpp +++ b/src/tuning/kernels/xdot.hpp @@ -22,7 +22,7 @@ namespace clblast { // ================================================================================================= // Settings for this kernel (default command-line arguments) -TunerDefaults GetTunerDefaults(const int) { +TunerDefaults XdotGetTunerDefaults(const int) { auto settings = TunerDefaults(); settings.options = {kArgN}; settings.default_n = 2*1024*1024; @@ -31,7 +31,7 @@ TunerDefaults GetTunerDefaults(const int) { // Settings for this kernel (general) template -TunerSettings GetTunerSettings(const int V, const Arguments &args) { +TunerSettings XdotGetTunerSettings(const int V, const Arguments &args) { auto settings = TunerSettings(); // Identification of the kernel @@ -74,12 +74,12 @@ TunerSettings GetTunerSettings(const int V, const Arguments &args) { // Tests for valid arguments template -void TestValidArguments(const int, const Arguments &) { } -std::vector SetConstraints(const int) { return {}; } +void XdotTestValidArguments(const int, const Arguments &) { } +std::vector XdotSetConstraints(const int) { return {}; } // Sets the kernel's arguments template -void SetArguments(const int V, Kernel &kernel, const Arguments &args, std::vector>& buffers) { +void XdotSetArguments(const int V, Kernel &kernel, const Arguments &args, std::vector>& buffers) { if (V == 1) { kernel.SetArgument(0, static_cast(args.n)); kernel.SetArgument(1, buffers[0]()); // 0 == X vector diff --git a/src/tuning/kernels/xgemm.cpp b/src/tuning/kernels/xgemm.cpp index f388c76c..d365ce6d 100644 --- a/src/tuning/kernels/xgemm.cpp +++ b/src/tuning/kernels/xgemm.cpp @@ -23,11 +23,11 @@ template void StartVariation(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(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; - case clblast::Precision::kSingle: clblast::Tuner(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; - case clblast::Precision::kDouble: clblast::Tuner(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; - case clblast::Precision::kComplexSingle: clblast::Tuner(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; - case clblast::Precision::kComplexDouble: clblast::Tuner(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; + case clblast::Precision::kHalf: clblast::Tuner(argc, argv, V, clblast::XgemmGetTunerDefaults, clblast::XgemmGetTunerSettings, clblast::XgemmTestValidArguments, clblast::XgemmSetConstraints, clblast::XgemmSetArguments); break; + case clblast::Precision::kSingle: clblast::Tuner(argc, argv, V, clblast::XgemmGetTunerDefaults, clblast::XgemmGetTunerSettings, clblast::XgemmTestValidArguments, clblast::XgemmSetConstraints, clblast::XgemmSetArguments); break; + case clblast::Precision::kDouble: clblast::Tuner(argc, argv, V, clblast::XgemmGetTunerDefaults, clblast::XgemmGetTunerSettings, clblast::XgemmTestValidArguments, clblast::XgemmSetConstraints, clblast::XgemmSetArguments); break; + case clblast::Precision::kComplexSingle: clblast::Tuner(argc, argv, V, clblast::XgemmGetTunerDefaults, clblast::XgemmGetTunerSettings, clblast::XgemmTestValidArguments, clblast::XgemmSetConstraints, clblast::XgemmSetArguments); break; + case clblast::Precision::kComplexDouble: clblast::Tuner(argc, argv, V, clblast::XgemmGetTunerDefaults, clblast::XgemmGetTunerSettings, clblast::XgemmTestValidArguments, clblast::XgemmSetConstraints, clblast::XgemmSetArguments); break; } } diff --git a/src/tuning/kernels/xgemm.hpp b/src/tuning/kernels/xgemm.hpp index 09ebe91d..66e197e1 100644 --- a/src/tuning/kernels/xgemm.hpp +++ b/src/tuning/kernels/xgemm.hpp @@ -23,7 +23,7 @@ namespace clblast { // ================================================================================================= // Settings for this kernel (default command-line arguments) -TunerDefaults GetTunerDefaults(const int V) { +TunerDefaults XgemmGetTunerDefaults(const int V) { auto settings = TunerDefaults(); settings.options = {kArgM, kArgN, kArgK, kArgAlpha, kArgBeta, kArgFraction, kArgHeuristicSelection, kArgPsoSwarmSize, @@ -38,7 +38,7 @@ TunerDefaults GetTunerDefaults(const int V) { // Settings for this kernel (general) template -TunerSettings GetTunerSettings(const int V, const Arguments &args) { +TunerSettings XgemmGetTunerSettings(const int V, const Arguments &args) { auto settings = TunerSettings(); // Identification of the kernel @@ -118,8 +118,8 @@ TunerSettings GetTunerSettings(const int V, const Arguments &args) { // Tests for valid arguments template -void TestValidArguments(const int, const Arguments &) { } -std::vector SetConstraints(const int V) { +void XgemmTestValidArguments(const int, const Arguments &) { } +std::vector XgemmSetConstraints(const int V) { auto constraints = std::vector(); auto MultipleOfX = [] (std::vector v) { return IsMultiple(v[0], v[1]); }; auto MultipleOfXMulY = [] (std::vector v) { return IsMultiple(v[0], v[1]*v[2]); }; @@ -148,7 +148,7 @@ std::vector SetConstraints(const int V) { // Sets the kernel's arguments template -void SetArguments(const int, Kernel &kernel, const Arguments &args, std::vector>& buffers) { +void XgemmSetArguments(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, static_cast(args.k)); diff --git a/src/tuning/kernels/xgemm_direct.cpp b/src/tuning/kernels/xgemm_direct.cpp index b059ad62..7298a6c3 100644 --- a/src/tuning/kernels/xgemm_direct.cpp +++ b/src/tuning/kernels/xgemm_direct.cpp @@ -23,11 +23,11 @@ template void StartVariation(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(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; - case clblast::Precision::kSingle: clblast::Tuner(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; - case clblast::Precision::kDouble: clblast::Tuner(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; - case clblast::Precision::kComplexSingle: clblast::Tuner(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; - case clblast::Precision::kComplexDouble: clblast::Tuner(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; + case clblast::Precision::kHalf: clblast::Tuner(argc, argv, V, clblast::XgemmDirectGetTunerDefaults, clblast::XgemmDirectGetTunerSettings, clblast::XgemmDirectTestValidArguments, clblast::XgemmDirectSetConstraints, clblast::XgemmDirectSetArguments); break; + case clblast::Precision::kSingle: clblast::Tuner(argc, argv, V, clblast::XgemmDirectGetTunerDefaults, clblast::XgemmDirectGetTunerSettings, clblast::XgemmDirectTestValidArguments, clblast::XgemmDirectSetConstraints, clblast::XgemmDirectSetArguments); break; + case clblast::Precision::kDouble: clblast::Tuner(argc, argv, V, clblast::XgemmDirectGetTunerDefaults, clblast::XgemmDirectGetTunerSettings, clblast::XgemmDirectTestValidArguments, clblast::XgemmDirectSetConstraints, clblast::XgemmDirectSetArguments); break; + case clblast::Precision::kComplexSingle: clblast::Tuner(argc, argv, V, clblast::XgemmDirectGetTunerDefaults, clblast::XgemmDirectGetTunerSettings, clblast::XgemmDirectTestValidArguments, clblast::XgemmDirectSetConstraints, clblast::XgemmDirectSetArguments); break; + case clblast::Precision::kComplexDouble: clblast::Tuner(argc, argv, V, clblast::XgemmDirectGetTunerDefaults, clblast::XgemmDirectGetTunerSettings, clblast::XgemmDirectTestValidArguments, clblast::XgemmDirectSetConstraints, clblast::XgemmDirectSetArguments); break; } } diff --git a/src/tuning/kernels/xgemm_direct.hpp b/src/tuning/kernels/xgemm_direct.hpp index 7cc9f654..ecb10bc6 100644 --- a/src/tuning/kernels/xgemm_direct.hpp +++ b/src/tuning/kernels/xgemm_direct.hpp @@ -23,7 +23,7 @@ namespace clblast { // ================================================================================================= // Settings for this kernel (default command-line arguments) -TunerDefaults GetTunerDefaults(const int V) { +TunerDefaults XgemmDirectGetTunerDefaults(const int V) { auto settings = TunerDefaults(); settings.options = {kArgM, kArgN, kArgK, kArgAlpha, kArgBeta, kArgFraction, kArgHeuristicSelection, kArgPsoSwarmSize, @@ -38,7 +38,7 @@ TunerDefaults GetTunerDefaults(const int V) { // Settings for this kernel (general) template -TunerSettings GetTunerSettings(const int V, const Arguments &args) { +TunerSettings XgemmDirectGetTunerSettings(const int V, const Arguments &args) { auto settings = TunerSettings(); // Identification of the kernel @@ -109,8 +109,8 @@ TunerSettings GetTunerSettings(const int V, const Arguments &args) { // Tests for valid arguments template -void TestValidArguments(const int, const Arguments &) { } -std::vector SetConstraints(const int V) { +void XgemmDirectTestValidArguments(const int, const Arguments &) { } +std::vector XgemmDirectSetConstraints(const int V) { auto constraints = std::vector(); auto MultipleOfX = [] (std::vector v) { return IsMultiple(v[0], v[1]); }; auto MultipleOfXMulY = [] (std::vector v) { return IsMultiple(v[0], v[1]*v[2]); }; @@ -138,7 +138,7 @@ std::vector SetConstraints(const int V) { // Sets the kernel's arguments template -void SetArguments(const int, Kernel &kernel, const Arguments &args, std::vector>& buffers) { +void XgemmDirectSetArguments(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, static_cast(args.k)); diff --git a/src/tuning/kernels/xgemv.cpp b/src/tuning/kernels/xgemv.cpp index 165c5628..9e45d73f 100644 --- a/src/tuning/kernels/xgemv.cpp +++ b/src/tuning/kernels/xgemv.cpp @@ -23,11 +23,11 @@ template void StartVariation(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(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; - case clblast::Precision::kSingle: clblast::Tuner(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; - case clblast::Precision::kDouble: clblast::Tuner(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; - case clblast::Precision::kComplexSingle: clblast::Tuner(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; - case clblast::Precision::kComplexDouble: clblast::Tuner(argc, argv, V, clblast::GetTunerDefaults, clblast::GetTunerSettings, clblast::TestValidArguments, clblast::SetConstraints, clblast::SetArguments); break; + case clblast::Precision::kHalf: clblast::Tuner(argc, argv, V, clblast::XgemvGetTunerDefaults, clblast::XgemvGetTunerSettings, clblast::XgemvTestValidArguments, clblast::XgemvSetConstraints, clblast::XgemvSetArguments); break; + case clblast::Precision::kSingle: clblast::Tuner(argc, argv, V, clblast::XgemvGetTunerDefaults, clblast::XgemvGetTunerSettings, clblast::XgemvTestValidArguments, clblast::XgemvSetConstraints, clblast::XgemvSetArguments); break; + case clblast::Precision::kDouble: clblast::Tuner(argc, argv, V, clblast::XgemvGetTunerDefaults, clblast::XgemvGetTunerSettings, clblast::XgemvTestValidArguments, clblast::XgemvSetConstraints, clblast::XgemvSetArguments); break; + case clblast::Precision::kComplexSingle: clblast::Tuner(argc, argv, V, clblast::XgemvGetTunerDefaults, clblast::XgemvGetTunerSettings, clblast::XgemvTestValidArguments, clblast::XgemvSetConstraints, clblast::XgemvSetArguments); break; + case clblast::Precision::kComplexDouble: clblast::Tuner(argc, argv, V, clblast::XgemvGetTunerDefaults, clblast::XgemvGetTunerSettings, clblast::XgemvTestValidArguments, clblast::XgemvSetConstraints, clblast::XgemvSetArguments); break; } } diff --git a/src/tuning/kernels/xgemv.hpp b/src/tuning/kernels/xgemv.hpp index 87186195..e44efe32 100644 --- a/src/tuning/kernels/xgemv.hpp +++ b/src/tuning/kernels/xgemv.hpp @@ -24,7 +24,7 @@ namespace clblast { // ================================================================================================= // Settings for this kernel (default command-line arguments) -TunerDefaults GetTunerDefaults(const int) { +TunerDefaults XgemvGetTunerDefaults(const int) { auto settings = TunerDefaults(); settings.options = {kArgM, kArgN, kArgAlpha, kArgBeta}; settings.default_m = 2048; @@ -35,7 +35,7 @@ TunerDefaults GetTunerDefaults(const int) { // Settings for this kernel (general) template -TunerSettings GetTunerSettings(const int V, const Arguments &args) { +TunerSettings XgemvGetTunerSettings(const int V, const Arguments &args) { auto settings = TunerSettings(); // Identification of the kernel @@ -96,8 +96,8 @@ TunerSettings GetTunerSettings(const int V, const Arguments &args) { // Tests for valid arguments template -void TestValidArguments(const int, const Arguments &) { } -std::vector SetConstraints(const int V) { +void XgemvTestValidArguments(const int, const Arguments &) { } +std::vector XgemvSetConstraints(const int V) { auto constraints = std::vector(); if (V==2 || V==3) { auto MultipleOfX = [] (std::vector v) { return IsMultiple(v[0], v[1]); }; @@ -112,7 +112,7 @@ std::vector SetConstraints(const int V) { // Sets the kernel's arguments template -void SetArguments(const int V, Kernel &kernel, const Arguments &args, std::vector>& buffers) { +void XgemvSetArguments(const int V, Kernel &kernel, const Arguments &args, std::vector>& buffers) { auto a_rotated = (V==3) ? 1 : 0; kernel.SetArgument(0, static_cast(args.m)); kernel.SetArgument(1, static_cast(args.n)); diff --git a/src/tuning/kernels/xger.cpp b/src/tuning/kernels/xger.cpp index 8a90f340..6dfc9ffa 100644 --- a/src/tuning/kernels/xger.cpp +++ b/src/tuning/kernels/xger.cpp @@ -22,11 +22,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(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; + case clblast::Precision::kHalf: clblast::Tuner(argc, argv, 0, clblast::XgerGetTunerDefaults, clblast::XgerGetTunerSettings, clblast::XgerTestValidArguments, clblast::XgerSetConstraints, clblast::XgerSetArguments); break; + case clblast::Precision::kSingle: clblast::Tuner(argc, argv, 0, clblast::XgerGetTunerDefaults, clblast::XgerGetTunerSettings, clblast::XgerTestValidArguments, clblast::XgerSetConstraints, clblast::XgerSetArguments); break; + case clblast::Precision::kDouble: clblast::Tuner(argc, argv, 0, clblast::XgerGetTunerDefaults, clblast::XgerGetTunerSettings, clblast::XgerTestValidArguments, clblast::XgerSetConstraints, clblast::XgerSetArguments); break; + case clblast::Precision::kComplexSingle: clblast::Tuner(argc, argv, 0, clblast::XgerGetTunerDefaults, clblast::XgerGetTunerSettings, clblast::XgerTestValidArguments, clblast::XgerSetConstraints, clblast::XgerSetArguments); break; + case clblast::Precision::kComplexDouble: clblast::Tuner(argc, argv, 0, clblast::XgerGetTunerDefaults, clblast::XgerGetTunerSettings, clblast::XgerTestValidArguments, clblast::XgerSetConstraints, clblast::XgerSetArguments); break; } return 0; } diff --git a/src/tuning/kernels/xger.hpp b/src/tuning/kernels/xger.hpp index 01d85c9e..afd2f36e 100644 --- a/src/tuning/kernels/xger.hpp +++ b/src/tuning/kernels/xger.hpp @@ -21,7 +21,7 @@ namespace clblast { // ================================================================================================= // Settings for this kernel (default command-line arguments) -TunerDefaults GetTunerDefaults(const int) { +TunerDefaults XgerGetTunerDefaults(const int) { auto settings = TunerDefaults(); settings.options = {kArgM, kArgN, kArgAlpha}; settings.default_m = 1024; @@ -31,7 +31,7 @@ TunerDefaults GetTunerDefaults(const int) { // Settings for this kernel (general) template -TunerSettings GetTunerSettings(const int, const Arguments &args) { +TunerSettings XgerGetTunerSettings(const int, const Arguments &args) { auto settings = TunerSettings(); // Identification of the kernel @@ -77,12 +77,12 @@ TunerSettings GetTunerSettings(const int, const Arguments &args) { // Tests for valid arguments template -void TestValidArguments(const int, const Arguments &) { } -std::vector SetConstraints(const int) { return {}; } +void XgerTestValidArguments(const int, const Arguments &) { } +std::vector XgerSetConstraints(const int) { return {}; } // Sets the kernel's arguments template -void SetArguments(const int, Kernel &kernel, const Arguments &args, std::vector>& buffers) { +void XgerSetArguments(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)); diff --git a/src/tuning/tuning_api.cpp b/src/tuning/tuning_api.cpp index 4ffb46c2..5900378a 100644 --- a/src/tuning/tuning_api.cpp +++ b/src/tuning/tuning_api.cpp @@ -17,10 +17,19 @@ #include #include #include -#include #include "tuning/tuning.hpp" +#include "tuning/kernels/xaxpy.hpp" +#include "tuning/kernels/xdot.hpp" +#include "tuning/kernels/xgemv.hpp" +#include "tuning/kernels/xger.hpp" +#include "tuning/kernels/xgemm.hpp" +#include "tuning/kernels/xgemm_direct.hpp" #include "tuning/kernels/copy_fast.hpp" +#include "tuning/kernels/copy_pad.hpp" +#include "tuning/kernels/transpose_fast.hpp" +#include "tuning/kernels/transpose_pad.hpp" +#include "tuning/kernels/invert.hpp" namespace clblast { // ================================================================================================= @@ -30,8 +39,8 @@ StatusCode TuneXaxpy(RawCommandQueue * queue, const size_t n, const double fraction, std::unordered_map ¶meters) { auto args = Arguments(); args.fraction = fraction; args.n = n; auto queue_cpp = Queue(*queue); - return TunerAPI(queue_cpp, args, 0, GetTunerDefaults, GetTunerSettings, - TestValidArguments, SetConstraints, SetArguments, parameters); + return TunerAPI(queue_cpp, args, 0, XaxpyGetTunerDefaults, XaxpyGetTunerSettings, + XaxpyTestValidArguments, XaxpySetConstraints, XaxpySetArguments, parameters); } template StatusCode TuneXaxpy(RawCommandQueue*, const size_t, const double, std::unordered_map&); template StatusCode TuneXaxpy(RawCommandQueue*, const size_t, const double, std::unordered_map&); @@ -44,11 +53,11 @@ StatusCode TuneXdot(RawCommandQueue * queue, const size_t n, const double fraction, std::unordered_map ¶meters) { auto args = Arguments(); args.fraction = fraction; args.n = n; auto queue_cpp = Queue(*queue); - auto status = TunerAPI(queue_cpp, args, 1, GetTunerDefaults, GetTunerSettings, - TestValidArguments, SetConstraints, SetArguments, parameters); + auto status = TunerAPI(queue_cpp, args, 1, XdotGetTunerDefaults, XdotGetTunerSettings, + XdotTestValidArguments, XdotSetConstraints, XdotSetArguments, parameters); if (status != StatusCode::kSuccess) { return status; } - return TunerAPI(queue_cpp, args, 2, GetTunerDefaults, GetTunerSettings, - TestValidArguments, SetConstraints, SetArguments, parameters); + return TunerAPI(queue_cpp, args, 2, XdotGetTunerDefaults, XdotGetTunerSettings, + XdotTestValidArguments, XdotSetConstraints, XdotSetArguments, parameters); } template StatusCode TuneXdot(RawCommandQueue*, const size_t, const double, std::unordered_map&); template StatusCode TuneXdot(RawCommandQueue*, const size_t, const double, std::unordered_map&); @@ -61,14 +70,14 @@ StatusCode TuneXgemv(RawCommandQueue * queue, const size_t m, const size_t n, const double fraction, std::unordered_map ¶meters) { auto args = Arguments(); args.fraction = fraction; args.m = m; args.n = n; auto queue_cpp = Queue(*queue); - auto status = TunerAPI(queue_cpp, args, 1, GetTunerDefaults, GetTunerSettings, - TestValidArguments, SetConstraints, SetArguments, parameters); + auto status = TunerAPI(queue_cpp, args, 1, XgemvGetTunerDefaults, XgemvGetTunerSettings, + XgemvTestValidArguments, XgemvSetConstraints, XgemvSetArguments, parameters); if (status != StatusCode::kSuccess) { return status; } - status = TunerAPI(queue_cpp, args, 2, GetTunerDefaults, GetTunerSettings, - TestValidArguments, SetConstraints, SetArguments, parameters); + status = TunerAPI(queue_cpp, args, 2, XgemvGetTunerDefaults, XgemvGetTunerSettings, + XgemvTestValidArguments, XgemvSetConstraints, XgemvSetArguments, parameters); if (status != StatusCode::kSuccess) { return status; } - return TunerAPI(queue_cpp, args, 3, GetTunerDefaults, GetTunerSettings, - TestValidArguments, SetConstraints, SetArguments, parameters); + return TunerAPI(queue_cpp, args, 3, XgemvGetTunerDefaults, XgemvGetTunerSettings, + XgemvTestValidArguments, XgemvSetConstraints, XgemvSetArguments, parameters); } template StatusCode TuneXgemv(RawCommandQueue*, const size_t, const size_t, const double, std::unordered_map&); template StatusCode TuneXgemv(RawCommandQueue*, const size_t, const size_t, const double, std::unordered_map&); @@ -81,8 +90,8 @@ StatusCode TuneXger(RawCommandQueue * queue, const size_t m, const size_t n, const double fraction, std::unordered_map ¶meters) { auto args = Arguments(); args.fraction = fraction; args.m = m; args.n = n; auto queue_cpp = Queue(*queue); - return TunerAPI(queue_cpp, args, 0, GetTunerDefaults, GetTunerSettings, - TestValidArguments, SetConstraints, SetArguments, parameters); + return TunerAPI(queue_cpp, args, 0, XgerGetTunerDefaults, XgerGetTunerSettings, + XgerTestValidArguments, XgerSetConstraints, XgerSetArguments, parameters); } template StatusCode TuneXger(RawCommandQueue*, const size_t, const size_t, const double, std::unordered_map&); template StatusCode TuneXger(RawCommandQueue*, const size_t, const size_t, const double, std::unordered_map&); @@ -95,8 +104,8 @@ StatusCode TuneXgemm(RawCommandQueue * queue, const size_t m, const size_t n, co const double fraction, std::unordered_map ¶meters) { auto args = Arguments(); args.fraction = fraction; args.m = m; args.n = n; args.k = k; auto queue_cpp = Queue(*queue); - return TunerAPI(queue_cpp, args, 2, GetTunerDefaults, GetTunerSettings, - TestValidArguments, SetConstraints, SetArguments, parameters); + return TunerAPI(queue_cpp, args, 2, XgemmGetTunerDefaults, XgemmGetTunerSettings, + XgemmTestValidArguments, XgemmSetConstraints, XgemmSetArguments, parameters); } template StatusCode TuneXgemm(RawCommandQueue*, const size_t, const size_t, const size_t, const double, std::unordered_map&); template StatusCode TuneXgemm(RawCommandQueue*, const size_t, const size_t, const size_t, const double, std::unordered_map&); @@ -109,8 +118,8 @@ StatusCode TuneXgemmDirect(RawCommandQueue * queue, const size_t m, const size_t const double fraction, std::unordered_map ¶meters) { auto args = Arguments(); args.fraction = fraction; args.m = m; args.n = n; args.k = k; auto queue_cpp = Queue(*queue); - return TunerAPI(queue_cpp, args, 2, GetTunerDefaults, GetTunerSettings, - TestValidArguments, SetConstraints, SetArguments, parameters); + return TunerAPI(queue_cpp, args, 2, XgemmDirectGetTunerDefaults, XgemmDirectGetTunerSettings, + XgemmDirectTestValidArguments, XgemmDirectSetConstraints, XgemmDirectSetArguments, parameters); } template StatusCode TuneXgemmDirect(RawCommandQueue*, const size_t, const size_t, const size_t, const double, std::unordered_map&); template StatusCode TuneXgemmDirect(RawCommandQueue*, const size_t, const size_t, const size_t, const double, std::unordered_map&); @@ -123,8 +132,8 @@ StatusCode TuneCopy(RawCommandQueue * queue, const size_t m, const size_t n, const double fraction, std::unordered_map ¶meters) { auto args = Arguments(); args.fraction = fraction; args.m = m; args.n = n; auto queue_cpp = Queue(*queue); - return TunerAPI(queue_cpp, args, 0, GetTunerDefaults, GetTunerSettings, - TestValidArguments, SetConstraints, SetArguments, parameters); + return TunerAPI(queue_cpp, args, 0, CopyGetTunerDefaults, CopyGetTunerSettings, + CopyTestValidArguments, CopySetConstraints, CopySetArguments, parameters); } template StatusCode TuneCopy(RawCommandQueue*, const size_t, const size_t, const double, std::unordered_map&); template StatusCode TuneCopy(RawCommandQueue*, const size_t, const size_t, const double, std::unordered_map&); @@ -137,8 +146,8 @@ StatusCode TunePad(RawCommandQueue * queue, const size_t m, const size_t n, const double fraction, std::unordered_map ¶meters) { auto args = Arguments(); args.fraction = fraction; args.m = m; args.n = n; auto queue_cpp = Queue(*queue); - return TunerAPI(queue_cpp, args, 0, GetTunerDefaults, GetTunerSettings, - TestValidArguments, SetConstraints, SetArguments, parameters); + return TunerAPI(queue_cpp, args, 0, PadGetTunerDefaults, PadGetTunerSettings, + PadTestValidArguments, PadSetConstraints, PadSetArguments, parameters); } template StatusCode TunePad(RawCommandQueue*, const size_t, const size_t, const double, std::unordered_map&); template StatusCode TunePad(RawCommandQueue*, const size_t, const size_t, const double, std::unordered_map&); @@ -151,8 +160,8 @@ StatusCode TuneTranspose(RawCommandQueue * queue, const size_t m, const size_t n const double fraction, std::unordered_map ¶meters) { auto args = Arguments(); args.fraction = fraction; args.m = m; args.n = n; auto queue_cpp = Queue(*queue); - return TunerAPI(queue_cpp, args, 0, GetTunerDefaults, GetTunerSettings, - TestValidArguments, SetConstraints, SetArguments, parameters); + return TunerAPI(queue_cpp, args, 0, TransposeGetTunerDefaults, TransposeGetTunerSettings, + TransposeTestValidArguments, TransposeSetConstraints, TransposeSetArguments, parameters); } template StatusCode TuneTranspose(RawCommandQueue*, const size_t, const size_t, const double, std::unordered_map&); template StatusCode TuneTranspose(RawCommandQueue*, const size_t, const size_t, const double, std::unordered_map&); @@ -165,8 +174,8 @@ StatusCode TunePadtranspose(RawCommandQueue * queue, const size_t m, const size_ const double fraction, std::unordered_map ¶meters) { auto args = Arguments(); args.fraction = fraction; args.m = m; args.n = n; auto queue_cpp = Queue(*queue); - return TunerAPI(queue_cpp, args, 0, GetTunerDefaults, GetTunerSettings, - TestValidArguments, SetConstraints, SetArguments, parameters); + return TunerAPI(queue_cpp, args, 0, PadtransposeGetTunerDefaults, PadtransposeGetTunerSettings, + PadtransposeTestValidArguments, PadtransposeSetConstraints, PadtransposeSetArguments, parameters); } template StatusCode TunePadtranspose(RawCommandQueue*, const size_t, const size_t, const double, std::unordered_map&); template StatusCode TunePadtranspose(RawCommandQueue*, const size_t, const size_t, const double, std::unordered_map&); @@ -179,8 +188,8 @@ StatusCode TuneInvert(RawCommandQueue * queue, const size_t m, const size_t n, c const double fraction, std::unordered_map ¶meters) { auto args = Arguments(); args.fraction = fraction; args.m = m; args.n = n; args.k = k; auto queue_cpp = Queue(*queue); - return TunerAPI(queue_cpp, args, 0, GetTunerDefaults, GetTunerSettings, - TestValidArguments, SetConstraints, SetArguments, parameters); + return TunerAPI(queue_cpp, args, 0, InvertGetTunerDefaults, InvertGetTunerSettings, + InvertTestValidArguments, InvertSetConstraints, InvertSetArguments, parameters); } template StatusCode TuneInvert(RawCommandQueue*, const size_t, const size_t, const size_t, const double, std::unordered_map&); template StatusCode TuneInvert(RawCommandQueue*, const size_t, const size_t, const size_t, const double, std::unordered_map&); -- cgit v1.2.3