summaryrefslogtreecommitdiff
path: root/test/correctness/routines
diff options
context:
space:
mode:
Diffstat (limited to 'test/correctness/routines')
-rw-r--r--test/correctness/routines/xaxpy.cc86
-rw-r--r--test/correctness/routines/xgemm.cc124
-rw-r--r--test/correctness/routines/xgemv.cc113
-rw-r--r--test/correctness/routines/xsymm.cc122
-rw-r--r--test/correctness/routines/xsyr2k.cc123
-rw-r--r--test/correctness/routines/xsyrk.cc114
6 files changed, 353 insertions, 329 deletions
diff --git a/test/correctness/routines/xaxpy.cc b/test/correctness/routines/xaxpy.cc
index 45dcf6bb..5922a96d 100644
--- a/test/correctness/routines/xaxpy.cc
+++ b/test/correctness/routines/xaxpy.cc
@@ -7,57 +7,63 @@
// Author(s):
// Cedric Nugteren <www.cedricnugteren.nl>
//
-// This file implements the tests for the Xaxpy routine. It is based on the TestXY class.
+// This file implements the tests for the Xaxpy routine.
//
// =================================================================================================
-#include "wrapper_clblas.h"
-#include "correctness/testxy.h"
+#include "correctness/testblas.h"
+#include "routines/xaxpy.h"
namespace clblast {
// =================================================================================================
-// The correctness tester, containing the function calls to CLBlast and to clBLAS for comparison.
+// The correctness tester
template <typename T>
-void XaxpyTest(int argc, char *argv[], const bool silent, const std::string &name) {
+void RunTest(int argc, char *argv[], const bool silent, const std::string &name) {
- // Creates the CLBlast lambda
- auto clblast_lambda = [](const Arguments<T> &args,
- const Buffer &x_vec, const Buffer &y_vec,
- CommandQueue &queue) -> StatusCode {
- auto queue_plain = queue();
- auto event = cl_event{};
- return Axpy(args.n, args.alpha,
- x_vec(), args.x_offset, args.x_inc,
- y_vec(), args.y_offset, args.y_inc,
- &queue_plain, &event);
- };
-
- // Creates the clBLAS lambda (for comparison)
- auto clblas_lambda = [](const Arguments<T> &args,
- const Buffer &x_vec, const Buffer &y_vec,
- CommandQueue &queue) -> StatusCode {
- auto queue_plain = queue();
- auto event = cl_event{};
- auto status = clblasXaxpy(args.n, args.alpha,
- x_vec(), args.x_offset, args.x_inc,
- y_vec(), args.y_offset, args.y_inc,
- 1, &queue_plain, 0, nullptr, &event);
- return static_cast<StatusCode>(status);
- };
+ // Creates a tester
+ TestBlas<T> tester{argc, argv, silent, name, TestXaxpy<T>::GetOptions(),
+ TestXaxpy<T>::RunRoutine, TestXaxpy<T>::RunReference,
+ TestXaxpy<T>::DownloadResult, TestXaxpy<T>::GetResultIndex,
+ TestXaxpy<T>::ResultID1, TestXaxpy<T>::ResultID2};
- // Initializes the arguments relevant for this routine
+ // This variable holds the arguments relevant for this routine
auto args = Arguments<T>{};
- const auto options = std::vector<std::string>{kArgN, kArgXInc, kArgYInc,
- kArgXOffset, kArgYOffset, kArgAlpha};
- // Creates a tester
- TestXY<T> tester{argc, argv, silent, name, options, clblast_lambda, clblas_lambda};
+ // Creates the arguments vector for the regular tests
+ auto regular_test_vector = std::vector<Arguments<T>>{};
+ for (auto &n: tester.kVectorDims) { args.n = n;
+ for (auto &x_inc: tester.kIncrements) { args.x_inc = x_inc;
+ for (auto &x_offset: tester.kOffsets) { args.x_offset = x_offset;
+ for (auto &y_inc: tester.kIncrements) { args.y_inc = y_inc;
+ for (auto &y_offset: tester.kOffsets) { args.y_offset = y_offset;
+ for (auto &alpha: tester.kAlphaValues) { args.alpha = alpha;
+ args.x_size = TestXaxpy<T>::GetSizeX(args);
+ args.y_size = TestXaxpy<T>::GetSizeY(args);
+ if (args.x_size<1 || args.y_size<1) { continue; }
+ regular_test_vector.push_back(args);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ // Creates the arguments vector for the invalid-buffer tests
+ auto invalid_test_vector = std::vector<Arguments<T>>{};
+ args.n = tester.kBufferSize;
+ args.x_inc = args.y_inc = 1;
+ args.x_offset = args.y_offset = 0;
+ for (auto &x_size: tester.kVecSizes) { args.x_size = x_size;
+ for (auto &y_size: tester.kVecSizes) { args.y_size = y_size;
+ invalid_test_vector.push_back(args);
+ }
+ }
// Runs the tests
const auto case_name = "default";
- tester.TestRegular(args, case_name);
- tester.TestInvalidBufferSizes(args, case_name);
+ tester.TestRegular(regular_test_vector, case_name);
+ tester.TestInvalid(invalid_test_vector, case_name);
}
// =================================================================================================
@@ -65,10 +71,10 @@ void XaxpyTest(int argc, char *argv[], const bool silent, const std::string &nam
// Main function (not within the clblast namespace)
int main(int argc, char *argv[]) {
- clblast::XaxpyTest<float>(argc, argv, false, "SAXPY");
- clblast::XaxpyTest<double>(argc, argv, true, "DAXPY");
- clblast::XaxpyTest<clblast::float2>(argc, argv, true, "CAXPY");
- clblast::XaxpyTest<clblast::double2>(argc, argv, true, "ZAXPY");
+ clblast::RunTest<float>(argc, argv, false, "SAXPY");
+ clblast::RunTest<double>(argc, argv, true, "DAXPY");
+ clblast::RunTest<clblast::float2>(argc, argv, true, "CAXPY");
+ clblast::RunTest<clblast::double2>(argc, argv, true, "ZAXPY");
return 0;
}
diff --git a/test/correctness/routines/xgemm.cc b/test/correctness/routines/xgemm.cc
index b829aaa3..2c0a3492 100644
--- a/test/correctness/routines/xgemm.cc
+++ b/test/correctness/routines/xgemm.cc
@@ -7,77 +7,81 @@
// Author(s):
// Cedric Nugteren <www.cedricnugteren.nl>
//
-// This file implements the tests for the Xgemm routine. It is based on the TestABC class.
+// This file implements the tests for the Xgemm routine.
//
// =================================================================================================
-#include "wrapper_clblas.h"
-#include "correctness/testabc.h"
+#include "correctness/testblas.h"
+#include "routines/xgemm.h"
namespace clblast {
// =================================================================================================
-// The correctness tester, containing the function calls to CLBlast and to clBLAS for comparison.
+// The correctness tester
template <typename T>
-void XgemmTest(int argc, char *argv[], const bool silent, const std::string &name) {
+void RunTest(int argc, char *argv[], const bool silent, const std::string &name) {
- // Creates the CLBlast lambda
- auto clblast_lambda = [](const Arguments<T> &args,
- const Buffer &a_mat, const Buffer &b_mat, const Buffer &c_mat,
- CommandQueue &queue) -> StatusCode {
- auto queue_plain = queue();
- auto event = cl_event{};
- return Gemm(args.layout, args.a_transpose, args.b_transpose,
- args.m, args.n, args.k,
- args.alpha,
- a_mat(), args.a_offset, args.a_ld,
- b_mat(), args.b_offset, args.b_ld,
- args.beta,
- c_mat(), args.c_offset, args.c_ld,
- &queue_plain, &event);
- };
-
- // Creates the clBLAS lambda (for comparison)
- auto clblas_lambda = [](const Arguments<T> &args,
- const Buffer &a_mat, const Buffer &b_mat, const Buffer &c_mat,
- CommandQueue &queue) -> StatusCode {
- auto queue_plain = queue();
- auto event = cl_event{};
- auto status = clblasXgemm(static_cast<clblasOrder>(args.layout),
- static_cast<clblasTranspose>(args.a_transpose),
- static_cast<clblasTranspose>(args.b_transpose),
- args.m, args.n, args.k,
- args.alpha,
- a_mat(), args.a_offset, args.a_ld,
- b_mat(), args.b_offset, args.b_ld,
- args.beta,
- c_mat(), args.c_offset, args.c_ld,
- 1, &queue_plain, 0, nullptr, &event);
- return static_cast<StatusCode>(status);
- };
+ // Creates a tester
+ TestBlas<T> tester{argc, argv, silent, name, TestXgemm<T>::GetOptions(),
+ TestXgemm<T>::RunRoutine, TestXgemm<T>::RunReference,
+ TestXgemm<T>::DownloadResult, TestXgemm<T>::GetResultIndex,
+ TestXgemm<T>::ResultID1, TestXgemm<T>::ResultID2};
- // Initializes the arguments relevant for this routine
+ // This variable holds the arguments relevant for this routine
auto args = Arguments<T>{};
- const auto options = std::vector<std::string>{kArgM, kArgN, kArgK, kArgLayout,
- kArgATransp, kArgBTransp,
- kArgALeadDim, kArgBLeadDim, kArgCLeadDim,
- kArgAOffset, kArgBOffset, kArgCOffset};
-
- // Creates a tester
- TestABC<T> tester{argc, argv, silent, name, options, clblast_lambda, clblas_lambda};
// Loops over the test-cases from a data-layout point of view
- for (auto &layout: tester.kLayouts) {
- args.layout = layout;
- for (auto &a_transpose: tester.kTransposes) {
- args.a_transpose = a_transpose;
- for (auto &b_transpose: tester.kTransposes) {
- args.b_transpose = b_transpose;
- const auto case_name = ToString(layout)+" "+ToString(a_transpose)+" "+ToString(b_transpose);
+ for (auto &layout: tester.kLayouts) { args.layout = layout;
+ for (auto &a_transpose: tester.kTransposes) { args.a_transpose = a_transpose;
+ for (auto &b_transpose: tester.kTransposes) { args.b_transpose = b_transpose;
+
+ // Creates the arguments vector for the regular tests
+ auto regular_test_vector = std::vector<Arguments<T>>{};
+ for (auto &m: tester.kMatrixDims) { args.m = m;
+ for (auto &n: tester.kMatrixDims) { args.n = n;
+ for (auto &k: tester.kMatrixDims) { args.k = k;
+ for (auto &a_ld: tester.kMatrixDims) { args.a_ld = a_ld;
+ for (auto &a_offset: tester.kOffsets) { args.a_offset = a_offset;
+ for (auto &b_ld: tester.kMatrixDims) { args.b_ld = b_ld;
+ for (auto &b_offset: tester.kOffsets) { args.b_offset = b_offset;
+ for (auto &c_ld: tester.kMatrixDims) { args.c_ld = c_ld;
+ for (auto &c_offset: tester.kOffsets) { args.c_offset = c_offset;
+ for (auto &alpha: tester.kAlphaValues) { args.alpha = alpha;
+ for (auto &beta: tester.kBetaValues) { args.beta = beta;
+ args.a_size = TestXgemm<T>::GetSizeA(args);
+ args.b_size = TestXgemm<T>::GetSizeB(args);
+ args.c_size = TestXgemm<T>::GetSizeC(args);
+ if (args.a_size<1 || args.b_size<1 || args.c_size<1) { continue; }
+ regular_test_vector.push_back(args);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ // Creates the arguments vector for the invalid-buffer tests
+ auto invalid_test_vector = std::vector<Arguments<T>>{};
+ args.m = args.n = args.k = tester.kBufferSize;
+ args.a_ld = args.b_ld = args.c_ld = tester.kBufferSize;
+ args.a_offset = args.b_offset = args.c_offset = 0;
+ for (auto &a_size: tester.kMatSizes) { args.a_size = a_size;
+ for (auto &b_size: tester.kMatSizes) { args.b_size = b_size;
+ for (auto &c_size: tester.kMatSizes) { args.c_size = c_size;
+ invalid_test_vector.push_back(args);
+ }
+ }
+ }
// Runs the tests
- tester.TestRegular(args, case_name, false);
- tester.TestInvalidBufferSizes(args, case_name);
+ const auto case_name = ToString(layout)+" "+ToString(a_transpose)+" "+ToString(b_transpose);
+ tester.TestRegular(regular_test_vector, case_name);
+ tester.TestInvalid(invalid_test_vector, case_name);
}
}
}
@@ -88,10 +92,10 @@ void XgemmTest(int argc, char *argv[], const bool silent, const std::string &nam
// Main function (not within the clblast namespace)
int main(int argc, char *argv[]) {
- clblast::XgemmTest<float>(argc, argv, false, "SGEMM");
- clblast::XgemmTest<double>(argc, argv, true, "DGEMM");
- clblast::XgemmTest<clblast::float2>(argc, argv, true, "CGEMM");
- clblast::XgemmTest<clblast::double2>(argc, argv, true, "ZGEMM");
+ clblast::RunTest<float>(argc, argv, false, "SGEMM");
+ clblast::RunTest<double>(argc, argv, true, "DGEMM");
+ clblast::RunTest<clblast::float2>(argc, argv, true, "CGEMM");
+ clblast::RunTest<clblast::double2>(argc, argv, true, "ZGEMM");
return 0;
}
diff --git a/test/correctness/routines/xgemv.cc b/test/correctness/routines/xgemv.cc
index 1f484eb4..163669e5 100644
--- a/test/correctness/routines/xgemv.cc
+++ b/test/correctness/routines/xgemv.cc
@@ -7,68 +7,79 @@
// Author(s):
// Cedric Nugteren <www.cedricnugteren.nl>
//
-// This file implements the tests for the Xgemv routine. It is based on the TestAXY class.
+// This file implements the tests for the Xgemv routine.
//
// =================================================================================================
-#include "wrapper_clblas.h"
-#include "correctness/testaxy.h"
+#include "correctness/testblas.h"
+#include "routines/xgemv.h"
namespace clblast {
// =================================================================================================
-// The correctness tester, containing the function calls to CLBlast and to clBLAS for comparison.
+// The correctness tester
template <typename T>
-void XgemvTest(int argc, char *argv[], const bool silent, const std::string &name) {
+void RunTest(int argc, char *argv[], const bool silent, const std::string &name) {
- // Creates the CLBlast lambda
- auto clblast_lambda = [](const Arguments<T> &args,
- const Buffer &a_mat, const Buffer &x_vec, const Buffer &y_vec,
- CommandQueue &queue) -> StatusCode {
- auto queue_plain = queue();
- auto event = cl_event{};
- return Gemv(args.layout, args.a_transpose, args.m, args.n, args.alpha,
- a_mat(), args.a_offset, args.a_ld,
- x_vec(), args.x_offset, args.x_inc, args.beta,
- y_vec(), args.y_offset, args.y_inc,
- &queue_plain, &event);
- };
-
- // Creates the clBLAS lambda (for comparison)
- auto clblas_lambda = [](const Arguments<T> &args,
- const Buffer &a_mat, const Buffer &x_vec, const Buffer &y_vec,
- CommandQueue &queue) -> StatusCode {
- auto queue_plain = queue();
- auto event = cl_event{};
- auto status = clblasXgemv(static_cast<clblasOrder>(args.layout),
- static_cast<clblasTranspose>(args.a_transpose),
- args.m, args.n, args.alpha,
- a_mat(), args.a_offset, args.a_ld,
- x_vec(), args.x_offset, args.x_inc, args.beta,
- y_vec(), args.y_offset, args.y_inc,
- 1, &queue_plain, 0, nullptr, &event);
- return static_cast<StatusCode>(status);
- };
+ // Creates a tester
+ TestBlas<T> tester{argc, argv, silent, name, TestXgemv<T>::GetOptions(),
+ TestXgemv<T>::RunRoutine, TestXgemv<T>::RunReference,
+ TestXgemv<T>::DownloadResult, TestXgemv<T>::GetResultIndex,
+ TestXgemv<T>::ResultID1, TestXgemv<T>::ResultID2};
- // Initializes the arguments relevant for this routine
+ // This variable holds the arguments relevant for this routine
auto args = Arguments<T>{};
- const auto options = std::vector<std::string>{kArgM, kArgN, kArgLayout, kArgATransp,
- kArgALeadDim, kArgXInc, kArgYInc,
- kArgAOffset, kArgXOffset, kArgYOffset};
-
- // Creates a tester
- TestAXY<T> tester{argc, argv, silent, name, options, clblast_lambda, clblas_lambda};
// Loops over the test-cases from a data-layout point of view
- for (auto &layout: tester.kLayouts) {
- args.layout = layout;
- for (auto &a_transpose: tester.kTransposes) {
- args.a_transpose = a_transpose;
- const auto case_name = ToString(layout)+" "+ToString(a_transpose);
+ for (auto &layout: tester.kLayouts) { args.layout = layout;
+ for (auto &a_transpose: tester.kTransposes) { args.a_transpose = a_transpose;
+
+ // Creates the arguments vector for the regular tests
+ auto regular_test_vector = std::vector<Arguments<T>>{};
+ for (auto &m: tester.kMatrixVectorDims) { args.m = m;
+ for (auto &n: tester.kMatrixVectorDims) { args.n = n;
+ for (auto &a_ld: tester.kMatrixVectorDims) { args.a_ld = a_ld;
+ for (auto &a_offset: tester.kOffsets) { args.a_offset = a_offset;
+ for (auto &x_inc: tester.kIncrements) { args.x_inc = x_inc;
+ for (auto &x_offset: tester.kOffsets) { args.x_offset = x_offset;
+ for (auto &y_inc: tester.kIncrements) { args.y_inc = y_inc;
+ for (auto &y_offset: tester.kOffsets) { args.y_offset = y_offset;
+ for (auto &alpha: tester.kAlphaValues) { args.alpha = alpha;
+ for (auto &beta: tester.kBetaValues) { args.beta = beta;
+ args.a_size = TestXgemv<T>::GetSizeA(args);
+ args.x_size = TestXgemv<T>::GetSizeX(args);
+ args.y_size = TestXgemv<T>::GetSizeY(args);
+ if (args.a_size<1 || args.x_size<1 || args.y_size<1) { continue; }
+ regular_test_vector.push_back(args);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ // Creates the arguments vector for the invalid-buffer tests
+ auto invalid_test_vector = std::vector<Arguments<T>>{};
+ args.m = args.n = tester.kBufferSize;
+ args.a_ld = tester.kBufferSize;
+ args.x_inc = args.y_inc = 1;
+ args.a_offset = args.x_offset = args.y_offset = 0;
+ for (auto &a_size: tester.kMatSizes) { args.a_size = a_size;
+ for (auto &x_size: tester.kVecSizes) { args.x_size = x_size;
+ for (auto &y_size: tester.kVecSizes) { args.y_size = y_size;
+ invalid_test_vector.push_back(args);
+ }
+ }
+ }
// Runs the tests
- tester.TestRegular(args, case_name);
- tester.TestInvalidBufferSizes(args, case_name);
+ const auto case_name = ToString(layout)+" "+ToString(a_transpose);
+ tester.TestRegular(regular_test_vector, case_name);
+ tester.TestInvalid(invalid_test_vector, case_name);
}
}
}
@@ -78,10 +89,10 @@ void XgemvTest(int argc, char *argv[], const bool silent, const std::string &nam
// Main function (not within the clblast namespace)
int main(int argc, char *argv[]) {
- clblast::XgemvTest<float>(argc, argv, false, "SGEMV");
- clblast::XgemvTest<double>(argc, argv, true, "DGEMV");
- clblast::XgemvTest<clblast::float2>(argc, argv, true, "CGEMV");
- clblast::XgemvTest<clblast::double2>(argc, argv, true, "ZGEMV");
+ clblast::RunTest<float>(argc, argv, false, "SGEMV");
+ clblast::RunTest<double>(argc, argv, true, "DGEMV");
+ clblast::RunTest<clblast::float2>(argc, argv, true, "CGEMV");
+ clblast::RunTest<clblast::double2>(argc, argv, true, "ZGEMV");
return 0;
}
diff --git a/test/correctness/routines/xsymm.cc b/test/correctness/routines/xsymm.cc
index 0e02e9ca..e494b890 100644
--- a/test/correctness/routines/xsymm.cc
+++ b/test/correctness/routines/xsymm.cc
@@ -7,77 +7,79 @@
// Author(s):
// Cedric Nugteren <www.cedricnugteren.nl>
//
-// This file implements the tests for the Xsymm routine. It is based on the TestABC class.
+// This file implements the tests for the Xsymm routine.
//
// =================================================================================================
-#include "wrapper_clblas.h"
-#include "correctness/testabc.h"
+#include "correctness/testblas.h"
+#include "routines/xsymm.h"
namespace clblast {
// =================================================================================================
-// The correctness tester, containing the function calls to CLBlast and to clBLAS for comparison.
+// The correctness tester
template <typename T>
-void XsymmTest(int argc, char *argv[], const bool silent, const std::string &name) {
+void RunTest(int argc, char *argv[], const bool silent, const std::string &name) {
- // Creates the CLBlast lambda
- auto clblast_lambda = [](const Arguments<T> &args,
- const Buffer &a_mat, const Buffer &b_mat, const Buffer &c_mat,
- CommandQueue &queue) -> StatusCode {
- auto queue_plain = queue();
- auto event = cl_event{};
- return Symm(args.layout, args.side, args.triangle,
- args.m, args.n,
- args.alpha,
- a_mat(), args.a_offset, args.a_ld,
- b_mat(), args.b_offset, args.b_ld,
- args.beta,
- c_mat(), args.c_offset, args.c_ld,
- &queue_plain, &event);
- };
-
- // Creates the clBLAS lambda (for comparison)
- auto clblas_lambda = [](const Arguments<T> &args,
- const Buffer &a_mat, const Buffer &b_mat, const Buffer &c_mat,
- CommandQueue &queue) -> StatusCode {
- auto queue_plain = queue();
- auto event = cl_event{};
- auto status = clblasXsymm(static_cast<clblasOrder>(args.layout),
- static_cast<clblasSide>(args.side),
- static_cast<clblasUplo>(args.triangle),
- args.m, args.n,
- args.alpha,
- a_mat(), args.a_offset, args.a_ld,
- b_mat(), args.b_offset, args.b_ld,
- args.beta,
- c_mat(), args.c_offset, args.c_ld,
- 1, &queue_plain, 0, nullptr, &event);
- return static_cast<StatusCode>(status);
- };
+ // Creates a tester
+ TestBlas<T> tester{argc, argv, silent, name, TestXsymm<T>::GetOptions(),
+ TestXsymm<T>::RunRoutine, TestXsymm<T>::RunReference,
+ TestXsymm<T>::DownloadResult, TestXsymm<T>::GetResultIndex,
+ TestXsymm<T>::ResultID1, TestXsymm<T>::ResultID2};
- // Initializes the arguments relevant for this routine
+ // This variable holds the arguments relevant for this routine
auto args = Arguments<T>{};
- const auto options = std::vector<std::string>{kArgM, kArgN, kArgLayout,
- kArgSide, kArgTriangle,
- kArgALeadDim, kArgBLeadDim, kArgCLeadDim,
- kArgAOffset, kArgBOffset, kArgCOffset};
-
- // Creates a tester
- TestABC<T> tester{argc, argv, silent, name, options, clblast_lambda, clblas_lambda};
// Loops over the test-cases from a data-layout point of view
- for (auto &layout: tester.kLayouts) {
- args.layout = layout;
- for (auto &side: {Side::kLeft, Side::kRight}) {
- args.side = side;
- for (auto &triangle: {Triangle::kUpper, Triangle::kLower}) {
- args.triangle = triangle;
- const auto case_name = ToString(layout)+" "+ToString(side)+" "+ToString(triangle);
+ for (auto &layout: tester.kLayouts) { args.layout = layout;
+ for (auto &side: tester.kSides) { args.side = side;
+ for (auto &triangle: tester.kTriangles) { args.triangle = triangle;
+
+ // Creates the arguments vector for the regular tests
+ auto regular_test_vector = std::vector<Arguments<T>>{};
+ for (auto &m: tester.kMatrixDims) { args.m = m;
+ for (auto &n: tester.kMatrixDims) { args.n = n;
+ for (auto &a_ld: tester.kMatrixDims) { args.a_ld = a_ld;
+ for (auto &a_offset: tester.kOffsets) { args.a_offset = a_offset;
+ for (auto &b_ld: tester.kMatrixDims) { args.b_ld = b_ld;
+ for (auto &b_offset: tester.kOffsets) { args.b_offset = b_offset;
+ for (auto &c_ld: tester.kMatrixDims) { args.c_ld = c_ld;
+ for (auto &c_offset: tester.kOffsets) { args.c_offset = c_offset;
+ for (auto &alpha: tester.kAlphaValues) { args.alpha = alpha;
+ for (auto &beta: tester.kBetaValues) { args.beta = beta;
+ args.a_size = TestXsymm<T>::GetSizeA(args);
+ args.b_size = TestXsymm<T>::GetSizeB(args);
+ args.c_size = TestXsymm<T>::GetSizeC(args);
+ if (args.a_size<1 || args.b_size<1 || args.c_size<1) { continue; }
+ regular_test_vector.push_back(args);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ // Creates the arguments vector for the invalid-buffer tests
+ auto invalid_test_vector = std::vector<Arguments<T>>{};
+ args.m = args.n = tester.kBufferSize;
+ args.a_ld = args.b_ld = args.c_ld = tester.kBufferSize;
+ args.a_offset = args.b_offset = args.c_offset = 0;
+ for (auto &a_size: tester.kMatSizes) { args.a_size = a_size;
+ for (auto &b_size: tester.kMatSizes) { args.b_size = b_size;
+ for (auto &c_size: tester.kMatSizes) { args.c_size = c_size;
+ invalid_test_vector.push_back(args);
+ }
+ }
+ }
// Runs the tests
- tester.TestRegular(args, case_name, true);
- tester.TestInvalidBufferSizes(args, case_name);
+ const auto case_name = ToString(layout)+" "+ToString(side)+" "+ToString(triangle);
+ tester.TestRegular(regular_test_vector, case_name);
+ tester.TestInvalid(invalid_test_vector, case_name);
}
}
}
@@ -88,10 +90,10 @@ void XsymmTest(int argc, char *argv[], const bool silent, const std::string &nam
// Main function (not within the clblast namespace)
int main(int argc, char *argv[]) {
- clblast::XsymmTest<float>(argc, argv, false, "SSYMM");
- clblast::XsymmTest<double>(argc, argv, true, "DSYMM");
- clblast::XsymmTest<clblast::float2>(argc, argv, true, "CSYMM");
- clblast::XsymmTest<clblast::double2>(argc, argv, true, "ZSYMM");
+ clblast::RunTest<float>(argc, argv, false, "SSYMM");
+ clblast::RunTest<double>(argc, argv, true, "DSYMM");
+ clblast::RunTest<clblast::float2>(argc, argv, true, "CSYMM");
+ clblast::RunTest<clblast::double2>(argc, argv, true, "ZSYMM");
return 0;
}
diff --git a/test/correctness/routines/xsyr2k.cc b/test/correctness/routines/xsyr2k.cc
index 3365e6a8..b4bf03d9 100644
--- a/test/correctness/routines/xsyr2k.cc
+++ b/test/correctness/routines/xsyr2k.cc
@@ -7,78 +7,81 @@
// Author(s):
// Cedric Nugteren <www.cedricnugteren.nl>
//
-// This file implements the tests for the Xsyr2k routine. It is based on the TestABC class.
+// This file implements the tests for the Xsyr2k routine.
//
// =================================================================================================
-#include "wrapper_clblas.h"
-#include "correctness/testabc.h"
+#include "correctness/testblas.h"
+#include "routines/xsyr2k.h"
namespace clblast {
// =================================================================================================
-// The correctness tester, containing the function calls to CLBlast and to clBLAS for comparison.
+// The correctness tester
template <typename T>
-void Xsyr2kTest(int argc, char *argv[], const bool silent, const std::string &name) {
+void RunTest(int argc, char *argv[], const bool silent, const std::string &name) {
- // Creates the CLBlast lambda
- auto clblast_lambda = [](const Arguments<T> &args,
- const Buffer &a_mat, const Buffer &b_mat, const Buffer &c_mat,
- CommandQueue &queue) -> StatusCode {
- auto queue_plain = queue();
- auto event = cl_event{};
- return Syr2k(args.layout, args.triangle, args.a_transpose,
- args.n, args.k,
- args.alpha,
- a_mat(), args.a_offset, args.a_ld,
- b_mat(), args.b_offset, args.b_ld,
- args.beta,
- c_mat(), args.c_offset, args.c_ld,
- &queue_plain, &event);
- };
-
- // Creates the clBLAS lambda (for comparison)
- auto clblas_lambda = [](const Arguments<T> &args,
- const Buffer &a_mat, const Buffer &b_mat, const Buffer &c_mat,
- CommandQueue &queue) -> StatusCode {
- auto queue_plain = queue();
- auto event = cl_event{};
- auto status = clblasXsyr2k(static_cast<clblasOrder>(args.layout),
- static_cast<clblasUplo>(args.triangle),
- static_cast<clblasTranspose>(args.a_transpose),
- args.n, args.k,
- args.alpha,
- a_mat(), args.a_offset, args.a_ld,
- b_mat(), args.b_offset, args.b_ld,
- args.beta,
- c_mat(), args.c_offset, args.c_ld,
- 1, &queue_plain, 0, nullptr, &event);
- return static_cast<StatusCode>(status);
- };
+ // Creates a tester
+ TestBlas<T> tester{argc, argv, silent, name, TestXsyr2k<T>::GetOptions(),
+ TestXsyr2k<T>::RunRoutine, TestXsyr2k<T>::RunReference,
+ TestXsyr2k<T>::DownloadResult, TestXsyr2k<T>::GetResultIndex,
+ TestXsyr2k<T>::ResultID1, TestXsyr2k<T>::ResultID2};
- // Initializes the arguments relevant for this routine
+ // This variable holds the arguments relevant for this routine
auto args = Arguments<T>{};
- const auto options = std::vector<std::string>{kArgN, kArgK, kArgLayout,
- kArgTriangle, kArgATransp,
- kArgALeadDim, kArgBLeadDim, kArgCLeadDim,
- kArgAOffset, kArgBOffset, kArgCOffset};
-
- // Creates a tester
- TestABC<T> tester{argc, argv, silent, name, options, clblast_lambda, clblas_lambda};
// Loops over the test-cases from a data-layout point of view
- for (auto &layout: tester.kLayouts) {
- args.layout = layout;
- for (auto &triangle: {Triangle::kUpper, Triangle::kLower}) {
- args.triangle = triangle;
- for (auto &ab_transpose: {Transpose::kNo, Transpose::kYes}) { // No conjugate here since it is
- args.a_transpose = ab_transpose; // not supported by clBLAS
+ for (auto &layout: tester.kLayouts) { args.layout = layout;
+ for (auto &triangle: tester.kTriangles) { args.triangle = triangle;
+ for (auto &ab_transpose: {Transpose::kNo, Transpose::kYes}) { // No conjugate here since it
+ args.a_transpose = ab_transpose; // is not supported by clBLAS
args.b_transpose = ab_transpose;
- const auto case_name = ToString(layout)+" "+ToString(triangle)+" "+ToString(ab_transpose);
+
+ // Creates the arguments vector for the regular tests
+ auto regular_test_vector = std::vector<Arguments<T>>{};
+ for (auto &n: tester.kMatrixDims) { args.n = n;
+ for (auto &k: tester.kMatrixDims) { args.k = k;
+ for (auto &a_ld: tester.kMatrixDims) { args.a_ld = a_ld;
+ for (auto &a_offset: tester.kOffsets) { args.a_offset = a_offset;
+ for (auto &b_ld: tester.kMatrixDims) { args.b_ld = b_ld;
+ for (auto &b_offset: tester.kOffsets) { args.b_offset = b_offset;
+ for (auto &c_ld: tester.kMatrixDims) { args.c_ld = c_ld;
+ for (auto &c_offset: tester.kOffsets) { args.c_offset = c_offset;
+ for (auto &alpha: tester.kAlphaValues) { args.alpha = alpha;
+ for (auto &beta: tester.kBetaValues) { args.beta = beta;
+ args.a_size = TestXsyr2k<T>::GetSizeA(args);
+ args.b_size = TestXsyr2k<T>::GetSizeB(args);
+ args.c_size = TestXsyr2k<T>::GetSizeC(args);
+ if (args.a_size<1 || args.b_size<1 || args.c_size<1) { continue; }
+ regular_test_vector.push_back(args);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ // Creates the arguments vector for the invalid-buffer tests
+ auto invalid_test_vector = std::vector<Arguments<T>>{};
+ args.n = args.k = tester.kBufferSize;
+ args.a_ld = args.b_ld = args.c_ld = tester.kBufferSize;
+ args.a_offset = args.b_offset = args.c_offset = 0;
+ for (auto &a_size: tester.kMatSizes) { args.a_size = a_size;
+ for (auto &b_size: tester.kMatSizes) { args.b_size = b_size;
+ for (auto &c_size: tester.kMatSizes) { args.c_size = c_size;
+ invalid_test_vector.push_back(args);
+ }
+ }
+ }
// Runs the tests
- tester.TestRegular(args, case_name, true);
- tester.TestInvalidBufferSizes(args, case_name);
+ const auto case_name = ToString(layout)+" "+ToString(triangle)+" "+ToString(ab_transpose);
+ tester.TestRegular(regular_test_vector, case_name);
+ tester.TestInvalid(invalid_test_vector, case_name);
}
}
}
@@ -89,10 +92,10 @@ void Xsyr2kTest(int argc, char *argv[], const bool silent, const std::string &na
// Main function (not within the clblast namespace)
int main(int argc, char *argv[]) {
- clblast::Xsyr2kTest<float>(argc, argv, false, "SSYR2K");
- clblast::Xsyr2kTest<double>(argc, argv, true, "DSYR2K");
- clblast::Xsyr2kTest<clblast::float2>(argc, argv, true, "CSYR2K");
- clblast::Xsyr2kTest<clblast::double2>(argc, argv, true, "ZSYR2K");
+ clblast::RunTest<float>(argc, argv, false, "SSYR2K");
+ clblast::RunTest<double>(argc, argv, true, "DSYR2K");
+ clblast::RunTest<clblast::float2>(argc, argv, true, "CSYR2K");
+ clblast::RunTest<clblast::double2>(argc, argv, true, "ZSYR2K");
return 0;
}
diff --git a/test/correctness/routines/xsyrk.cc b/test/correctness/routines/xsyrk.cc
index 8d3bd82e..899d3b77 100644
--- a/test/correctness/routines/xsyrk.cc
+++ b/test/correctness/routines/xsyrk.cc
@@ -7,75 +7,73 @@
// Author(s):
// Cedric Nugteren <www.cedricnugteren.nl>
//
-// This file implements the tests for the Xsyrk routine. It is based on the TestAC class.
+// This file implements the tests for the Xsyrk routine.
//
// =================================================================================================
-#include "wrapper_clblas.h"
-#include "correctness/testac.h"
+#include "correctness/testblas.h"
+#include "routines/xsyrk.h"
namespace clblast {
// =================================================================================================
-// The correctness tester, containing the function calls to CLBlast and to clBLAS for comparison.
+// The correctness tester
template <typename T>
-void XsyrkTest(int argc, char *argv[], const bool silent, const std::string &name) {
+void RunTest(int argc, char *argv[], const bool silent, const std::string &name) {
- // Creates the CLBlast lambda
- auto clblast_lambda = [](const Arguments<T> &args,
- const Buffer &a_mat, const Buffer &c_mat,
- CommandQueue &queue) -> StatusCode {
- auto queue_plain = queue();
- auto event = cl_event{};
- return Syrk(args.layout, args.triangle, args.a_transpose,
- args.n, args.k,
- args.alpha,
- a_mat(), args.a_offset, args.a_ld,
- args.beta,
- c_mat(), args.c_offset, args.c_ld,
- &queue_plain, &event);
- };
-
- // Creates the clBLAS lambda (for comparison)
- auto clblas_lambda = [](const Arguments<T> &args,
- const Buffer &a_mat, const Buffer &c_mat,
- CommandQueue &queue) -> StatusCode {
- auto queue_plain = queue();
- auto event = cl_event{};
- auto status = clblasXsyrk(static_cast<clblasOrder>(args.layout),
- static_cast<clblasUplo>(args.triangle),
- static_cast<clblasTranspose>(args.a_transpose),
- args.n, args.k,
- args.alpha,
- a_mat(), args.a_offset, args.a_ld,
- args.beta,
- c_mat(), args.c_offset, args.c_ld,
- 1, &queue_plain, 0, nullptr, &event);
- return static_cast<StatusCode>(status);
- };
+ // Creates a tester
+ TestBlas<T> tester{argc, argv, silent, name, TestXsyrk<T>::GetOptions(),
+ TestXsyrk<T>::RunRoutine, TestXsyrk<T>::RunReference,
+ TestXsyrk<T>::DownloadResult, TestXsyrk<T>::GetResultIndex,
+ TestXsyrk<T>::ResultID1, TestXsyrk<T>::ResultID2};
- // Initializes the arguments relevant for this routine
+ // This variable holds the arguments relevant for this routine
auto args = Arguments<T>{};
- const auto options = std::vector<std::string>{kArgN, kArgK, kArgLayout,
- kArgTriangle, kArgATransp,
- kArgALeadDim, kArgCLeadDim,
- kArgAOffset, kArgCOffset};
-
- // Creates a tester
- TestAC<T> tester{argc, argv, silent, name, options, clblast_lambda, clblas_lambda};
// Loops over the test-cases from a data-layout point of view
- for (auto &layout: tester.kLayouts) {
- args.layout = layout;
- for (auto &triangle: {Triangle::kUpper, Triangle::kLower}) {
- args.triangle = triangle;
- for (auto &a_transpose: {Transpose::kNo, Transpose::kYes}) { // No conjugate here since it is
- args.a_transpose = a_transpose; // not supported by clBLAS
- const auto case_name = ToString(layout)+" "+ToString(triangle)+" "+ToString(a_transpose);
+ for (auto &layout: tester.kLayouts) { args.layout = layout;
+ for (auto &triangle: tester.kTriangles) { args.triangle = triangle;
+ for (auto &a_transpose: {Transpose::kNo, Transpose::kYes}) { // No conjugate here since it
+ args.a_transpose = a_transpose; // is not supported by clBLAS
+
+ // Creates the arguments vector for the regular tests
+ auto regular_test_vector = std::vector<Arguments<T>>{};
+ for (auto &n: tester.kMatrixDims) { args.n = n;
+ for (auto &k: tester.kMatrixDims) { args.k = k;
+ for (auto &a_ld: tester.kMatrixDims) { args.a_ld = a_ld;
+ for (auto &a_offset: tester.kOffsets) { args.a_offset = a_offset;
+ for (auto &c_ld: tester.kMatrixDims) { args.c_ld = c_ld;
+ for (auto &c_offset: tester.kOffsets) { args.c_offset = c_offset;
+ for (auto &alpha: tester.kAlphaValues) { args.alpha = alpha;
+ for (auto &beta: tester.kBetaValues) { args.beta = beta;
+ args.a_size = TestXsyrk<T>::GetSizeA(args);
+ args.c_size = TestXsyrk<T>::GetSizeC(args);
+ if (args.a_size<1 || args.c_size<1) { continue; }
+ regular_test_vector.push_back(args);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ // Creates the arguments vector for the invalid-buffer tests
+ auto invalid_test_vector = std::vector<Arguments<T>>{};
+ args.n = args.k = tester.kBufferSize;
+ args.a_ld = args.c_ld = tester.kBufferSize;
+ args.a_offset = args.c_offset = 0;
+ for (auto &a_size: tester.kMatSizes) { args.a_size = a_size;
+ for (auto &c_size: tester.kMatSizes) { args.c_size = c_size;
+ invalid_test_vector.push_back(args);
+ }
+ }
// Runs the tests
- tester.TestRegular(args, case_name);
- tester.TestInvalidBufferSizes(args, case_name);
+ const auto case_name = ToString(layout)+" "+ToString(triangle)+" "+ToString(a_transpose);
+ tester.TestRegular(regular_test_vector, case_name);
+ tester.TestInvalid(invalid_test_vector, case_name);
}
}
}
@@ -86,10 +84,10 @@ void XsyrkTest(int argc, char *argv[], const bool silent, const std::string &nam
// Main function (not within the clblast namespace)
int main(int argc, char *argv[]) {
- clblast::XsyrkTest<float>(argc, argv, false, "SSYRK");
- clblast::XsyrkTest<double>(argc, argv, true, "DSYRK");
- clblast::XsyrkTest<clblast::float2>(argc, argv, true, "CSYRK");
- clblast::XsyrkTest<clblast::double2>(argc, argv, true, "ZSYRK");
+ clblast::RunTest<float>(argc, argv, false, "SSYRK");
+ clblast::RunTest<double>(argc, argv, true, "DSYRK");
+ clblast::RunTest<clblast::float2>(argc, argv, true, "CSYRK");
+ clblast::RunTest<clblast::double2>(argc, argv, true, "ZSYRK");
return 0;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 18:53:37 +0000