wu-arch/vortex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed POCL device cleanup

Browse Source
This commit is contained in:
Blaise Tine
2020-09-04 10:45:25 -04:00
parent ce29f57d0c
commit 37a19873d7
7 changed files with 60 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
benchmarks/opencl/lib/libOpenCL.so
View File

Binary file not shown.

BIN
benchmarks/opencl/lib/libOpenCL.so.2
View File

Binary file not shown.

BIN
benchmarks/opencl/lib/libOpenCL.so.2.5.0
View File

Binary file not shown.

BIN
benchmarks/opencl/runtime/lib/libOpenCL.so.2.5.0
View File

Binary file not shown.

118
benchmarks/opencl/sgemm/main.cc
View File

@@ -34,25 +34,27 @@
#define NUM_DATA 64 #define NUM_DATA 64
#define CL_CHECK(_expr) \ #define CL_CHECK(_expr) \
do { \ do { \
cl_int _err = _expr; \ cl_int _err = _expr; \
if (_err == CL_SUCCESS) \ if (_err == CL_SUCCESS) \
break; \ break; \
fprintf(stderr, "OpenCL Error: '%s' returned %d!\n", #_expr, (int)_err); \ printf("OpenCL Error: '%s' returned %d!\n", #_expr, (int)_err); \
abort(); \ cleanup(); \
} while (0) exit(-1); \
} while (0)
#define CL_CHECK_ERR(_expr) \ #define CL_CHECK2(_expr) \
({ \ ({ \
cl_int _err = CL_INVALID_VALUE; \ cl_int _err = CL_INVALID_VALUE; \
decltype(_expr) _ret = _expr; \ decltype(_expr) _ret = _expr; \
if (_err != CL_SUCCESS) { \ if (_err != CL_SUCCESS) { \
fprintf(stderr, "OpenCL Error: '%s' returned %d!\n", #_expr, (int)_err); \ printf("OpenCL Error: '%s' returned %d!\n", #_expr, (int)_err); \
abort(); \ cleanup(); \
} \ exit(-1); \
_ret; \ } \
}) _ret; \
})
void pfn_notify(const char *errinfo, const void *private_info, size_t cb, void pfn_notify(const char *errinfo, const void *private_info, size_t cb,
void *user_data) { void *user_data) {
@@ -80,37 +82,34 @@ static int read_kernel_file(const char* filename, uint8_t** data, size_t* size)
return 0; return 0;
} }
cl_device_id device_id = NULL;
uint8_t *kernel_bin = NULL; uint8_t *kernel_bin = NULL;
cl_context context = 0;
cl_kernel kernel = 0;
cl_command_queue queue = 0;
cl_program program = 0;
cl_mem memObjects[3] = {0, 0, 0};
/// ///
// Cleanup any created OpenCL resources // Cleanup any created OpenCL resources
// //
void Cleanup(cl_context context, cl_command_queue commandQueue, void cleanup() {
cl_program program, cl_kernel kernel, cl_mem memObjects[3]) {
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
if (memObjects[i] != 0) if (memObjects[i]) clReleaseMemObject(memObjects[i]);
clReleaseMemObject(memObjects[i]);
} }
if (commandQueue != 0) if (queue) clReleaseCommandQueue(queue);
clReleaseCommandQueue(commandQueue); if (kernel) clReleaseKernel(kernel);
if (program) clReleaseProgram(program);
if (kernel != 0) if (context) clReleaseContext(context);
clReleaseKernel(kernel); if (device_id) clReleaseDevice(device_id);
if (program != 0)
clReleaseProgram(program);
if (context != 0)
clReleaseContext(context);
if (kernel_bin) free(kernel_bin); if (kernel_bin) free(kernel_bin);
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
printf("enter demo main\n"); printf("enter demo main\n");
cl_platform_id platform_id; cl_platform_id platform_id;
cl_device_id device_id;
size_t kernel_size; size_t kernel_size;
cl_int binary_status = 0; cl_int binary_status = 0;
int i; int i;
@@ -122,17 +121,11 @@ int main(int argc, char **argv) {
// Getting platform and device information // Getting platform and device information
CL_CHECK(clGetPlatformIDs(1, &platform_id, NULL)); CL_CHECK(clGetPlatformIDs(1, &platform_id, NULL));
CL_CHECK(clGetDeviceIDs(platform_id, CL_DEVICE_TYPE_DEFAULT, 1, &device_id, NULL)); CL_CHECK(clGetDeviceIDs(platform_id, CL_DEVICE_TYPE_DEFAULT, 1, &device_id, NULL));
cl_context context; context = CL_CHECK2(clCreateContext(NULL, 1, &device_id, &pfn_notify, NULL, &_err));
context = CL_CHECK_ERR(
clCreateContext(NULL, 1, &device_id, &pfn_notify, NULL, &_err)); queue = CL_CHECK2(clCreateCommandQueue(context, device_id,
CL_QUEUE_PROFILING_ENABLE, &_err));
cl_command_queue queue;
queue = CL_CHECK_ERR(clCreateCommandQueue(context, device_id,
CL_QUEUE_PROFILING_ENABLE, &_err));
cl_kernel kernel = 0;
cl_mem memObjects[3] = {0, 0, 0};
// Create OpenCL program - first attempt to load cached binary. // Create OpenCL program - first attempt to load cached binary.
// If that is not available, then create the program from source // If that is not available, then create the program from source
@@ -140,15 +133,13 @@ int main(int argc, char **argv) {
std::cout << "Attempting to create program from binary..." << std::endl; std::cout << "Attempting to create program from binary..." << std::endl;
// cl_program program = CreateProgramFromBinary(context, device_id, // cl_program program = CreateProgramFromBinary(context, device_id,
// "kernel.cl.bin"); // "kernel.cl.bin");
cl_program program = CL_CHECK_ERR(clCreateProgramWithBinary( program = CL_CHECK2(clCreateProgramWithBinary(
context, 1, &device_id, &kernel_size, &kernel_bin, &binary_status, &_err)); context, 1, &device_id, &kernel_size, &kernel_bin, &binary_status, &_err));
if (program == NULL) { if (program == NULL) {
std::cerr << "Failed to write program binary" << std::endl; printf("clCreateProgramWithBinary() failed\n");
Cleanup(context, queue, program, kernel, memObjects); cleanup();
return 1; return -1;
} else { }
std::cout << "Read program from binary." << std::endl;
}
// Build program // Build program
CL_CHECK(clBuildProgram(program, 1, &device_id, NULL, NULL, NULL)); CL_CHECK(clBuildProgram(program, 1, &device_id, NULL, NULL, NULL));
@@ -156,19 +147,19 @@ int main(int argc, char **argv) {
printf("attempting to create input buffer\n"); printf("attempting to create input buffer\n");
fflush(stdout); fflush(stdout);
cl_mem input_bufferA; cl_mem input_bufferA;
input_bufferA = CL_CHECK_ERR( input_bufferA = CL_CHECK2(
clCreateBuffer(context, CL_MEM_READ_ONLY, clCreateBuffer(context, CL_MEM_READ_ONLY,
sizeof(float) * NUM_DATA * NUM_DATA, NULL, &_err)); sizeof(float) * NUM_DATA * NUM_DATA, NULL, &_err));
cl_mem input_bufferB; cl_mem input_bufferB;
input_bufferB = CL_CHECK_ERR( input_bufferB = CL_CHECK2(
clCreateBuffer(context, CL_MEM_READ_ONLY, clCreateBuffer(context, CL_MEM_READ_ONLY,
sizeof(float) * NUM_DATA * NUM_DATA, NULL, &_err)); sizeof(float) * NUM_DATA * NUM_DATA, NULL, &_err));
printf("attempting to create output buffer\n"); printf("attempting to create output buffer\n");
fflush(stdout); fflush(stdout);
cl_mem output_buffer; cl_mem output_buffer;
output_buffer = CL_CHECK_ERR( output_buffer = CL_CHECK2(
clCreateBuffer(context, CL_MEM_WRITE_ONLY, clCreateBuffer(context, CL_MEM_WRITE_ONLY,
sizeof(float) * NUM_DATA * NUM_DATA, NULL, &_err)); sizeof(float) * NUM_DATA * NUM_DATA, NULL, &_err));
@@ -180,7 +171,7 @@ int main(int argc, char **argv) {
printf("attempting to create kernel\n"); printf("attempting to create kernel\n");
fflush(stdout); fflush(stdout);
kernel = CL_CHECK_ERR(clCreateKernel(program, "sgemm", &_err)); kernel = CL_CHECK2(clCreateKernel(program, "sgemm", &_err));
CL_CHECK(clSetKernelArg(kernel, 0, sizeof(input_bufferA), &input_bufferA)); CL_CHECK(clSetKernelArg(kernel, 0, sizeof(input_bufferA), &input_bufferA));
CL_CHECK(clSetKernelArg(kernel, 1, sizeof(input_bufferB), &input_bufferB)); CL_CHECK(clSetKernelArg(kernel, 1, sizeof(input_bufferB), &input_bufferB));
CL_CHECK(clSetKernelArg(kernel, 2, sizeof(output_buffer), &output_buffer)); CL_CHECK(clSetKernelArg(kernel, 2, sizeof(output_buffer), &output_buffer));
@@ -209,7 +200,7 @@ int main(int argc, char **argv) {
CL_CHECK(clEnqueueNDRangeKernel(queue, kernel, 3, NULL, global_work_size, CL_CHECK(clEnqueueNDRangeKernel(queue, kernel, 3, NULL, global_work_size,
local_work_size, 0, NULL, local_work_size, 0, NULL,
&kernel_completion)); &kernel_completion));
printf("Enqueue'd kerenel\n"); printf("Enqueue'd kernel\n");
fflush(stdout); fflush(stdout);
cl_ulong time_start, time_end; cl_ulong time_start, time_end;
CL_CHECK(clWaitForEvents(1, &kernel_completion)); CL_CHECK(clWaitForEvents(1, &kernel_completion));
@@ -231,13 +222,8 @@ int main(int argc, char **argv) {
} }
printf("\n"); printf("\n");
CL_CHECK(clReleaseMemObject(memObjects[0])); // Clean up
CL_CHECK(clReleaseMemObject(memObjects[1])); cleanup();
CL_CHECK(clReleaseMemObject(memObjects[2]));
CL_CHECK(clReleaseKernel(kernel));
CL_CHECK(clReleaseProgram(program));
CL_CHECK(clReleaseContext(context));
return 0; return 0;
} }

BIN
benchmarks/opencl/sgemm/sgemm
View File

Binary file not shown.

9
benchmarks/opencl/vecadd/main.cc
View File

@@ -31,6 +31,7 @@
}) })
int exitcode = 0; int exitcode = 0;
cl_device_id device_id = NULL;
cl_context context = NULL; cl_context context = NULL;
cl_command_queue commandQueue = NULL; cl_command_queue commandQueue = NULL;
cl_program program = NULL; cl_program program = NULL;
@@ -72,6 +73,8 @@ static void cleanup() {
if (b_memobj) clReleaseMemObject(b_memobj); if (b_memobj) clReleaseMemObject(b_memobj);
if (c_memobj) clReleaseMemObject(c_memobj); if (c_memobj) clReleaseMemObject(c_memobj);
if (context) clReleaseContext(context); if (context) clReleaseContext(context);
if (device_id) clReleaseDevice(device_id);
if (kernel_bin) free(kernel_bin); if (kernel_bin) free(kernel_bin);
if (A) free(A); if (A) free(A);
if (B) free(B); if (B) free(B);
@@ -104,7 +107,6 @@ int main (int argc, char **argv) {
printf("enter demo main\n"); printf("enter demo main\n");
cl_platform_id platform_id; cl_platform_id platform_id;
cl_device_id device_id;
size_t kernel_size; size_t kernel_size;
cl_int binary_status = 0; cl_int binary_status = 0;
int i; int i;
@@ -139,6 +141,11 @@ int main (int argc, char **argv) {
// Create program from kernel source // Create program from kernel source
program = CL_CHECK2(clCreateProgramWithBinary( program = CL_CHECK2(clCreateProgramWithBinary(
context, 1, &device_id, &kernel_size, &kernel_bin, &binary_status, &_err)); context, 1, &device_id, &kernel_size, &kernel_bin, &binary_status, &_err));
if (program == NULL) {
printf("clCreateProgramWithBinary() failed\n");
cleanup();
return -1;
}
// Build program // Build program
CL_CHECK(clBuildProgram(program, 1, &device_id, NULL, NULL, NULL)); CL_CHECK(clBuildProgram(program, 1, &device_id, NULL, NULL, NULL));