P4 to Git Change 2026938 by axie@axie-hip-rocm on 2019/11/07 17:44:09

SWDEV-198859 - Options for hip-clang-vdi path to provide the chicken bits, or functional equivalents to HCC_DB

	There are regression caused by this change in ocltst test.
	Back out changelist 2026859

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#176 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#156 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/debug.hpp#13 edit

rocclr/runtime/device/pal/palvirtual.cpp

@@ -2392,7 +2392,7 @@ bool VirtualGPU::submitKernelInternal(const amd::NDRangeContainer& sizes, const
   }
   size_t ldsSize;
 
-  ClPrint(amd::LOG_INFO, amd::LOG_KERN, "!\tShaderName : %s\n", hsaKernel.name().c_str());
+  LogPrintfInfo("!\tShaderName : %s\n", hsaKernel.name().c_str());
 
   // Check memory dependency and SVM objects
   if (!processMemObjectsHSA(kernel, parameters, nativeMem, ldsSize)) {
@@ -3381,11 +3381,11 @@ bool VirtualGPU::processMemObjectsHSA(const amd::Kernel& kernel, const_address p
 
           addVmMemory(gpuMem);
           const void* globalAddress = *reinterpret_cast<const void* const*>(params + desc.offset_);
-          ClPrint(amd::LOG_INFO, amd::LOG_KERN, "!\targ%d: %s %s = ptr:%p obj:[%p-%p] threadId : %zx\n", index,
-                  desc.typeName_.c_str(), desc.name_.c_str(), globalAddress,
-                  reinterpret_cast<void*>(gpuMem->vmAddress()),
-                  reinterpret_cast<void*>(gpuMem->vmAddress() + gpuMem->size()),
-                  std::this_thread::get_id());
+          LogPrintfInfo("!\targ%d: %s %s = ptr:%p obj:[%p-%p] threadId : %zx\n", index,
+                        desc.typeName_.c_str(), desc.name_.c_str(), globalAddress,
+                        reinterpret_cast<void*>(gpuMem->vmAddress()),
+                        reinterpret_cast<void*>(gpuMem->vmAddress() + gpuMem->size()),
+                        std::this_thread::get_id());
 
           //! Check if compiler expects read/write.
           //! Note: SVM with subbuffers has an issue with tracking.