P4 to Git Change 1768245 by wchau@wchau_OCL_Linux on 2019/04/10 22:01:33

SWDEV-165259 - Update OpenCL runtime to support MsgPack metadata
	- Fixed the missing support of Printf for CO v3
	- Added back the flag to disable CO v3 for the non-COMGR environment

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.cpp#20 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#40 edit

rocclr/runtime/device/devkernel.cpp

@@ -1386,7 +1386,8 @@ bool Kernel::GetPrintfStr(const amd_comgr_metadata_node_t programMD,
 
   amd_comgr_metadata_node_t printfMeta;
 
-  amd_comgr_status_t status = amd::Comgr::metadata_lookup(programMD, "Printf", &printfMeta);
+  amd_comgr_status_t status = amd::Comgr::metadata_lookup(programMD,
+                                codeObjectVer() == 2 ? "Printf" : "amdhsa.printf", &printfMeta);
   if (status != AMD_COMGR_STATUS_SUCCESS) {
     return true;   // printf string metadata is not provided so just exit
   }