[Piglit] [PATCH] cl: Add cl-custom-flush-after-enqueue-kernel

[Tom Stellard]

From: Tom Stellard <thomas.stellard at amd.com>

This test checks that clEnqueueReadBuffer() does not begin copying
before a kernel referencing its buffer has finished executing.
---
 tests/all_cl.tests                           |  1 +
 tests/cl/custom/CMakeLists.cl.txt            |  1 +
 tests/cl/custom/flush-after-enqueue-kernel.c | 92 ++++++++++++++++++++++++++++
 3 files changed, 94 insertions(+)
 create mode 100644 tests/cl/custom/flush-after-enqueue-kernel.c

diff --git a/tests/all_cl.tests b/tests/all_cl.tests
index d0c279d..3a9766e 100644
--- a/tests/all_cl.tests
+++ b/tests/all_cl.tests
@@ -38,6 +38,7 @@ profile.tests['Program'] = program
 
 # Custom
 add_plain_test(custom, 'Run simple kernel', ['cl-custom-run-simple-kernel'])
+add_plain_test(custom, 'Flush after enqueue kernel', ['cl-custom-flush-after-enqueue-kernel'])
 
 # API
 #  Platform
diff --git a/tests/cl/custom/CMakeLists.cl.txt b/tests/cl/custom/CMakeLists.cl.txt
index 4f93e2a..96deea3 100644
--- a/tests/cl/custom/CMakeLists.cl.txt
+++ b/tests/cl/custom/CMakeLists.cl.txt
@@ -1 +1,2 @@
 piglit_cl_add_custom_test (run-simple-kernel run-simple-kernel.c)
+piglit_cl_add_custom_test (flush-after-enqueue-kernel flush-after-enqueue-kernel.c)
diff --git a/tests/cl/custom/flush-after-enqueue-kernel.c b/tests/cl/custom/flush-after-enqueue-kernel.c
new file mode 100644
index 0000000..e13aac2
--- /dev/null
+++ b/tests/cl/custom/flush-after-enqueue-kernel.c
@@ -0,0 +1,92 @@
+#include "piglit-framework-cl-custom.h"
+
+PIGLIT_CL_CUSTOM_TEST_CONFIG_BEGIN
+
+	config.name = "clFlush() after clEnqueueNDRangeKernel()";
+	config.run_per_device = true;
+
+PIGLIT_CL_CUSTOM_TEST_CONFIG_END
+
+#define BUFFER_ELTS 1024
+
+/* The goal of this kernel is to run long enough, so that it will still be
+ * running when we call clEnqueueReadBuffer().  It will be submitted with a
+ * large number of work items.
+ */
+char *source =
+"kernel void test (global int *out, global int *in) {\n"
+"	unsigned i;\n"
+"	for (i = 0; i < BUFFER_ELTS; i++) {\n"
+"		out[i] = in[i];\n"
+"	}\n"
+"}";
+
+
+enum piglit_result
+piglit_cl_test(const int argc,
+	       const char **argv,
+	       const struct piglit_cl_custom_test_config *config,
+	       const struct piglit_cl_custom_test_env *env)
+{
+	size_t global_size[3] = {16, 16, 16};
+	size_t local_size[3]  = {1, 1, 1};
+
+	int  in_data[BUFFER_ELTS];
+	int out_data[BUFFER_ELTS];
+
+	piglit_cl_context context = NULL;
+	cl_mem in_buffer = NULL, out_buffer = NULL;
+	cl_program program = NULL;
+	cl_kernel kernel = NULL;
+	char  compile_opts[100];
+
+	unsigned i;
+
+	context = piglit_cl_create_context(env->platform_id, &env->device_id, 1);
+
+	memset(in_data, 1, sizeof(in_data));
+	in_buffer = piglit_cl_create_buffer(context, CL_MEM_READ_ONLY, sizeof(in_data));
+	piglit_cl_write_whole_buffer(context->command_queues[0], in_buffer, in_data);
+
+	memset(out_data, 0, sizeof(out_data));
+	out_buffer = piglit_cl_create_buffer(context, CL_MEM_WRITE_ONLY, sizeof(out_data));
+	piglit_cl_write_whole_buffer(context->command_queues[0], out_buffer, out_data);
+
+	sprintf(compile_opts, "-DBUFFER_ELTS=%d", BUFFER_ELTS);
+
+	program = piglit_cl_build_program_with_source(context, 1, &source,
+								compile_opts);
+	kernel = piglit_cl_create_kernel(program, "test");
+
+	if (!piglit_cl_set_kernel_arg(kernel, 0, sizeof(cl_mem), &out_buffer)) {
+		return PIGLIT_FAIL;
+	}
+	if (!piglit_cl_set_kernel_arg(kernel, 1, sizeof(cl_mem), &in_buffer)) {
+		return PIGLIT_FAIL;
+	}
+
+	if (!piglit_cl_enqueue_ND_range_kernel(context->command_queues[0],
+					kernel, 3, global_size, local_size)) {
+		return PIGLIT_FAIL;
+	}
+
+	/* This test will check that the clEnqueueReadBuffer() call waits for
+	 * the kernel to finish before copying data.  The test was inspired by
+	 * a bug in clover where clEnqueueReadBuffer() was being executed
+	 * immediately if the command queue had been previously flushed.
+	 */
+	clFlush(context->command_queues[0]);
+
+	if (!piglit_cl_read_whole_buffer(context->command_queues[0], out_buffer,
+					out_data)) {
+		return PIGLIT_FAIL;
+	}
+
+	for (i = 0; i < BUFFER_ELTS; ++i) {
+		if (!piglit_cl_probe_integer(out_data[i], in_data[i], 0)) {
+			fprintf(stderr, "Error at out[%u]\n", i);
+			return PIGLIT_FAIL;
+		}
+	}
+	return PIGLIT_PASS;
+}
-- 
1.7.11.4