P4 to Git Change 1710776 by wchau@wchau_OCL_boltzmann on 2018/11/22 12:54:51

SWDEV-165259 - Update OpenCL runtime to support MsgPack metadata

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.cpp#10 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.hpp#7 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#14 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/build/Makefile.pal#20 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#70 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#45 edit

rocclr/runtime/device/devprogram.hpp

@@ -114,7 +114,12 @@ class Program : public amd::HeapObject {
   size_t globalVariableTotalSize_;
   amd::option::Options* programOptions_;
 
+
+#if defined(USE_COMGR_LIBRARY)
+  amd_comgr_metadata_node_t* metadata_;   //!< COMgr metadata
+#else
   CodeObjectMD* metadata_;  //!< Runtime metadata
+#endif
 
  public:
   //! Construct a section.
@@ -196,7 +201,14 @@ class Program : public amd::HeapObject {
   //! Global variables are a part of the code segment
   bool hasGlobalStores() const { return hasGlobalStores_; }
 
+#if defined(USE_COMGR_LIBRARY)
+  const amd_comgr_metadata_node_t* metadata() const { return metadata_; }
+#else
   const CodeObjectMD* metadata() const { return metadata_; }
+#endif
+
+  //! Get the machine target for the program
+  const char* machineTarget() const { return machineTarget_; }
 
  protected:
   //! pre-compile setup