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

harness: select queue creation function based on OpenCL version (#490)

Browse Source 
Use clCreateCommandQueue before OpenCL 2.0.

This enables most of the binaries to run to completion on a
1.2 implementation.

Signed-off-by: Kévin Petit <kpet@free.fr>
This commit is contained in:
Kévin Petit
2019-11-19 18:59:04 +00:00
committed by GitHub
parent 2398587980
commit 4a8cae4ae2
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
test_common/harness/testHarness.c
View File

@@ -695,28 +695,7 @@ test_status callSingleTestFunction( test_definition test, cl_device_id deviceToU
cl_int error; cl_int error;
cl_context context = NULL; cl_context context = NULL;
cl_command_queue queue = NULL; cl_command_queue queue = NULL;
const cl_command_queue_properties cmd_queueProps = (queueProps)?CL_QUEUE_PROPERTIES:0;
cl_command_queue_properties queueCreateProps[] = {cmd_queueProps, queueProps, 0};
/* Create a context to work with, unless we're told not to */
if( !forceNoContextCreation )
{
context = clCreateContext(NULL, 1, &deviceToUse, notify_callback, NULL, &error );
if (!context)
{
print_error( error, "Unable to create testing context" );
return TEST_FAIL;
}
queue = clCreateCommandQueueWithProperties( context, deviceToUse, &queueCreateProps[0], &error );
if( queue == NULL )
{
print_error( error, "Unable to create testing command queue" );
return TEST_FAIL;
}
}
/* Run the test and print the result */
log_info( "%s...\n", test.name ); log_info( "%s...\n", test.name );
fflush( stdout ); fflush( stdout );
@@ -728,6 +707,32 @@ test_status callSingleTestFunction( test_definition test, cl_device_id deviceToU
return TEST_SKIP; return TEST_SKIP;
} }
/* Create a context to work with, unless we're told not to */
if( !forceNoContextCreation )
{
context = clCreateContext(NULL, 1, &deviceToUse, notify_callback, NULL, &error );
if (!context)
{
print_error( error, "Unable to create testing context" );
return TEST_FAIL;
}
if (device_version < Version(2, 0)) {
queue = clCreateCommandQueue(context, deviceToUse, queueProps, &error);
} else {
const cl_command_queue_properties cmd_queueProps = (queueProps)?CL_QUEUE_PROPERTIES:0;
cl_command_queue_properties queueCreateProps[] = {cmd_queueProps, queueProps, 0};
queue = clCreateCommandQueueWithProperties( context, deviceToUse, &queueCreateProps[0], &error );
}
if( queue == NULL )
{
print_error( error, "Unable to create testing command queue" );
return TEST_FAIL;
}
}
/* Run the test and print the result */
error = check_functions_for_offline_compiler(test.name, deviceToUse); error = check_functions_for_offline_compiler(test.name, deviceToUse);
test_missing_support_offline_cmpiler(error, test.name); test_missing_support_offline_cmpiler(error, test.name);