Skip to content

Fix samples memory leak and cleanup issues #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bashbaug merged 4 commits into from
Aug 8, 2025
Merged

Fix samples memory leak and cleanup issues #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d23c2e8
Fix samples memory leak and cleanup issues
xinjin01 May 12, 2025
72fc5af
Fix use-after-free on dev_version in version logic
xinjin01 Jul 30, 2025
a27b74e
Replace label endl with end
xinjin01 Jul 30, 2025
9cdff1a
Remove redundant NULL check before free(dev_version)
xinjin01 Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions samples/core/binaries/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,21 +258,21 @@ int main(int argc, char *argv[])
error, vec);

/// Run kernel
cl_event pass;
OCLERROR_RET(clSetKernelArg(Collatz, 0, sizeof(cl_mem), &buf), error, buff);

GET_CURRENT_TIMER(start_time)
cl_event pass;
OCLERROR_RET(clEnqueueNDRangeKernel(queue, Collatz, 1, &start, &length,
NULL, 0, NULL, &pass),
error, buff);
OCLERROR_RET(clWaitForEvents(1, &pass), error, buff);
OCLERROR_RET(clWaitForEvents(1, &pass), error, ev);
GET_CURRENT_TIMER(end_time)

if (diag_opts.verbose) print_timings(start_time, end_time, &pass, 1);

OCLERROR_RET(clEnqueueReadBuffer(queue, buf, CL_BLOCKING, 0,
sizeof(cl_int) * length, v, 0, NULL, NULL),
error, buff);
error, ev);

/// Show results
int max_steps = 0;
Expand All @@ -298,6 +298,8 @@ int main(int argc, char *argv[])
length, start + 1, max_steps, max_ind);

/// Cleanup
ev:
OCLERROR_RET(clReleaseEvent(pass), end_error, buff);
buff:
OCLERROR_RET(clReleaseMemObject(buf), end_error, vec);
vec:
Expand Down
89 changes: 55 additions & 34 deletions samples/core/blur/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,19 +359,20 @@ cl_int single_pass_box_blur(state *const s, cl_int size)
OCLERROR_RET(clEnqueueNDRangeKernel(s->queue, blur, 2, origin, image_size,
NULL, 0, NULL, &pass),
error, blr);
OCLERROR_RET(clWaitForEvents(1, &pass), error, blr);
OCLERROR_RET(clWaitForEvents(1, &pass), error, ev);
GET_CURRENT_TIMER(end)

OCLERROR_RET(clEnqueueReadImage(s->queue, s->output_image_buf, CL_BLOCKING,
origin, image_size, 0, 0,
s->output_image.pixels, 0, NULL, NULL),
error, blr);
error, ev);

if (s->verbose) print_timings(start, end, &pass, 1);

// write output file
OCLERROR_RET(finalize_blur(s), error, blr);

OCLERROR_RET(finalize_blur(s), error, ev);
ev:
clReleaseEvent(pass);
blr:
clReleaseKernel(blur);
end:
Expand Down Expand Up @@ -417,20 +418,23 @@ cl_int dual_pass_box_blur(state *const s, cl_int size)
error, blr2);
OCLERROR_RET(clEnqueueNDRangeKernel(s->queue, blur2, 2, origin, image_size,
NULL, 0, NULL, pass + 1),
error, blr2);
OCLERROR_RET(clWaitForEvents(2, pass), error, blr2);
error, ev1);
OCLERROR_RET(clWaitForEvents(2, pass), error, ev2);
GET_CURRENT_TIMER(end)

OCLERROR_RET(clEnqueueReadImage(s->queue, s->output_image_buf, CL_BLOCKING,
origin, image_size, 0, 0,
s->output_image.pixels, 0, NULL, NULL),
error, blr2);
error, ev2);

if (s->verbose) print_timings(start, end, pass, 2);

// write output file
OCLERROR_RET(finalize_blur(s), error, blr2);

