SWDEV-470698 - fix formatting, add format check workflow (#657)
Este cometimento está contido em:
1 ascendente
5840940caa
cometimento
f7338717ae
1574 ficheiros modificados
+162903
-199277
Não existem ficheiros que correspondam à sua pesquisa
@@ -41,21 +41,20 @@ static const unsigned int Sizes[NUM_SIZES] = {256, 512, 1024, 2048};
|
||||
|
||||
#if defined(CL_VERSION_2_0)
|
||||
#define NUM_FORMATS 2
|
||||
static const cl_image_format formats[NUM_FORMATS] = {
|
||||
{CL_RGBA, CL_UNSIGNED_INT8}, {CL_sRGBA, CL_UNORM_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},
|
||||
{CL_sRGBA, CL_UNORM_INT8}};
|
||||
static const char* textFormats[NUM_FORMATS] = {"CL_RGBA , CL_UNSIGNED_INT8",
|
||||
"CL_sRGBA, CL_UNORM_INT8 "};
|
||||
static const unsigned int formatSize[NUM_FORMATS] = {sizeof(CL_UNSIGNED_INT8),
|
||||
sizeof(CL_UNORM_INT8)};
|
||||
#else
|
||||
#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)};
|
||||
#endif
|
||||
|
||||
const static char *strKernel = {KERNEL_CODE(
|
||||
const static char* strKernel = {KERNEL_CODE(
|
||||
\n __constant sampler_t s_nearest = CLK_FILTER_NEAREST | CLK_NORMALIZED_COORDS_FALSE | CLK_ADDRESS_CLAMP_TO_EDGE;
|
||||
\n __kernel void image_kernel(read_write image2d_t image, uint zero) {
|
||||
int x = get_global_id(0);
|
||||
@@ -70,27 +69,23 @@ const static char *strKernel = {KERNEL_CODE(
|
||||
}
|
||||
\n)};
|
||||
|
||||
OCLPerfImageReadWrite::OCLPerfImageReadWrite() {
|
||||
_numSubTests = NUM_SIZES * NUM_FORMATS;
|
||||
}
|
||||
OCLPerfImageReadWrite::OCLPerfImageReadWrite() { _numSubTests = NUM_SIZES * NUM_FORMATS; }
|
||||
|
||||
OCLPerfImageReadWrite::~OCLPerfImageReadWrite() {}
|
||||
|
||||
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 OCLPerfImageReadWrite::setData(void *ptr, unsigned int size,
|
||||
unsigned int value) {
|
||||
unsigned int *ptr2 = (unsigned int *)ptr;
|
||||
void OCLPerfImageReadWrite::setData(void* ptr, unsigned int size, unsigned int value) {
|
||||
unsigned int* ptr2 = (unsigned int*)ptr;
|
||||
for (unsigned int i = 0; i < size >> 2; i++) {
|
||||
ptr2[i] = value;
|
||||
value++;
|
||||
}
|
||||
}
|
||||
|
||||
void OCLPerfImageReadWrite::open(unsigned int test, char *units,
|
||||
double &conversion, unsigned int deviceId) {
|
||||
void OCLPerfImageReadWrite::open(unsigned int test, char* units, double& conversion,
|
||||
unsigned int deviceId) {
|
||||
error_ = CL_SUCCESS;
|
||||
testId_ = test;
|
||||
|
||||
@@ -105,14 +100,13 @@ void OCLPerfImageReadWrite::open(unsigned int test, char *units,
|
||||
|
||||
// check device version
|
||||
size_t param_size = 0;
|
||||
char *strVersion = 0;
|
||||
error_ = _wrapper->clGetDeviceInfo(
|
||||
devices_[_deviceId], CL_DEVICE_OPENCL_C_VERSION, 0, 0, ¶m_size);
|
||||
char* strVersion = 0;
|
||||
error_ =
|
||||
_wrapper->clGetDeviceInfo(devices_[_deviceId], CL_DEVICE_OPENCL_C_VERSION, 0, 0, ¶m_size);
|
||||
CHECK_RESULT(error_ != CL_SUCCESS, "clGetDeviceInfo failed");
|
||||
strVersion = new char[param_size];
|
||||
error_ =
|
||||
_wrapper->clGetDeviceInfo(devices_[_deviceId], CL_DEVICE_OPENCL_C_VERSION,
|
||||
param_size, strVersion, 0);
|
||||
error_ = _wrapper->clGetDeviceInfo(devices_[_deviceId], CL_DEVICE_OPENCL_C_VERSION, param_size,
|
||||
strVersion, 0);
|
||||
CHECK_RESULT(error_ != CL_SUCCESS, "clGetDeviceInfo failed");
|
||||
if (strVersion[9] < '2') {
|
||||
skip_ = true;
|
||||
@@ -126,7 +120,7 @@ void OCLPerfImageReadWrite::open(unsigned int test, char *units,
|
||||
size_t size;
|
||||
cl_bool imageSupport_ = false;
|
||||
error_ = _wrapper->clGetDeviceInfo(devices_[_deviceId], CL_DEVICE_IMAGE_SUPPORT,
|
||||
sizeof(imageSupport_), &imageSupport_, &size);
|
||||
sizeof(imageSupport_), &imageSupport_, &size);
|
||||
if (!imageSupport_) {
|
||||
printf("\n%s\n", "Image not supported, skipping this test!");
|
||||
skip_ = true;
|
||||
@@ -141,16 +135,14 @@ void OCLPerfImageReadWrite::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);
|
||||
}
|
||||
@@ -161,9 +153,9 @@ void OCLPerfImageReadWrite::open(unsigned int test, char *units,
|
||||
|
||||
// create image
|
||||
setData(memptr, memSize, 0x0);
|
||||
imageBuffer_ = _wrapper->clCreateImage2D(
|
||||
context_, CL_MEM_READ_WRITE | CL_MEM_USE_HOST_PTR, &formats[bufnum_],
|
||||
bufSize_, bufSize_, 0, memptr, &error_);
|
||||
imageBuffer_ =
|
||||
_wrapper->clCreateImage2D(context_, CL_MEM_READ_WRITE | CL_MEM_USE_HOST_PTR,
|
||||
&formats[bufnum_], bufSize_, bufSize_, 0, memptr, &error_);
|
||||
CHECK_RESULT(error_ != CL_SUCCESS, "clCreateImage2D() failed");
|
||||
|
||||
const unsigned int zero = 0;
|
||||
@@ -186,8 +178,7 @@ void OCLPerfImageReadWrite::run(void) {
|
||||
size_t gws[2] = {bufSize_, bufSize_};
|
||||
size_t lws[2] = {8, 8};
|
||||
|
||||
error_ = _wrapper->clEnqueueNDRangeKernel(cmd_queue_, kernel_, 2, NULL, gws,
|
||||
lws, 0, NULL, NULL);
|
||||
error_ = _wrapper->clEnqueueNDRangeKernel(cmd_queue_, kernel_, 2, NULL, gws, lws, 0, NULL, NULL);
|
||||
CHECK_RESULT((error_ != CL_SUCCESS), "clEnqueueNDRangeKernel() failed");
|
||||
_wrapper->clFinish(cmd_queue_);
|
||||
|
||||
@@ -195,8 +186,8 @@ void OCLPerfImageReadWrite::run(void) {
|
||||
timer.Start();
|
||||
|
||||
for (unsigned int i = 0; i < numIter; ++i) {
|
||||
error_ = _wrapper->clEnqueueNDRangeKernel(cmd_queue_, kernel_, 2, NULL, gws,
|
||||
lws, 0, NULL, NULL);
|
||||
error_ =
|
||||
_wrapper->clEnqueueNDRangeKernel(cmd_queue_, kernel_, 2, NULL, gws, lws, 0, NULL, NULL);
|
||||
CHECK_RESULT((error_ != CL_SUCCESS), "clEnqueueNDRangeKernel() failed");
|
||||
_wrapper->clFinish(cmd_queue_);
|
||||
}
|
||||
@@ -211,8 +202,8 @@ void OCLPerfImageReadWrite::run(void) {
|
||||
_perfInfo = (float)perf;
|
||||
char buf[256];
|
||||
unsigned int fmt_num = (testId_ / NUM_SIZES) % NUM_FORMATS;
|
||||
SNPRINTF(buf, sizeof(buf), " (%4dx%4d) fmt:%s(%1d) i: %4d (GB/s) ", bufSize_,
|
||||
bufSize_, textFormats[fmt_num], formatSize[bufnum_], numIter);
|
||||
SNPRINTF(buf, sizeof(buf), " (%4dx%4d) fmt:%s(%1d) i: %4d (GB/s) ", bufSize_, bufSize_,
|
||||
textFormats[fmt_num], formatSize[bufnum_], numIter);
|
||||
testDescString = buf;
|
||||
}
|
||||
|
||||
@@ -223,8 +214,7 @@ unsigned int OCLPerfImageReadWrite::close(void) {
|
||||
}
|
||||
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();
|
||||
|
||||
Criar uma nova questão referindo esta
Bloquear um utilizador