From cdf354f89524ed88d4f9358004e5a8eabd9ce286 Mon Sep 17 00:00:00 2001 From: Cedric Nugteren Date: Sun, 5 Mar 2017 15:04:16 +0100 Subject: Adjusted the test-infrastructure to support testing of batched-versions of routines --- test/routines/level1/xasum.hpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'test/routines/level1/xasum.hpp') diff --git a/test/routines/level1/xasum.hpp b/test/routines/level1/xasum.hpp index 64377189..fb2c9f1a 100644 --- a/test/routines/level1/xasum.hpp +++ b/test/routines/level1/xasum.hpp @@ -74,12 +74,12 @@ class TestXasum { std::vector&, std::vector&) {} // N/A for this routine // Describes how to run the CLBlast routine - static StatusCode RunRoutine(const Arguments &args, Buffers &buffers, Queue &queue) { + static StatusCode RunRoutine(const Arguments &args, std::vector> &buffers, Queue &queue) { auto queue_plain = queue(); auto event = cl_event{}; auto status = Asum(args.n, - buffers.scalar(), args.asum_offset, - buffers.x_vec(), args.x_offset, args.x_inc, + buffers[0].scalar(), args.asum_offset, + buffers[0].x_vec(), args.x_offset, args.x_inc, &queue_plain, &event); if (status == StatusCode::kSuccess) { clWaitForEvents(1, &event); clReleaseEvent(event); } return status; @@ -87,12 +87,12 @@ class TestXasum { // Describes how to run the clBLAS routine (for correctness/performance comparison) #ifdef CLBLAST_REF_CLBLAS - static StatusCode RunReference1(const Arguments &args, Buffers &buffers, Queue &queue) { + static StatusCode RunReference1(const Arguments &args, std::vector> &buffers, Queue &queue) { auto queue_plain = queue(); auto event = cl_event{}; auto status = clblasXasum(args.n, - buffers.scalar, args.asum_offset, - buffers.x_vec, args.x_offset, args.x_inc, + buffers[0].scalar, args.asum_offset, + buffers[0].x_vec, args.x_offset, args.x_inc, 1, &queue_plain, 0, nullptr, &event); clWaitForEvents(1, &event); return static_cast(status); @@ -101,15 +101,15 @@ class TestXasum { // Describes how to run the CPU BLAS routine (for correctness/performance comparison) #ifdef CLBLAST_REF_CBLAS - static StatusCode RunReference2(const Arguments &args, Buffers &buffers, Queue &queue) { + static StatusCode RunReference2(const Arguments &args, std::vector> &buffers, Queue &queue) { std::vector scalar_cpu(args.scalar_size, static_cast(0)); std::vector x_vec_cpu(args.x_size, static_cast(0)); - buffers.scalar.Read(queue, args.scalar_size, scalar_cpu); - buffers.x_vec.Read(queue, args.x_size, x_vec_cpu); + buffers[0].scalar.Read(queue, args.scalar_size, scalar_cpu); + buffers[0].x_vec.Read(queue, args.x_size, x_vec_cpu); cblasXasum(args.n, scalar_cpu, args.asum_offset, x_vec_cpu, args.x_offset, args.x_inc); - buffers.scalar.Write(queue, args.scalar_size, scalar_cpu); + buffers[0].scalar.Write(queue, args.scalar_size, scalar_cpu); return StatusCode::kSuccess; } #endif -- cgit v1.2.3