P4 to Git Change 1608319 by gandryey@gera-lnx-rcf-lc on 2018/09/19 16:55:11

SWDEV-79445 - OCL generic changes and code clean-up
	Program compilation clean-up. Step#2:
	- Combine PAL and ROCr implementations of compilation under common methods in device::Program for HSAIL and LC.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#319 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.hpp#74 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palcompiler.cpp#26 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.hpp#34 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#73 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.hpp#30 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#46 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#31 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#87 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#36 edit


[ROCm/clr commit: e132af9cad]

projects/clr/rocclr/runtime/device/pal/palprogram.cpp

@@ -143,6 +143,13 @@ HSAILProgram::HSAILProgram(Device& device)
       maxScratchRegs_(0),
       executable_(nullptr),
       loaderContext_(this) {
+  xnackEnabled_ = dev().hwInfo()->xnackEnabled_;
+  if (dev().properties().revision == Pal::AsicRevision::Bristol) {
+    const static char* Carrizo = "Carrizo";
+    machineTarget_ = Carrizo;
+  } else {
+    machineTarget_ = dev().hwInfo()->targetName_;
+  }
   loader_ = amd::hsa::loader::Loader::Create(&loaderContext_);
 }
 
@@ -156,6 +163,8 @@ HSAILProgram::HSAILProgram(NullDevice& device)
       executable_(nullptr),
       loaderContext_(this) {
   isNull_ = true;
+  xnackEnabled_ = dev().hwInfo()->xnackEnabled_;
+  machineTarget_ = dev().hwInfo()->targetName_;
   loader_ = amd::hsa::loader::Loader::Create(&loaderContext_);
 }