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

device_execution: fix CL_QUEUE_* in error messages (#1896)

Browse Source 
When reporting errors from `clCreateCommandQueueWithProperties`,
report the correct property names.  In particular:

`CL_QUEUE_DEVICE` should be `CL_QUEUE_ON_DEVICE`.
`CL_QUEUE_DEFAULT` should be `CL_QUEUE_ON_DEVICE_DEFAULT`.

Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
This commit is contained in:
Sven van Haastregt
2024-03-12 17:36:02 +01:00
committed by GitHub
parent ffb0265abd
commit d8ad10d1ea
10 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test_conformance/device_execution/device_queue.cpp
View File

@@ -84,7 +84,7 @@ static int check_device_queues(cl_device_id device, cl_context context, cl_uint
for(i = 0; i < num_queues; ++i) for(i = 0; i < num_queues; ++i)
{ {
queue[i] = clCreateCommandQueueWithProperties(context, device, properties, &err_ret); queue[i] = clCreateCommandQueueWithProperties(context, device, properties, &err_ret);
test_error(err_ret, "clCreateCommandQueueWithProperties(CL_QUEUE_DEVICE) failed"); test_error(err_ret, "clCreateCommandQueueWithProperties failed");
} }
// Validate all queues // Validate all queues
@@ -128,7 +128,9 @@ int test_device_queue(cl_device_id device, cl_context context, cl_command_queue
if(max_queues > MAX_QUEUES) max_queues = MAX_QUEUES; if(max_queues > MAX_QUEUES) max_queues = MAX_QUEUES;
dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret); dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret);
test_error(err_ret, "clCreateCommandQueueWithProperties(CL_QUEUE_DEVICE|CL_QUEUE_DEFAULT) failed"); test_error(err_ret,
"clCreateCommandQueueWithProperties(CL_QUEUE_ON_DEVICE | "
"CL_QUEUE_ON_DEVICE_DEFAULT) failed");
err_ret = check_device_queue(device, context, dev_queue, preffered_size); err_ret = check_device_queue(device, context, dev_queue, preffered_size);
if(check_error(err_ret, "Default device queue validation failed")) res = -1; if(check_error(err_ret, "Default device queue validation failed")) res = -1;

4
test_conformance/device_execution/enqueue_block.cpp
View File

@@ -623,7 +623,9 @@ int test_enqueue_block(cl_device_id device, cl_context context, cl_command_queue
}; };
dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret); dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret);
test_error(err_ret, "clCreateCommandQueueWithProperties(CL_QUEUE_DEVICE|CL_QUEUE_DEFAULT) failed"); test_error(err_ret,
"clCreateCommandQueueWithProperties(CL_QUEUE_ON_DEVICE | "
"CL_QUEUE_ON_DEVICE_DEFAULT) failed");
size_t global_size = MAX_GWS; size_t global_size = MAX_GWS;
size_t local_size = (max_local_size > global_size/16) ? global_size/16 : max_local_size; size_t local_size = (max_local_size > global_size/16) ? global_size/16 : max_local_size;

4
test_conformance/device_execution/enqueue_flags.cpp
View File

@@ -696,7 +696,9 @@ int test_enqueue_flags(cl_device_id device, cl_context context, cl_command_queue
}; };
dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret); dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret);
test_error(err_ret, "clCreateCommandQueueWithProperties(CL_QUEUE_DEVICE|CL_QUEUE_DEFAULT) failed"); test_error(err_ret,
"clCreateCommandQueueWithProperties(CL_QUEUE_ON_DEVICE | "
"CL_QUEUE_ON_DEVICE_DEFAULT) failed");
size_t global_size = MAX_GWS; size_t global_size = MAX_GWS;
size_t local_size = (max_local_size > global_size/16) ? global_size/16 : max_local_size; size_t local_size = (max_local_size > global_size/16) ? global_size/16 : max_local_size;

8
test_conformance/device_execution/enqueue_multi_queue.cpp
View File

@@ -123,7 +123,9 @@ int test_enqueue_multi_queue(cl_device_id device, cl_context context, cl_command
}; };
dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret); dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret);
test_error(err_ret, "clCreateCommandQueueWithProperties(CL_QUEUE_DEVICE|CL_QUEUE_DEFAULT) failed"); test_error(err_ret,
"clCreateCommandQueueWithProperties(CL_QUEUE_ON_DEVICE | "
"CL_QUEUE_ON_DEVICE_DEFAULT) failed");
if(max_queues > 1) if(max_queues > 1)
{ {
@@ -141,7 +143,9 @@ int test_enqueue_multi_queue(cl_device_id device, cl_context context, cl_command
for(i = 0; i < n; ++i) for(i = 0; i < n; ++i)
{ {
queues[i] = clCreateCommandQueueWithProperties(context, device, queue_prop, &err_ret); queues[i] = clCreateCommandQueueWithProperties(context, device, queue_prop, &err_ret);
test_error(err_ret, "clCreateCommandQueueWithProperties(CL_QUEUE_DEVICE) failed"); test_error(err_ret,
"clCreateCommandQueueWithProperties(CL_QUEUE_ON_DEVICE) "
"failed");
q[i] = queues[i]; q[i] = queues[i];
} }

4
test_conformance/device_execution/enqueue_ndrange.cpp
View File

@@ -641,7 +641,9 @@ int test_enqueue_ndrange(cl_device_id device, cl_context context, cl_command_que
}; };
dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret); dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret);
test_error(err_ret, "clCreateCommandQueueWithProperties(CL_QUEUE_DEVICE|CL_QUEUE_DEFAULT) failed"); test_error(err_ret,
"clCreateCommandQueueWithProperties(CL_QUEUE_ON_DEVICE | "
"CL_QUEUE_ON_DEVICE_DEFAULT) failed");
max_local_size = (max_local_size > MAX_GWS)? MAX_GWS: max_local_size; max_local_size = (max_local_size > MAX_GWS)? MAX_GWS: max_local_size;
if(gWimpyMode) if(gWimpyMode)