OCLERROR_RET(finalize_blur(s), error, ev2);
ev2:
OCLERROR_RET(clReleaseEvent(pass[1]), end_error, ev1);
ev1:
OCLERROR_RET(clReleaseEvent(pass[0]), end_error, blr2);
blr2:
OCLERROR_RET(clReleaseKernel(blur2), end_error, blr1);
blr1:
Expand Down Expand Up @@ -531,20 +535,23 @@ cl_int dual_pass_local_memory_exchange_box_blur(state *const s, cl_int size)
size_t wgss[3] = { 1, wgs2, 1 };
OCLERROR_RET(clEnqueueNDRangeKernel(s->queue, blur2, 2, origin, work_size2,
wgss, 0, NULL, pass + 1),
error, blr2);
OCLERROR_RET(clWaitForEvents(2, pass), error, blr2);
error, ev1);
OCLERROR_RET(clWaitForEvents(2, pass), error, ev2);
GET_CURRENT_TIMER(end)

OCLERROR_RET(clEnqueueReadImage(s->queue, s->output_image_buf, CL_BLOCKING,
origin, image_size, 0, 0,
s->output_image.pixels, 0, NULL, NULL),
error, blr2);
error, ev2);

if (s->verbose) print_timings(start, end, pass, 2);

// write output file
OCLERROR_RET(finalize_blur(s), error, blr2);

OCLERROR_RET(finalize_blur(s), error, ev2);
ev2:
OCLERROR_RET(clReleaseEvent(pass[1]), end_error, ev1);
ev1:
OCLERROR_RET(clReleaseEvent(pass[0]), end_error, blr2);
blr2:
OCLERROR_RET(clReleaseKernel(blur2), end_error, blr1);
blr1:
Expand Down Expand Up @@ -620,21 +627,25 @@ cl_int dual_pass_subgroup_exchange_box_blur(state *const s, cl_int size)
size_t wgss[3] = { 1, wgs2, 1 };
OCLERROR_RET(clEnqueueNDRangeKernel(s->queue, blur2, 2, origin, work_size2,
wgss, 0, NULL, pass + 1),
error, blr2);
OCLERROR_RET(clWaitForEvents(2, pass), error, blr2);
error, ev1);
OCLERROR_RET(clWaitForEvents(2, pass), error, ev2);
GET_CURRENT_TIMER(end)

OCLERROR_RET(clEnqueueReadImage(s->queue, s->output_image_buf, CL_BLOCKING,
origin, image_size, 0, 0,
s->output_image.pixels, 0, NULL, NULL),
error, blr2);
error, ev2);

if (s->verbose) print_timings(start, end, pass, 2);

// write output file
OCLERROR_RET(finalize_blur(s), error, blr2);
OCLERROR_RET(finalize_blur(s), error, ev2);

// cleanup for error handling
ev2:
OCLERROR_RET(clReleaseEvent(pass[1]), end_error, ev1);
ev1:
OCLERROR_RET(clReleaseEvent(pass[0]), end_error, blr2);
blr2:
OCLERROR_RET(clReleaseKernel(blur2), end_error, blr1);
blr1:
Expand Down Expand Up @@ -685,20 +696,23 @@ cl_int dual_pass_kernel_blur(state *const s, cl_int size, cl_mem kern)
error, blr2);
OCLERROR_RET(clEnqueueNDRangeKernel(s->queue, blur2, 2, origin, image_size,
NULL, 0, NULL, pass + 1),
error, blr2);
OCLERROR_RET(clWaitForEvents(2, pass), error, blr2);
error, ev1);
OCLERROR_RET(clWaitForEvents(2, pass), error, ev2);
GET_CURRENT_TIMER(end)

OCLERROR_RET(clEnqueueReadImage(s->queue, s->output_image_buf, CL_BLOCKING,
origin, image_size, 0, 0,
s->output_image.pixels, 0, NULL, NULL),
error, blr2);
error, ev2);

if (s->verbose) print_timings(start, end, pass, 2);

// write output file
OCLERROR_RET(finalize_blur(s), error, blr2);

