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.cpp

@@ -9,6 +9,7 @@
 #include "utils/options.hpp"
 #include "utils/bif_section_labels.hpp"
 #include "utils/libUtils.h"
+#include "comgrctx.hpp"
 
 #include <map>
 #include <string>
@@ -30,6 +31,19 @@ using llvm::AMDGPU::HSAMD::ValueType;
 namespace device {
 
 #if defined(USE_COMGR_LIBRARY)
+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;
+}
+
 static amd_comgr_status_t populateArgs(const amd_comgr_metadata_node_t key,
                                        const amd_comgr_metadata_node_t value,
                                        void *data) {