ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-25 16:29:03 +00:00
Code Packages Projects Releases Wiki Activity

Fix Issue #53: required buffer size exceed the available size in non_uniform_work_group (#247)

Browse Source
This commit is contained in:
cdai2
2019-04-30 22:22:01 +08:00
committed by Kévin Petit
parent 64609a7d78
commit c6e99e3e35
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test_conformance/non_uniform_work_group/TestNonUniformWorkGroup.cpp
View File

@@ -635,6 +635,24 @@ size_t TestNonUniformWorkGroup::adjustLocalArraySize (size_t localArraySize) {
return localArraySize; return localArraySize;
} }
size_t TestNonUniformWorkGroup::adjustGlobalBufferSize(size_t globalBufferSize) {
// In case if global buffer size is too big, sometimes we can not run kernel because of lack
// of resources due to kernel itself requires some global memory to run
int err;
cl_ulong deviceMaxAllocObjSize = 0;
err = clGetDeviceInfo(_device, CL_DEVICE_MAX_MEM_ALLOC_SIZE, sizeof(deviceMaxAllocObjSize), &deviceMaxAllocObjSize, NULL);
test_error(err, "clGetDeviceInfo failed");
size_t adjustedGlobalBufferSize = globalBufferSize;
if (deviceMaxAllocObjSize < globalBufferSize) {
adjustedGlobalBufferSize = deviceMaxAllocObjSize;
log_info("globalBufferSize was adjusted from %lu to %lu\n", globalBufferSize, adjustedGlobalBufferSize);
}
return adjustedGlobalBufferSize;
}
int TestNonUniformWorkGroup::runKernel () { int TestNonUniformWorkGroup::runKernel () {
int err; int err;
@@ -656,7 +674,8 @@ int TestNonUniformWorkGroup::runKernel () {
err = clSetKernelArg(_testKernel, 1, localArraySize, NULL); err = clSetKernelArg(_testKernel, 1, localArraySize, NULL);
test_error(err, "clSetKernelArg failed"); test_error(err, "clSetKernelArg failed");
clMemWrapper testGlobalArray = clCreateBuffer(_context, CL_MEM_READ_WRITE, _numOfGlobalWorkItems*sizeof(cl_uint), NULL, &err); size_t globalBufferSize = adjustGlobalBufferSize(_numOfGlobalWorkItems*sizeof(cl_uint));
clMemWrapper testGlobalArray = clCreateBuffer(_context, CL_MEM_READ_WRITE, globalBufferSize, NULL, &err);
test_error(err, "clCreateBuffer failed"); test_error(err, "clCreateBuffer failed");
err = clSetKernelArg(_testKernel, 2, sizeof(testGlobalArray), &testGlobalArray); err = clSetKernelArg(_testKernel, 2, sizeof(testGlobalArray), &testGlobalArray);
@@ -780,3 +799,4 @@ int SubTestExecutor::status() {
return 0; return 0;
} }
} }

2
test_conformance/non_uniform_work_group/TestNonUniformWorkGroup.h
View File

@@ -117,6 +117,7 @@ private:
void calculateExpectedValues (); void calculateExpectedValues ();
void showTestInfo (); void showTestInfo ();
size_t adjustLocalArraySize(size_t localArraySize); size_t adjustLocalArraySize(size_t localArraySize);
size_t adjustGlobalBufferSize(size_t globalBufferSize);
}; };
// Class responsible for running subtest scenarios in test function // Class responsible for running subtest scenarios in test function
@@ -145,3 +146,4 @@ private:
}; };
#endif // _TESTNONUNIFORMWORKGROUP_H #endif // _TESTNONUNIFORMWORKGROUP_H