P4 to Git Change 1702548 by wchau@wchau_OCL_boltzmann on 2018/11/05 14:14:59

SWDEV-162389 - OpenCL Support for COMgr
	- currently COMgr library does not support gfx10+
	- to build the OCL driver with the COMgr support, add an COMGR_DIR option for the MAKE command
	- the COMGR_DIR specifies the directory that contains the COMgr header file, "include/amd_comgr.h", and library, "lib/libamd_comgr.so"
	NOTE: check in the codes to unblock German's work for now, codes will be modified to handle HSAIL and LC paths dynamically.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#176 edit
... //depot/stg/opencl/drivers/opencl/opencldefs#235 edit
... //depot/stg/opencl/drivers/opencl/runtime/build/Makefile.runtime#76 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#12 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#8 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/build/Makefile.oclrocm#21 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdefs.hpp#20 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#94 edit

rocclr/runtime/device/rocm/rocprogram.cpp

@@ -318,7 +318,7 @@ LightningProgram::LightningProgram(roc::NullDevice& device)
   : roc::Program(device) {
   isLC_ = true;
   xnackEnabled_ = dev().deviceInfo().xnackEnabled_;
-  machineTarget_ = dev().deviceInfo().machineTarget_;
+  machineTarget_ = dev().deviceInfo().machineTargetLC_;
 }
 
 bool LightningProgram::createBinary(amd::option::Options* options) {