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

Fix buffer tests memory leaks (#1165)

Browse Source 
* Fix buffer tests memory leaks

This change fixes buffer tests, broken by PR #1082. This pull request is similar to #1160

* Fix formatting
This commit is contained in:
Sebastian Łużyński
2021-02-18 11:07:10 +01:00
committed by GitHub
parent fc67d7b28f
commit 8b5d3c2055
2 changed files with 55 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test_conformance/buffers/test_buffer_map.cpp
View File

@@ -554,7 +554,6 @@ static int verify_read_struct( void *ptr, int n )
static int test_buffer_map_read( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements, size_t size, char *type, int loops, static int test_buffer_map_read( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements, size_t size, char *type, int loops,
const char *kernelCode[], const char *kernelName[], int (*fn)(void *,int) ) const char *kernelCode[], const char *kernelName[], int (*fn)(void *,int) )
{ {
clMemWrapper buffers[5];
void *outptr[5]; void *outptr[5];
clProgramWrapper program[5]; clProgramWrapper program[5];
clKernelWrapper kernel[5]; clKernelWrapper kernel[5];
@@ -593,7 +592,7 @@ static int test_buffer_map_read( cl_device_id deviceID, cl_context context, cl_c
for (src_flag_id = 0; src_flag_id < NUM_FLAGS; src_flag_id++) for (src_flag_id = 0; src_flag_id < NUM_FLAGS; src_flag_id++)
{ {
clMemWrapper buffer;
outptr[i] = align_malloc( ptrSizes[i] * num_elements, min_alignment); outptr[i] = align_malloc( ptrSizes[i] * num_elements, min_alignment);
if ( ! outptr[i] ){ if ( ! outptr[i] ){
log_error( " unable to allocate %d bytes of memory\n", (int)ptrSizes[i] * num_elements ); log_error( " unable to allocate %d bytes of memory\n", (int)ptrSizes[i] * num_elements );
@@ -601,18 +600,22 @@ static int test_buffer_map_read( cl_device_id deviceID, cl_context context, cl_c
} }
if ((flag_set[src_flag_id] & CL_MEM_USE_HOST_PTR) || (flag_set[src_flag_id] & CL_MEM_COPY_HOST_PTR)) if ((flag_set[src_flag_id] & CL_MEM_USE_HOST_PTR) || (flag_set[src_flag_id] & CL_MEM_COPY_HOST_PTR))
buffers[i] = clCreateBuffer(context, flag_set[src_flag_id], ptrSizes[i] * num_elements, outptr[i], &err); buffer =
clCreateBuffer(context, flag_set[src_flag_id],
ptrSizes[i] * num_elements, outptr[i], &err);
else else
buffers[i] = clCreateBuffer(context, flag_set[src_flag_id], ptrSizes[i] * num_elements, NULL, &err); buffer = clCreateBuffer(context, flag_set[src_flag_id],
ptrSizes[i] * num_elements, NULL, &err);
if (!buffers[i] || err) if (!buffer || err)
{ {
print_error(err, "clCreateBuffer failed\n" ); print_error(err, "clCreateBuffer failed\n" );
align_free( outptr[i] ); align_free( outptr[i] );
return -1; return -1;
} }
err = clSetKernelArg( kernel[i], 0, sizeof( cl_mem ), (void *)&buffers[i] ); err = clSetKernelArg(kernel[i], 0, sizeof(cl_mem), (void *)&buffer);
if ( err != CL_SUCCESS ){ if ( err != CL_SUCCESS ){
print_error( err, "clSetKernelArg failed\n" ); print_error( err, "clSetKernelArg failed\n" );
align_free( outptr[i] ); align_free( outptr[i] );
@@ -631,8 +634,11 @@ static int test_buffer_map_read( cl_device_id deviceID, cl_context context, cl_c
return -1; return -1;
} }
mappedPtr = clEnqueueMapBuffer(queue, buffers[i], CL_TRUE, CL_MAP_READ, 0, ptrSizes[i]*num_elements, 0, NULL, NULL, &err); mappedPtr = clEnqueueMapBuffer(queue, buffer, CL_TRUE, CL_MAP_READ,
if ( err != CL_SUCCESS ){ 0, ptrSizes[i] * num_elements, 0,
NULL, NULL, &err);
if (err != CL_SUCCESS)
{
print_error( err, "clEnqueueMapBuffer failed" ); print_error( err, "clEnqueueMapBuffer failed" );
align_free( outptr[i] ); align_free( outptr[i] );
return -1; return -1;
@@ -648,7 +654,8 @@ static int test_buffer_map_read( cl_device_id deviceID, cl_context context, cl_c
1 << i, flag_set_names[src_flag_id]); 1 << i, flag_set_names[src_flag_id]);
} }
err = clEnqueueUnmapMemObject(queue, buffers[i], mappedPtr, 0, NULL, NULL); err = clEnqueueUnmapMemObject(queue, buffer, mappedPtr, 0, NULL,
NULL);
test_error(err, "clEnqueueUnmapMemObject failed"); test_error(err, "clEnqueueUnmapMemObject failed");
// If we are using the outptr[i] as backing via USE_HOST_PTR we need to make sure we are done before freeing. // If we are using the outptr[i] as backing via USE_HOST_PTR we need to make sure we are done before freeing.

61
test_conformance/buffers/test_buffer_read.cpp
View File

@@ -621,7 +621,6 @@ static int verify_read_struct(TestStruct *outptr, int n)
int test_buffer_read( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements, size_t size, char *type, int loops, int test_buffer_read( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements, size_t size, char *type, int loops,
const char *kernelCode[], const char *kernelName[], int (*fn)(void *,int) ) const char *kernelCode[], const char *kernelName[], int (*fn)(void *,int) )
{ {
clMemWrapper buffers[5];
void *outptr[5]; void *outptr[5];
void *inptr[5]; void *inptr[5];
clProgramWrapper program[5]; clProgramWrapper program[5];
@@ -664,7 +663,7 @@ int test_buffer_read( cl_device_id deviceID, cl_context context, cl_command_queu
for (src_flag_id = 0; src_flag_id < NUM_FLAGS; src_flag_id++) for (src_flag_id = 0; src_flag_id < NUM_FLAGS; src_flag_id++)
{ {
clMemWrapper buffer;
outptr[i] = align_malloc( ptrSizes[i] * num_elements, min_alignment); outptr[i] = align_malloc( ptrSizes[i] * num_elements, min_alignment);
if ( ! outptr[i] ){ if ( ! outptr[i] ){
log_error( " unable to allocate %d bytes for outptr\n", (int)( ptrSizes[i] * num_elements ) ); log_error( " unable to allocate %d bytes for outptr\n", (int)( ptrSizes[i] * num_elements ) );
@@ -678,17 +677,21 @@ int test_buffer_read( cl_device_id deviceID, cl_context context, cl_command_queu
if ((flag_set[src_flag_id] & CL_MEM_USE_HOST_PTR) || (flag_set[src_flag_id] & CL_MEM_COPY_HOST_PTR)) if ((flag_set[src_flag_id] & CL_MEM_USE_HOST_PTR) || (flag_set[src_flag_id] & CL_MEM_COPY_HOST_PTR))
buffers[i] = clCreateBuffer(context, flag_set[src_flag_id], ptrSizes[i] * num_elements, inptr[i], &err); buffer =
clCreateBuffer(context, flag_set[src_flag_id],
ptrSizes[i] * num_elements, inptr[i], &err);
else else
buffers[i] = clCreateBuffer(context, flag_set[src_flag_id], ptrSizes[i] * num_elements, NULL, &err); buffer = clCreateBuffer(context, flag_set[src_flag_id],
if ( err != CL_SUCCESS ){ ptrSizes[i] * num_elements, NULL, &err);
if (err != CL_SUCCESS)
{
print_error(err, " clCreateBuffer failed\n" ); print_error(err, " clCreateBuffer failed\n" );
align_free( outptr[i] ); align_free( outptr[i] );
align_free( inptr[i] ); align_free( inptr[i] );
return -1; return -1;
} }
err = clSetKernelArg( kernel[i], 0, sizeof( cl_mem ), (void *)&buffers[i] ); err = clSetKernelArg(kernel[i], 0, sizeof(cl_mem), (void *)&buffer);
if ( err != CL_SUCCESS ){ if ( err != CL_SUCCESS ){
print_error( err, "clSetKernelArg failed" ); print_error( err, "clSetKernelArg failed" );
align_free( outptr[i] ); align_free( outptr[i] );
@@ -696,7 +699,8 @@ int test_buffer_read( cl_device_id deviceID, cl_context context, cl_command_queu
return -1; return -1;
} }
err = clEnqueueNDRangeKernel( queue, kernel[i], 1, NULL, global_work_size, NULL, 0, NULL, NULL ); err = clEnqueueNDRangeKernel(queue, kernel[i], 1, NULL,
global_work_size, NULL, 0, NULL, NULL);
if ( err != CL_SUCCESS ){ if ( err != CL_SUCCESS ){
print_error( err, "clEnqueueNDRangeKernel failed" ); print_error( err, "clEnqueueNDRangeKernel failed" );
align_free( outptr[i] ); align_free( outptr[i] );
@@ -704,7 +708,9 @@ int test_buffer_read( cl_device_id deviceID, cl_context context, cl_command_queu
return -1; return -1;
} }
err = clEnqueueReadBuffer( queue, buffers[i], CL_TRUE, 0, ptrSizes[i]*num_elements, outptr[i], 0, NULL, NULL ); err = clEnqueueReadBuffer(queue, buffer, CL_TRUE, 0,
ptrSizes[i] * num_elements, outptr[i], 0,
NULL, NULL);
if ( err != CL_SUCCESS ){ if ( err != CL_SUCCESS ){
print_error( err, "clEnqueueReadBuffer failed" ); print_error( err, "clEnqueueReadBuffer failed" );
align_free( outptr[i] ); align_free( outptr[i] );
@@ -722,8 +728,11 @@ int test_buffer_read( cl_device_id deviceID, cl_context context, cl_command_queu
1 << i, flag_set_names[src_flag_id]); 1 << i, flag_set_names[src_flag_id]);
} }
err = clEnqueueReadBuffer( queue, buffers[i], CL_TRUE, 0, ptrSizes[i]*num_elements, inptr[i], 0, NULL, NULL ); err = clEnqueueReadBuffer(queue, buffer, CL_TRUE, 0,
if ( err != CL_SUCCESS ){ ptrSizes[i] * num_elements, inptr[i], 0,
NULL, NULL);
if (err != CL_SUCCESS)
{
print_error( err, "clEnqueueReadBuffer failed" ); print_error( err, "clEnqueueReadBuffer failed" );
align_free( outptr[i] ); align_free( outptr[i] );
align_free( inptr[i] ); align_free( inptr[i] );
@@ -752,7 +761,6 @@ int test_buffer_read( cl_device_id deviceID, cl_context context, cl_command_queu
int test_buffer_read_async( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements, size_t size, char *type, int loops, int test_buffer_read_async( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements, size_t size, char *type, int loops,
const char *kernelCode[], const char *kernelName[], int (*fn)(void *,int) ) const char *kernelCode[], const char *kernelName[], int (*fn)(void *,int) )
{ {
clMemWrapper buffers[5];
clProgramWrapper program[5]; clProgramWrapper program[5];
clKernelWrapper kernel[5]; clKernelWrapper kernel[5];
clEventWrapper event; clEventWrapper event;
@@ -796,7 +804,7 @@ int test_buffer_read_async( cl_device_id deviceID, cl_context context, cl_comman
for (src_flag_id = 0; src_flag_id < NUM_FLAGS; src_flag_id++) for (src_flag_id = 0; src_flag_id < NUM_FLAGS; src_flag_id++)
{ {
clMemWrapper buffer;
outptr[i] = align_malloc(ptrSizes[i] * num_elements, min_alignment); outptr[i] = align_malloc(ptrSizes[i] * num_elements, min_alignment);
if ( ! outptr[i] ){ if ( ! outptr[i] ){
log_error( " unable to allocate %d bytes for outptr\n", (int)(ptrSizes[i] * num_elements) ); log_error( " unable to allocate %d bytes for outptr\n", (int)(ptrSizes[i] * num_elements) );
@@ -812,9 +820,12 @@ int test_buffer_read_async( cl_device_id deviceID, cl_context context, cl_comman
if ((flag_set[src_flag_id] & CL_MEM_USE_HOST_PTR) || (flag_set[src_flag_id] & CL_MEM_COPY_HOST_PTR)) if ((flag_set[src_flag_id] & CL_MEM_USE_HOST_PTR) || (flag_set[src_flag_id] & CL_MEM_COPY_HOST_PTR))
buffers[i] = clCreateBuffer(context, flag_set[src_flag_id], ptrSizes[i] * num_elements, inptr[i], &err); buffer =
clCreateBuffer(context, flag_set[src_flag_id],
ptrSizes[i] * num_elements, inptr[i], &err);
else else
buffers[i] = clCreateBuffer(context, flag_set[src_flag_id], ptrSizes[i] * num_elements, NULL, &err); buffer = clCreateBuffer(context, flag_set[src_flag_id],
ptrSizes[i] * num_elements, NULL, &err);
if ( err != CL_SUCCESS ){ if ( err != CL_SUCCESS ){
print_error(err, " clCreateBuffer failed\n" ); print_error(err, " clCreateBuffer failed\n" );
align_free( outptr[i] ); align_free( outptr[i] );
@@ -822,7 +833,7 @@ int test_buffer_read_async( cl_device_id deviceID, cl_context context, cl_comman
return -1; return -1;
} }
err = clSetKernelArg( kernel[i], 0, sizeof( cl_mem ), (void *)&buffers[i] ); err = clSetKernelArg(kernel[i], 0, sizeof(cl_mem), (void *)&buffer);
if ( err != CL_SUCCESS ){ if ( err != CL_SUCCESS ){
print_error( err, "clSetKernelArg failed" ); print_error( err, "clSetKernelArg failed" );
align_free( outptr[i] ); align_free( outptr[i] );
@@ -839,7 +850,9 @@ int test_buffer_read_async( cl_device_id deviceID, cl_context context, cl_comman
} }
lastIndex = ( num_elements * ( 1 << i ) - 1 ) * ptrSizes[0]; lastIndex = ( num_elements * ( 1 << i ) - 1 ) * ptrSizes[0];
err = clEnqueueReadBuffer( queue, buffers[i], false, 0, ptrSizes[i]*num_elements, outptr[i], 0, NULL, &event ); err = clEnqueueReadBuffer(queue, buffer, false, 0,
ptrSizes[i] * num_elements, outptr[i], 0,
NULL, &event);
#ifdef CHECK_FOR_NON_WAIT #ifdef CHECK_FOR_NON_WAIT
if ( ((uchar *)outptr[i])[lastIndex] ){ if ( ((uchar *)outptr[i])[lastIndex] ){
log_error( " clEnqueueReadBuffer() possibly returned only after inappropriately waiting for execution to be finished\n" ); log_error( " clEnqueueReadBuffer() possibly returned only after inappropriately waiting for execution to be finished\n" );
@@ -885,7 +898,6 @@ int test_buffer_read_async( cl_device_id deviceID, cl_context context, cl_comman
int test_buffer_read_array_barrier( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements, size_t size, char *type, int loops, int test_buffer_read_array_barrier( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements, size_t size, char *type, int loops,
const char *kernelCode[], const char *kernelName[], int (*fn)(void *,int) ) const char *kernelCode[], const char *kernelName[], int (*fn)(void *,int) )
{ {
clMemWrapper buffers[5];
clProgramWrapper program[5]; clProgramWrapper program[5];
clKernelWrapper kernel[5]; clKernelWrapper kernel[5];
clEventWrapper event; clEventWrapper event;
@@ -928,7 +940,7 @@ int test_buffer_read_array_barrier( cl_device_id deviceID, cl_context context, c
for (src_flag_id = 0; src_flag_id < NUM_FLAGS; src_flag_id++) for (src_flag_id = 0; src_flag_id < NUM_FLAGS; src_flag_id++)
{ {
clMemWrapper buffer;
outptr[i] = align_malloc(ptrSizes[i] * num_elements, min_alignment); outptr[i] = align_malloc(ptrSizes[i] * num_elements, min_alignment);
if ( ! outptr[i] ){ if ( ! outptr[i] ){
log_error( " unable to allocate %d bytes for outptr\n", (int)(ptrSizes[i] * num_elements) ); log_error( " unable to allocate %d bytes for outptr\n", (int)(ptrSizes[i] * num_elements) );
@@ -943,9 +955,12 @@ int test_buffer_read_array_barrier( cl_device_id deviceID, cl_context context, c
memset( inptr[i], 0, ptrSizes[i] * num_elements ); // initialize to zero to tell difference memset( inptr[i], 0, ptrSizes[i] * num_elements ); // initialize to zero to tell difference
if ((flag_set[src_flag_id] & CL_MEM_USE_HOST_PTR) || (flag_set[src_flag_id] & CL_MEM_COPY_HOST_PTR)) if ((flag_set[src_flag_id] & CL_MEM_USE_HOST_PTR) || (flag_set[src_flag_id] & CL_MEM_COPY_HOST_PTR))
buffers[i] = clCreateBuffer(context, flag_set[src_flag_id], ptrSizes[i] * num_elements, inptr[i], &err); buffer =
clCreateBuffer(context, flag_set[src_flag_id],
ptrSizes[i] * num_elements, inptr[i], &err);
else else
buffers[i] = clCreateBuffer(context, flag_set[src_flag_id], ptrSizes[i] * num_elements, NULL, &err); buffer = clCreateBuffer(context, flag_set[src_flag_id],
ptrSizes[i] * num_elements, NULL, &err);
if ( err != CL_SUCCESS ){ if ( err != CL_SUCCESS ){
print_error(err, " clCreateBuffer failed\n" ); print_error(err, " clCreateBuffer failed\n" );
align_free( outptr[i] ); align_free( outptr[i] );
@@ -953,7 +968,7 @@ int test_buffer_read_array_barrier( cl_device_id deviceID, cl_context context, c
return -1; return -1;
} }
err = clSetKernelArg( kernel[i], 0, sizeof( cl_mem ), (void *)&buffers[i] ); err = clSetKernelArg(kernel[i], 0, sizeof(cl_mem), (void *)&buffer);
if ( err != CL_SUCCESS ){ if ( err != CL_SUCCESS ){
print_error( err, "clSetKernelArgs failed" ); print_error( err, "clSetKernelArgs failed" );
align_free( outptr[i] ); align_free( outptr[i] );
@@ -970,7 +985,9 @@ int test_buffer_read_array_barrier( cl_device_id deviceID, cl_context context, c
} }
lastIndex = ( num_elements * ( 1 << i ) - 1 ) * ptrSizes[0]; lastIndex = ( num_elements * ( 1 << i ) - 1 ) * ptrSizes[0];
err = clEnqueueReadBuffer( queue, buffers[i], false, 0, ptrSizes[i]*num_elements, (void *)(outptr[i]), 0, NULL, &event ); err = clEnqueueReadBuffer(queue, buffer, false, 0,
ptrSizes[i] * num_elements,
(void *)(outptr[i]), 0, NULL, &event);
#ifdef CHECK_FOR_NON_WAIT #ifdef CHECK_FOR_NON_WAIT
if ( ((uchar *)outptr[i])[lastIndex] ){ if ( ((uchar *)outptr[i])[lastIndex] ){
log_error( " clEnqueueReadBuffer() possibly returned only after inappropriately waiting for execution to be finished\n" ); log_error( " clEnqueueReadBuffer() possibly returned only after inappropriately waiting for execution to be finished\n" );