SWDEV-470698 - fix formatting, add format check workflow (#657)
Este commit está contenido en:
cometido por
GitHub
padre
5840940caa
commit
f7338717ae
@@ -38,8 +38,8 @@
|
||||
|
||||
#define NUM_SIZES 8
|
||||
// 256KB, 1 MB, 4MB, 16 MB
|
||||
static const unsigned int Sizes[NUM_SIZES] = {
|
||||
1024, 32 * 1024, 64 * 1024, 128 * 1024, 262144, 1048576, 4194304, 16777216};
|
||||
static const unsigned int Sizes[NUM_SIZES] = {1024, 32 * 1024, 64 * 1024, 128 * 1024,
|
||||
262144, 1048576, 4194304, 16777216};
|
||||
|
||||
static cl_uint blockedSubtests;
|
||||
|
||||
@@ -47,7 +47,7 @@ static const unsigned int Iterations[2] = {1, OCLPerfBufferReadSpeed::NUM_ITER};
|
||||
#define NUM_OFFSETS 1
|
||||
static const unsigned int offsets[NUM_OFFSETS] = {0};
|
||||
#define NUM_SUBTESTS (3 + NUM_OFFSETS)
|
||||
extern const char *blkStr[2];
|
||||
extern const char* blkStr[2];
|
||||
|
||||
OCLPerfBufferReadSpeed::OCLPerfBufferReadSpeed() {
|
||||
_numSubTests = NUM_SIZES * NUM_SUBTESTS * 2;
|
||||
@@ -57,16 +57,15 @@ OCLPerfBufferReadSpeed::OCLPerfBufferReadSpeed() {
|
||||
|
||||
OCLPerfBufferReadSpeed::~OCLPerfBufferReadSpeed() {}
|
||||
|
||||
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 OCLPerfBufferReadSpeed::open(unsigned int test, char *units,
|
||||
double &conversion, unsigned int deviceId) {
|
||||
void OCLPerfBufferReadSpeed::open(unsigned int test, char* units, double& conversion,
|
||||
unsigned int deviceId) {
|
||||
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;
|
||||
_crcword = 0;
|
||||
conversion = 1.0f;
|
||||
@@ -87,7 +86,7 @@ void OCLPerfBufferReadSpeed::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
|
||||
@@ -97,13 +96,11 @@ void OCLPerfBufferReadSpeed::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], type_, 0, NULL,
|
||||
&num_devices);
|
||||
error_ = _wrapper->clGetDeviceIDs(platforms[_platformIndex], type_, 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");
|
||||
@@ -127,8 +124,8 @@ void OCLPerfBufferReadSpeed::open(unsigned int test, char *units,
|
||||
CHECK_RESULT(platform == 0, "Couldn't find AMD platform, cannot proceed");
|
||||
|
||||
char getVersion[128];
|
||||
error_ = _wrapper->clGetPlatformInfo(platform, CL_PLATFORM_VERSION,
|
||||
sizeof(getVersion), getVersion, NULL);
|
||||
error_ = _wrapper->clGetPlatformInfo(platform, CL_PLATFORM_VERSION, sizeof(getVersion),
|
||||
getVersion, NULL);
|
||||
CHECK_RESULT(error_ != CL_SUCCESS, "clGetPlatformInfo failed");
|
||||
platformVersion[0] = getVersion[7];
|
||||
platformVersion[1] = getVersion[8];
|
||||
@@ -148,23 +145,20 @@ void OCLPerfBufferReadSpeed::open(unsigned int test, char *units,
|
||||
if (_openTest < blockedSubtests) {
|
||||
numIter = Iterations[_openTest / (NUM_SIZES * NUM_SUBTESTS)];
|
||||
} else {
|
||||
numIter =
|
||||
4 * OCLPerfBufferReadSpeed::NUM_ITER / ((_openTest % NUM_SIZES) + 1);
|
||||
numIter = 4 * OCLPerfBufferReadSpeed::NUM_ITER / ((_openTest % NUM_SIZES) + 1);
|
||||
}
|
||||
|
||||
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, type_, num_devices, devices, NULL);
|
||||
error_ = _wrapper->clGetDeviceIDs(platform, type_, num_devices, devices, NULL);
|
||||
CHECK_RESULT(error_ != CL_SUCCESS, "clGetDeviceIDs failed");
|
||||
|
||||
CHECK_RESULT(_deviceId >= num_devices, "Requested deviceID not available");
|
||||
device = devices[_deviceId];
|
||||
|
||||
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);
|
||||
@@ -177,24 +171,19 @@ void OCLPerfBufferReadSpeed::open(unsigned int test, char *units,
|
||||
flags |= CL_MEM_ALLOC_HOST_PTR;
|
||||
} else if (useHostPtr) {
|
||||
flags |= CL_MEM_USE_HOST_PTR;
|
||||
hostMem = (char *)malloc(bufSize_ + alignment - 1 + offset);
|
||||
hostMem = (char*)malloc(bufSize_ + alignment - 1 + offset);
|
||||
CHECK_RESULT(hostMem == 0, "malloc(hostMem) failed");
|
||||
alignedMem =
|
||||
(char *)((((intptr_t)hostMem + alignment - 1) & ~(alignment - 1)) +
|
||||
offset);
|
||||
alignedMem = (char*)((((intptr_t)hostMem + alignment - 1) & ~(alignment - 1)) + offset);
|
||||
}
|
||||
outBuffer_ =
|
||||
_wrapper->clCreateBuffer(context_, flags, bufSize_, alignedMem, &error_);
|
||||
outBuffer_ = _wrapper->clCreateBuffer(context_, flags, bufSize_, alignedMem, &error_);
|
||||
CHECK_RESULT(outBuffer_ == 0, "clCreateBuffer(outBuffer) failed");
|
||||
|
||||
// Force memory to be on GPU if possible
|
||||
{
|
||||
cl_mem memBuffer =
|
||||
_wrapper->clCreateBuffer(context_, 0, bufSize_, NULL, &error_);
|
||||
cl_mem memBuffer = _wrapper->clCreateBuffer(context_, 0, bufSize_, NULL, &error_);
|
||||
CHECK_RESULT(memBuffer == 0, "clCreateBuffer(memBuffer) failed");
|
||||
|
||||
_wrapper->clEnqueueCopyBuffer(cmd_queue_, memBuffer, outBuffer_, 0, 0,
|
||||
bufSize_, 0, NULL, NULL);
|
||||
_wrapper->clEnqueueCopyBuffer(cmd_queue_, memBuffer, outBuffer_, 0, 0, bufSize_, 0, NULL, NULL);
|
||||
_wrapper->clFinish(cmd_queue_);
|
||||
|
||||
_wrapper->clReleaseMemObject(memBuffer);
|
||||
@@ -203,20 +192,20 @@ void OCLPerfBufferReadSpeed::open(unsigned int test, char *units,
|
||||
|
||||
void OCLPerfBufferReadSpeed::run(void) {
|
||||
CPerfCounter timer;
|
||||
char *mem = new char[bufSize_];
|
||||
char* mem = new char[bufSize_];
|
||||
cl_bool blocking = (_openTest < blockedSubtests) ? CL_TRUE : CL_FALSE;
|
||||
|
||||
// Warm up
|
||||
error_ = _wrapper->clEnqueueReadBuffer(cmd_queue_, outBuffer_, CL_TRUE, 0,
|
||||
bufSize_, mem, 0, NULL, NULL);
|
||||
error_ = _wrapper->clEnqueueReadBuffer(cmd_queue_, outBuffer_, CL_TRUE, 0, bufSize_, mem, 0, NULL,
|
||||
NULL);
|
||||
|
||||
CHECK_RESULT(error_, "clEnqueueReadBuffer failed");
|
||||
|
||||
timer.Reset();
|
||||
timer.Start();
|
||||
for (unsigned int i = 0; i < numIter; i++) {
|
||||
error_ = _wrapper->clEnqueueReadBuffer(cmd_queue_, outBuffer_, blocking, 0,
|
||||
bufSize_, mem, 0, NULL, NULL);
|
||||
error_ = _wrapper->clEnqueueReadBuffer(cmd_queue_, outBuffer_, blocking, 0, bufSize_, mem, 0,
|
||||
NULL, NULL);
|
||||
|
||||
CHECK_RESULT(error_, "clEnqueueReadBuffer failed");
|
||||
}
|
||||
@@ -241,8 +230,8 @@ void OCLPerfBufferReadSpeed::run(void) {
|
||||
SNPRINTF(str, sizeof(str), "(GB/s)");
|
||||
}
|
||||
char buf[256];
|
||||
SNPRINTF(buf, sizeof(buf), " (%8d bytes) %3s i: %4d %29s ", bufSize_,
|
||||
blkStr[blocking], numIter, str);
|
||||
SNPRINTF(buf, sizeof(buf), " (%8d bytes) %3s i: %4d %29s ", bufSize_, blkStr[blocking], numIter,
|
||||
str);
|
||||
testDescString = buf;
|
||||
|
||||
delete mem;
|
||||
@@ -251,13 +240,11 @@ void OCLPerfBufferReadSpeed::run(void) {
|
||||
unsigned int OCLPerfBufferReadSpeed::close(void) {
|
||||
if (outBuffer_) {
|
||||
error_ = _wrapper->clReleaseMemObject(outBuffer_);
|
||||
CHECK_RESULT_NO_RETURN(error_ != CL_SUCCESS,
|
||||
"clReleaseMemObject(outBuffer_) failed");
|
||||
CHECK_RESULT_NO_RETURN(error_ != CL_SUCCESS, "clReleaseMemObject(outBuffer_) 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_);
|
||||
@@ -272,7 +259,7 @@ unsigned int OCLPerfBufferReadSpeed::close(void) {
|
||||
|
||||
void OCLPerfBufferReadRectSpeed::run(void) {
|
||||
CPerfCounter timer;
|
||||
char *mem = new char[bufSize_];
|
||||
char* mem = new char[bufSize_];
|
||||
size_t width = static_cast<size_t>(sqrt(static_cast<float>(bufSize_)));
|
||||
size_t bufOrigin[3] = {0, 0, 0};
|
||||
size_t hostOrigin[3] = {0, 0, 0};
|
||||
@@ -291,18 +278,17 @@ void OCLPerfBufferReadRectSpeed::run(void) {
|
||||
return;
|
||||
}
|
||||
// Warm up
|
||||
error_ = _wrapper->clEnqueueReadBufferRect(
|
||||
cmd_queue_, outBuffer_, CL_TRUE, bufOrigin, hostOrigin, region, width, 0,
|
||||
width, 0, mem, 0, NULL, NULL);
|
||||
error_ = _wrapper->clEnqueueReadBufferRect(cmd_queue_, outBuffer_, CL_TRUE, bufOrigin, hostOrigin,
|
||||
region, width, 0, width, 0, mem, 0, NULL, NULL);
|
||||
|
||||
CHECK_RESULT(error_, "clEnqueueReadBufferRect failed");
|
||||
|
||||
timer.Reset();
|
||||
timer.Start();
|
||||
for (unsigned int i = 0; i < testNumIter; i++) {
|
||||
error_ = _wrapper->clEnqueueReadBufferRect(
|
||||
cmd_queue_, outBuffer_, blocking, bufOrigin, hostOrigin, region, width,
|
||||
0, width, 0, mem, 0, NULL, NULL);
|
||||
error_ =
|
||||
_wrapper->clEnqueueReadBufferRect(cmd_queue_, outBuffer_, blocking, bufOrigin, hostOrigin,
|
||||
region, width, 0, width, 0, mem, 0, NULL, NULL);
|
||||
CHECK_RESULT(error_, "clEnqueueReadBufferRect failed");
|
||||
}
|
||||
if (blocking != CL_TRUE) {
|
||||
@@ -326,8 +312,8 @@ void OCLPerfBufferReadRectSpeed::run(void) {
|
||||
SNPRINTF(str, sizeof(str), "(GB/s)");
|
||||
}
|
||||
char buf[256];
|
||||
SNPRINTF(buf, sizeof(buf), " (%8d bytes) %3s i: %4d %29s ", bufSize_,
|
||||
blkStr[blocking], numIter, str);
|
||||
SNPRINTF(buf, sizeof(buf), " (%8d bytes) %3s i: %4d %29s ", bufSize_, blkStr[blocking], numIter,
|
||||
str);
|
||||
testDescString = buf;
|
||||
|
||||
delete mem;
|
||||
|
||||
Referencia en una nueva incidencia
Block a user