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

Remove most remaining clCreate*WithProperties calls in tests that run on 1.2

Browse Source 
Don't touch interop suites or code only run with options not required
for conformance.

Signed-off-by: Kevin Petit <kevin.petit@arm.com>
This commit is contained in:
Kevin Petit
2020-02-20 12:04:07 +00:00
parent b40fb16571
commit e306ecd691
19 changed files with 34 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test_conformance/allocations/allocation_utils.cpp
View File

@@ -19,7 +19,7 @@ cl_command_queue reset_queue(cl_context context, cl_device_id device_id, cl_comm
{ {
log_info("Invalid command queue. Releasing and recreating the command queue.\n"); log_info("Invalid command queue. Releasing and recreating the command queue.\n");
clReleaseCommandQueue(*queue); clReleaseCommandQueue(*queue);
*queue = clCreateCommandQueueWithProperties(context, device_id, 0, error); *queue = clCreateCommandQueue(context, device_id, 0, error);
return *queue; return *queue;
} }

2
test_conformance/api/test_create_context_from_type.cpp
View File

@@ -68,7 +68,7 @@ int test_create_context_from_type(cl_device_id deviceID, cl_context context, cl_
return -1; return -1;
} }
queue_to_test = clCreateCommandQueueWithProperties(context_to_test, deviceID, NULL, &error); queue_to_test = clCreateCommandQueue(context_to_test, deviceID, NULL, &error);
test_error(error, "clCreateCommandQueue failed"); test_error(error, "clCreateCommandQueue failed");
if (queue_to_test == NULL) { if (queue_to_test == NULL) {
log_error("clCreateCommandQueue returned NULL, but error was CL_SUCCESS."); log_error("clCreateCommandQueue returned NULL, but error was CL_SUCCESS.");

2
test_conformance/api/test_create_kernels.c
View File

@@ -521,7 +521,7 @@ int test_repeated_setup_cleanup(cl_device_id deviceID, cl_context context, cl_co
local_context = clCreateContext(NULL, 1, &deviceID, notify_callback, NULL, &error); local_context = clCreateContext(NULL, 1, &deviceID, notify_callback, NULL, &error);
test_error( error, "clCreateContext failed"); test_error( error, "clCreateContext failed");
local_queue = clCreateCommandQueueWithProperties(local_context, deviceID, 0, &error); local_queue = clCreateCommandQueue(local_context, deviceID, 0, &error);
test_error( error, "clCreateCommandQueue failed"); test_error( error, "clCreateCommandQueue failed");
error = create_single_kernel_helper(local_context, &local_program, NULL, 1, &repeate_test_kernel, NULL); error = create_single_kernel_helper(local_context, &local_program, NULL, 1, &repeate_test_kernel, NULL);

4
test_conformance/api/test_retain.cpp
View File

@@ -38,7 +38,7 @@ int test_retain_queue_single(cl_device_id deviceID, cl_context context, cl_comma
/* Create a test queue */ /* Create a test queue */
queue = clCreateCommandQueueWithProperties( context, deviceID, 0, &err ); queue = clCreateCommandQueue( context, deviceID, 0, &err );
test_error( err, "Unable to create command queue to test with" ); test_error( err, "Unable to create command queue to test with" );
/* Test the instance count */ /* Test the instance count */
@@ -70,7 +70,7 @@ int test_retain_queue_multiple(cl_device_id deviceID, cl_context context, cl_com
/* Create a test program */ /* Create a test program */
queue = clCreateCommandQueueWithProperties( context, deviceID, 0, &err ); queue = clCreateCommandQueue( context, deviceID, 0, &err );
test_error( err, "Unable to create command queue to test with" ); test_error( err, "Unable to create command queue to test with" );
/* Increment 9 times, which should bring the count to 10 */ /* Increment 9 times, which should bring the count to 10 */

9
test_conformance/basic/test_readimage.c
View File

@@ -209,13 +209,8 @@ int test_readimage(cl_device_id device, cl_context context, cl_command_queue que
if (err) if (err)
return -1; return -1;
cl_sampler_properties properties[] = { cl_sampler sampler = clCreateSampler(context, CL_FALSE, CL_ADDRESS_CLAMP_TO_EDGE, CL_FILTER_NEAREST, &err);
CL_SAMPLER_NORMALIZED_COORDS, CL_FALSE, test_error(err, "clCreateSampler failed");
CL_SAMPLER_ADDRESSING_MODE, CL_ADDRESS_CLAMP_TO_EDGE,
CL_SAMPLER_FILTER_MODE, CL_FILTER_NEAREST,
0 };
cl_sampler sampler = clCreateSamplerWithProperties(context, properties, &err);
test_error(err, "clCreateSamplerWithProperties failed");
if(supportsBGRA) if(supportsBGRA)
{ {

2
test_conformance/buffers/test_buffer_migrate.c
View File

@@ -203,7 +203,7 @@ int test_buffer_migrate(cl_device_id deviceID, cl_context context, cl_command_qu
// Create a command queue for each sub-device // Create a command queue for each sub-device
for (i=0; i<num_devices; i++) { for (i=0; i<num_devices; i++) {
if (devices[i]) { if (devices[i]) {
if ((queues[i] = clCreateCommandQueueWithProperties(ctx, devices[i], 0, &err)) == NULL) { if ((queues[i] = clCreateCommandQueue(ctx, devices[i], 0, &err)) == NULL) {
print_error(err, "Failed creating command queues."); print_error(err, "Failed creating command queues.");
failed = 1; failed = 1;
goto cleanup; goto cleanup;

12
test_conformance/buffers/test_image_migrate.c
View File

@@ -112,14 +112,6 @@ static cl_int restoreImage(cl_command_queue *queues, cl_mem *mem_objects, cl_uin
return CL_SUCCESS; return CL_SUCCESS;
} }
// Declaration moved out of protected scope/goto
cl_sampler_properties properties[] = {
CL_SAMPLER_NORMALIZED_COORDS, CL_FALSE,
CL_SAMPLER_ADDRESSING_MODE, CL_ADDRESS_CLAMP,
CL_SAMPLER_FILTER_MODE, CL_FILTER_NEAREST,
0
};
int test_image_migrate(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements) int test_image_migrate(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
{ {
int failed = 0; int failed = 0;
@@ -244,7 +236,7 @@ int test_image_migrate(cl_device_id deviceID, cl_context context, cl_command_que
// Create a command queue for each sub-device // Create a command queue for each sub-device
for (i=0; i<num_devices; i++) { for (i=0; i<num_devices; i++) {
if (devices[i]) { if (devices[i]) {
if ((queues[i] = clCreateCommandQueueWithProperties(ctx, devices[i], 0, &err)) == NULL) { if ((queues[i] = clCreateCommandQueue(ctx, devices[i], 0, &err)) == NULL) {
print_error(err, "Failed creating command queues."); print_error(err, "Failed creating command queues.");
failed = 1; failed = 1;
goto cleanup; goto cleanup;
@@ -266,7 +258,7 @@ int test_image_migrate(cl_device_id deviceID, cl_context context, cl_command_que
} }
// Create sampler. // Create sampler.
sampler = clCreateSamplerWithProperties(ctx, properties, &err ); sampler = clCreateSampler(ctx, CL_FALSE, CL_ADDRESS_CLAMP, CL_FILTER_NEAREST, &err );
if ((err != CL_SUCCESS) || !sampler) { if ((err != CL_SUCCESS) || !sampler) {
print_error(err, "Failed to create a sampler."); print_error(err, "Failed to create a sampler.");
failed = 1; failed = 1;

4
test_conformance/buffers/test_sub_buffers.cpp
View File

@@ -429,10 +429,10 @@ int test_sub_buffers_read_write_dual_devices( cl_device_id deviceID, cl_context
test_error( error, "Unable to create shared context" ); test_error( error, "Unable to create shared context" );
// Create two queues (can't use the existing one, because it's on the wrong context) // Create two queues (can't use the existing one, because it's on the wrong context)
clCommandQueueWrapper queue1 = clCreateCommandQueueWithProperties( testingContext, deviceID, 0, &error ); clCommandQueueWrapper queue1 = clCreateCommandQueue( testingContext, deviceID, 0, &error );
test_error( error, "Unable to create command queue on main device" ); test_error( error, "Unable to create command queue on main device" );
clCommandQueueWrapper queue2 = clCreateCommandQueueWithProperties( testingContext, otherDevice, 0, &error ); clCommandQueueWrapper queue2 = clCreateCommandQueue( testingContext, otherDevice, 0, &error );
test_error( error, "Unable to create command queue on secondary device" ); test_error( error, "Unable to create command queue on secondary device" );
// Determine the reasonable buffer size and address alignment that applies to BOTH devices // Determine the reasonable buffer size and address alignment that applies to BOTH devices

16
test_conformance/events/test_event_dependencies.cpp
View File

@@ -116,30 +116,30 @@ int test_event_enqueue_wait_for_events_run_test( cl_device_id deviceID, cl_conte
} }
// If we are using two queues then create them // If we are using two queues then create them
cl_queue_properties props[] = {CL_QUEUE_PROPERTIES, CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE, 0}; cl_command_queue_properties props = CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE;
if (two_queues) { if (two_queues) {
// Get a second queue // Get a second queue
if (two_devices) if (two_devices)
{ {
if( !checkDeviceForQueueSupport( two_device_ids[ 0 ], props[1] ) || if( !checkDeviceForQueueSupport( two_device_ids[ 0 ], props ) ||
!checkDeviceForQueueSupport( two_device_ids[ 1 ], props[1] ) ) !checkDeviceForQueueSupport( two_device_ids[ 1 ], props ) )
{ {
log_info( "WARNING: One or more device for multi-device test does not support out-of-order exec mode; skipping test.\n" ); log_info( "WARNING: One or more device for multi-device test does not support out-of-order exec mode; skipping test.\n" );
return -1942; return -1942;
} }
queueWrappers[0] = clCreateCommandQueueWithProperties(context_to_use, two_device_ids[0], &props[0], &error); queueWrappers[0] = clCreateCommandQueue(context_to_use, two_device_ids[0], props, &error);
test_error(error, "clCreateCommandQueue for first queue on first device failed."); test_error(error, "clCreateCommandQueue for first queue on first device failed.");
queueWrappers[1] = clCreateCommandQueueWithProperties(context_to_use, two_device_ids[1], &props[0], &error); queueWrappers[1] = clCreateCommandQueue(context_to_use, two_device_ids[1], props, &error);
test_error(error, "clCreateCommandQueue for second queue on second device failed."); test_error(error, "clCreateCommandQueue for second queue on second device failed.");
} }
else else
{ {
// Single device has already been checked for out-of-order exec support // Single device has already been checked for out-of-order exec support
queueWrappers[0] = clCreateCommandQueueWithProperties(context_to_use, deviceID, &props[0], &error); queueWrappers[0] = clCreateCommandQueue(context_to_use, deviceID, props, &error);
test_error(error, "clCreateCommandQueue for first queue failed."); test_error(error, "clCreateCommandQueue for first queue failed.");
queueWrappers[1] = clCreateCommandQueueWithProperties(context_to_use, deviceID, &props[0], &error); queueWrappers[1] = clCreateCommandQueue(context_to_use, deviceID, props, &error);
test_error(error, "clCreateCommandQueue for second queue failed."); test_error(error, "clCreateCommandQueue for second queue failed.");
} }
// Ugly hack to make sure we only have the wrapper auto-release if they are different queues // Ugly hack to make sure we only have the wrapper auto-release if they are different queues
@@ -151,7 +151,7 @@ int test_event_enqueue_wait_for_events_run_test( cl_device_id deviceID, cl_conte
{ {
// (Note: single device has already been checked for out-of-order exec support) // (Note: single device has already been checked for out-of-order exec support)
// Otherwise create one queue and have the second one be the same // Otherwise create one queue and have the second one be the same
queueWrappers[0] = clCreateCommandQueueWithProperties(context_to_use, deviceID, &props[0], &error); queueWrappers[0] = clCreateCommandQueue(context_to_use, deviceID, props, &error);
test_error(error, "clCreateCommandQueue for first queue failed."); test_error(error, "clCreateCommandQueue for first queue failed.");
queues[0] = queueWrappers[0]; queues[0] = queueWrappers[0];
queues[1] = (cl_command_queue)queues[0]; queues[1] = (cl_command_queue)queues[0];

6
test_conformance/events/test_waitlists.cpp
View File

@@ -270,15 +270,15 @@ int test_waitlists( cl_device_id deviceID, cl_context context, cl_command_queue
{ {
cl_int error; cl_int error;
int retVal = 0; int retVal = 0;
cl_queue_properties props[] = {CL_QUEUE_PROPERTIES, CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE, 0}; cl_command_queue_properties props = CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE;
if( !checkDeviceForQueueSupport( deviceID, CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE ) ) if( !checkDeviceForQueueSupport( deviceID, props ) )
{ {
log_info( "WARNING: Device does not support out-of-order exec mode; skipping test.\n" ); log_info( "WARNING: Device does not support out-of-order exec mode; skipping test.\n" );
return 0; return 0;
} }
clCommandQueueWrapper queue = clCreateCommandQueueWithProperties( context, deviceID, &props[0], &error ); clCommandQueueWrapper queue = clCreateCommandQueue( context, deviceID, props, &error );
test_error(error, "Unable to create out-of-order queue"); test_error(error, "Unable to create out-of-order queue");
log_info( "\n" ); log_info( "\n" );

4
test_conformance/half/cl_utils.c
View File

@@ -141,10 +141,10 @@ test_status InitCL( cl_device_id device )
return TEST_FAIL; return TEST_FAIL;
} }
gQueue = clCreateCommandQueueWithProperties(gContext, device, 0, &error); gQueue = clCreateCommandQueue(gContext, device, 0, &error);
if( NULL == gQueue ) if( NULL == gQueue )
{ {
vlog_error( "clCreateContext failed. (%d)\n", error ); vlog_error( "clCreateCommandQueue failed. (%d)\n", error );
return TEST_FAIL; return TEST_FAIL;
} }

7
test_conformance/images/samplerlessReads/test_iterations.cpp
View File

@@ -117,12 +117,7 @@ int test_read_image_2D( cl_context context, cl_command_queue queue, cl_kernel ke
log_info( " - Creating kernel arguments...\n" ); log_info( " - Creating kernel arguments...\n" );
// Create sampler to use // Create sampler to use
cl_sampler_properties properties[] = { actualSampler = clCreateSampler( context, CL_FALSE, CL_ADDRESS_NONE, CL_FILTER_NEAREST, &error );
CL_SAMPLER_NORMALIZED_COORDS, CL_FALSE,
CL_SAMPLER_ADDRESSING_MODE, CL_ADDRESS_NONE,
CL_SAMPLER_FILTER_MODE, CL_FILTER_NEAREST,
0 };
actualSampler = clCreateSamplerWithProperties( context, properties, &error );
test_error( error, "Unable to create image sampler" ); test_error( error, "Unable to create image sampler" );
// Create results buffer // Create results buffer

7
test_conformance/images/samplerlessReads/test_read_1D.cpp
View File

@@ -119,12 +119,7 @@ int test_read_image_1D( cl_context context, cl_command_queue queue, cl_kernel ke
log_info( " - Creating kernel arguments...\n" ); log_info( " - Creating kernel arguments...\n" );
// Create sampler to use // Create sampler to use
cl_sampler_properties properties[] = { actualSampler = clCreateSampler( context, CL_FALSE, CL_ADDRESS_NONE, CL_FILTER_NEAREST, &error );
CL_SAMPLER_NORMALIZED_COORDS, CL_FALSE,
CL_SAMPLER_ADDRESSING_MODE, CL_ADDRESS_NONE,
CL_SAMPLER_FILTER_MODE, CL_FILTER_NEAREST,
0 };
actualSampler = clCreateSamplerWithProperties( context, properties, &error );
test_error( error, "Unable to create image sampler" ); test_error( error, "Unable to create image sampler" );
// Create results buffer // Create results buffer

7
test_conformance/images/samplerlessReads/test_read_1D_array.cpp
View File

@@ -114,12 +114,7 @@ int test_read_image_1D_array( cl_context context, cl_command_queue queue, cl_ker
log_info( " - Creating kernel arguments...\n" ); log_info( " - Creating kernel arguments...\n" );
// Create sampler to use // Create sampler to use
cl_sampler_properties properties[] = { actualSampler = clCreateSampler( context, CL_FALSE, CL_ADDRESS_NONE, CL_FILTER_NEAREST, &error );
CL_SAMPLER_NORMALIZED_COORDS, CL_FALSE,
CL_SAMPLER_ADDRESSING_MODE, CL_ADDRESS_NONE,
CL_SAMPLER_FILTER_MODE, CL_FILTER_NEAREST,
0 };
actualSampler = clCreateSamplerWithProperties( context, properties, &error );
test_error( error, "Unable to create image sampler" ); test_error( error, "Unable to create image sampler" );
// Create results buffer // Create results buffer

7
test_conformance/images/samplerlessReads/test_read_1D_buffer.cpp
View File

@@ -108,12 +108,7 @@ int test_read_image_1D_buffer( cl_context context, cl_command_queue queue, cl_ke
log_info( " - Creating kernel arguments...\n" ); log_info( " - Creating kernel arguments...\n" );
// Create sampler to use // Create sampler to use
cl_sampler_properties properties[] = { actualSampler = clCreateSampler( context, CL_FALSE, CL_ADDRESS_NONE, CL_FILTER_NEAREST, &error );
CL_SAMPLER_NORMALIZED_COORDS, CL_FALSE,
CL_SAMPLER_ADDRESSING_MODE, CL_ADDRESS_NONE,
CL_SAMPLER_FILTER_MODE, CL_FILTER_NEAREST,
0 };
actualSampler = clCreateSamplerWithProperties( context, properties, &error );
test_error( error, "Unable to create image sampler" ); test_error( error, "Unable to create image sampler" );
// Create results buffer // Create results buffer

7
test_conformance/images/samplerlessReads/test_read_2D_array.cpp
View File

@@ -98,12 +98,7 @@ int test_read_image_2D_array( cl_context context, cl_command_queue queue, cl_ker
} }
// Create sampler to use // Create sampler to use
cl_sampler_properties properties[] = { actualSampler = clCreateSampler( context, CL_FALSE, CL_ADDRESS_NONE, CL_FILTER_NEAREST, &error );
CL_SAMPLER_NORMALIZED_COORDS, CL_FALSE,
CL_SAMPLER_ADDRESSING_MODE, CL_ADDRESS_NONE,
CL_SAMPLER_FILTER_MODE, CL_FILTER_NEAREST,
0 };
actualSampler = clCreateSamplerWithProperties( context, properties, &error );
test_error( error, "Unable to create image sampler" ); test_error( error, "Unable to create image sampler" );
// Create results buffer // Create results buffer

7
test_conformance/images/samplerlessReads/test_read_3D.cpp
View File

@@ -97,12 +97,7 @@ int test_read_image_3D( cl_context context, cl_command_queue queue, cl_kernel ke
} }
// Create sampler to use // Create sampler to use
cl_sampler_properties properties[] = { actualSampler = clCreateSampler( context, CL_FALSE, CL_ADDRESS_NONE, CL_FILTER_NEAREST, &error );
CL_SAMPLER_NORMALIZED_COORDS, CL_FALSE,
CL_SAMPLER_ADDRESSING_MODE, CL_ADDRESS_NONE,
CL_SAMPLER_FILTER_MODE, CL_FILTER_NEAREST,
0 };
actualSampler = clCreateSamplerWithProperties( context, properties, &error );
test_error( error, "Unable to create image sampler" ); test_error( error, "Unable to create image sampler" );
// Create results buffer // Create results buffer

9
test_conformance/profiling/execute_multipass.c
View File

@@ -115,14 +115,9 @@ static int run_kernel( cl_device_id device, cl_context context, cl_command_queue
if( localThreads[1] > threads[1] ) if( localThreads[1] > threads[1] )
localThreads[1] = threads[1]; localThreads[1] = threads[1];
cl_sampler_properties properties[] = { cl_sampler sampler = clCreateSampler( context, CL_FALSE, CL_ADDRESS_CLAMP_TO_EDGE, CL_FILTER_NEAREST, &err );
CL_SAMPLER_NORMALIZED_COORDS, CL_FALSE,
CL_SAMPLER_ADDRESSING_MODE, CL_ADDRESS_CLAMP_TO_EDGE,
CL_SAMPLER_FILTER_MODE, CL_FILTER_NEAREST,
0 };
cl_sampler sampler = clCreateSamplerWithProperties( context, properties, &err );
if( err ){ if( err ){
log_error( " clCreateSamplerWithProperties failed.\n" ); log_error( " clCreateSampler failed.\n" );
return -1; return -1;
} }

2
test_conformance/spir/run_services.cpp
View File

@@ -115,7 +115,7 @@ void create_context_and_queue(cl_device_id device, cl_context *out_context, cl_c
throw Exceptions::TestError("clCreateContext failed\n", error); throw Exceptions::TestError("clCreateContext failed\n", error);
} }
*out_queue = clCreateCommandQueueWithProperties( *out_context, device, 0, &error ); *out_queue = clCreateCommandQueue( *out_context, device, 0, &error );
if( NULL == *out_queue || error ) if( NULL == *out_queue || error )
{ {
throw Exceptions::TestError("clCreateCommandQueue failed\n", error); throw Exceptions::TestError("clCreateCommandQueue failed\n", error);