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 unnecessary cl_mem_flags casts (#1018)

Browse Source 
* api, atomics: remove unnecessary cl_mem_flags casts

Instances in api, atomics, buffers and c11_atomics suites

Contributes #759

Signed-off-by: Ellen Norris-Thompson <ellen.norris-thompson@arm.com>

* basic: remove unnecessary cl_mem_flags casts

Contributes #759

Signed-off-by: Ellen Norris-Thompson <ellen.norris-thompson@arm.com>

* spir, thread_dimensions: remove unnecessary cl_mem_flags casts

Instances in spir, thread_dimensions and workgroups tests

Contributes #759

Signed-off-by: Ellen Norris-Thompson <ellen.norris-thompson@arm.com>

* profiling, relationals: remove unnecessary cl_mem_flags casts

Includes relationals, profiling, muliple_device_context, integer_ops
tests

Contributes #759

Signed-off-by: Ellen Norris-Thompson <ellen.norris-thompson@arm.com>

* clcpp: remove unnecessary cl_mem_flags casts

Contibutes #759

Signed-off-by: Ellen Norris-Thompson <ellen.norris-thompson@arm.com>

* events, geometrics: remove unnecessary cl_mem_flags casts

Includes events, geometrics, gl and images tests

Contributes #759

Signed-off-by: Ellen Norris-Thompson <ellen.norris-thompson@arm.com>

* commonfs, compiler: remove unnecessary cl_mem_flags casts

Includes cast removal in commonfs, compiler and device_partition tests

Fixes #759

Signed-off-by: Ellen Norris-Thompson <ellen.norris-thompson@arm.com>

* Fix up formatting

Signed-off-by: Ellen Norris-Thompson <ellen.norris-thompson@arm.com>
This commit is contained in:
ellnor01
2020-10-19 13:56:02 +01:00
committed by GitHub
parent 8ca1537157
commit a6809710ea
140 changed files with 1077 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
test_conformance/profiling/copy.cpp
View File

@@ -107,12 +107,14 @@ static int copy_size( cl_device_id device, cl_context context, cl_command_queue
int_input_ptr = (cl_int*)malloc(sizeof(cl_int) * num_elements);
int_output_ptr = (cl_int*)malloc(sizeof(cl_int) * num_elements);
streams[0] = clCreateBuffer( context, (cl_mem_flags)(CL_MEM_READ_WRITE), sizeof(cl_int) * num_elements, NULL, &err );
streams[0] = clCreateBuffer(context, CL_MEM_READ_WRITE,
sizeof(cl_int) * num_elements, NULL, &err);
if( !streams[0] ){
log_error("clCreateBuffer failed\n");
return -1;
}
streams[1] = clCreateBuffer( context, (cl_mem_flags)(CL_MEM_READ_WRITE), sizeof(cl_int) * num_elements, NULL, &err );
streams[1] = clCreateBuffer(context, CL_MEM_READ_WRITE,
sizeof(cl_int) * num_elements, NULL, &err);
if( !streams[1] ){
log_error("clCreateBuffer failed\n");
return -1;
@@ -250,13 +252,15 @@ static int copy_partial_size( cl_device_id device, cl_context context, cl_comman
inptr = (cl_int *)malloc(sizeof(cl_int) * num_elements);
outptr = (cl_int *)malloc(sizeof(cl_int) * num_elements);
streams[0] = clCreateBuffer( context, (cl_mem_flags)(CL_MEM_READ_WRITE), sizeof(cl_int) * num_elements, NULL, &err );
streams[0] = clCreateBuffer(context, CL_MEM_READ_WRITE,
sizeof(cl_int) * num_elements, NULL, &err);
if (!streams[0])
{
log_error("clCreateBuffer failed\n");
return -1;
}
streams[1] = clCreateBuffer( context, (cl_mem_flags)(CL_MEM_READ_WRITE), sizeof(cl_int) * num_elements, NULL, &err );
streams[1] = clCreateBuffer(context, CL_MEM_READ_WRITE,
sizeof(cl_int) * num_elements, NULL, &err);
if (!streams[1])
{
log_error("clCreateBuffer failed\n");
@@ -467,7 +471,7 @@ static int copy_image_size( cl_device_id device, cl_context context,
}
// allocate the input image
flags = (cl_mem_flags)(CL_MEM_READ_WRITE);
flags = CL_MEM_READ_WRITE;
memobjs[0] = create_image_2d(context, flags, &image_format_desc, w, h, 0, NULL, &err);
if( memobjs[0] == (cl_mem)0 ) {
free( dst );
@@ -476,7 +480,8 @@ static int copy_image_size( cl_device_id device, cl_context context,
return -1;
}
memobjs[1] = clCreateBuffer( context, (cl_mem_flags)(CL_MEM_READ_WRITE), num_bytes, NULL, &err );
memobjs[1] =
clCreateBuffer(context, CL_MEM_READ_WRITE, num_bytes, NULL, &err);
if( memobjs[1] == (cl_mem)0 ) {
clReleaseMemObject(memobjs[0]);
free( dst );
@@ -784,7 +789,7 @@ int test_copy_array_to_image( cl_device_id device, cl_context context, cl_comman
}
// allocate the input image
flags = (cl_mem_flags)(CL_MEM_READ_WRITE);
flags = CL_MEM_READ_WRITE;
memobjs[0] = create_image_2d( context, flags, &image_format_desc, w, h, 0, NULL, &err );
if( memobjs[0] == (cl_mem)0 ){
free( dst );
@@ -793,7 +798,9 @@ int test_copy_array_to_image( cl_device_id device, cl_context context, cl_comman
return -1;
}
memobjs[1] = clCreateBuffer( context, (cl_mem_flags)(CL_MEM_READ_WRITE), channel_nbytes * num_channels*w*h, NULL, &err );
memobjs[1] =
clCreateBuffer(context, CL_MEM_READ_WRITE,
channel_nbytes * num_channels * w * h, NULL, &err);
if( memobjs[1] == (cl_mem)0 ) {
clReleaseMemObject( memobjs[0] );
free( dst );

10
test_conformance/profiling/execute.cpp
View File

@@ -184,8 +184,9 @@ static int kernelFilter( cl_device_id device, cl_context context, cl_command_que
threads[1] = h;
// 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),
&image_format_desc, w, h, 0, inptr, &err );
memobjs[0] =
create_image_2d(context, CL_MEM_READ_ONLY | CL_MEM_COPY_HOST_PTR,
&image_format_desc, w, h, 0, inptr, &err);
if( memobjs[0] == (cl_mem)0 ){
log_error( " unable to create 2D image using create_image_2d\n" );
return -1;
@@ -199,8 +200,9 @@ static int kernelFilter( cl_device_id device, cl_context context, cl_command_que
}
// allocate an array memory object to load the filter weights
memobjs[2] = clCreateBuffer( context, (cl_mem_flags)( CL_MEM_READ_ONLY | CL_MEM_COPY_HOST_PTR ),
sizeof( cl_float ) * filter_w * filter_h, &filter_weights, &err );
memobjs[2] = clCreateBuffer(
context, CL_MEM_READ_ONLY | CL_MEM_COPY_HOST_PTR,
sizeof(cl_float) * filter_w * filter_h, &filter_weights, &err);
if( memobjs[2] == (cl_mem)0 ){
log_error( " unable to create array using clCreateBuffer\n" );
clReleaseMemObject( memobjs[1] );

8
test_conformance/profiling/execute_multipass.cpp
View File

@@ -122,14 +122,18 @@ static int run_kernel( cl_device_id device, cl_context context, cl_command_queue
}
// allocate the input and output image memory objects
memobjs[0] = create_image_3d( context, (cl_mem_flags)(CL_MEM_READ_ONLY | CL_MEM_COPY_HOST_PTR), &image_format_desc, w, h, d, 0, 0, inptr, &err );
memobjs[0] =
create_image_3d(context, CL_MEM_READ_ONLY | CL_MEM_COPY_HOST_PTR,
&image_format_desc, w, h, d, 0, 0, inptr, &err);
if( memobjs[0] == (cl_mem)0 ){
log_error( " unable to create 2D image using create_image_2d\n" );
return -1;
}
// allocate an array memory object to load the filter weights
memobjs[1] = clCreateBuffer( context, (cl_mem_flags)( CL_MEM_READ_WRITE ), sizeof( cl_float ) * w*h*d*nChannels, NULL, &err );
memobjs[1] =
clCreateBuffer(context, CL_MEM_READ_WRITE,
sizeof(cl_float) * w * h * d * nChannels, NULL, &err);
if( memobjs[1] == (cl_mem)0 ){
log_error( " unable to create array using clCreateBuffer\n" );
clReleaseMemObject( memobjs[0] );

3
test_conformance/profiling/readArray.cpp
View File

@@ -639,7 +639,8 @@ int test_stream_read( cl_device_id device, cl_context context, cl_command_queue
log_error( " unable to allocate %d bytes for outptr\n", (int)( ptrSizes[i] * num_elements ) );
return -1;
}
streams[i] = clCreateBuffer( context, (cl_mem_flags)(CL_MEM_READ_WRITE), ptrSizes[i] * num_elements, NULL, &err );
streams[i] = clCreateBuffer(context, CL_MEM_READ_WRITE,
ptrSizes[i] * num_elements, NULL, &err);
if( !streams[i] ){
log_error( " clCreateBuffer failed\n" );
free( outptr[i] );

5
test_conformance/profiling/readImage.cpp
View File

@@ -167,7 +167,7 @@ int read_image( cl_device_id device, cl_context context, cl_command_queue queue,
}
// allocate the input and output image memory objects
flags = (cl_mem_flags)(CL_MEM_READ_WRITE);
flags = CL_MEM_READ_WRITE;
memobjs[0] = create_image_2d( context, flags, &image_format_desc, w, h, 0, NULL, &err );
if( memobjs[0] == (cl_mem)0 ){
free( dst );
@@ -176,7 +176,8 @@ int read_image( cl_device_id device, cl_context context, cl_command_queue queue,
return -1;
}
memobjs[1] = clCreateBuffer( context, (cl_mem_flags)(CL_MEM_READ_WRITE), channel_nbytes * 4 * w * h, NULL, &err );
memobjs[1] = clCreateBuffer(context, CL_MEM_READ_WRITE,
channel_nbytes * 4 * w * h, NULL, &err);
if( memobjs[1] == (cl_mem)0 ){
free( dst );
free( (void *)inptr );

11
test_conformance/profiling/writeArray.cpp
View File

@@ -639,7 +639,8 @@ int test_stream_write( cl_device_id device, cl_context context, cl_command_queue
for( i = 0; i < loops; i++ ){
ii = i << 1;
streams[ii] = clCreateBuffer( context, (cl_mem_flags)(CL_MEM_READ_WRITE), ptrSizes[i] * num_elements, NULL, &err );
streams[ii] = clCreateBuffer(context, CL_MEM_READ_WRITE,
ptrSizes[i] * num_elements, NULL, &err);
if( ! streams[ii] ){
free( outptr[i] );
log_error( " clCreateBuffer failed\n" );
@@ -647,11 +648,15 @@ int test_stream_write( cl_device_id device, cl_context context, cl_command_queue
}
if( ! strcmp( type, "half" ) ){
outptr[i] = malloc( outPtrSizes[i] * num_elements * 2 );
streams[ii+1] = clCreateBuffer( context, (cl_mem_flags)(CL_MEM_READ_WRITE), outPtrSizes[i] * 2 * num_elements, NULL, &err );
streams[ii + 1] =
clCreateBuffer(context, CL_MEM_READ_WRITE,
outPtrSizes[i] * 2 * num_elements, NULL, &err);
}
else{
outptr[i] = malloc( outPtrSizes[i] * num_elements );
streams[ii+1] = clCreateBuffer( context, (cl_mem_flags)(CL_MEM_READ_WRITE), outPtrSizes[i] * num_elements, NULL, &err );
streams[ii + 1] =
clCreateBuffer(context, CL_MEM_READ_WRITE,
outPtrSizes[i] * num_elements, NULL, &err);
}
if( ! streams[ii+1] ){
clReleaseMemObject(streams[ii]);

5
test_conformance/profiling/writeImage.cpp
View File

@@ -452,7 +452,7 @@ int write_image( cl_device_id device, cl_context context, cl_command_queue queue
}
// allocate the input and output image memory objects
flags = (cl_mem_flags)(CL_MEM_READ_WRITE);
flags = CL_MEM_READ_WRITE;
memobjs[0] = create_image_2d( context, flags, &image_format_desc, w, h, 0, NULL, &err );
if( memobjs[0] == (cl_mem)0 ){
free( dst );
@@ -461,7 +461,8 @@ int write_image( cl_device_id device, cl_context context, cl_command_queue queue
return -1;
}
memobjs[1] = clCreateBuffer( context, (cl_mem_flags)(CL_MEM_READ_WRITE), channel_nbytes * 4 * w * h, NULL, &err );
memobjs[1] = clCreateBuffer(context, CL_MEM_READ_WRITE,
channel_nbytes * 4 * w * h, NULL, &err);
if( memobjs[1] == (cl_mem)0 ){
free( dst );
free( (void *)inptr );