P4 to Git Change 1457559 by lmoriche@lmoriche_opencl_dev2 on 2017/09/11 18:05:30

SWDEV-130808 - Add support of two new queries: CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD, CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD.
	- Restore the original behavior when setting GPU_MAX_WORKGROUP_SIZE.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#356 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#33 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.cpp#24 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#279 edit


[ROCm/clr commit: c870a30523]
This commit is contained in:
foreman
2017-09-11 18:19:56 -04:00
parent 8f2a3ebf44
commit 906abbac5d
4 changed files with 3 additions and 17 deletions
@@ -428,11 +428,7 @@ bool Settings::create(const CALdeviceattribs& calAttr, bool reportAsOCL12Device,
void Settings::override() {
// Limit reported workgroup size
if (GPU_MAX_WORKGROUP_SIZE != 0) {
maxWorkGroupSize_ = GPU_MAX_WORKGROUP_SIZE;
}
if (GPU_PREFERRED_WORKGROUP_SIZE != 0) {
preferredWorkGroupSize_ = GPU_PREFERRED_WORKGROUP_SIZE;
preferredWorkGroupSize_ = GPU_MAX_WORKGROUP_SIZE;
}
// Override blit engine type