P4 to Git Change 1456363 by wchau@wchau_OCL_boltzmann on 2017/09/07 15:47:03

SWDEV-130808 - Add support of two new queries: CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD, CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_device.cpp#64 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl.hpp#4 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h#15 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl.hpp#6 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h#31 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl.hpp#3 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h#8 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl.hpp#2 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#288 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#570 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#353 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.hpp#99 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#55 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#30 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.hpp#11 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#58 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.cpp#21 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.hpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#275 edit

rocclr/runtime/device/rocm/rocdevice.cpp

@@ -916,6 +916,7 @@ bool Device::populateOCLDeviceConstants() {
   info_.maxWorkItemSizes_[0] = std::min(max_workgroup_size[0], max_work_item_size);
   info_.maxWorkItemSizes_[1] = std::min(max_workgroup_size[1], max_work_item_size);
   info_.maxWorkItemSizes_[2] = std::min(max_workgroup_size[2], max_work_item_size);
+  info_.preferredWorkGroupSize_ = settings().preferredWorkGroupSize_;
 
   info_.nativeVectorWidthChar_ = info_.preferredVectorWidthChar_ = 4;
   info_.nativeVectorWidthShort_ = info_.preferredVectorWidthShort_ = 2;