OCLERROR_RET(finalize_blur(s), error, ev2);
ev2:
OCLERROR_RET(clReleaseEvent(pass[1]), end_error, ev1);
ev1:
OCLERROR_RET(clReleaseEvent(pass[0]), end_error, blr2);
blr2:
OCLERROR_RET(clReleaseKernel(blur2), end_error, blr1);
blr1:
Expand Down Expand Up @@ -801,20 +815,23 @@ cl_int dual_pass_local_memory_exchange_kernel_blur(state *const s, cl_int size,
size_t wgss[3] = { 1, wgs2, 1 };
OCLERROR_RET(clEnqueueNDRangeKernel(s->queue, blur2, 2, origin, work_size2,
wgss, 0, NULL, pass + 1),
error, blr2);
OCLERROR_RET(clWaitForEvents(2, pass), error, blr2);
error, ev1);
OCLERROR_RET(clWaitForEvents(2, pass), error, ev2);
GET_CURRENT_TIMER(end)

OCLERROR_RET(clEnqueueReadImage(s->queue, s->output_image_buf, CL_BLOCKING,
origin, image_size, 0, 0,
s->output_image.pixels, 0, NULL, NULL),
error, blr2);
error, ev2);

if (s->verbose) print_timings(start, end, pass, 2);

// write output file
OCLERROR_RET(finalize_blur(s), error, blr2);

OCLERROR_RET(finalize_blur(s), error, ev2);
ev2:
OCLERROR_RET(clReleaseEvent(pass[1]), end_error, ev1);
ev1:
OCLERROR_RET(clReleaseEvent(pass[0]), end_error, blr2);
blr2:
OCLERROR_RET(clReleaseKernel(blur2), end_error, blr1);
blr1:
Expand Down Expand Up @@ -894,21 +911,25 @@ cl_int dual_pass_subgroup_exchange_kernel_blur(state *const s, cl_int size,
size_t wgss[3] = { 1, wgs2, 1 };
OCLERROR_RET(clEnqueueNDRangeKernel(s->queue, blur2, 2, origin, work_size2,
wgss, 0, NULL, pass + 1),
error, blr2);
OCLERROR_RET(clWaitForEvents(2, pass), error, blr2);
error, ev1);
OCLERROR_RET(clWaitForEvents(2, pass), error, ev2);
GET_CURRENT_TIMER(end)

OCLERROR_RET(clEnqueueReadImage(s->queue, s->output_image_buf, CL_BLOCKING,
origin, image_size, 0, 0,
s->output_image.pixels, 0, NULL, NULL),
error, blr2);
error, ev2);

if (s->verbose) print_timings(start, end, pass, 2);

// write output file
OCLERROR_RET(finalize_blur(s), error, blr2);
OCLERROR_RET(finalize_blur(s), error, ev2);

// cleanup for error handling
ev2:
OCLERROR_RET(clReleaseEvent(pass[1]), end_error, ev1);
ev1:
OCLERROR_RET(clReleaseEvent(pass[0]), end_error, blr2);
blr2:
OCLERROR_RET(clReleaseKernel(blur2), end_error, blr1);
blr1:
Expand Down Expand Up @@ -1073,11 +1094,11 @@ int main(int argc, char *argv[])
dev_version_size, dev_version, NULL),
error, dev);
char compiler_options[1024] = "";
if (opencl_version_contains(dev_version, "3."))
if (opencl_version_contains(dev_version, "OpenCL C 3."))
{
strcat(compiler_options, "-cl-std=CL3.0 ");
}
else if (opencl_version_contains(dev_version, "2."))
else if (opencl_version_contains(dev_version, "OpenCL C 2."))
{
strcat(compiler_options, "-cl-std=CL2.0 ");
}
Expand Down
72 changes: 49 additions & 23 deletions samples/core/multi-device/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,6 @@ int main(int argc, char* argv[])
dev_opts.triplet.dev_type, &error),
error, end);

