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

Fix Minor memory leaks in test_buffer/compiler. (#1160)

Browse Source 
* Fix Minor memory leaks in test_buffer/compiler.

Signed-off-by: John Kesapides <john.kesapides@arm.com>

* Fixes in test_buffer
* Remove commented unmap call
* remove unused ii variables.

Signed-off-by: John Kesapides <john.kesapides@arm.com>

* test_buffer fixes:
* test_buffer_fill remove unsued ii

Signed-off-by: John Kesapides <john.kesapides@arm.com>
This commit is contained in:
John Kesapides
2021-02-17 09:19:06 +00:00
committed by GitHub
parent 5d2a4bc522
commit c67aa0535b
3 changed files with 106 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
test_conformance/buffers/test_buffer_fill.cpp
View File

@@ -562,14 +562,13 @@ int test_buffer_fill( cl_device_id deviceID, cl_context context, cl_command_queu
int loops, void *inptr[5], void *hostptr[5], void *pattern[5], size_t offset_elements, size_t fill_elements,
const char *kernelCode[], const char *kernelName[], int (*fn)(void *,void *,int) )
{
clMemWrapper buffers[10];
void *outptr[5];
clProgramWrapper program[5];
clKernelWrapper kernel[5];
size_t ptrSizes[5];
size_t global_work_size[3];
int err;
int i, ii;
int i;
int src_flag_id;
int total_errors = 0;
@@ -586,8 +585,6 @@ int test_buffer_fill( cl_device_id deviceID, cl_context context, cl_command_queu
loops = (loops < 5 ? loops : 5);
for (i = 0; i < loops; i++)
{
ii = i << 1;
err = create_single_kernel_helper(context, &program[i], &kernel[i], 1,
&kernelCode[i], kernelName[i]);
if (err)
@@ -599,18 +596,25 @@ int test_buffer_fill( cl_device_id deviceID, cl_context context, cl_command_queu
for (src_flag_id = 0; src_flag_id < NUM_FLAGS; src_flag_id++)
{
clEventWrapper event[2];
clMemWrapper buffers[2];
if ((flag_set[src_flag_id] & CL_MEM_USE_HOST_PTR) || (flag_set[src_flag_id] & CL_MEM_COPY_HOST_PTR))
buffers[ii] = clCreateBuffer(context, flag_set[src_flag_id], ptrSizes[i] * num_elements, hostptr[i], &err);
buffers[0] = clCreateBuffer(context, flag_set[src_flag_id],
ptrSizes[i] * num_elements,
hostptr[i], &err);
else
buffers[ii] = clCreateBuffer(context, flag_set[src_flag_id], ptrSizes[i] * num_elements, NULL, &err);
if ( !buffers[ii] || err){
buffers[0] =
clCreateBuffer(context, flag_set[src_flag_id],
ptrSizes[i] * num_elements, NULL, &err);
if (!buffers[0] || err)
{
print_error(err, "clCreateBuffer failed\n" );
return -1;
}
// Initialize source buffer with 0, since the validation code expects 0(s) outside of the fill region.
if (!((flag_set[src_flag_id] & CL_MEM_USE_HOST_PTR) || (flag_set[src_flag_id] & CL_MEM_COPY_HOST_PTR))) {
err = clEnqueueWriteBuffer(queue, buffers[ii], CL_FALSE, 0, ptrSizes[i]*num_elements, hostptr[i], 0, NULL, NULL);
err = clEnqueueWriteBuffer(queue, buffers[0], CL_FALSE, 0,
ptrSizes[i] * num_elements,
hostptr[i], 0, NULL, NULL);
if ( err != CL_SUCCESS ){
print_error(err, "clEnqueueWriteBuffer failed\n" );
return -1;
@@ -619,27 +623,31 @@ int test_buffer_fill( cl_device_id deviceID, cl_context context, cl_command_queu
outptr[i] = align_malloc( ptrSizes[i] * num_elements, min_alignment);
memset(outptr[i], 0, ptrSizes[i] * num_elements);
buffers[ii+1] = clCreateBuffer(context, CL_MEM_COPY_HOST_PTR, ptrSizes[i] * num_elements, outptr[i], &err);
if ( !buffers[ii+1] || err){
buffers[1] =
clCreateBuffer(context, CL_MEM_COPY_HOST_PTR,
ptrSizes[i] * num_elements, outptr[i], &err);
if (!buffers[1] || err)
{
print_error(err, "clCreateBuffer failed\n" );
align_free( outptr[i] );
return -1;
}
err = clEnqueueFillBuffer(queue, buffers[ii], pattern[i], ptrSizes[i],
ptrSizes[i] * offset_elements, ptrSizes[i] * fill_elements,
0, NULL, &(event[0]));
/* uncomment for test debugging
err = clEnqueueWriteBuffer(queue, buffers[ii], CL_FALSE, 0, ptrSizes[i]*num_elements, inptr[i], 0, NULL, &(event[0]));
*/
err = clEnqueueFillBuffer(
queue, buffers[0], pattern[i], ptrSizes[i],
ptrSizes[i] * offset_elements, ptrSizes[i] * fill_elements, 0,
NULL, &(event[0]));
if ( err != CL_SUCCESS ){
print_error( err, " clEnqueueFillBuffer failed" );
align_free( outptr[i] );
return -1;
}
err = clSetKernelArg( kernel[i], 0, sizeof( cl_mem ), (void *)&buffers[ii] );
err |= clSetKernelArg( kernel[i], 1, sizeof( cl_mem ), (void *)&buffers[ii+1] );
err = clSetKernelArg(kernel[i], 0, sizeof(cl_mem),
(void *)&buffers[0]);
err |= clSetKernelArg(kernel[i], 1, sizeof(cl_mem),
(void *)&buffers[1]);
if ( err != CL_SUCCESS ){
print_error( err, "clSetKernelArg failed" );
align_free( outptr[i] );
@@ -659,7 +667,9 @@ int test_buffer_fill( cl_device_id deviceID, cl_context context, cl_command_queu
return -1;
}
err = clEnqueueReadBuffer( queue, buffers[ii+1], false, 0, ptrSizes[i]*num_elements, outptr[i], 0, NULL, &(event[1]) );
err = clEnqueueReadBuffer(queue, buffers[1], false, 0,
ptrSizes[i] * num_elements, outptr[i], 0,
NULL, &(event[1]));
if (err != CL_SUCCESS){
print_error( err, "clEnqueueReadBuffer failed" );
return -1;