10
test_conformance/device_execution/enqueue_profiling.cpp
View File

@@ -66,8 +66,8 @@ int test_enqueue_profiling(cl_device_id device, cl_context context,
dev_queue = clCreateCommandQueueWithProperties( dev_queue = clCreateCommandQueueWithProperties(
context, device, dev_queue_prop_def, &err_ret); context, device, dev_queue_prop_def, &err_ret);
test_error(err_ret, test_error(err_ret,
"clCreateCommandQueueWithProperties(CL_QUEUE_DEVICE|CL_QUEUE_" "clCreateCommandQueueWithProperties(CL_QUEUE_ON_DEVICE | "
"DEFAULT) failed"); "CL_QUEUE_ON_DEVICE_DEFAULT) failed");
cl_queue_properties host_queue_prop_def[] = { CL_QUEUE_PROPERTIES, cl_queue_properties host_queue_prop_def[] = { CL_QUEUE_PROPERTIES,
CL_QUEUE_PROFILING_ENABLE, CL_QUEUE_PROFILING_ENABLE,
@@ -75,9 +75,9 @@ int test_enqueue_profiling(cl_device_id device, cl_context context,
host_queue = clCreateCommandQueueWithProperties( host_queue = clCreateCommandQueueWithProperties(
context, device, host_queue_prop_def, &err_ret); context, device, host_queue_prop_def, &err_ret);
test_error(err_ret, test_error(
"clCreateCommandQueueWithProperties(CL_QUEUE_DEVICE|CL_QUEUE_" err_ret,
"DEFAULT) failed"); "clCreateCommandQueueWithProperties(CL_QUEUE_PROFILING_ENABLE) failed");
cl_int status; cl_int status;
size_t size = 1; size_t size = 1;

4
test_conformance/device_execution/enqueue_wg_size.cpp
View File

@@ -1659,7 +1659,9 @@ int test_enqueue_wg_size(cl_device_id device, cl_context context, cl_command_que
}; };
dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret); dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret);
test_error(err_ret, "clCreateCommandQueueWithProperties(CL_QUEUE_DEVICE|CL_QUEUE_DEFAULT) failed"); test_error(err_ret,
"clCreateCommandQueueWithProperties(CL_QUEUE_ON_DEVICE | "
"CL_QUEUE_ON_DEVICE_DEFAULT) failed");
size_t failCnt = 0; size_t failCnt = 0;

4
test_conformance/device_execution/host_multi_queue.cpp
View File

@@ -157,7 +157,9 @@ int test_host_multi_queue(cl_device_id device, cl_context context, cl_command_qu
}; };
dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret); dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret);
test_error(err_ret, "clCreateCommandQueueWithProperties(CL_QUEUE_DEVICE|CL_QUEUE_DEFAULT) failed"); test_error(err_ret,
"clCreateCommandQueueWithProperties(CL_QUEUE_ON_DEVICE | "
"CL_QUEUE_ON_DEVICE_DEFAULT) failed");
cl_uint n = num_kernels_multi_queue_block; // Number of host queues cl_uint n = num_kernels_multi_queue_block; // Number of host queues
std::vector<clCommandQueueWrapper> queues(n); std::vector<clCommandQueueWrapper> queues(n);

4
test_conformance/device_execution/host_queue_order.cpp
View File

@@ -117,7 +117,9 @@ int test_host_queue_order(cl_device_id device, cl_context context, cl_command_qu
}; };
dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret); dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret);
test_error(err_ret, "clCreateCommandQueueWithProperties(CL_QUEUE_DEVICE|CL_QUEUE_DEFAULT) failed"); test_error(err_ret,
"clCreateCommandQueueWithProperties(CL_QUEUE_ON_DEVICE | "
"CL_QUEUE_ON_DEVICE_DEFAULT) failed");
cl_int status; cl_int status;
size_t size = 1; size_t size = 1;

4
test_conformance/device_execution/nested_blocks.cpp
View File

@@ -335,7 +335,9 @@ int test_enqueue_nested_blocks(cl_device_id device, cl_context context, cl_comma
}; };
dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret); dev_queue = clCreateCommandQueueWithProperties(context, device, queue_prop_def, &err_ret);
test_error(err_ret, "clCreateCommandQueueWithProperties(CL_QUEUE_DEVICE|CL_QUEUE_DEFAULT) failed"); test_error(err_ret,
"clCreateCommandQueueWithProperties(CL_QUEUE_ON_DEVICE | "
"CL_QUEUE_ON_DEVICE_DEFAULT) failed");
kernel_arg args[] = kernel_arg args[] =
{ {