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
This commit is contained in:
foreman
2017-09-07 16:00:01 -04:00
parent e8395888c5
commit 0b90f3418f
11 changed files with 33 additions and 5 deletions
+1
View File
@@ -487,6 +487,7 @@ void NullDevice::fillDeviceInfo(const CALdeviceattribs& calAttr, const gslMemInf
info_.maxWorkItemSizes_[0] = info_.maxWorkGroupSize_;
info_.maxWorkItemSizes_[1] = info_.maxWorkGroupSize_;
info_.maxWorkItemSizes_[2] = info_.maxWorkGroupSize_;
info_.preferredWorkGroupSize_ = settings().preferredWorkGroupSize_;
if (settings().hwLDSSize_ != 0) {
info_.localMemType_ = CL_LOCAL;
+6 -2
View File
@@ -57,8 +57,8 @@ Settings::Settings() {
doublePrecision_ = ::CL_KHR_FP64;
// Fill workgroup info size
// @todo: revisit the 256 limitation on workgroup size
maxWorkGroupSize_ = 256;
maxWorkGroupSize_ = 1024;
preferredWorkGroupSize_ = 256;
hostMemDirectAccess_ = HostMemDisable;
@@ -431,6 +431,10 @@ void Settings::override() {
maxWorkGroupSize_ = GPU_MAX_WORKGROUP_SIZE;
}
if (GPU_PREFERRED_WORKGROUP_SIZE != 0) {
preferredWorkGroupSize_ = GPU_PREFERRED_WORKGROUP_SIZE;
}
// Override blit engine type
if (GPU_BLIT_ENGINE_TYPE != BlitEngineDefault) {
blitEngine_ = GPU_BLIT_ENGINE_TYPE;
@@ -78,6 +78,7 @@ class Settings : public device::Settings {
uint maxRenameSize_; //!< Maximum size for all renames
uint hwLDSSize_; //!< HW local data store size
uint maxWorkGroupSize_; //!< Requested workgroup size for this device
uint preferredWorkGroupSize_; //!< Requested preferred workgroup size for this device
uint hostMemDirectAccess_; //!< Enables direct access to the host memory
amd::LibrarySelector libSelector_; //!< Select linking libraries for compiler
uint workloadSplitSize_; //!< Workload split size