SWDEV-470698 - fix formatting, add format check workflow (#657)
This commit is contained in:
committed by
GitHub
parent
5840940caa
commit
f7338717ae
@@ -40,12 +40,11 @@
|
||||
static const unsigned int Sizes[NUM_SIZES] = {64, 128, 256, 512};
|
||||
|
||||
#define NUM_FORMATS 1
|
||||
static const cl_image_format formats[NUM_FORMATS] = {
|
||||
{CL_RGBA, CL_UNSIGNED_INT8}};
|
||||
static const char *textFormats[NUM_FORMATS] = {"CL_RGBA , CL_UNSIGNED_INT8"};
|
||||
static const cl_image_format formats[NUM_FORMATS] = {{CL_RGBA, CL_UNSIGNED_INT8}};
|
||||
static const char* textFormats[NUM_FORMATS] = {"CL_RGBA , CL_UNSIGNED_INT8"};
|
||||
static const unsigned int formatSize[NUM_FORMATS] = {sizeof(CL_UNSIGNED_INT8)};
|
||||
|
||||
const static char *strKernel = {KERNEL_CODE(
|
||||
const static char* strKernel = {KERNEL_CODE(
|
||||
\n __kernel void image_kernel(write_only image3d_t input) {
|
||||
size_t x = get_global_id(0);
|
||||
size_t y = get_global_id(1);
|
||||
@@ -56,18 +55,15 @@ const static char *strKernel = {KERNEL_CODE(
|
||||
}
|
||||
\n)};
|
||||
|
||||
OCLPerf3DImageWriteSpeed::OCLPerf3DImageWriteSpeed() {
|
||||
_numSubTests = NUM_SIZES * NUM_FORMATS;
|
||||
}
|
||||
OCLPerf3DImageWriteSpeed::OCLPerf3DImageWriteSpeed() { _numSubTests = NUM_SIZES * NUM_FORMATS; }
|
||||
|
||||
OCLPerf3DImageWriteSpeed::~OCLPerf3DImageWriteSpeed() {}
|
||||
|
||||
static void CL_CALLBACK notify_callback(const char *errinfo,
|
||||
const void *private_info, size_t cb,
|
||||
void *user_data) {}
|
||||
static void CL_CALLBACK notify_callback(const char* errinfo, const void* private_info, size_t cb,
|
||||
void* user_data) {}
|
||||
|
||||
void OCLPerf3DImageWriteSpeed::open(unsigned int test, char *units,
|
||||
double &conversion, unsigned int deviceId) {
|
||||
void OCLPerf3DImageWriteSpeed::open(unsigned int test, char* units, double& conversion,
|
||||
unsigned int deviceId) {
|
||||
error_ = CL_SUCCESS;
|
||||
testId_ = test;
|
||||
|
||||
@@ -82,8 +78,8 @@ void OCLPerf3DImageWriteSpeed::open(unsigned int test, char *units,
|
||||
|
||||
char charbuf[1024];
|
||||
size_t retsize;
|
||||
error_ = _wrapper->clGetDeviceInfo(devices_[_deviceId], CL_DEVICE_EXTENSIONS,
|
||||
1024, charbuf, &retsize);
|
||||
error_ =
|
||||
_wrapper->clGetDeviceInfo(devices_[_deviceId], CL_DEVICE_EXTENSIONS, 1024, charbuf, &retsize);
|
||||
CHECK_RESULT(error_ != CL_SUCCESS, "clGetDeviceInfo failed");
|
||||
|
||||
if (!strstr(charbuf, "cl_khr_3d_image_writes")) {
|
||||
@@ -98,16 +94,14 @@ void OCLPerf3DImageWriteSpeed::open(unsigned int test, char *units,
|
||||
|
||||
cmd_queue_ = cmdQueues_[_deviceId];
|
||||
|
||||
program_ = _wrapper->clCreateProgramWithSource(context_, 1, &strKernel, NULL,
|
||||
&error_);
|
||||
program_ = _wrapper->clCreateProgramWithSource(context_, 1, &strKernel, NULL, &error_);
|
||||
CHECK_RESULT((error_ != CL_SUCCESS), "clCreateProgramWithSource() failed");
|
||||
|
||||
error_ = _wrapper->clBuildProgram(program_, 1, &devices_[deviceId],
|
||||
"-cl-std=CL2.0", NULL, NULL);
|
||||
error_ = _wrapper->clBuildProgram(program_, 1, &devices_[deviceId], "-cl-std=CL2.0", NULL, NULL);
|
||||
if (error_ != CL_SUCCESS) {
|
||||
char programLog[1024];
|
||||
_wrapper->clGetProgramBuildInfo(program_, devices_[deviceId],
|
||||
CL_PROGRAM_BUILD_LOG, 1024, programLog, 0);
|
||||
_wrapper->clGetProgramBuildInfo(program_, devices_[deviceId], CL_PROGRAM_BUILD_LOG, 1024,
|
||||
programLog, 0);
|
||||
printf("\n%s\n", programLog);
|
||||
fflush(stdout);
|
||||
}
|
||||
@@ -116,9 +110,8 @@ void OCLPerf3DImageWriteSpeed::open(unsigned int test, char *units,
|
||||
kernel_ = _wrapper->clCreateKernel(program_, "image_kernel", &error_);
|
||||
CHECK_RESULT((error_ != CL_SUCCESS), "clCreateKernel() failed");
|
||||
|
||||
imageBuffer_ = _wrapper->clCreateImage3D(
|
||||
context_, CL_MEM_WRITE_ONLY, &formats[bufnum_], bufSize_, bufSize_,
|
||||
bufSize_, 0, 0, NULL, &error_);
|
||||
imageBuffer_ = _wrapper->clCreateImage3D(context_, CL_MEM_WRITE_ONLY, &formats[bufnum_], bufSize_,
|
||||
bufSize_, bufSize_, 0, 0, NULL, &error_);
|
||||
CHECK_RESULT(imageBuffer_ == 0, "clCreateImage(imageBuffer_) failed");
|
||||
|
||||
// set kernel arguments
|
||||
@@ -138,32 +131,28 @@ void OCLPerf3DImageWriteSpeed::run(void) {
|
||||
size_t lws[3] = {8, 8, 4};
|
||||
|
||||
// warm up
|
||||
error_ = _wrapper->clEnqueueNDRangeKernel(cmd_queue_, kernel_, 3, NULL, gws,
|
||||
lws, 0, NULL, NULL);
|
||||
error_ = _wrapper->clEnqueueNDRangeKernel(cmd_queue_, kernel_, 3, NULL, gws, lws, 0, NULL, NULL);
|
||||
CHECK_RESULT((error_ != CL_SUCCESS), "clEnqueueNDRangeKernel() failed");
|
||||
_wrapper->clFinish(cmd_queue_);
|
||||
|
||||
// checkData
|
||||
char *bufptr = (char *)malloc(memSize_);
|
||||
char* bufptr = (char*)malloc(memSize_);
|
||||
|
||||
size_t origin[3] = {0, 0, 0};
|
||||
size_t region[3] = {bufSize_, bufSize_, bufSize_};
|
||||
size_t image_row_pitch = bufSize_ * formatSize[bufnum_];
|
||||
size_t image_slice_pitch = image_row_pitch * bufSize_;
|
||||
error_ = clEnqueueReadImage(cmd_queue_, imageBuffer_, true, origin, region,
|
||||
image_row_pitch, image_slice_pitch, bufptr, 0,
|
||||
NULL, NULL);
|
||||
error_ = clEnqueueReadImage(cmd_queue_, imageBuffer_, true, origin, region, image_row_pitch,
|
||||
image_slice_pitch, bufptr, 0, NULL, NULL);
|
||||
CHECK_RESULT((error_ != CL_SUCCESS), "clEnqueueReadImage() failed");
|
||||
|
||||
for (size_t i = 0; i < bufSize_ * bufSize_ * bufSize_ * 4; ++i) {
|
||||
if (bufptr[i] != 1) {
|
||||
printf("(%4dx%4dx%4d) fmt:%s(%1u) checkData() fail, image_ptr[%u] = %d\n",
|
||||
bufSize_, bufSize_, bufSize_, textFormats[fmt_num],
|
||||
formatSize[bufnum_], (unsigned int)i, (int)bufptr[i]);
|
||||
printf("(%4dx%4dx%4d) fmt:%s(%1u) checkData() fail, image_ptr[%u] = %d\n", bufSize_, bufSize_,
|
||||
bufSize_, textFormats[fmt_num], formatSize[bufnum_], (unsigned int)i, (int)bufptr[i]);
|
||||
CHECK_RESULT_NO_RETURN(0, "Data validation failed!\n");
|
||||
char buf[256];
|
||||
SNPRINTF(buf, sizeof(buf),
|
||||
" (%4dx%4dx%4d) fmt:%s(%1d) checkData() FAILED! ", bufSize_,
|
||||
SNPRINTF(buf, sizeof(buf), " (%4dx%4dx%4d) fmt:%s(%1d) checkData() FAILED! ", bufSize_,
|
||||
bufSize_, bufSize_, textFormats[fmt_num], formatSize[bufnum_]);
|
||||
testDescString = buf;
|
||||
return;
|
||||
@@ -178,8 +167,8 @@ void OCLPerf3DImageWriteSpeed::run(void) {
|
||||
timer.Start();
|
||||
|
||||
for (unsigned int i = 0; i < numIter; ++i) {
|
||||
error_ = _wrapper->clEnqueueNDRangeKernel(cmd_queue_, kernel_, 3, NULL, gws,
|
||||
lws, 0, NULL, NULL);
|
||||
error_ =
|
||||
_wrapper->clEnqueueNDRangeKernel(cmd_queue_, kernel_, 3, NULL, gws, lws, 0, NULL, NULL);
|
||||
CHECK_RESULT((error_ != CL_SUCCESS), "clEnqueueNDRangeKernel() failed");
|
||||
_wrapper->clFinish(cmd_queue_);
|
||||
}
|
||||
@@ -193,9 +182,8 @@ void OCLPerf3DImageWriteSpeed::run(void) {
|
||||
|
||||
_perfInfo = (float)perf;
|
||||
char buf[256];
|
||||
SNPRINTF(buf, sizeof(buf), " (%3dx%3dx%3d) fmt:%s(%1u) i: %2d (GB/s) ",
|
||||
bufSize_, bufSize_, bufSize_, textFormats[fmt_num],
|
||||
formatSize[bufnum_], numIter);
|
||||
SNPRINTF(buf, sizeof(buf), " (%3dx%3dx%3d) fmt:%s(%1u) i: %2d (GB/s) ", bufSize_, bufSize_,
|
||||
bufSize_, textFormats[fmt_num], formatSize[bufnum_], numIter);
|
||||
testDescString = buf;
|
||||
}
|
||||
|
||||
@@ -203,8 +191,7 @@ unsigned int OCLPerf3DImageWriteSpeed::close(void) {
|
||||
if (!skip_) {
|
||||
if (imageBuffer_) {
|
||||
error_ = _wrapper->clReleaseMemObject(imageBuffer_);
|
||||
CHECK_RESULT_NO_RETURN(error_ != CL_SUCCESS,
|
||||
"clReleaseMemObject(imageBuffer_) failed");
|
||||
CHECK_RESULT_NO_RETURN(error_ != CL_SUCCESS, "clReleaseMemObject(imageBuffer_) failed");
|
||||
}
|
||||
}
|
||||
return OCLTestImp::close();
|
||||
|
||||
Reference in New Issue
Block a user