From 7434cabbf7a099cf67c3fff1e52bf959d2a9e6fd Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 7 Nov 2019 17:48:59 -0500 Subject: [PATCH] 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/paldevice.cpp | 2 +- rocclr/runtime/device/pal/palvirtual.cpp | 12 +++++------ rocclr/runtime/utils/debug.hpp | 27 ++++++++++-------------- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/rocclr/runtime/device/pal/paldevice.cpp b/rocclr/runtime/device/pal/paldevice.cpp index 22f9a3656d..21ce72d743 100644 --- a/rocclr/runtime/device/pal/paldevice.cpp +++ b/rocclr/runtime/device/pal/paldevice.cpp @@ -1022,7 +1022,7 @@ bool Device::create(Pal::IDevice* device) { } message << std::endl; - ClPrint(amd::LOG_INFO, amd::LOG_INIT, message.str().c_str()); + LogInfo(message.str().c_str()); #endif // DEBUG for (uint i = 0; i < Pal::GpuHeap::GpuHeapCount; ++i) { diff --git a/rocclr/runtime/device/pal/palvirtual.cpp b/rocclr/runtime/device/pal/palvirtual.cpp index c77a38b55d..da8a617cb1 100644 --- a/rocclr/runtime/device/pal/palvirtual.cpp +++ b/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(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(gpuMem->vmAddress()), - reinterpret_cast(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(gpuMem->vmAddress()), + reinterpret_cast(gpuMem->vmAddress() + gpuMem->size()), + std::this_thread::get_id()); //! Check if compiler expects read/write. //! Note: SVM with subbuffers has an issue with tracking. diff --git a/rocclr/runtime/utils/debug.hpp b/rocclr/runtime/utils/debug.hpp index cd7d5db5cd..d025bdb983 100644 --- a/rocclr/runtime/utils/debug.hpp +++ b/rocclr/runtime/utils/debug.hpp @@ -142,17 +142,20 @@ inline void warning(const char* msg) { amd::report_warning(msg); } } \ } while (false) +#define LogInfo(msg) Log(amd::LOG_INFO, msg) +#define LogError(msg) Log(amd::LOG_ERROR, msg) +#define LogWarning(msg) Log(amd::LOG_WARNING, msg) #define LogTSInfo(msg) LogTS(amd::LOG_INFO, msg) #define LogTSError(msg) LogTS(amd::LOG_ERROR, msg) #define LogTSWarning(msg) LogTS(amd::LOG_WARNING, msg) -#define DebugInfoGuarantee(cond) LogGuarantee(cond, amd::LOG_INFO, "Warning") +#define LogPrintfDebug(format, ...) Logf(amd::LOG_DEBUG, format, __VA_ARGS__) +#define LogPrintfError(format, ...) Logf(amd::LOG_ERROR, format, __VA_ARGS__) +#define LogPrintfWarning(format, ...) Logf(amd::LOG_WARNING, format, __VA_ARGS__) +#define LogPrintfInfo(format, ...) Logf(amd::LOG_INFO, format, __VA_ARGS__) -/* backend and compiler use LOG_LEVEL macro from makefile. Define GPU_LOG_MASK for them. */ -#if defined(LOG_LEVEL) -#define GPU_LOG_MASK 0x7FFFFFFF -#endif +#define DebugInfoGuarantee(cond) LogGuarantee(cond, amd::LOG_INFO, "Warning") // You may define CL_LOG to enable following log functions even for release build #define CL_LOG @@ -176,20 +179,12 @@ inline void warning(const char* msg) { amd::report_warning(msg); } } \ } while (false) +#define ClTrace(level, mask) ClPrint(level, mask, "%s", __func__) + #else /*CL_LOG*/ #define ClPrint(level, mask, format, ...) (void)(0) #define ClCondPrint(level, mask, condition, format, ...) (void)(0) +#define ClTrace(level, mask) (void)(0) #endif /*CL_LOG*/ -#define ClTrace(level, mask) ClPrint(level, mask, "%s", __func__) - -#define LogInfo(msg) ClPrint(amd::LOG_INFO, amd::LOG_ALWAYS, msg) -#define LogError(msg) ClPrint(amd::LOG_ERROR, amd::LOG_ALWAYS, msg) -#define LogWarning(msg) ClPrint(amd::LOG_WARNING, amd::LOG_ALWAYS, msg) - -#define LogPrintfDebug(format, ...) ClPrint(amd::LOG_DEBUG, amd::LOG_ALWAYS, format, __VA_ARGS__) -#define LogPrintfError(format, ...) ClPrint(amd::LOG_ERROR, amd::LOG_ALWAYS, format, __VA_ARGS__) -#define LogPrintfWarning(format, ...) ClPrint(amd::LOG_WARNING, amd::LOG_ALWAYS, format, __VA_ARGS__) -#define LogPrintfInfo(format, ...) ClPrint(amd::LOG_INFO, amd::LOG_ALWAYS, format, __VA_ARGS__) - #endif /*DEBUG_HPP_*/