P4 to Git Change 2026859 by axie@axie-hip-rocm on 2019/11/07 15:54:13
SWDEV-198863 - Options for hip-clang-vdi path to provide the chicken bits, or functional equivalents to HCC_DB (phase 3)
Use ClPrint to implement other log functions.
Move some funtion to use new log functions.
This is the final change of the JIRA.
Tests:
1. Linux HIP ROCM platform. VEGA10. Driver is release build.
1.1 export LOG_LEVEL=3
./hipModule
There are many logs.
1.2 export GPU_LOG_MASK=0
./hipModule
There is no log
2. Windows HIP PAL platform. VEGA10, Driver is release build.
2.1 set LOG_LEVEL=3
run test hipPrintfKernel
There are many logs
2.2 set GPU_LOG_MASK=0
run test hipPrintfKernel
There is no log
3. http://ocltc.amd.com:8111/viewModification.html?modId=128490&personal=true&tab=vcsModificationBuilds
ReviewBoard: http://ocltc.amd.com/reviews/r/18247/
Affected files ...
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#175 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#155 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/debug.hpp#12 edit
[ROCm/clr commit: c10b29f0e0]
This commit is contained in:
@@ -142,21 +142,18 @@ 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 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__)
|
||||
|
||||
#define DebugInfoGuarantee(cond) LogGuarantee(cond, amd::LOG_INFO, "Warning")
|
||||
|
||||
/* 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
|
||||
|
||||
// You may define CL_LOG to enable following log functions even for release build
|
||||
#define CL_LOG
|
||||
|
||||
@@ -179,12 +176,20 @@ 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_*/
|
||||
|
||||
Reference in New Issue
Block a user