SWDEV-470698 - fix formatting, add format check workflow (#657)
This commit is contained in:
Danylo Lytovchenko
committato da
GitHub
GitHub
parent
5840940caa
commit
f7338717ae
@@ -39,7 +39,7 @@ static const unsigned int Sizes0[NUM_SIZES] = {16384, 16384};
|
||||
|
||||
#define NUM_FORMATS 1
|
||||
static const cl_image_format formats[NUM_FORMATS] = {{CL_R, CL_UNSIGNED_INT16}};
|
||||
static const char *textFormats[NUM_FORMATS] = {"R8"};
|
||||
static const char* textFormats[NUM_FORMATS] = {"R8"};
|
||||
static const unsigned int formatSize[NUM_FORMATS] = {2 * sizeof(cl_uchar)};
|
||||
|
||||
static const unsigned int Iterations[2] = {1, OCLImageCopyPartial::NUM_ITER};
|
||||
@@ -51,13 +51,12 @@ OCLImageCopyPartial::OCLImageCopyPartial() {
|
||||
|
||||
OCLImageCopyPartial::~OCLImageCopyPartial() {}
|
||||
|
||||
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 OCLImageCopyPartial::setData(void *ptr, unsigned int pitch,
|
||||
unsigned int size, unsigned int value) {
|
||||
unsigned int *ptr2 = (unsigned int *)ptr;
|
||||
void OCLImageCopyPartial::setData(void* ptr, unsigned int pitch, unsigned int size,
|
||||
unsigned int value) {
|
||||
unsigned int* ptr2 = (unsigned int*)ptr;
|
||||
value = 0;
|
||||
for (unsigned int i = 0; i < size >> 2; i++) {
|
||||
ptr2[i] = value;
|
||||
@@ -65,16 +64,15 @@ void OCLImageCopyPartial::setData(void *ptr, unsigned int pitch,
|
||||
}
|
||||
}
|
||||
|
||||
void OCLImageCopyPartial::checkData(void *ptr, unsigned int pitch,
|
||||
unsigned int size, unsigned int value) {
|
||||
unsigned int *ptr2 = (unsigned int *)ptr;
|
||||
void OCLImageCopyPartial::checkData(void* ptr, unsigned int pitch, unsigned int size,
|
||||
unsigned int value) {
|
||||
unsigned int* ptr2 = (unsigned int*)ptr;
|
||||
value = 0;
|
||||
for (unsigned int i = 0; i < size >> 2; i++) {
|
||||
if (ptr2[i] != value) {
|
||||
printf("Data validation failed at %d! Got 0x%08x 0x%08x 0x%08x 0x%08x\n",
|
||||
i, ptr2[i], ptr2[i + 1], ptr2[i + 2], ptr2[i + 3]);
|
||||
printf("Expected 0x%08x 0x%08x 0x%08x 0x%08x\n", value, value, value,
|
||||
value);
|
||||
printf("Data validation failed at %d! Got 0x%08x 0x%08x 0x%08x 0x%08x\n", i, ptr2[i],
|
||||
ptr2[i + 1], ptr2[i + 2], ptr2[i + 3]);
|
||||
printf("Expected 0x%08x 0x%08x 0x%08x 0x%08x\n", value, value, value, value);
|
||||
CHECK_RESULT(true, "Data validation failed!");
|
||||
break;
|
||||
}
|
||||
@@ -82,13 +80,13 @@ void OCLImageCopyPartial::checkData(void *ptr, unsigned int pitch,
|
||||
}
|
||||
}
|
||||
|
||||
void OCLImageCopyPartial::open(unsigned int test, char *units,
|
||||
double &conversion, unsigned int deviceId) {
|
||||
void OCLImageCopyPartial::open(unsigned int test, char* units, double& conversion,
|
||||
unsigned int deviceId) {
|
||||
cl_uint typeOfDevice = type_;
|
||||
cl_uint numPlatforms;
|
||||
cl_platform_id platform = NULL;
|
||||
cl_uint num_devices = 0;
|
||||
cl_device_id *devices = NULL;
|
||||
cl_device_id* devices = NULL;
|
||||
cl_device_id device = NULL;
|
||||
size_t queryOut = 0;
|
||||
_crcword = 0;
|
||||
@@ -106,7 +104,7 @@ void OCLImageCopyPartial::open(unsigned int test, char *units,
|
||||
error_ = _wrapper->clGetPlatformIDs(0, NULL, &numPlatforms);
|
||||
CHECK_RESULT(error_ != CL_SUCCESS, "clGetPlatformIDs failed");
|
||||
if (0 < numPlatforms) {
|
||||
cl_platform_id *platforms = new cl_platform_id[numPlatforms];
|
||||
cl_platform_id* platforms = new cl_platform_id[numPlatforms];
|
||||
error_ = _wrapper->clGetPlatformIDs(numPlatforms, platforms, NULL);
|
||||
CHECK_RESULT(error_ != CL_SUCCESS, "clGetPlatformIDs failed");
|
||||
#if 0
|
||||
@@ -116,13 +114,12 @@ void OCLImageCopyPartial::open(unsigned int test, char *units,
|
||||
#endif
|
||||
platform = platforms[_platformIndex];
|
||||
char pbuf[100];
|
||||
error_ = _wrapper->clGetPlatformInfo(platforms[_platformIndex],
|
||||
CL_PLATFORM_VENDOR, sizeof(pbuf), pbuf,
|
||||
NULL);
|
||||
error_ = _wrapper->clGetPlatformInfo(platforms[_platformIndex], CL_PLATFORM_VENDOR,
|
||||
sizeof(pbuf), pbuf, NULL);
|
||||
num_devices = 0;
|
||||
/* Get the number of requested devices */
|
||||
error_ = _wrapper->clGetDeviceIDs(platforms[_platformIndex], typeOfDevice,
|
||||
0, NULL, &num_devices);
|
||||
error_ =
|
||||
_wrapper->clGetDeviceIDs(platforms[_platformIndex], typeOfDevice, 0, NULL, &num_devices);
|
||||
// Runtime returns an error when no GPU devices are present instead of just
|
||||
// returning 0 devices
|
||||
// CHECK_RESULT(error_ != CL_SUCCESS, "clGetDeviceIDs failed");
|
||||
@@ -155,33 +152,31 @@ void OCLImageCopyPartial::open(unsigned int test, char *units,
|
||||
*/
|
||||
CHECK_RESULT(platform == 0, "Couldn't find AMD platform, cannot proceed");
|
||||
|
||||
devices = (cl_device_id *)malloc(num_devices * sizeof(cl_device_id));
|
||||
devices = (cl_device_id*)malloc(num_devices * sizeof(cl_device_id));
|
||||
CHECK_RESULT(devices == 0, "no devices");
|
||||
|
||||
/* Get the requested device */
|
||||
error_ = _wrapper->clGetDeviceIDs(platform, typeOfDevice, num_devices,
|
||||
devices, NULL);
|
||||
error_ = _wrapper->clGetDeviceIDs(platform, typeOfDevice, num_devices, devices, NULL);
|
||||
CHECK_RESULT(error_ != CL_SUCCESS, "clGetDeviceIDs failed");
|
||||
|
||||
CHECK_RESULT(_deviceId >= num_devices, "Requested deviceID not available");
|
||||
device = devices[_deviceId];
|
||||
|
||||
error_ = _wrapper->clGetDeviceInfo(device, CL_DEVICE_IMAGE2D_MAX_WIDTH,
|
||||
sizeof(size_t), &queryOut, NULL);
|
||||
error_ = _wrapper->clGetDeviceInfo(device, CL_DEVICE_IMAGE2D_MAX_WIDTH, sizeof(size_t), &queryOut,
|
||||
NULL);
|
||||
bufSizeW_ = (cl_uint)queryOut;
|
||||
error_ = _wrapper->clGetDeviceInfo(device, CL_DEVICE_IMAGE2D_MAX_HEIGHT,
|
||||
sizeof(size_t), &queryOut, NULL);
|
||||
error_ = _wrapper->clGetDeviceInfo(device, CL_DEVICE_IMAGE2D_MAX_HEIGHT, sizeof(size_t),
|
||||
&queryOut, NULL);
|
||||
bufSizeH_ = (cl_uint)queryOut;
|
||||
|
||||
context_ = _wrapper->clCreateContext(NULL, 1, &device, notify_callback, NULL,
|
||||
&error_);
|
||||
context_ = _wrapper->clCreateContext(NULL, 1, &device, notify_callback, NULL, &error_);
|
||||
CHECK_RESULT(context_ == 0, "clCreateContext failed");
|
||||
|
||||
cmd_queue_ = _wrapper->clCreateCommandQueue(context_, device, 0, NULL);
|
||||
CHECK_RESULT(cmd_queue_ == 0, "clCreateCommandQueue failed");
|
||||
|
||||
cl_mem_flags flags = CL_MEM_WRITE_ONLY;
|
||||
void *mem;
|
||||
void* mem;
|
||||
size_t origin[3] = {0, 0, 0};
|
||||
size_t region[3] = {bufSizeW_, bufSizeH_, 1};
|
||||
size_t image_row_pitch;
|
||||
@@ -197,29 +192,25 @@ void OCLImageCopyPartial::open(unsigned int test, char *units,
|
||||
}
|
||||
|
||||
if (dstImage_) {
|
||||
dstBuffer_ =
|
||||
_wrapper->clCreateImage2D(context_, flags, &formats[bufnum_], bufSizeW_,
|
||||
bufSizeH_, 0, NULL, &error_);
|
||||
dstBuffer_ = _wrapper->clCreateImage2D(context_, flags, &formats[bufnum_], bufSizeW_, bufSizeH_,
|
||||
0, NULL, &error_);
|
||||
CHECK_RESULT(dstBuffer_ == 0, "clCreateImage(dstBuffer) failed");
|
||||
mem = _wrapper->clEnqueueMapImage(
|
||||
cmd_queue_, dstBuffer_, CL_TRUE, CL_MAP_WRITE, origin, region,
|
||||
&image_row_pitch, &image_slice_pitch, 0, NULL, NULL, &error_);
|
||||
mem = _wrapper->clEnqueueMapImage(cmd_queue_, dstBuffer_, CL_TRUE, CL_MAP_WRITE, origin, region,
|
||||
&image_row_pitch, &image_slice_pitch, 0, NULL, NULL, &error_);
|
||||
CHECK_RESULT(error_, "clEnqueueMapImage failed");
|
||||
memSize = (unsigned int)image_row_pitch * (unsigned int)region[1];
|
||||
} else {
|
||||
dstBuffer_ = _wrapper->clCreateBuffer(
|
||||
context_, flags, region[0] * region[1] * formatSize[bufnum_], NULL,
|
||||
&error_);
|
||||
context_, flags, region[0] * region[1] * formatSize[bufnum_], NULL, &error_);
|
||||
CHECK_RESULT(dstBuffer_ == 0, "clCreateBuffer(dstBuffer) failed");
|
||||
mem = _wrapper->clEnqueueMapBuffer(
|
||||
cmd_queue_, dstBuffer_, CL_TRUE, CL_MAP_WRITE, 0,
|
||||
region[0] * region[1] * formatSize[bufnum_], 0, NULL, NULL, &error_);
|
||||
mem = _wrapper->clEnqueueMapBuffer(cmd_queue_, dstBuffer_, CL_TRUE, CL_MAP_WRITE, 0,
|
||||
region[0] * region[1] * formatSize[bufnum_], 0, NULL, NULL,
|
||||
&error_);
|
||||
CHECK_RESULT(error_, "clEnqueueMapBuffer failed");
|
||||
memSize =
|
||||
(unsigned int)region[0] * (unsigned int)region[1] * formatSize[bufnum_];
|
||||
memSize = (unsigned int)region[0] * (unsigned int)region[1] * formatSize[bufnum_];
|
||||
image_row_pitch = 0;
|
||||
}
|
||||
unsigned int *ptr2 = (unsigned int *)mem;
|
||||
unsigned int* ptr2 = (unsigned int*)mem;
|
||||
for (unsigned int i = 0; i < memSize >> 2; i++) {
|
||||
ptr2[i] = 0xdeadbeef;
|
||||
}
|
||||
@@ -227,26 +218,22 @@ void OCLImageCopyPartial::open(unsigned int test, char *units,
|
||||
|
||||
flags = CL_MEM_READ_ONLY;
|
||||
if (srcImage_) {
|
||||
srcBuffer_ =
|
||||
_wrapper->clCreateImage2D(context_, flags, &formats[bufnum_], bufSizeW_,
|
||||
bufSizeH_, 0, NULL, &error_);
|
||||
srcBuffer_ = _wrapper->clCreateImage2D(context_, flags, &formats[bufnum_], bufSizeW_, bufSizeH_,
|
||||
0, NULL, &error_);
|
||||
CHECK_RESULT(srcBuffer_ == 0, "clCreateImage(srcBuffer) failed");
|
||||
mem = _wrapper->clEnqueueMapImage(
|
||||
cmd_queue_, srcBuffer_, CL_TRUE, CL_MAP_WRITE, origin, region,
|
||||
&image_row_pitch, &image_slice_pitch, 0, NULL, NULL, &error_);
|
||||
mem = _wrapper->clEnqueueMapImage(cmd_queue_, srcBuffer_, CL_TRUE, CL_MAP_WRITE, origin, region,
|
||||
&image_row_pitch, &image_slice_pitch, 0, NULL, NULL, &error_);
|
||||
CHECK_RESULT(error_, "clEnqueueMapImage failed");
|
||||
memSize = (unsigned int)image_row_pitch * (unsigned int)region[1];
|
||||
} else {
|
||||
srcBuffer_ = _wrapper->clCreateBuffer(
|
||||
context_, flags, region[0] * region[1] * formatSize[bufnum_], NULL,
|
||||
&error_);
|
||||
context_, flags, region[0] * region[1] * formatSize[bufnum_], NULL, &error_);
|
||||
CHECK_RESULT(srcBuffer_ == 0, "clCreateBuffer(srcBuffer) failed");
|
||||
mem = _wrapper->clEnqueueMapBuffer(
|
||||
cmd_queue_, srcBuffer_, CL_TRUE, CL_MAP_WRITE, 0,
|
||||
region[0] * region[1] * formatSize[bufnum_], 0, NULL, NULL, &error_);
|
||||
mem = _wrapper->clEnqueueMapBuffer(cmd_queue_, srcBuffer_, CL_TRUE, CL_MAP_WRITE, 0,
|
||||
region[0] * region[1] * formatSize[bufnum_], 0, NULL, NULL,
|
||||
&error_);
|
||||
CHECK_RESULT(error_, "clEnqueueMapBuffer failed");
|
||||
memSize =
|
||||
(unsigned int)region[0] * (unsigned int)region[1] * formatSize[bufnum_];
|
||||
memSize = (unsigned int)region[0] * (unsigned int)region[1] * formatSize[bufnum_];
|
||||
image_row_pitch = 0;
|
||||
}
|
||||
setData(mem, (unsigned int)image_row_pitch, memSize, 0xdeadbeef);
|
||||
@@ -267,24 +254,23 @@ void OCLImageCopyPartial::run(void) {
|
||||
|
||||
// Warm up
|
||||
if (srcImage_ == false) {
|
||||
error_ = _wrapper->clEnqueueCopyBufferToImage(
|
||||
cmd_queue_, srcBuffer_, dstBuffer_, 0, origin, region, 0, NULL, NULL);
|
||||
error_ = _wrapper->clEnqueueCopyBufferToImage(cmd_queue_, srcBuffer_, dstBuffer_, 0, origin,
|
||||
region, 0, NULL, NULL);
|
||||
CHECK_RESULT(error_, "clEnqueueCopyBufferToImage failed");
|
||||
} else if (dstImage_ == false) {
|
||||
error_ = _wrapper->clEnqueueCopyImageToBuffer(
|
||||
cmd_queue_, srcBuffer_, dstBuffer_, origin, region, 0, 0, NULL, NULL);
|
||||
error_ = _wrapper->clEnqueueCopyImageToBuffer(cmd_queue_, srcBuffer_, dstBuffer_, origin,
|
||||
region, 0, 0, NULL, NULL);
|
||||
CHECK_RESULT(error_, "clEnqueueCopyImageToBuffer failed");
|
||||
} else {
|
||||
error_ =
|
||||
_wrapper->clEnqueueCopyImage(cmd_queue_, srcBuffer_, dstBuffer_, origin,
|
||||
origin, region, 0, NULL, NULL);
|
||||
error_ = _wrapper->clEnqueueCopyImage(cmd_queue_, srcBuffer_, dstBuffer_, origin, origin,
|
||||
region, 0, NULL, NULL);
|
||||
CHECK_RESULT(error_, "clEnqueueCopyImage failed");
|
||||
}
|
||||
error_ = _wrapper->clFinish(cmd_queue_);
|
||||
CHECK_RESULT(error_, "clFinish failed");
|
||||
|
||||
const char *strSrc = NULL;
|
||||
const char *strDst = NULL;
|
||||
const char* strSrc = NULL;
|
||||
const char* strDst = NULL;
|
||||
if (srcImage_)
|
||||
strSrc = "img";
|
||||
else
|
||||
@@ -293,30 +279,28 @@ void OCLImageCopyPartial::run(void) {
|
||||
strDst = "img";
|
||||
else
|
||||
strDst = "buf";
|
||||
void *mem;
|
||||
void* mem;
|
||||
size_t image_row_pitch;
|
||||
size_t image_slice_pitch;
|
||||
unsigned int memSize;
|
||||
if (dstImage_) {
|
||||
mem = _wrapper->clEnqueueMapImage(
|
||||
cmd_queue_, dstBuffer_, CL_TRUE, CL_MAP_READ, origin, region,
|
||||
&image_row_pitch, &image_slice_pitch, 0, NULL, NULL, &error_);
|
||||
mem = _wrapper->clEnqueueMapImage(cmd_queue_, dstBuffer_, CL_TRUE, CL_MAP_READ, origin, region,
|
||||
&image_row_pitch, &image_slice_pitch, 0, NULL, NULL, &error_);
|
||||
CHECK_RESULT(error_, "clEnqueueMapImage failed");
|
||||
memSize = (unsigned int)image_row_pitch * (unsigned int)region[1];
|
||||
} else {
|
||||
mem = _wrapper->clEnqueueMapBuffer(
|
||||
cmd_queue_, dstBuffer_, CL_TRUE, CL_MAP_READ, 0,
|
||||
region[0] * region[1] * formatSize[bufnum_], 0, NULL, NULL, &error_);
|
||||
mem = _wrapper->clEnqueueMapBuffer(cmd_queue_, dstBuffer_, CL_TRUE, CL_MAP_READ, 0,
|
||||
region[0] * region[1] * formatSize[bufnum_], 0, NULL, NULL,
|
||||
&error_);
|
||||
CHECK_RESULT(error_, "clEnqueueMapBuffer failed");
|
||||
memSize =
|
||||
(unsigned int)region[0] * (unsigned int)region[1] * formatSize[bufnum_];
|
||||
memSize = (unsigned int)region[0] * (unsigned int)region[1] * formatSize[bufnum_];
|
||||
image_row_pitch = 0;
|
||||
}
|
||||
checkData(mem, (unsigned int)image_row_pitch, memSize, 0x600df00d);
|
||||
_wrapper->clEnqueueUnmapMemObject(cmd_queue_, dstBuffer_, mem, 0, NULL, NULL);
|
||||
char buf[256];
|
||||
SNPRINTF(buf, sizeof(buf), " (%4dx%4d) fmt:%s src:%s dst:%s i: %4d (GB/s) ",
|
||||
bufSizeW_, bufSizeH_, textFormats[bufnum_], strSrc, strDst, numIter);
|
||||
SNPRINTF(buf, sizeof(buf), " (%4dx%4d) fmt:%s src:%s dst:%s i: %4d (GB/s) ", bufSizeW_, bufSizeH_,
|
||||
textFormats[bufnum_], strSrc, strDst, numIter);
|
||||
testDescString = buf;
|
||||
}
|
||||
|
||||
@@ -325,18 +309,15 @@ unsigned int OCLImageCopyPartial::close(void) {
|
||||
|
||||
if (srcBuffer_) {
|
||||
error_ = _wrapper->clReleaseMemObject(srcBuffer_);
|
||||
CHECK_RESULT_NO_RETURN(error_ != CL_SUCCESS,
|
||||
"clReleaseMemObject(srcBuffer_) failed");
|
||||
CHECK_RESULT_NO_RETURN(error_ != CL_SUCCESS, "clReleaseMemObject(srcBuffer_) failed");
|
||||
}
|
||||
if (dstBuffer_) {
|
||||
error_ = _wrapper->clReleaseMemObject(dstBuffer_);
|
||||
CHECK_RESULT_NO_RETURN(error_ != CL_SUCCESS,
|
||||
"clReleaseMemObject(dstBuffer_) failed");
|
||||
CHECK_RESULT_NO_RETURN(error_ != CL_SUCCESS, "clReleaseMemObject(dstBuffer_) failed");
|
||||
}
|
||||
if (cmd_queue_) {
|
||||
error_ = _wrapper->clReleaseCommandQueue(cmd_queue_);
|
||||
CHECK_RESULT_NO_RETURN(error_ != CL_SUCCESS,
|
||||
"clReleaseCommandQueue failed");
|
||||
CHECK_RESULT_NO_RETURN(error_ != CL_SUCCESS, "clReleaseCommandQueue failed");
|
||||
}
|
||||
if (context_) {
|
||||
error_ = _wrapper->clReleaseContext(context_);
|
||||
|
||||
Fai riferimento in un nuovo problema
Block a user