P4 to Git Change 1469232 by kzhuravl@kzhuravl-fiji-ocllc on 2017/10/12 13:32:01

SWDEV-125823 - Fix perforce opencl build

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#38 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.hpp#14 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#47 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.hpp#20 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#29 edit

rocclr/runtime/device/pal/palkernel.cpp

@@ -1188,10 +1188,10 @@ hsa_kernel_dispatch_packet_t* HSAILKernel::loadArguments(
 
 #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;
 
 const LightningProgram& LightningKernel::prog() const {
   return reinterpret_cast<const LightningProgram&>(prog_);

rocclr/runtime/device/pal/palkernel.hpp

@@ -17,10 +17,10 @@
 #include "hsa.h"
 
 #if defined(WITH_LIGHTNING_COMPILER)
-#include "llvm/Support/AMDGPUCodeObjectMetadata.h"
+#include "llvm/Support/AMDGPUMetadata.h"
 
-typedef llvm::AMDGPU::CodeObject::Kernel::Metadata KernelMD;
-typedef llvm::AMDGPU::CodeObject::Kernel::Arg::Metadata KernelArgMD;
+typedef llvm::AMDGPU::HSAMD::Kernel::Metadata KernelMD;
+typedef llvm::AMDGPU::HSAMD::Kernel::Arg::Metadata KernelArgMD;
 #endif  // defined(WITH_LIGHTNING_COMPILER)
 
 namespace amd {

rocclr/runtime/device/pal/palprogram.cpp

@@ -20,7 +20,7 @@
 #include "hsa_ext_image.h"
 #include "amd_hsa_loader.hpp"
 #if defined(WITH_LIGHTNING_COMPILER)
-#include "llvm/Support/AMDGPUCodeObjectMetadata.h"
+#include "llvm/Support/AMDGPUMetadata.h"
 #include "driver/AmdCompiler.h"
 #include "libraries.amdgcn.inc"
 #include "gelf.h"
@@ -1616,7 +1616,7 @@ bool LightningProgram::setKernels(amd::option::Options* options, void* binary, s
                    && note->n_namesz == sizeof "AMD" && !memcmp(name, "AMD", 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;
           }

rocclr/runtime/device/pal/palprogram.hpp

@@ -8,9 +8,9 @@
 #include "amd_hsa_loader.hpp"
 
 #if defined(WITH_LIGHTNING_COMPILER)
-#include "llvm/Support/AMDGPUCodeObjectMetadata.h"
+#include "llvm/Support/AMDGPUMetadata.h"
 
-typedef llvm::AMDGPU::CodeObject::Metadata CodeObjectMD;
+typedef llvm::AMDGPU::HSAMD::Metadata CodeObjectMD;
 #endif  // defined(WITH_LIGHTNING_COMPILER)
 
 namespace amd {

rocclr/runtime/device/rocm/rocprogram.hpp

@@ -17,16 +17,11 @@
 #include "rocdevice.hpp"
 
 #if defined(WITH_LIGHTNING_COMPILER)
-#include "llvm/Support/AMDGPUMetadata.h"
 #include "driver/AmdCompiler.h"
+#include "llvm/Support/AMDGPUMetadata.h"
 
-//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)