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

Use clCreateCommandQueue when possible (in a few tests) (#474)

Browse Source 
In all these cases, the new entrypoint is not necessary. These
changes enable the tests to work or are a necessary step to get
the tests to work on an OpenCL 1.2 implementation.

While this may not be the final approach we want to solve this
specific compatibility issue, it also has the nice property of
reducing the diff with cl12_trunk until we merge.

Signed-off-by: Kévin Petit <kpet@free.fr>
This commit is contained in:
Kévin Petit
2019-11-11 17:16:22 +00:00
committed by GitHub
parent 32bbb19885
commit 937a2cb67d
12 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test_conformance/contractions/contractions.c
View File

@@ -570,7 +570,7 @@ 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 || error ) if( NULL == gQueue || error )
{ {
vlog_error( "clCreateContext failed. %d\n", error ); vlog_error( "clCreateContext failed. %d\n", error );

2
test_conformance/conversions/test_conversions.c
View File

@@ -719,7 +719,7 @@ 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 || error ) if( NULL == gQueue || error )
{ {
vlog_error( "clCreateCommandQueue failed. (%d)\n", error ); vlog_error( "clCreateCommandQueue failed. (%d)\n", error );

4
test_conformance/math_brute_force/binary.c
View File

@@ -332,7 +332,7 @@ int TestFunc_Float_Float_Float_common(const Func *f, MTdata d, int isNextafter)
goto exit; goto exit;
} }
} }
test_info.tinfo[i].tQueue = clCreateCommandQueueWithProperties(gContext, gDevice, 0, &error); test_info.tinfo[i].tQueue = clCreateCommandQueue(gContext, gDevice, 0, &error);
if( NULL == test_info.tinfo[i].tQueue || error ) if( NULL == test_info.tinfo[i].tQueue || error )
{ {
vlog_error( "clCreateCommandQueue failed. (%d)\n", error ); vlog_error( "clCreateCommandQueue failed. (%d)\n", error );
@@ -1065,7 +1065,7 @@ int TestFunc_Double_Double_Double_common(const Func *f, MTdata d, int isNextafte
goto exit; goto exit;
} }
} }
test_info.tinfo[i].tQueue = clCreateCommandQueueWithProperties(gContext, gDevice, 0, &error); test_info.tinfo[i].tQueue = clCreateCommandQueue(gContext, gDevice, 0, &error);
if( NULL == test_info.tinfo[i].tQueue || error ) if( NULL == test_info.tinfo[i].tQueue || error )
{ {
vlog_error( "clCreateCommandQueue failed. (%d)\n", error ); vlog_error( "clCreateCommandQueue failed. (%d)\n", error );

4
test_conformance/math_brute_force/binaryOperator.c
View File

@@ -321,7 +321,7 @@ int TestFunc_Float_Float_Float_Operator(const Func *f, MTdata d)
goto exit; goto exit;
} }
} }
test_info.tinfo[i].tQueue = clCreateCommandQueueWithProperties(gContext, gDevice, 0, &error); test_info.tinfo[i].tQueue = clCreateCommandQueue(gContext, gDevice, 0, &error);
if( NULL == test_info.tinfo[i].tQueue || error ) if( NULL == test_info.tinfo[i].tQueue || error )
{ {
vlog_error( "clCreateCommandQueue failed. (%d)\n", error ); vlog_error( "clCreateCommandQueue failed. (%d)\n", error );
@@ -1009,7 +1009,7 @@ int TestFunc_Double_Double_Double_Operator(const Func *f, MTdata d)
goto exit; goto exit;
} }
} }
test_info.tinfo[i].tQueue = clCreateCommandQueueWithProperties(gContext, gDevice, 0, &error); test_info.tinfo[i].tQueue = clCreateCommandQueue(gContext, gDevice, 0, &error);
if( NULL == test_info.tinfo[i].tQueue || error ) if( NULL == test_info.tinfo[i].tQueue || error )
{ {
vlog_error( "clCreateCommandQueue failed. (%d)\n", error ); vlog_error( "clCreateCommandQueue failed. (%d)\n", error );

4
test_conformance/math_brute_force/binary_i.c
View File

@@ -324,7 +324,7 @@ int TestFunc_Float_Float_Int(const Func *f, MTdata d)
goto exit; goto exit;
} }
} }
test_info.tinfo[i].tQueue = clCreateCommandQueueWithProperties(gContext, gDevice, 0, &error); test_info.tinfo[i].tQueue = clCreateCommandQueue(gContext, gDevice, 0, &error);
if( NULL == test_info.tinfo[i].tQueue || error ) if( NULL == test_info.tinfo[i].tQueue || error )
{ {
vlog_error( "clCreateCommandQueue failed. (%d)\n", error ); vlog_error( "clCreateCommandQueue failed. (%d)\n", error );
@@ -832,7 +832,7 @@ int TestFunc_Double_Double_Int(const Func *f, MTdata d)
goto exit; goto exit;
} }
} }
test_info.tinfo[i].tQueue = clCreateCommandQueueWithProperties(gContext, gDevice, 0, &error); test_info.tinfo[i].tQueue = clCreateCommandQueue(gContext, gDevice, 0, &error);
if( NULL == test_info.tinfo[i].tQueue || error ) if( NULL == test_info.tinfo[i].tQueue || error )
{ {
vlog_error( "clCreateCommandQueue failed. (%d)\n", error ); vlog_error( "clCreateCommandQueue failed. (%d)\n", error );

4
test_conformance/math_brute_force/macro_binary.c
View File

@@ -309,7 +309,7 @@ int TestMacro_Int_Float_Float(const Func *f, MTdata d)
goto exit; goto exit;
} }
} }
test_info.tinfo[i].tQueue = clCreateCommandQueueWithProperties(gContext, gDevice, 0, &error); test_info.tinfo[i].tQueue = clCreateCommandQueue(gContext, gDevice, 0, &error);
if( NULL == test_info.tinfo[i].tQueue || error ) if( NULL == test_info.tinfo[i].tQueue || error )
{ {
vlog_error( "clCreateCommandQueue failed. (%d)\n", error ); vlog_error( "clCreateCommandQueue failed. (%d)\n", error );
@@ -821,7 +821,7 @@ int TestMacro_Int_Double_Double(const Func *f, MTdata d)
goto exit; goto exit;
} }
} }
test_info.tinfo[i].tQueue = clCreateCommandQueueWithProperties(gContext, gDevice, 0, &error); test_info.tinfo[i].tQueue = clCreateCommandQueue(gContext, gDevice, 0, &error);
if( NULL == test_info.tinfo[i].tQueue || error ) if( NULL == test_info.tinfo[i].tQueue || error )
{ {
vlog_error( "clCreateCommandQueue failed. (%d)\n", error ); vlog_error( "clCreateCommandQueue failed. (%d)\n", error );

4
test_conformance/math_brute_force/macro_unary.c
View File

@@ -273,7 +273,7 @@ int TestMacro_Int_Float(const Func *f, MTdata d)
goto exit; goto exit;
} }
} }
test_info.tinfo[i].tQueue = clCreateCommandQueueWithProperties(gContext, gDevice, 0, &error); test_info.tinfo[i].tQueue = clCreateCommandQueue(gContext, gDevice, 0, &error);
if( NULL == test_info.tinfo[i].tQueue || error ) if( NULL == test_info.tinfo[i].tQueue || error )
{ {
vlog_error( "clCreateCommandQueue failed. (%d)\n", error ); vlog_error( "clCreateCommandQueue failed. (%d)\n", error );
@@ -673,7 +673,7 @@ int TestMacro_Int_Double(const Func *f, MTdata d)
goto exit; goto exit;
} }
} }
test_info.tinfo[i].tQueue = clCreateCommandQueueWithProperties(gContext, gDevice, 0, &error); test_info.tinfo[i].tQueue = clCreateCommandQueue(gContext, gDevice, 0, &error);
if( NULL == test_info.tinfo[i].tQueue || error ) if( NULL == test_info.tinfo[i].tQueue || error )
{ {
vlog_error( "clCreateCommandQueue failed. (%d)\n", error ); vlog_error( "clCreateCommandQueue failed. (%d)\n", error );

2
test_conformance/math_brute_force/main.c
View File

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

4
test_conformance/math_brute_force/unary.c
View File

@@ -288,7 +288,7 @@ int TestFunc_Float_Float(const Func *f, MTdata d)
goto exit; goto exit;
} }
} }
test_info.tinfo[i].tQueue = clCreateCommandQueueWithProperties(gContext, gDevice, 0, &error); test_info.tinfo[i].tQueue = clCreateCommandQueue(gContext, gDevice, 0, &error);
if( NULL == test_info.tinfo[i].tQueue || error ) if( NULL == test_info.tinfo[i].tQueue || error )
{ {
vlog_error( "clCreateCommandQueue failed. (%d)\n", error ); vlog_error( "clCreateCommandQueue failed. (%d)\n", error );
@@ -1065,7 +1065,7 @@ int TestFunc_Double_Double(const Func *f, MTdata d)
goto exit; goto exit;
} }
} }
test_info.tinfo[i].tQueue = clCreateCommandQueueWithProperties(gContext, gDevice, 0, &error); test_info.tinfo[i].tQueue = clCreateCommandQueue(gContext, gDevice, 0, &error);
if( NULL == test_info.tinfo[i].tQueue || error ) if( NULL == test_info.tinfo[i].tQueue || error )
{ {
vlog_error( "clCreateCommandQueue failed. (%d)\n", error ); vlog_error( "clCreateCommandQueue failed. (%d)\n", error );

2
test_conformance/multiple_device_context/test_multiple_contexts.c
View File

@@ -118,7 +118,7 @@ TestItem *CreateTestItem( cl_device_id deviceID, cl_int *err )
} }
// Create a queue // Create a queue
item->q = clCreateCommandQueueWithProperties( item->c, deviceID, 0, &error); item->q = clCreateCommandQueue( item->c, deviceID, 0, &error);
if( item->q == NULL || error != CL_SUCCESS) if( item->q == NULL || error != CL_SUCCESS)
{ {
if (err) { if (err) {

2
test_conformance/multiple_device_context/test_multiple_devices.cpp
View File

@@ -119,7 +119,7 @@ int test_device_set(size_t deviceCount, size_t queueCount, cl_device_id *devices
/* Create work queues */ /* Create work queues */
for( i = 0; i < queueCount; i++ ) for( i = 0; i < queueCount; i++ )
{ {
queues[i] = clCreateCommandQueueWithProperties( context, devices[ i % deviceCount ], 0, &error ); queues[i] = clCreateCommandQueue( context, devices[ i % deviceCount ], 0, &error );
if (error != CL_SUCCESS || queues[i] == NULL) { if (error != CL_SUCCESS || queues[i] == NULL) {
log_info("Could not create queue[%d].\n", (int)i); log_info("Could not create queue[%d].\n", (int)i);
queueCount = i; queueCount = i;

2
test_conformance/printf/test_printf.c
View File

@@ -1093,7 +1093,7 @@ test_status InitCL( cl_device_id device )
gContext = clCreateContext(props, 1, &device, notify_callback, NULL, NULL); gContext = clCreateContext(props, 1, &device, notify_callback, NULL, NULL);
checkNull(gContext, "clCreateContext"); checkNull(gContext, "clCreateContext");
gQueue = clCreateCommandQueueWithProperties(gContext, device, 0, NULL); gQueue = clCreateCommandQueue(gContext, device, 0, NULL);
checkNull(gQueue, "clCreateCommandQueue"); checkNull(gQueue, "clCreateCommandQueue");
releaseOutputStream(gFd); releaseOutputStream(gFd);