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

rocclr/runtime/device/appprofile.cpp

@@ -131,9 +131,7 @@ bool ADL::init()
 
 #endif //BRAHMA
 
-AppProfile::AppProfile(): hsaDeviceHint_(0),
-                          gpuvmHighAddr_(false),
-                          noHsaInit_(false),
+AppProfile::AppProfile(): gpuvmHighAddr_(false),
                           profileOverridesAllSettings_(false)
 {
     appFileName_ = amd::Os::getAppFileName();
@@ -171,29 +169,6 @@ bool AppProfile::init()
     return true;
 }
 
-cl_device_type AppProfile::ApplyHsaDeviceHintFlag(const cl_device_type& type)
-{
-    cl_device_type ret_type = type;
-
-    bool isHsaHintSpecified = (type & (CL_HSA_ENABLED_AMD|CL_HSA_DISABLED_AMD))
-                                != 0;
-    // Apply app profile hsa device hint only if
-    // HSA_RUNTIME is not set/defined *and*
-    // no hsa hint flag already specified.
-    // OR
-    // Profile overridess all other settings (HSA_RUNTIME and hint flags).
-    if ( profileOverridesAllSettings_
-      || (flagIsDefault(HSA_RUNTIME) && !isHsaHintSpecified)) {
-        // Clear current hsa hint.
-        ret_type = type & ~(CL_HSA_ENABLED_AMD | CL_HSA_DISABLED_AMD);
-        // Apply hsa hint from app profile.
-        return (ret_type | hsaDeviceHint_);
-    }
-
-    // Do not apply app profile hsa device hint.
-    return type;
-}
-
 bool AppProfile::ParseApplicationProfile()
 {
     ADLApplicationProfile* pProfile = NULL;