P4 to Git Change 1740048 by wchau@wchau_OCL_Linux on 2019/02/05 14:10:40

SWDEV-134107 - Add support for respecting target's xnack setting
	- Enable the XNACK feature for all the APU system and remove the xnackEnabled_ field in AMDDeviceInfo struct

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#332 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdefs.hpp#23 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#116 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#98 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.cpp#41 edit


[ROCm/clr commit: 1fa47a7398]
This commit is contained in:
foreman
2019-02-05 14:44:09 -05:00
parent 1a807e9bee
commit 62357c20f4
5 changed files with 25 additions and 27 deletions
@@ -658,7 +658,7 @@ bool Device::create() {
// with dash as delimiter to be compatible with Windows directory name
std::ostringstream cacheTarget;
cacheTarget << "AMD-AMDGPU-" << gfxipMajor << "-" << gfxipMinor << "-" << gfxipStepping;
if (deviceInfo_.xnackEnabled_) {
if (settings().enableXNACK_) {
cacheTarget << "-xnack";
}
@@ -852,7 +852,7 @@ bool Device::populateOCLDeviceConstants() {
std::ostringstream oss;
oss << "gfx" << gfxipMajor << gfxipMinor << gfxipStepping;
if (settings().useLightning_ && deviceInfo_.xnackEnabled_) {
if (settings().useLightning_ && hsa_settings->enableXNACK_) {
oss << "-xnack";
}