P4 to Git Change 1469140 by emankov@em-hsa-lightning on 2017/10/12 10:53:13

SWDEV-86035 - Fix OCL build on Linux after LLVM merge (CL 1469082)

	TODO: PAL build should be fixed accordingly

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#27 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#71 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#28 edit


[ROCm/clr commit: 3c7f4d6c49]

projects/clr/rocclr/runtime/device/rocm/rockernel.cpp

@@ -13,10 +13,10 @@ namespace roc {
 
 #if defined(WITH_LIGHTNING_COMPILER)
 
-using llvm::AMDGPU::CodeObject::AccessQualifier;
-using llvm::AMDGPU::CodeObject::AddressSpaceQualifier;
-using llvm::AMDGPU::CodeObject::ValueKind;
-using llvm::AMDGPU::CodeObject::ValueType;
+using llvm::AMDGPU::HSAMD::AccessQualifier;
+using llvm::AMDGPU::HSAMD::AddressSpaceQualifier;
+using llvm::AMDGPU::HSAMD::ValueKind;
+using llvm::AMDGPU::HSAMD::ValueType;
 
 static inline ROC_ARG_TYPE GetKernelArgType(const KernelArgMD& lcArg) {
   switch (lcArg.mValueKind) {

projects/clr/rocclr/runtime/device/rocm/rocprogram.cpp

@@ -841,7 +841,7 @@ bool HSAILProgram::setKernels_LC(amd::option::Options* options, void* binary, si
                    !memcmp(name, AMDGPU::ElfNote::NoteName, note->n_namesz)) {
           std::string metadataStr((const char*)desc, (size_t)note->n_descsz);
           metadata_ = new CodeObjectMD();
-          if (CodeObjectMD::fromYamlString(metadataStr, *metadata_)) {
+          if (llvm::AMDGPU::HSAMD::fromString(metadataStr, *metadata_)) {
             buildLog_ += "Error: failed to process metadata\n";
             return false;
           }

projects/clr/rocclr/runtime/device/rocm/rocprogram.hpp

@@ -17,12 +17,18 @@
 #include "rocdevice.hpp"
 
 #if defined(WITH_LIGHTNING_COMPILER)
-#include "llvm/Support/AMDGPUCodeObjectMetadata.h"
+#include "llvm/Support/AMDGPUMetadata.h"
 #include "driver/AmdCompiler.h"
 
-typedef llvm::AMDGPU::CodeObject::Metadata CodeObjectMD;
-typedef llvm::AMDGPU::CodeObject::Kernel::Metadata KernelMD;
-typedef llvm::AMDGPU::CodeObject::Kernel::Arg::Metadata KernelArgMD;
+//typedef llvm::AMDGPU::CodeObject::Metadata CodeObjectMD;
+typedef llvm::AMDGPU::HSAMD::Metadata CodeObjectMD;
+
+//typedef llvm::AMDGPU::CodeObject::Kernel::Metadata KernelMD;
+typedef llvm::AMDGPU::HSAMD::Kernel::Metadata KernelMD;
+
+//typedef llvm::AMDGPU::CodeObject::Kernel::Arg::Metadata KernelArgMD;
+typedef llvm::AMDGPU::HSAMD::Kernel::Arg::Metadata KernelArgMD;
+
 #endif  // defined(WITH_LIGHTNING_COMPILER)
 
 //! \namespace roc HSA Device Implementation