// Query OpenCL version supported by device.
char dev_version[64];
OCLERROR_RET(clGetDeviceInfo(dev, CL_DEVICE_VERSION, sizeof(dev_version),
&dev_version, NULL),
error, end);

if (!diag_opts.quiet)
{
cl_util_print_device_info(dev);
Expand All @@ -225,6 +219,21 @@ int main(int argc, char* argv[])
fflush(stdout);
}

// Query OpenCL version supported by device.
size_t dev_version_size;

OCLERROR_RET(
clGetDeviceInfo(dev, CL_DEVICE_VERSION, 0, NULL, &dev_version_size),
error, end);

char compiler_options[1023] = "";
char* dev_version = NULL;
MEM_CHECK(dev_version = (char*)malloc(dev_version_size), error, end);

OCLERROR_RET(clGetDeviceInfo(dev, CL_DEVICE_VERSION, dev_version_size,
dev_version, NULL),
error, ver);

if (opencl_version_contains(dev_version, "1.0")
|| opencl_version_contains(dev_version, "1.1"))
{
Expand All @@ -233,15 +242,44 @@ int main(int argc, char* argv[])
"1.2 feature, but the device chosen only supports OpenCL %s. "
"Please try with a different OpenCL device instead.\n",
dev_version);
exit(EXIT_SUCCESS);
error = CL_SUCCESS;
goto ver;
}
else
{
// If no -cl-std option is specified then the highest 1.x version
// supported by each device is used to compile the program. Therefore,
// it's only necessary to add the -cl-std option for 2.0 and 3.0 OpenCL
// versions.

int written = 0;
if (opencl_version_contains(dev_version, "3."))
{
written = snprintf(compiler_options, sizeof(compiler_options),
"-cl-std=CL3.0 ");
}
else if (opencl_version_contains(dev_version, "2."))
{
written = snprintf(compiler_options, sizeof(compiler_options),
"-cl-std=CL2.0 ");
}

if (written < 0 || written >= (int)sizeof(compiler_options))
{
fprintf(
stderr,
"Error: compiler_options buffer overflow or encoding error.\n");
free(dev_version);
exit(EXIT_FAILURE);
}
}

// Check if device supports fission.
cl_device_partition_property* dev_props = NULL;
size_t props_size = 0;
OCLERROR_RET(clGetDeviceInfo(dev, CL_DEVICE_PARTITION_PROPERTIES, 0, NULL,
&props_size),
error, end);
error, ver);
if (props_size == 0)
{
fprintf(stdout,
Expand All @@ -254,7 +292,7 @@ int main(int argc, char* argv[])

// Check if the "partition equally" type is supported.
MEM_CHECK(dev_props = (cl_device_partition_property*)malloc(props_size),
error, end);
error, ver);
OCLERROR_RET(clGetDeviceInfo(dev, CL_DEVICE_PARTITION_PROPERTIES,
props_size, dev_props, NULL),
error, props);
Expand Down Expand Up @@ -328,20 +366,6 @@ int main(int argc, char* argv[])
context, 1, (const char**)&kernel, &program_size, &error),
error, ker);

// If no -cl-std option is specified then the highest 1.x version
// supported by each device is used to compile the program. Therefore,
// it's only necessary to add the -cl-std option for 2.0 and 3.0 OpenCL
// versions.
char compiler_options[1023] = "";
if (opencl_version_contains(dev_version, "3."))
{
strcat(compiler_options, "-cl-std=CL3.0 ");
}
else if (opencl_version_contains(dev_version, "2."))
{
strcat(compiler_options, "-cl-std=CL2.0 ");
}

OCLERROR_RET(
clBuildProgram(program, 2, subdevices, compiler_options, NULL, NULL),
error, prg);
Expand Down Expand Up @@ -701,6 +725,8 @@ int main(int argc, char* argv[])
free(subdevices);
props:
free(dev_props);
ver:
free(dev_version);
end:
if (error) cl_util_print_error(error);
return error;
Expand Down
Loading
Loading