P4 to Git Change 1792742 by gandryey@gera-win10 on 2019/06/06 11:13:45

SWDEV-79445 - OCL generic changes and code clean-up
	- Update COMGR loader to avoid the build with device layers

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/comgrctx.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#244 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.cpp#23 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.hpp#16 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#45 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#25 edit

rocclr/runtime/device/devkernel.hpp

@@ -26,6 +26,7 @@ struct RuntimeHandle {
 };
 
 #if defined(USE_COMGR_LIBRARY)
+#include "amd_comgr.h"
 #include "llvm/Support/AMDGPUMetadata.h"
 typedef llvm::AMDGPU::HSAMD::Kernel::Arg::Metadata KernelArgMD;
 
@@ -383,6 +384,7 @@ class Kernel : public amd::HeapObject {
     std::string compileVecTypeHint_;  //!< kernel compiled vector type hint
     bool uniformWorkGroupSize_;       //!< uniform work group size option
     size_t wavesPerSimdHint_;         //!< waves per simd hit
+    int maxOccupancyPerCu_;           //!< Max occupancy per compute unit in threads
   };
 
   //! Default constructor
@@ -560,17 +562,6 @@ class Kernel : public amd::HeapObject {
 };
 
 #if defined(USE_COMGR_LIBRARY)
-static amd_comgr_status_t getMetaBuf(const amd_comgr_metadata_node_t meta,
-                                     std::string* str) {
-  size_t size = 0;
-  amd_comgr_status_t status = amd::Comgr::get_metadata_string(meta, &size, NULL);
-
-  if (status == AMD_COMGR_STATUS_SUCCESS) {
-    str->resize(size-1);    // minus one to discount the null character
-    status = amd::Comgr::get_metadata_string(meta, &size, &((*str)[0]));
-  }
-
-  return status;
-}
+amd_comgr_status_t getMetaBuf(const amd_comgr_metadata_node_t meta, std::string* str);
 #endif // defined(USE_COMGR_LIBRARY)
 } // namespace device