diff options
Diffstat (limited to 'src/routines/common.cpp')
-rw-r--r-- | src/routines/common.cpp | 70 |
1 files changed, 39 insertions, 31 deletions
diff --git a/src/routines/common.cpp b/src/routines/common.cpp index 5b80e3f2..695785c4 100644 --- a/src/routines/common.cpp +++ b/src/routines/common.cpp @@ -13,6 +13,7 @@ #include <vector> #include <chrono> +#include <iostream> #include "routines/common.hpp" @@ -38,13 +39,22 @@ void RunKernel(Kernel &kernel, Queue &queue, const Device &device, auto local_size = size_t{1}; for (auto &item: local) { local_size *= item; } if (local_size > device.MaxWorkGroupSize()) { - throw RuntimeErrorCode(StatusCode::kInvalidLocalThreadsTotal); + throw RuntimeErrorCode(StatusCode::kInvalidLocalThreadsTotal, + ToString(local_size) + " is larger than " + ToString(device.MaxWorkGroupSize())); } // Make sure the global thread sizes are at least equal to the local sizes for (auto i=size_t{0}; i<global.size(); ++i) { if (global[i] < local[i]) { global[i] = local[i]; } } + + // Verify that the global thread sizes are a multiple of the local sizes + for (auto i=size_t{0}; i<global.size(); ++i) { + if ((global[i] / local[i]) * local[i] != global[i]) { + throw RuntimeErrorCode(StatusCode::kInvalidLocalThreadsDim, + ToString(global[i]) + " is not divisible by " + ToString(local[i])); + } + } } // Tests for local memory usage @@ -77,11 +87,10 @@ void RunKernel(Kernel &kernel, Queue &queue, const Device &device, // Sets all elements of a matrix to a constant value template <typename T> void FillMatrix(Queue &queue, const Device &device, - const std::shared_ptr<Program> program, const Databases &, + const std::shared_ptr<Program> program, EventPointer event, const std::vector<Event> &waitForEvents, const size_t m, const size_t n, const size_t ld, const size_t offset, - const Buffer<T> &dest, - const T constant_value) { + const Buffer<T> &dest, const T constant_value, const size_t local_size) { auto kernel = Kernel(program, "FillMatrix"); kernel.SetArgument(0, static_cast<int>(m)); kernel.SetArgument(1, static_cast<int>(n)); @@ -89,63 +98,62 @@ void FillMatrix(Queue &queue, const Device &device, kernel.SetArgument(3, static_cast<int>(offset)); kernel.SetArgument(4, dest()); kernel.SetArgument(5, GetRealArg(constant_value)); - auto local = std::vector<size_t>{16, 1}; - auto global = std::vector<size_t>{Ceil(m, 16), n}; + auto local = std::vector<size_t>{local_size, 1}; + auto global = std::vector<size_t>{Ceil(m, local_size), n}; RunKernel(kernel, queue, device, global, local, event, waitForEvents); } // Compiles the above function -template void FillMatrix<half>(Queue&, const Device&, const std::shared_ptr<Program>, const Databases&, +template void FillMatrix<half>(Queue&, const Device&, const std::shared_ptr<Program>, EventPointer, const std::vector<Event>&, const size_t, const size_t, - const size_t, const size_t, const Buffer<half>&, const half); -template void FillMatrix<float>(Queue&, const Device&, const std::shared_ptr<Program>, const Databases&, + const size_t, const size_t, const Buffer<half>&, const half, const size_t); +template void FillMatrix<float>(Queue&, const Device&, const std::shared_ptr<Program>, EventPointer, const std::vector<Event>&, const size_t, const size_t, - const size_t, const size_t, const Buffer<float>&, const float); -template void FillMatrix<double>(Queue&, const Device&, const std::shared_ptr<Program>, const Databases&, + const size_t, const size_t, const Buffer<float>&, const float, const size_t); +template void FillMatrix<double>(Queue&, const Device&, const std::shared_ptr<Program>, EventPointer, const std::vector<Event>&, const size_t, const size_t, - const size_t, const size_t, const Buffer<double>&, const double); -template void FillMatrix<float2>(Queue&, const Device&, const std::shared_ptr<Program>, const Databases&, + const size_t, const size_t, const Buffer<double>&, const double, const size_t); +template void FillMatrix<float2>(Queue&, const Device&, const std::shared_ptr<Program>, EventPointer, const std::vector<Event>&, const size_t, const size_t, - const size_t, const size_t, const Buffer<float2>&, const float2); -template void FillMatrix<double2>(Queue&, const Device&, const std::shared_ptr<Program>, const Databases&, + const size_t, const size_t, const Buffer<float2>&, const float2, const size_t); +template void FillMatrix<double2>(Queue&, const Device&, const std::shared_ptr<Program>, EventPointer, const std::vector<Event>&, const size_t, const size_t, - const size_t, const size_t, const Buffer<double2>&, const double2); + const size_t, const size_t, const Buffer<double2>&, const double2, const size_t); // Sets all elements of a vector to a constant value template <typename T> void FillVector(Queue &queue, const Device &device, - const std::shared_ptr<Program> program, const Databases &, + const std::shared_ptr<Program> program, EventPointer event, const std::vector<Event> &waitForEvents, const size_t n, const size_t inc, const size_t offset, - const Buffer<T> &dest, - const T constant_value) { + const Buffer<T> &dest, const T constant_value, const size_t local_size) { auto kernel = Kernel(program, "FillVector"); kernel.SetArgument(0, static_cast<int>(n)); kernel.SetArgument(1, static_cast<int>(inc)); kernel.SetArgument(2, static_cast<int>(offset)); kernel.SetArgument(3, dest()); kernel.SetArgument(4, GetRealArg(constant_value)); - auto local = std::vector<size_t>{16}; - auto global = std::vector<size_t>{Ceil(n, 16)}; + auto local = std::vector<size_t>{local_size}; + auto global = std::vector<size_t>{Ceil(n, local_size)}; RunKernel(kernel, queue, device, global, local, event, waitForEvents); } // Compiles the above function -template void FillVector<half>(Queue&, const Device&, const std::shared_ptr<Program>, const Databases&, +template void FillVector<half>(Queue&, const Device&, const std::shared_ptr<Program>, EventPointer, const std::vector<Event>&, const size_t, const size_t, - const size_t, const Buffer<half>&, const half); -template void FillVector<float>(Queue&, const Device&, const std::shared_ptr<Program>, const Databases&, + const size_t, const Buffer<half>&, const half, const size_t); +template void FillVector<float>(Queue&, const Device&, const std::shared_ptr<Program>, EventPointer, const std::vector<Event>&, const size_t, const size_t, - const size_t, const Buffer<float>&, const float); -template void FillVector<double>(Queue&, const Device&, const std::shared_ptr<Program>, const Databases&, + const size_t, const Buffer<float>&, const float, const size_t); +template void FillVector<double>(Queue&, const Device&, const std::shared_ptr<Program>, EventPointer, const std::vector<Event>&, const size_t, const size_t, - const size_t, const Buffer<double>&, const double); -template void FillVector<float2>(Queue&, const Device&, const std::shared_ptr<Program>, const Databases&, + const size_t, const Buffer<double>&, const double, const size_t); +template void FillVector<float2>(Queue&, const Device&, const std::shared_ptr<Program>, EventPointer, const std::vector<Event>&, const size_t, const size_t, - const size_t, const Buffer<float2>&, const float2); -template void FillVector<double2>(Queue&, const Device&, const std::shared_ptr<Program>, const Databases&, + const size_t, const Buffer<float2>&, const float2, const size_t); +template void FillVector<double2>(Queue&, const Device&, const std::shared_ptr<Program>, EventPointer, const std::vector<Event>&, const size_t, const size_t, - const size_t, const Buffer<double2>&, const double2); + const size_t, const Buffer<double2>&, const double2, const size_t); // ================================================================================================= } // namespace clblast |