P4 to Git Change 1608975 by gandryey@gera-w8 on 2018/09/20 18:14:01

SWDEV-79445 - OCL generic changes and code clean-up
	Program compilation clean-up. Follwoing CL#1608319:
	- Switch HSAIL GSL path to the common compilation method

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpucompiler.cpp#160 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#168 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#332 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#242 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.hpp#75 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#74 edit

rocclr/runtime/device/gpu/gpukernel.cpp

@@ -652,7 +652,7 @@ bool NullKernel::create(const std::string& code, const std::string& metadata,
     }
 
     if (ACL_SUCCESS !=
-        aclInsertSection(nullDev().compiler(), bin, code.data(), code.size(), aclSOURCE)) {
+        aclInsertSection(nullDev().amdilCompiler(), bin, code.data(), code.size(), aclSOURCE)) {
       LogWarning("aclInsertSection failed");
       aclBinaryFini(bin);
       return false;
@@ -672,10 +672,10 @@ bool NullKernel::create(const std::string& code, const std::string& metadata,
     // pass kernel name to compiler
     Opts->setCurrKernelName(name().c_str());
 
-    err = aclCompile(nullDev().compiler(), bin, options->origOptionStr.c_str(), ACL_TYPE_AMDIL_TEXT,
+    err = aclCompile(nullDev().amdilCompiler(), bin, options->origOptionStr.c_str(), ACL_TYPE_AMDIL_TEXT,
                      ACL_TYPE_ISA, NULL);
 
-    buildLog_ += aclGetCompilerLog(nullDev().compiler());
+    buildLog_ += aclGetCompilerLog(nullDev().amdilCompiler());
 
     if (err != ACL_SUCCESS) {
       LogWarning("aclCompile failed");
@@ -688,7 +688,7 @@ bool NullKernel::create(const std::string& code, const std::string& metadata,
       return true;
     }
     size_t len;
-    const void* isa = aclExtractSection(nullDev().compiler(), bin, &len, aclTEXT, &err);
+    const void* isa = aclExtractSection(nullDev().amdilCompiler(), bin, &len, aclTEXT, &err);
     if (err != ACL_SUCCESS) {
       LogWarning("aclExtractSection failed");
       aclBinaryFini(bin);