ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-20 22:39:03 +00:00
Code Packages Projects Releases Wiki Activity

switch SVM tests to the new test registration framework (#2168)

Browse Source 
Switches the SVM tests to the new test registration framework.

The first commit is the best to review and contains the actual changes.
The second commit purely has formatting changes.

Note that several of these changes were a bit more than mechanical
because many of the SVM tests create a new context vs. using the context
provided by the harness and passed to each test function. The previous
code named the context provided by the harness differently, and hence
could use the name "context" in each test function, but with the new
test registration framework this is no longer possible. Instead, I am
creating the new context using the name "contextWrapper" and then
assigning it to the "context" passed to the test function, which seems
like the best way to avoid using the wrong context unintentionally. I am
open to suggestions to do this differently.

I have verified that the same calls are made before and after these
changes, and specifically that there are no context leaks.
This commit is contained in:
Ben Ashbaugh
2024-12-03 14:51:23 -08:00
committed by GitHub
parent e361b387d9
commit d99b302f90
16 changed files with 1066 additions and 854 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
test_conformance/SVM/test_pointer_passing.cpp
View File

@@ -35,81 +35,107 @@ const char *SVMPointerPassing_test_kernel[] = {
// The buffer is initialized to known values at each location.
// The kernel checks that it finds the expected value at each location.
// TODO: possibly make this work across all base types (including typeN?), also check ptr arithmetic ++,--.
int test_svm_pointer_passing(cl_device_id deviceID, cl_context context2, cl_command_queue queue, int num_elements)
REGISTER_TEST(svm_pointer_passing)
{
clContextWrapper context = NULL;
clProgramWrapper program = NULL;
cl_uint num_devices = 0;
cl_int error = CL_SUCCESS;
clCommandQueueWrapper queues[MAXQ];
clContextWrapper contextWrapper = NULL;
clProgramWrapper program = NULL;
cl_uint num_devices = 0;
cl_int error = CL_SUCCESS;
clCommandQueueWrapper queues[MAXQ];
error = create_cl_objects(deviceID, &SVMPointerPassing_test_kernel[0], &context, &program, &queues[0], &num_devices, CL_DEVICE_SVM_COARSE_GRAIN_BUFFER);
if(error) return -1;
error = create_cl_objects(deviceID, &SVMPointerPassing_test_kernel[0],
&contextWrapper, &program, &queues[0],
&num_devices, CL_DEVICE_SVM_COARSE_GRAIN_BUFFER);
context = contextWrapper;
if (error) return -1;
clKernelWrapper kernel_verify_char = clCreateKernel(program, "verify_char", &error);
test_error(error,"clCreateKernel failed");
clKernelWrapper kernel_verify_char =
clCreateKernel(program, "verify_char", &error);
test_error(error, "clCreateKernel failed");
size_t bufSize = 256;
cl_uchar *pbuf_svm_alloc = (cl_uchar*) clSVMAlloc(context, CL_MEM_READ_WRITE, sizeof(cl_uchar)*bufSize, 0);
size_t bufSize = 256;
cl_uchar *pbuf_svm_alloc = (cl_uchar *)clSVMAlloc(
context, CL_MEM_READ_WRITE, sizeof(cl_uchar) * bufSize, 0);
cl_int *pNumCorrect = NULL;
pNumCorrect = (cl_int*) clSVMAlloc(context, CL_MEM_READ_WRITE, sizeof(cl_int), 0);
cl_int *pNumCorrect = NULL;
pNumCorrect =
(cl_int *)clSVMAlloc(context, CL_MEM_READ_WRITE, sizeof(cl_int), 0);
{
clMemWrapper buf = clCreateBuffer(context, CL_MEM_USE_HOST_PTR, sizeof(cl_uchar)*bufSize, pbuf_svm_alloc, &error);
test_error(error, "clCreateBuffer failed.");
clMemWrapper num_correct = clCreateBuffer(context, CL_MEM_USE_HOST_PTR, sizeof(cl_int), pNumCorrect, &error);
test_error(error, "clCreateBuffer failed.");
error = clSetKernelArg(kernel_verify_char, 1, sizeof(void*), (void *) &num_correct);
test_error(error, "clSetKernelArg failed");
// put values into buf so that we can expect to see these values in the kernel when we pass a pointer to them.
cl_command_queue cmdq = queues[0];
cl_uchar* pbuf_map_buffer = (cl_uchar*) clEnqueueMapBuffer(cmdq, buf, CL_TRUE, CL_MAP_READ | CL_MAP_WRITE, 0, sizeof(cl_uchar)*bufSize, 0, NULL,NULL, &error);
test_error2(error, pbuf_map_buffer, "clEnqueueMapBuffer failed");
for(int i = 0; i<(int)bufSize; i++)
{
pbuf_map_buffer[i]= (cl_uchar)i;
}
error = clEnqueueUnmapMemObject(cmdq, buf, pbuf_map_buffer, 0,NULL,NULL);
test_error(error, "clEnqueueUnmapMemObject failed.");
clMemWrapper buf =
clCreateBuffer(context, CL_MEM_USE_HOST_PTR,
sizeof(cl_uchar) * bufSize, pbuf_svm_alloc, &error);
test_error(error, "clCreateBuffer failed.");
for (cl_uint ii = 0; ii<num_devices; ++ii) // iterate over all devices in the platform.
{
cmdq = queues[ii];
for(int i = 0; i<(int)bufSize; i++)
{
cl_uchar* pChar = &pbuf_svm_alloc[i];
error = clSetKernelArgSVMPointer(kernel_verify_char, 0, pChar); // pass a pointer to a location within the buffer
test_error(error, "clSetKernelArg failed");
error = clSetKernelArg(kernel_verify_char, 2, sizeof(cl_uchar), (void *) &i ); // pass the expected value at the above location.
test_error(error, "clSetKernelArg failed");
error = clEnqueueNDRangeKernel(cmdq, kernel_verify_char, 1, NULL, &bufSize, NULL, 0, NULL, NULL);
test_error(error,"clEnqueueNDRangeKernel failed");
clMemWrapper num_correct = clCreateBuffer(
context, CL_MEM_USE_HOST_PTR, sizeof(cl_int), pNumCorrect, &error);
test_error(error, "clCreateBuffer failed.");
pNumCorrect = (cl_int*) clEnqueueMapBuffer(cmdq, num_correct, CL_TRUE, CL_MAP_READ | CL_MAP_WRITE, 0, sizeof(cl_int), 0, NULL,NULL, &error);
test_error2(error, pNumCorrect, "clEnqueueMapBuffer failed");
cl_int correct_count = *pNumCorrect;
error = clEnqueueUnmapMemObject(cmdq, num_correct, pNumCorrect, 0,NULL,NULL);
error = clSetKernelArg(kernel_verify_char, 1, sizeof(void *),
(void *)&num_correct);
test_error(error, "clSetKernelArg failed");
// put values into buf so that we can expect to see these values in the
// kernel when we pass a pointer to them.
cl_command_queue cmdq = queues[0];
cl_uchar *pbuf_map_buffer = (cl_uchar *)clEnqueueMapBuffer(
cmdq, buf, CL_TRUE, CL_MAP_READ | CL_MAP_WRITE, 0,
sizeof(cl_uchar) * bufSize, 0, NULL, NULL, &error);
test_error2(error, pbuf_map_buffer, "clEnqueueMapBuffer failed");
for (int i = 0; i < (int)bufSize; i++)
{
pbuf_map_buffer[i] = (cl_uchar)i;
}
error =
clEnqueueUnmapMemObject(cmdq, buf, pbuf_map_buffer, 0, NULL, NULL);
test_error(error, "clEnqueueUnmapMemObject failed.");
if(correct_count != 1)
for (cl_uint ii = 0; ii < num_devices;
++ii) // iterate over all devices in the platform.
{
log_error("Passing pointer directly to kernel for byte #%d failed on device %d\n", i, ii);
return -1;
cmdq = queues[ii];
for (int i = 0; i < (int)bufSize; i++)
{
cl_uchar *pChar = &pbuf_svm_alloc[i];
error = clSetKernelArgSVMPointer(
kernel_verify_char, 0,
pChar); // pass a pointer to a location within the buffer
test_error(error, "clSetKernelArg failed");
error = clSetKernelArg(kernel_verify_char, 2, sizeof(cl_uchar),
(void *)&i); // pass the expected value
// at the above location.
test_error(error, "clSetKernelArg failed");
error =
clEnqueueNDRangeKernel(cmdq, kernel_verify_char, 1, NULL,
&bufSize, NULL, 0, NULL, NULL);
test_error(error, "clEnqueueNDRangeKernel failed");
pNumCorrect = (cl_int *)clEnqueueMapBuffer(
cmdq, num_correct, CL_TRUE, CL_MAP_READ | CL_MAP_WRITE, 0,
sizeof(cl_int), 0, NULL, NULL, &error);
test_error2(error, pNumCorrect, "clEnqueueMapBuffer failed");
cl_int correct_count = *pNumCorrect;
error = clEnqueueUnmapMemObject(cmdq, num_correct, pNumCorrect,
0, NULL, NULL);
test_error(error, "clEnqueueUnmapMemObject failed.");
if (correct_count != 1)
{
log_error("Passing pointer directly to kernel for byte #%d "
"failed on device %d\n",
i, ii);
return -1;
}
}
}
}
error = clFinish(cmdq);
test_error(error, "clFinish failed");
}
error = clFinish(cmdq);
test_error(error, "clFinish failed");
}
clSVMFree(context, pbuf_svm_alloc);
clSVMFree(context, pNumCorrect);
clSVMFree(context, pbuf_svm_alloc);
clSVMFree(context, pNumCorrect);
return 0;
return 0;
}