P4 to Git Change 1365943 by lmoriche@lmoriche_opencl_dev on 2017/01/25 11:37:20

SWDEV-102726 - [OCL-LC-ROCm] Open source OpenCL Runtime
	- Cleanups: Remove CL_HSA_ENABLED/DISABLED_AMD.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_context.cpp#52 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_device.cpp#60 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h#13 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h#28 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/appprofile.cpp#15 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/appprofile.hpp#10 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#208 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#283 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocappprofile.cpp#4 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#36 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#14 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#53 edit
This commit is contained in:
foreman
2017-01-25 11:44:06 -05:00
parent c3b34aeaa7
commit aae258198d
8 changed files with 24 additions and 192 deletions
@@ -33,26 +33,10 @@ bool AppProfile::ParseApplicationProfile()
std::transform(appFileName_.begin(), appFileName_.end(), appFileName_.begin(), ::tolower);
if (appFileName_.compare(appName) == 0 ) {
hsaDeviceHint_ = CL_HSA_DISABLED_AMD;
gpuvmHighAddr_ = false;
noHsaInit_ = true;
profileOverridesAllSettings_ = true;
}
// Setting both bits is invalid, make it niether.
if (hsaDeviceHint_ & CL_HSA_ENABLED_AMD
&& hsaDeviceHint_ & CL_HSA_DISABLED_AMD) {
hsaDeviceHint_ = 0;
}
if (noHsaInit_) {
// If no HSA initialization, then force hint flag to non-HSA device.
// Even if this is not forced, the device selection logic will endure it.
// After all hint flags are treated as hint only - depending on
// availibility.
hsaDeviceHint_ = CL_HSA_DISABLED_AMD;
}
return true;
}