P4 to Git Change 2061164 by gandryey@gera-win10 on 2020/01/21 18:19:35

SWDEV-197836 - Drop the use of llvm header files in opencl runtime
	- Remove llvm::AMDGPU::HSAMD::Kernel::Metadata usage

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.cpp#33 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.hpp#22 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#78 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#40 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#86 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.hpp#31 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#55 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.hpp#28 edit

rocclr/runtime/device/devprogram.hpp

@@ -11,24 +11,8 @@
 
 #if defined(USE_COMGR_LIBRARY)
 #include "amd_comgr.h"
-
-namespace llvm {
-  namespace AMDGPU {
-    namespace HSAMD {
-      struct Metadata;
-      namespace Kernel {
-        struct Metadata;
-}}}}
-
-#define LC_METADATA 1
-typedef llvm::AMDGPU::HSAMD::Metadata CodeObjectMD;
-typedef llvm::AMDGPU::HSAMD::Kernel::Metadata KernelMD;
 #endif  // defined(USE_COMGR_LIBRARY)
 
-#ifndef LC_METADATA
-typedef char CodeObjectMD;
-#endif
-
 namespace amd {
   namespace hsa {
     namespace loader {
@@ -124,11 +108,9 @@ class Program : public amd::HeapObject {
 
 
 #if defined(USE_COMGR_LIBRARY)
-  amd_comgr_metadata_node_t metadata_;    //!< COMgr metadata
-  uint32_t codeObjectVer_;                //!< version of code object
+  amd_comgr_metadata_node_t metadata_ = {}; //!< COMgr metadata
+  uint32_t codeObjectVer_;                  //!< version of code object
   std::map<std::string, amd_comgr_metadata_node_t> kernelMetadataMap_; //!< Map of kernel metadata
-#else
-  CodeObjectMD* metadata_;  //!< Runtime metadata
 #endif
 
   std::vector<amd::Memory*> undef_mem_obj_;
@@ -227,8 +209,6 @@ class Program : public amd::HeapObject {
   }
 
   const uint32_t codeObjectVer() const { return codeObjectVer_; }
-#else
-  const CodeObjectMD* metadata() const { return metadata_; }
 #endif
 
   //! Get the machine target for the program