Added half-precision tests for the clBLAS reference through conversion to single-precision

40 files changed, 102 insertions, 102 deletions

diff --git a/test/routines/level1/xamax.h b/test/routines/level1/xamax.h
index 7b404dc3..12b031bc 100644
--- a/test/routines/level1/xamax.h
+++ b/test/routines/level1/xamax.h
@@ -86,8 +86,8 @@ class TestXamax {
       auto queue_plain = queue();
       auto event = cl_event{};
       auto status = clblasXamax<T>(args.n,
-                                   buffers.scalar(), args.imax_offset,
-                                   buffers.x_vec(), args.x_offset, args.x_inc,
+                                   buffers.scalar, args.imax_offset,
+                                   buffers.x_vec, args.x_offset, args.x_inc,
                                    1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level1/xasum.h b/test/routines/level1/xasum.h
index 6eae3c83..eb83817b 100644
--- a/test/routines/level1/xasum.h
+++ b/test/routines/level1/xasum.h
@@ -86,8 +86,8 @@ class TestXasum {
       auto queue_plain = queue();
       auto event = cl_event{};
       auto status = clblasXasum<T>(args.n,
-                                   buffers.scalar(), args.asum_offset,
-                                   buffers.x_vec(), args.x_offset, args.x_inc,
+                                   buffers.scalar, args.asum_offset,
+                                   buffers.x_vec, args.x_offset, args.x_inc,
                                    1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level1/xaxpy.h b/test/routines/level1/xaxpy.h
index 8f72f570..c241da91 100644
--- a/test/routines/level1/xaxpy.h
+++ b/test/routines/level1/xaxpy.h
@@ -87,8 +87,8 @@ class TestXaxpy {
       auto queue_plain = queue();
       auto event = cl_event{};
       auto status = clblasXaxpy(args.n, args.alpha,
-                                buffers.x_vec(), args.x_offset, args.x_inc,
-                                buffers.y_vec(), args.y_offset, args.y_inc,
+                                buffers.x_vec, args.x_offset, args.x_inc,
+                                buffers.y_vec, args.y_offset, args.y_inc,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level1/xcopy.h b/test/routines/level1/xcopy.h
index 0527ca6a..a1ff06ce 100644
--- a/test/routines/level1/xcopy.h
+++ b/test/routines/level1/xcopy.h
@@ -86,8 +86,8 @@ class TestXcopy {
       auto queue_plain = queue();
       auto event = cl_event{};
       auto status = clblasXcopy<T>(args.n,
-                                   buffers.x_vec(), args.x_offset, args.x_inc,
-                                   buffers.y_vec(), args.y_offset, args.y_inc,
+                                   buffers.x_vec, args.x_offset, args.x_inc,
+                                   buffers.y_vec, args.y_offset, args.y_inc,
                                    1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level1/xdot.h b/test/routines/level1/xdot.h
index d1c34c0f..0bbc93d5 100644
--- a/test/routines/level1/xdot.h
+++ b/test/routines/level1/xdot.h
@@ -91,9 +91,9 @@ class TestXdot {
       auto queue_plain = queue();
       auto event = cl_event{};
       auto status = clblasXdot<T>(args.n,
-                                  buffers.scalar(), args.dot_offset,
-                                  buffers.x_vec(), args.x_offset, args.x_inc,
-                                  buffers.y_vec(), args.y_offset, args.y_inc,
+                                  buffers.scalar, args.dot_offset,
+                                  buffers.x_vec, args.x_offset, args.x_inc,
+                                  buffers.y_vec, args.y_offset, args.y_inc,
                                   1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level1/xdotc.h b/test/routines/level1/xdotc.h
index a2742cb0..e1cc1854 100644
--- a/test/routines/level1/xdotc.h
+++ b/test/routines/level1/xdotc.h
@@ -91,9 +91,9 @@ class TestXdotc {
       auto queue_plain = queue();
       auto event = cl_event{};
       auto status = clblasXdotc<T>(args.n,
-                                   buffers.scalar(), args.dot_offset,
-                                   buffers.x_vec(), args.x_offset, args.x_inc,
-                                   buffers.y_vec(), args.y_offset, args.y_inc,
+                                   buffers.scalar, args.dot_offset,
+                                   buffers.x_vec, args.x_offset, args.x_inc,
+                                   buffers.y_vec, args.y_offset, args.y_inc,
                                    1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level1/xdotu.h b/test/routines/level1/xdotu.h
index 06ce979e..558257cc 100644
--- a/test/routines/level1/xdotu.h
+++ b/test/routines/level1/xdotu.h
@@ -91,9 +91,9 @@ class TestXdotu {
       auto queue_plain = queue();
       auto event = cl_event{};
       auto status = clblasXdotu<T>(args.n,
-                                   buffers.scalar(), args.dot_offset,
-                                   buffers.x_vec(), args.x_offset, args.x_inc,
-                                   buffers.y_vec(), args.y_offset, args.y_inc,
+                                   buffers.scalar, args.dot_offset,
+                                   buffers.x_vec, args.x_offset, args.x_inc,
+                                   buffers.y_vec, args.y_offset, args.y_inc,
                                    1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level1/xnrm2.h b/test/routines/level1/xnrm2.h
index d8a0de4e..19074ca2 100644
--- a/test/routines/level1/xnrm2.h
+++ b/test/routines/level1/xnrm2.h
@@ -86,8 +86,8 @@ class TestXnrm2 {
       auto queue_plain = queue();
       auto event = cl_event{};
       auto status = clblasXnrm2<T>(args.n,
-                                   buffers.scalar(), args.nrm2_offset,
-                                   buffers.x_vec(), args.x_offset, args.x_inc,
+                                   buffers.scalar, args.nrm2_offset,
+                                   buffers.x_vec, args.x_offset, args.x_inc,
                                    1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level1/xscal.h b/test/routines/level1/xscal.h
index 35855dbd..84d14ac7 100644
--- a/test/routines/level1/xscal.h
+++ b/test/routines/level1/xscal.h
@@ -82,7 +82,7 @@ class TestXscal {
       auto queue_plain = queue();
       auto event = cl_event{};
       auto status = clblasXscal(args.n, args.alpha,
-                                buffers.x_vec(), args.x_offset, args.x_inc,
+                                buffers.x_vec, args.x_offset, args.x_inc,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level1/xswap.h b/test/routines/level1/xswap.h
index ae69d3be..e870b602 100644
--- a/test/routines/level1/xswap.h
+++ b/test/routines/level1/xswap.h
@@ -86,8 +86,8 @@ class TestXswap {
       auto queue_plain = queue();
       auto event = cl_event{};
       auto status = clblasXswap<T>(args.n,
-                                   buffers.x_vec(), args.x_offset, args.x_inc,
-                                   buffers.y_vec(), args.y_offset, args.y_inc,
+                                   buffers.x_vec, args.x_offset, args.x_inc,
+                                   buffers.y_vec, args.y_offset, args.y_inc,
                                    1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xgbmv.h b/test/routines/level2/xgbmv.h
index c88cdf2a..c777ff73 100644
--- a/test/routines/level2/xgbmv.h
+++ b/test/routines/level2/xgbmv.h
@@ -102,9 +102,9 @@ class TestXgbmv {
       auto status = clblasXgbmv(convertToCLBLAS(args.layout),
                                 convertToCLBLAS(args.a_transpose),
                                 args.m, args.n, args.kl, args.ku, args.alpha,
-                                buffers.a_mat(), args.a_offset, args.a_ld,
-                                buffers.x_vec(), args.x_offset, args.x_inc, args.beta,
-                                buffers.y_vec(), args.y_offset, args.y_inc,
+                                buffers.a_mat, args.a_offset, args.a_ld,
+                                buffers.x_vec, args.x_offset, args.x_inc, args.beta,
+                                buffers.y_vec, args.y_offset, args.y_inc,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xgemv.h b/test/routines/level2/xgemv.h
index cf63d55f..f8a7e1d0 100644
--- a/test/routines/level2/xgemv.h
+++ b/test/routines/level2/xgemv.h
@@ -102,9 +102,9 @@ class TestXgemv {
       auto status = clblasXgemv(convertToCLBLAS(args.layout),
                                 convertToCLBLAS(args.a_transpose),
                                 args.m, args.n, args.alpha,
-                                buffers.a_mat(), args.a_offset, args.a_ld,
-                                buffers.x_vec(), args.x_offset, args.x_inc, args.beta,
-                                buffers.y_vec(), args.y_offset, args.y_inc,
+                                buffers.a_mat, args.a_offset, args.a_ld,
+                                buffers.x_vec, args.x_offset, args.x_inc, args.beta,
+                                buffers.y_vec, args.y_offset, args.y_inc,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xger.h b/test/routines/level2/xger.h
index ae142e2e..e0d1fe49 100644
--- a/test/routines/level2/xger.h
+++ b/test/routines/level2/xger.h
@@ -97,9 +97,9 @@ class TestXger {
       auto event = cl_event{};
       auto status = clblasXger(convertToCLBLAS(args.layout),
                                args.m, args.n, args.alpha,
-                               buffers.x_vec(), args.x_offset, args.x_inc,
-                               buffers.y_vec(), args.y_offset, args.y_inc,
-                               buffers.a_mat(), args.a_offset, args.a_ld,
+                               buffers.x_vec, args.x_offset, args.x_inc,
+                               buffers.y_vec, args.y_offset, args.y_inc,
+                               buffers.a_mat, args.a_offset, args.a_ld,
                                1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xgerc.h b/test/routines/level2/xgerc.h
index b236aef6..7449146b 100644
--- a/test/routines/level2/xgerc.h
+++ b/test/routines/level2/xgerc.h
@@ -97,9 +97,9 @@ class TestXgerc {
       auto event = cl_event{};
       auto status = clblasXgerc(convertToCLBLAS(args.layout),
                                 args.m, args.n, args.alpha,
-                                buffers.x_vec(), args.x_offset, args.x_inc,
-                                buffers.y_vec(), args.y_offset, args.y_inc,
-                                buffers.a_mat(), args.a_offset, args.a_ld,
+                                buffers.x_vec, args.x_offset, args.x_inc,
+                                buffers.y_vec, args.y_offset, args.y_inc,
+                                buffers.a_mat, args.a_offset, args.a_ld,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xgeru.h b/test/routines/level2/xgeru.h
index 3d3fa439..07837657 100644
--- a/test/routines/level2/xgeru.h
+++ b/test/routines/level2/xgeru.h
@@ -97,9 +97,9 @@ class TestXgeru {
       auto event = cl_event{};
       auto status = clblasXgeru(convertToCLBLAS(args.layout),
                                 args.m, args.n, args.alpha,
-                                buffers.x_vec(), args.x_offset, args.x_inc,
-                                buffers.y_vec(), args.y_offset, args.y_inc,
-                                buffers.a_mat(), args.a_offset, args.a_ld,
+                                buffers.x_vec, args.x_offset, args.x_inc,
+                                buffers.y_vec, args.y_offset, args.y_inc,
+                                buffers.a_mat, args.a_offset, args.a_ld,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xhbmv.h b/test/routines/level2/xhbmv.h
index 4098639a..73194975 100644
--- a/test/routines/level2/xhbmv.h
+++ b/test/routines/level2/xhbmv.h
@@ -96,9 +96,9 @@ class TestXhbmv {
       auto status = clblasXhbmv(convertToCLBLAS(args.layout),
                                 convertToCLBLAS(args.triangle),
                                 args.n, args.kl, args.alpha,
-                                buffers.a_mat(), args.a_offset, args.a_ld,
-                                buffers.x_vec(), args.x_offset, args.x_inc, args.beta,
-                                buffers.y_vec(), args.y_offset, args.y_inc,
+                                buffers.a_mat, args.a_offset, args.a_ld,
+                                buffers.x_vec, args.x_offset, args.x_inc, args.beta,
+                                buffers.y_vec, args.y_offset, args.y_inc,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xhemv.h b/test/routines/level2/xhemv.h
index 5652872d..aabbf14a 100644
--- a/test/routines/level2/xhemv.h
+++ b/test/routines/level2/xhemv.h
@@ -96,9 +96,9 @@ class TestXhemv {
       auto status = clblasXhemv(convertToCLBLAS(args.layout),
                                 convertToCLBLAS(args.triangle),
                                 args.n, args.alpha,
-                                buffers.a_mat(), args.a_offset, args.a_ld,
-                                buffers.x_vec(), args.x_offset, args.x_inc, args.beta,
-                                buffers.y_vec(), args.y_offset, args.y_inc,
+                                buffers.a_mat, args.a_offset, args.a_ld,
+                                buffers.x_vec, args.x_offset, args.x_inc, args.beta,
+                                buffers.y_vec, args.y_offset, args.y_inc,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xher.h b/test/routines/level2/xher.h
index 3bbf0887..1294832c 100644
--- a/test/routines/level2/xher.h
+++ b/test/routines/level2/xher.h
@@ -91,8 +91,8 @@ class TestXher {
       auto status = clblasXher(convertToCLBLAS(args.layout),
                                convertToCLBLAS(args.triangle),
                                args.n, args.alpha,
-                               buffers.x_vec(), args.x_offset, args.x_inc,
-                               buffers.a_mat(), args.a_offset, args.a_ld,
+                               buffers.x_vec, args.x_offset, args.x_inc,
+                               buffers.a_mat, args.a_offset, args.a_ld,
                                1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xher2.h b/test/routines/level2/xher2.h
index dc7fbe73..5e90174d 100644
--- a/test/routines/level2/xher2.h
+++ b/test/routines/level2/xher2.h
@@ -96,9 +96,9 @@ class TestXher2 {
       auto status = clblasXher2(convertToCLBLAS(args.layout),
                                 convertToCLBLAS(args.triangle),
                                 args.n, args.alpha,
-                                buffers.x_vec(), args.x_offset, args.x_inc,
-                                buffers.y_vec(), args.y_offset, args.y_inc,
-                                buffers.a_mat(), args.a_offset, args.a_ld,
+                                buffers.x_vec, args.x_offset, args.x_inc,
+                                buffers.y_vec, args.y_offset, args.y_inc,
+                                buffers.a_mat, args.a_offset, args.a_ld,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xhpmv.h b/test/routines/level2/xhpmv.h
index df5a90ee..8face6b6 100644
--- a/test/routines/level2/xhpmv.h
+++ b/test/routines/level2/xhpmv.h
@@ -96,9 +96,9 @@ class TestXhpmv {
       auto status = clblasXhpmv(convertToCLBLAS(args.layout),
                                 convertToCLBLAS(args.triangle),
                                 args.n, args.alpha,
-                                buffers.ap_mat(), args.ap_offset,
-                                buffers.x_vec(), args.x_offset, args.x_inc, args.beta,
-                                buffers.y_vec(), args.y_offset, args.y_inc,
+                                buffers.ap_mat, args.ap_offset,
+                                buffers.x_vec, args.x_offset, args.x_inc, args.beta,
+                                buffers.y_vec, args.y_offset, args.y_inc,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xhpr.h b/test/routines/level2/xhpr.h
index 0db11db0..63cab31f 100644
--- a/test/routines/level2/xhpr.h
+++ b/test/routines/level2/xhpr.h
@@ -91,8 +91,8 @@ class TestXhpr {
       auto status = clblasXhpr(convertToCLBLAS(args.layout),
                                convertToCLBLAS(args.triangle),
                                args.n, args.alpha,
-                               buffers.x_vec(), args.x_offset, args.x_inc,
-                               buffers.ap_mat(), args.ap_offset,
+                               buffers.x_vec, args.x_offset, args.x_inc,
+                               buffers.ap_mat, args.ap_offset,
                                1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xhpr2.h b/test/routines/level2/xhpr2.h
index e1e5b4c5..64d205a0 100644
--- a/test/routines/level2/xhpr2.h
+++ b/test/routines/level2/xhpr2.h
@@ -96,9 +96,9 @@ class TestXhpr2 {
       auto status = clblasXhpr2(convertToCLBLAS(args.layout),
                                 convertToCLBLAS(args.triangle),
                                 args.n, args.alpha,
-                                buffers.x_vec(), args.x_offset, args.x_inc,
-                                buffers.y_vec(), args.y_offset, args.y_inc,
-                                buffers.ap_mat(), args.ap_offset,
+                                buffers.x_vec, args.x_offset, args.x_inc,
+                                buffers.y_vec, args.y_offset, args.y_inc,
+                                buffers.ap_mat, args.ap_offset,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xsbmv.h b/test/routines/level2/xsbmv.h
index fce88f4c..3f1446c8 100644
--- a/test/routines/level2/xsbmv.h
+++ b/test/routines/level2/xsbmv.h
@@ -96,9 +96,9 @@ class TestXsbmv {
       auto status = clblasXsbmv(convertToCLBLAS(args.layout),
                                 convertToCLBLAS(args.triangle),
                                 args.n, args.kl, args.alpha,
-                                buffers.a_mat(), args.a_offset, args.a_ld,
-                                buffers.x_vec(), args.x_offset, args.x_inc, args.beta,
-                                buffers.y_vec(), args.y_offset, args.y_inc,
+                                buffers.a_mat, args.a_offset, args.a_ld,
+                                buffers.x_vec, args.x_offset, args.x_inc, args.beta,
+                                buffers.y_vec, args.y_offset, args.y_inc,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xspmv.h b/test/routines/level2/xspmv.h
index 2fdba77a..2add3cdd 100644
--- a/test/routines/level2/xspmv.h
+++ b/test/routines/level2/xspmv.h
@@ -96,9 +96,9 @@ class TestXspmv {
       auto status = clblasXspmv(convertToCLBLAS(args.layout),
                                 convertToCLBLAS(args.triangle),
                                 args.n, args.alpha,
-                                buffers.ap_mat(), args.ap_offset,
-                                buffers.x_vec(), args.x_offset, args.x_inc, args.beta,
-                                buffers.y_vec(), args.y_offset, args.y_inc,
+                                buffers.ap_mat, args.ap_offset,
+                                buffers.x_vec, args.x_offset, args.x_inc, args.beta,
+                                buffers.y_vec, args.y_offset, args.y_inc,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xspr.h b/test/routines/level2/xspr.h
index dcacc5de..ad21bdf6 100644
--- a/test/routines/level2/xspr.h
+++ b/test/routines/level2/xspr.h
@@ -91,8 +91,8 @@ class TestXspr {
       auto status = clblasXspr(convertToCLBLAS(args.layout),
                                convertToCLBLAS(args.triangle),
                                args.n, args.alpha,
-                               buffers.x_vec(), args.x_offset, args.x_inc,
-                               buffers.ap_mat(), args.ap_offset,
+                               buffers.x_vec, args.x_offset, args.x_inc,
+                               buffers.ap_mat, args.ap_offset,
                                1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xspr2.h b/test/routines/level2/xspr2.h
index 69fda2fb..c55e8181 100644
--- a/test/routines/level2/xspr2.h
+++ b/test/routines/level2/xspr2.h
@@ -96,9 +96,9 @@ class TestXspr2 {
       auto status = clblasXspr2(convertToCLBLAS(args.layout),
                                 convertToCLBLAS(args.triangle),
                                 args.n, args.alpha,
-                                buffers.x_vec(), args.x_offset, args.x_inc,
-                                buffers.y_vec(), args.y_offset, args.y_inc,
-                                buffers.ap_mat(), args.ap_offset,
+                                buffers.x_vec, args.x_offset, args.x_inc,
+                                buffers.y_vec, args.y_offset, args.y_inc,
+                                buffers.ap_mat, args.ap_offset,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xsymv.h b/test/routines/level2/xsymv.h
index 16f94d6f..b6583a24 100644
--- a/test/routines/level2/xsymv.h
+++ b/test/routines/level2/xsymv.h
@@ -96,9 +96,9 @@ class TestXsymv {
       auto status = clblasXsymv(convertToCLBLAS(args.layout),
                                 convertToCLBLAS(args.triangle),
                                 args.n, args.alpha,
-                                buffers.a_mat(), args.a_offset, args.a_ld,
-                                buffers.x_vec(), args.x_offset, args.x_inc, args.beta,
-                                buffers.y_vec(), args.y_offset, args.y_inc,
+                                buffers.a_mat, args.a_offset, args.a_ld,
+                                buffers.x_vec, args.x_offset, args.x_inc, args.beta,
+                                buffers.y_vec, args.y_offset, args.y_inc,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xsyr.h b/test/routines/level2/xsyr.h
index a66dd271..f3929588 100644
--- a/test/routines/level2/xsyr.h
+++ b/test/routines/level2/xsyr.h
@@ -91,8 +91,8 @@ class TestXsyr {
       auto status = clblasXsyr(convertToCLBLAS(args.layout),
                                convertToCLBLAS(args.triangle),
                                args.n, args.alpha,
-                               buffers.x_vec(), args.x_offset, args.x_inc,
-                               buffers.a_mat(), args.a_offset, args.a_ld,
+                               buffers.x_vec, args.x_offset, args.x_inc,
+                               buffers.a_mat, args.a_offset, args.a_ld,
                                1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xsyr2.h b/test/routines/level2/xsyr2.h
index a36815e5..8cdb6a14 100644
--- a/test/routines/level2/xsyr2.h
+++ b/test/routines/level2/xsyr2.h
@@ -96,9 +96,9 @@ class TestXsyr2 {
       auto status = clblasXsyr2(convertToCLBLAS(args.layout),
                                 convertToCLBLAS(args.triangle),
                                 args.n, args.alpha,
-                                buffers.x_vec(), args.x_offset, args.x_inc,
-                                buffers.y_vec(), args.y_offset, args.y_inc,
-                                buffers.a_mat(), args.a_offset, args.a_ld,
+                                buffers.x_vec, args.x_offset, args.x_inc,
+                                buffers.y_vec, args.y_offset, args.y_inc,
+                                buffers.a_mat, args.a_offset, args.a_ld,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xtbmv.h b/test/routines/level2/xtbmv.h
index 1425b60b..9c4131ec 100644
--- a/test/routines/level2/xtbmv.h
+++ b/test/routines/level2/xtbmv.h
@@ -92,8 +92,8 @@ class TestXtbmv {
                                    convertToCLBLAS(args.a_transpose),
                                    convertToCLBLAS(args.diagonal),
                                    args.n, args.kl,
-                                   buffers.a_mat(), args.a_offset, args.a_ld,
-                                   buffers.x_vec(), args.x_offset, args.x_inc,
+                                   buffers.a_mat, args.a_offset, args.a_ld,
+                                   buffers.x_vec, args.x_offset, args.x_inc,
                                    1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xtpmv.h b/test/routines/level2/xtpmv.h
index a834b437..58249227 100644
--- a/test/routines/level2/xtpmv.h
+++ b/test/routines/level2/xtpmv.h
@@ -92,8 +92,8 @@ class TestXtpmv {
                                    convertToCLBLAS(args.a_transpose),
                                    convertToCLBLAS(args.diagonal),
                                    args.n,
-                                   buffers.ap_mat(), args.ap_offset,
-                                   buffers.x_vec(), args.x_offset, args.x_inc,
+                                   buffers.ap_mat, args.ap_offset,
+                                   buffers.x_vec, args.x_offset, args.x_inc,
                                    1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level2/xtrmv.h b/test/routines/level2/xtrmv.h
index cd502d5d..635a1319 100644
--- a/test/routines/level2/xtrmv.h
+++ b/test/routines/level2/xtrmv.h
@@ -92,8 +92,8 @@ class TestXtrmv {
                                    convertToCLBLAS(args.a_transpose),
                                    convertToCLBLAS(args.diagonal),
                                    args.n,
-                                   buffers.a_mat(), args.a_offset, args.a_ld,
-                                   buffers.x_vec(), args.x_offset, args.x_inc,
+                                   buffers.a_mat, args.a_offset, args.a_ld,
+                                   buffers.x_vec, args.x_offset, args.x_inc,
                                    1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level3/xgemm.h b/test/routines/level3/xgemm.h
index cd5c2acd..842dae93 100644
--- a/test/routines/level3/xgemm.h
+++ b/test/routines/level3/xgemm.h
@@ -105,9 +105,9 @@ class TestXgemm {
                                 convertToCLBLAS(args.a_transpose),
                                 convertToCLBLAS(args.b_transpose),
                                 args.m, args.n, args.k, args.alpha,
-                                buffers.a_mat(), args.a_offset, args.a_ld,
-                                buffers.b_mat(), args.b_offset, args.b_ld, args.beta,
-                                buffers.c_mat(), args.c_offset, args.c_ld,
+                                buffers.a_mat, args.a_offset, args.a_ld,
+                                buffers.b_mat, args.b_offset, args.b_ld, args.beta,
+                                buffers.c_mat, args.c_offset, args.c_ld,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level3/xhemm.h b/test/routines/level3/xhemm.h
index edc71024..106b99ff 100644
--- a/test/routines/level3/xhemm.h
+++ b/test/routines/level3/xhemm.h
@@ -105,9 +105,9 @@ class TestXhemm {
                                 convertToCLBLAS(args.side),
                                 convertToCLBLAS(args.triangle),
                                 args.m, args.n, args.alpha,
-                                buffers.a_mat(), args.a_offset, args.a_ld,
-                                buffers.b_mat(), args.b_offset, args.b_ld, args.beta,
-                                buffers.c_mat(), args.c_offset, args.c_ld,
+                                buffers.a_mat, args.a_offset, args.a_ld,
+                                buffers.b_mat, args.b_offset, args.b_ld, args.beta,
+                                buffers.c_mat, args.c_offset, args.c_ld,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level3/xher2k.h b/test/routines/level3/xher2k.h
index a78e1293..e2f4448f 100644
--- a/test/routines/level3/xher2k.h
+++ b/test/routines/level3/xher2k.h
@@ -105,9 +105,9 @@ class TestXher2k {
                                  convertToCLBLAS(args.triangle),
                                  convertToCLBLAS(args.a_transpose),
                                  args.n, args.k, alpha2,
-                                 buffers.a_mat(), args.a_offset, args.a_ld,
-                                 buffers.b_mat(), args.b_offset, args.b_ld, args.beta,
-                                 buffers.c_mat(), args.c_offset, args.c_ld,
+                                 buffers.a_mat, args.a_offset, args.a_ld,
+                                 buffers.b_mat, args.b_offset, args.b_ld, args.beta,
+                                 buffers.c_mat, args.c_offset, args.c_ld,
                                  1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level3/xherk.h b/test/routines/level3/xherk.h
index 245293d6..43d7cfcd 100644
--- a/test/routines/level3/xherk.h
+++ b/test/routines/level3/xherk.h
@@ -95,8 +95,8 @@ class TestXherk {
                                 convertToCLBLAS(args.triangle),
                                 convertToCLBLAS(args.a_transpose),
                                 args.n, args.k, args.alpha,
-                                buffers.a_mat(), args.a_offset, args.a_ld, args.beta,
-                                buffers.c_mat(), args.c_offset, args.c_ld,
+                                buffers.a_mat, args.a_offset, args.a_ld, args.beta,
+                                buffers.c_mat, args.c_offset, args.c_ld,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level3/xsymm.h b/test/routines/level3/xsymm.h
index e638b735..c32b4cf7 100644
--- a/test/routines/level3/xsymm.h
+++ b/test/routines/level3/xsymm.h
@@ -105,9 +105,9 @@ class TestXsymm {
                                 convertToCLBLAS(args.side),
                                 convertToCLBLAS(args.triangle),
                                 args.m, args.n, args.alpha,
-                                buffers.a_mat(), args.a_offset, args.a_ld,
-                                buffers.b_mat(), args.b_offset, args.b_ld, args.beta,
-                                buffers.c_mat(), args.c_offset, args.c_ld,
+                                buffers.a_mat, args.a_offset, args.a_ld,
+                                buffers.b_mat, args.b_offset, args.b_ld, args.beta,
+                                buffers.c_mat, args.c_offset, args.c_ld,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level3/xsyr2k.h b/test/routines/level3/xsyr2k.h
index abac20f4..57c3c203 100644
--- a/test/routines/level3/xsyr2k.h
+++ b/test/routines/level3/xsyr2k.h
@@ -103,9 +103,9 @@ class TestXsyr2k {
                                  convertToCLBLAS(args.triangle),
                                  convertToCLBLAS(args.a_transpose),
                                  args.n, args.k, args.alpha,
-                                 buffers.a_mat(), args.a_offset, args.a_ld,
-                                 buffers.b_mat(), args.b_offset, args.b_ld, args.beta,
-                                 buffers.c_mat(), args.c_offset, args.c_ld,
+                                 buffers.a_mat, args.a_offset, args.a_ld,
+                                 buffers.b_mat, args.b_offset, args.b_ld, args.beta,
+                                 buffers.c_mat, args.c_offset, args.c_ld,
                                  1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level3/xsyrk.h b/test/routines/level3/xsyrk.h
index 8a5fcb5f..6c3a3786 100644
--- a/test/routines/level3/xsyrk.h
+++ b/test/routines/level3/xsyrk.h
@@ -95,8 +95,8 @@ class TestXsyrk {
                                 convertToCLBLAS(args.triangle),
                                 convertToCLBLAS(args.a_transpose),
                                 args.n, args.k, args.alpha,
-                                buffers.a_mat(), args.a_offset, args.a_ld, args.beta,
-                                buffers.c_mat(), args.c_offset, args.c_ld,
+                                buffers.a_mat, args.a_offset, args.a_ld, args.beta,
+                                buffers.c_mat, args.c_offset, args.c_ld,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);
diff --git a/test/routines/level3/xtrmm.h b/test/routines/level3/xtrmm.h
index 7c9c21bc..3eb63030 100644
--- a/test/routines/level3/xtrmm.h
+++ b/test/routines/level3/xtrmm.h
@@ -97,8 +97,8 @@ class TestXtrmm {
                                 convertToCLBLAS(args.a_transpose),
                                 convertToCLBLAS(args.diagonal),
                                 args.m, args.n, args.alpha,
-                                buffers.a_mat(), args.a_offset, args.a_ld,
-                                buffers.b_mat(), args.b_offset, args.b_ld,
+                                buffers.a_mat, args.a_offset, args.a_ld,
+                                buffers.b_mat, args.b_offset, args.b_ld,
                                 1, &queue_plain, 0, nullptr, &event);
       clWaitForEvents(1, &event);
       return static_cast<StatusCode>(status);