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

Remove code under USE_LOCAL_THREADS (#850)

Browse Source 
Code uses outdated API calls

Fixes #715

Change-Id: I575c8ec4003fd30a3cec28ad114d5749f2e83d0f
Signed-off-by: Ellen Norris-Thompson <ellen.norris-thompson@arm.com>
This commit is contained in:
ellnor01
2020-07-20 17:01:34 +01:00
committed by GitHub
parent 36c281b2a0
commit a34bae7abc
6 changed files with 6 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test_conformance/profiling/copy.cpp
View File

@@ -436,9 +436,6 @@ static int copy_image_size( cl_device_id device, cl_context context,
void *dst = NULL; void *dst = NULL;
cl_kernel kernel[1]; cl_kernel kernel[1];
size_t threads[2]; size_t threads[2];
#ifdef USE_LOCAL_THREADS
size_t localThreads[2];
#endif
int err = 0; int err = 0;
cl_mem_flags flags; cl_mem_flags flags;
unsigned int num_channels = 4; unsigned int num_channels = 4;
@@ -456,16 +453,6 @@ static int copy_image_size( cl_device_id device, cl_context context,
threads[0] = (size_t)w; threads[0] = (size_t)w;
threads[1] = (size_t)h; threads[1] = (size_t)h;
#ifdef USE_LOCAL_THREADS
err = clGetDeviceConfigInfo( id, CL_DEVICE_MAX_THREAD_GROUP_SIZE, localThreads, sizeof( cl_uint ), NULL );
test_error( err, "Unable to get thread group max size" );
localThreads[1] = localThreads[0];
if( localThreads[0] > threads[0] )
localThreads[0] = threads[0];
if( localThreads[1] > threads[1] )
localThreads[1] = threads[1];
#endif
inptr = (void *)generate_image( (int)num_bytes, d ); inptr = (void *)generate_image( (int)num_bytes, d );
if( ! inptr ){ if( ! inptr ){
log_error("unable to allocate inptr at %d x %d\n", (int)w, (int)h ); log_error("unable to allocate inptr at %d x %d\n", (int)w, (int)h );
@@ -539,11 +526,8 @@ static int copy_image_size( cl_device_id device, cl_context context,
return -1; return -1;
} }
#ifdef USE_LOCAL_THREADS
err = clEnqueueNDRangeKernel( queue, kernel[0], 2, NULL, threads, localThreads, 0, NULL, NULL );
#else
err = clEnqueueNDRangeKernel( queue, kernel[0], 2, NULL, threads, NULL, 0, NULL, NULL ); err = clEnqueueNDRangeKernel( queue, kernel[0], 2, NULL, threads, NULL, 0, NULL, NULL );
#endif
if (err != CL_SUCCESS){ if (err != CL_SUCCESS){
print_error( err, "clEnqueueNDRangeKernel failed" ); print_error( err, "clEnqueueNDRangeKernel failed" );
clReleaseKernel( kernel[0] ); clReleaseKernel( kernel[0] );

17
test_conformance/profiling/execute.cpp
View File

@@ -175,9 +175,6 @@ static int kernelFilter( cl_device_id device, cl_context context, cl_command_que
cl_event executeEvent; cl_event executeEvent;
cl_ulong queueStart, submitStart, writeStart, writeEnd; cl_ulong queueStart, submitStart, writeStart, writeEnd;
size_t threads[2]; size_t threads[2];
#ifdef USE_LOCAL_THREADS
size_t localThreads[2];
#endif
float filter_weights[] = { .1f, .1f, .1f, .1f, .2f, .1f, .1f, .1f, .1f }; float filter_weights[] = { .1f, .1f, .1f, .1f, .2f, .1f, .1f, .1f, .1f };
int filter_w = 3, filter_h = 3; int filter_w = 3, filter_h = 3;
int err = 0; int err = 0;
@@ -186,16 +183,6 @@ static int kernelFilter( cl_device_id device, cl_context context, cl_command_que
threads[0] = w; threads[0] = w;
threads[1] = h; threads[1] = h;
#ifdef USE_LOCAL_THREADS
err = clGetDeviceConfigInfo( id, CL_DEVICE_MAX_THREAD_GROUP_SIZE, localThreads, sizeof( cl_uint ), NULL );
test_error( err, "Unable to get thread group max size" );
localThreads[1] = localThreads[0];
if( localThreads[0] > threads[0] )
localThreads[0] = threads[0];
if( localThreads[1] > threads[1] )
localThreads[1] = threads[1];
#endif
// allocate the input and output image memory objects // allocate the input and output image memory objects
memobjs[0] = create_image_2d( context, (cl_mem_flags)(CL_MEM_READ_ONLY | CL_MEM_COPY_HOST_PTR), memobjs[0] = create_image_2d( context, (cl_mem_flags)(CL_MEM_READ_ONLY | CL_MEM_COPY_HOST_PTR),
&image_format_desc, w, h, 0, inptr, &err ); &image_format_desc, w, h, 0, inptr, &err );
@@ -249,11 +236,7 @@ static int kernelFilter( cl_device_id device, cl_context context, cl_command_que
return -1; return -1;
} }
#ifdef USE_LOCAL_THREADS
err = clEnqueueNDRangeKernel( queue, kernel[0], 2, NULL, threads, localThreads, 0, NULL, &executeEvent );
#else
err = clEnqueueNDRangeKernel( queue, kernel[0], 2, NULL, threads, NULL, 0, NULL, &executeEvent ); err = clEnqueueNDRangeKernel( queue, kernel[0], 2, NULL, threads, NULL, 0, NULL, &executeEvent );
#endif
if( err != CL_SUCCESS ){ if( err != CL_SUCCESS ){
print_error( err, "clEnqueueNDRangeKernel failed\n" ); print_error( err, "clEnqueueNDRangeKernel failed\n" );

18
test_conformance/profiling/readArray.cpp
View File

@@ -622,25 +622,12 @@ int test_stream_read( cl_device_id device, cl_context context, cl_command_queue
cl_event readEvent; cl_event readEvent;
cl_ulong queueStart, submitStart, readStart, readEnd; cl_ulong queueStart, submitStart, readStart, readEnd;
size_t threads[1]; size_t threads[1];
#ifdef USE_LOCAL_THREADS
size_t localThreads[1];
#endif
int err, err_count = 0; int err, err_count = 0;
int i; int i;
size_t ptrSizes[5]; size_t ptrSizes[5];
threads[0] = (size_t)num_elements; threads[0] = (size_t)num_elements;
#ifdef USE_LOCAL_THREADS
err = clGetDeviceConfigInfo( id, CL_DEVICE_MAX_THREAD_GROUP_SIZE, localThreads, sizeof( cl_uint ), NULL );
if( err != CL_SUCCESS ){
log_error( "Unable to get thread group max size: %d", err );
return -1;
}
if( localThreads[0] > threads[0] )
localThreads[0] = threads[0];
#endif
ptrSizes[0] = size; ptrSizes[0] = size;
ptrSizes[1] = ptrSizes[0] << 1; ptrSizes[1] = ptrSizes[0] << 1;
ptrSizes[2] = ptrSizes[1] << 1; ptrSizes[2] = ptrSizes[1] << 1;
@@ -676,11 +663,8 @@ int test_stream_read( cl_device_id device, cl_context context, cl_command_queue
return -1; return -1;
} }
#ifdef USE_LOCAL_THREADS
err = clEnqueueNDRangeKernel( queue, kernel[i], 1, NULL, threads, localThreads, 0, NULL, NULL );
#else
err = clEnqueueNDRangeKernel( queue, kernel[i], 1, NULL, threads, NULL, 0, NULL, NULL ); err = clEnqueueNDRangeKernel( queue, kernel[i], 1, NULL, threads, NULL, 0, NULL, NULL );
#endif
if( err != CL_SUCCESS ){ if( err != CL_SUCCESS ){
print_error( err, "clEnqueueNDRangeKernel failed" ); print_error( err, "clEnqueueNDRangeKernel failed" );
clReleaseKernel( kernel[i] ); clReleaseKernel( kernel[i] );

18
test_conformance/profiling/readImage.cpp
View File

@@ -130,9 +130,6 @@ int read_image( cl_device_id device, cl_context context, cl_command_queue queue,
cl_event readEvent; cl_event readEvent;
cl_ulong queueStart, submitStart, readStart, readEnd; cl_ulong queueStart, submitStart, readStart, readEnd;
size_t threads[2]; size_t threads[2];
#ifdef USE_LOCAL_THREADS
size_t localThreads[2];
#endif
int err; int err;
int w = 64, h = 64; int w = 64, h = 64;
cl_mem_flags flags; cl_mem_flags flags;
@@ -150,16 +147,6 @@ int read_image( cl_device_id device, cl_context context, cl_command_queue queue,
threads[0] = (size_t)w; threads[0] = (size_t)w;
threads[1] = (size_t)h; threads[1] = (size_t)h;
#ifdef USE_LOCAL_THREADS
err = clGetDeviceConfigInfo( id, CL_DEVICE_MAX_THREAD_GROUP_SIZE, localThreads, sizeof( unsigned int ), NULL );
test_error( err, "Unable to get thread group max size" );
localThreads[1] = localThreads[0];
if( localThreads[0] > threads[0] )
localThreads[0] = threads[0];
if( localThreads[1] > threads[1] )
localThreads[1] = threads[1];
#endif
d = init_genrand( gRandomSeed ); d = init_genrand( gRandomSeed );
if( image_format_desc.image_channel_data_type == CL_SIGNED_INT8 ) if( image_format_desc.image_channel_data_type == CL_SIGNED_INT8 )
inptr = (void *)generateSignedImage( w * h * 4, d ); inptr = (void *)generateSignedImage( w * h * 4, d );
@@ -231,11 +218,8 @@ int read_image( cl_device_id device, cl_context context, cl_command_queue queue,
return -1; return -1;
} }
#ifdef USE_LOCAL_THREADS
err = clEnqueueNDRangeKernel(queue, kernel[0], 2, NULL, threads, localThreads, 0, NULL, NULL );
#else
err = clEnqueueNDRangeKernel(queue, kernel[0], 2, NULL, threads, NULL, 0, NULL, NULL ); err = clEnqueueNDRangeKernel(queue, kernel[0], 2, NULL, threads, NULL, 0, NULL, NULL );
#endif
if( err != CL_SUCCESS ){ if( err != CL_SUCCESS ){
print_error( err, "clEnqueueNDRangeKernel failed" ); print_error( err, "clEnqueueNDRangeKernel failed" );
clReleaseKernel( kernel[0] ); clReleaseKernel( kernel[0] );

22
test_conformance/profiling/writeArray.cpp
View File

@@ -25,8 +25,6 @@
#include "harness/errorHelpers.h" #include "harness/errorHelpers.h"
#include "harness/conversions.h" #include "harness/conversions.h"
//#define USE_LOCAL_THREADS 1
#ifndef uchar #ifndef uchar
typedef unsigned char uchar; typedef unsigned char uchar;
#endif #endif
@@ -621,24 +619,11 @@ int test_stream_write( cl_device_id device, cl_context context, cl_command_queue
cl_ulong queueStart, submitStart, writeStart, writeEnd; cl_ulong queueStart, submitStart, writeStart, writeEnd;
size_t ptrSizes[5], outPtrSizes[5]; size_t ptrSizes[5], outPtrSizes[5];
size_t threads[1]; size_t threads[1];
#ifdef USE_LOCAL_THREADS
size_t localThreads[1];
#endif
int err, err_count = 0; int err, err_count = 0;
int i, ii; int i, ii;
threads[0] = (size_t)num_elements; threads[0] = (size_t)num_elements;
#ifdef USE_LOCAL_THREADS
err = clGetDeviceConfigInfo( id, CL_DEVICE_MAX_THREAD_GROUP_SIZE, localThreads, sizeof( cl_uint ), NULL );
if( err != CL_SUCCESS ){
print_error( err, " Unable to get thread group max size" );
return -1;
}
if( localThreads[0] > threads[0] )
localThreads[0] = threads[0];
#endif
ptrSizes[0] = size; ptrSizes[0] = size;
ptrSizes[1] = ptrSizes[0] << 1; ptrSizes[1] = ptrSizes[0] << 1;
ptrSizes[2] = ptrSizes[1] << 1; ptrSizes[2] = ptrSizes[1] << 1;
@@ -764,11 +749,8 @@ int test_stream_write( cl_device_id device, cl_context context, cl_command_queue
return -1; return -1;
} }
#ifdef USE_LOCAL_THREADS
err = clEnqueueNDRangeKernel( queue, kernel[i], 1, NULL, threads, localThreads, 0, NULL, NULL );
#else
err = clEnqueueNDRangeKernel( queue, kernel[i], 1, NULL, threads, NULL, 0, NULL, NULL ); err = clEnqueueNDRangeKernel( queue, kernel[i], 1, NULL, threads, NULL, 0, NULL, NULL );
#endif
if( err != CL_SUCCESS ){ if( err != CL_SUCCESS ){
print_error( err, " clEnqueueNDRangeKernel failed" ); print_error( err, " clEnqueueNDRangeKernel failed" );
clReleaseEvent(writeEvent); clReleaseEvent(writeEvent);
@@ -813,7 +795,7 @@ int test_stream_write( cl_device_id device, cl_context context, cl_command_queue
} }
if( !err2 ) if( !err2 )
{ {
log_info( " %s%d data verified\n", type, 1<<i ); log_info(" %s%d data verified\n", type, 1 << i);
} }
err = err2; err = err2;

18
test_conformance/profiling/writeImage.cpp
View File

@@ -413,9 +413,6 @@ int write_image( cl_device_id device, cl_context context, cl_command_queue queue
cl_event writeEvent; cl_event writeEvent;
cl_ulong queueStart, submitStart, writeStart, writeEnd; cl_ulong queueStart, submitStart, writeStart, writeEnd;
size_t threads[2]; size_t threads[2];
#ifdef USE_LOCAL_THREADS
size_t localThreads[2];
#endif
int err; int err;
int w = 64, h = 64; int w = 64, h = 64;
cl_mem_flags flags; cl_mem_flags flags;
@@ -436,16 +433,6 @@ int write_image( cl_device_id device, cl_context context, cl_command_queue queue
threads[0] = (size_t)w; threads[0] = (size_t)w;
threads[1] = (size_t)h; threads[1] = (size_t)h;
#ifdef USE_LOCAL_THREADS
err = clGetDeviceConfigInfo( id, CL_DEVICE_MAX_THREAD_GROUP_SIZE, localThreads, sizeof( unsigned int ), NULL );
test_error( err, "Unable to get thread group max size" );
localThreads[1] = localThreads[0];
if( localThreads[0] > threads[0] )
localThreads[0] = threads[0];
if( localThreads[1] > threads[1] )
localThreads[1] = threads[1];
#endif
d = init_genrand( gRandomSeed ); d = init_genrand( gRandomSeed );
if( image_format_desc.image_channel_data_type == CL_SIGNED_INT8 ) if( image_format_desc.image_channel_data_type == CL_SIGNED_INT8 )
inptr = (void *)generateSignedImage( w * h * 4, d ); inptr = (void *)generateSignedImage( w * h * 4, d );
@@ -581,11 +568,8 @@ int write_image( cl_device_id device, cl_context context, cl_command_queue queue
return -1; return -1;
} }
#ifdef USE_LOCAL_THREADS
err = clEnqueueNDRangeKernel(queue, kernel[0], 2, NULL, threads, localThreads, 0, NULL, NULL );
#else
err = clEnqueueNDRangeKernel(queue, kernel[0], 2, NULL, threads, NULL, 0, NULL, NULL ); err = clEnqueueNDRangeKernel(queue, kernel[0], 2, NULL, threads, NULL, 0, NULL, NULL );
#endif
if( err != CL_SUCCESS ){ if( err != CL_SUCCESS ){
print_error( err, "clEnqueueNDRangeKernel failed" ); print_error( err, "clEnqueueNDRangeKernel failed" );
clReleaseEvent(writeEvent); clReleaseEvent(writeEvent);