SWDEV-397356: Move HIP_API_PRINT after HIP_INIT so that the begin function call gets printed

Change-Id: I99b655596741c19bc483647794ae8b4f6e6f2843


[ROCm/clr commit: d88f0358b0]
此提交包含在:
Ioannis Assiouras
2023-04-27 16:02:44 +01:00
父節點 d7275cb51c
當前提交 7adb0089c6
共有 2 個檔案被更改,包括 9 行新增4 行删除
+7 -3
查看文件
@@ -108,12 +108,16 @@ extern amd::Monitor g_hipInitlock;
__func__, ihipGetErrorName(err), ToString( __VA_ARGS__ ).c_str());
#define HIP_INIT_API_INTERNAL(noReturn, cid, ...) \
HIP_API_PRINT(__VA_ARGS__) \
amd::Thread* thread = amd::Thread::current(); \
if (!VDI_CHECK_THREAD(thread) && !noReturn) { \
HIP_RETURN(hipErrorOutOfMemory); \
if (!VDI_CHECK_THREAD(thread)) { \
ClPrint(amd::LOG_NONE, amd::LOG_ALWAYS, "An internal error has occurred." \
" This may be due to insufficient memory."); \
if (!noReturn) { \
return hipErrorOutOfMemory; \
} \
} \
HIP_INIT(noReturn) \
HIP_API_PRINT(__VA_ARGS__) \
HIP_CB_SPAWNER_OBJECT(cid);
// This macro should be called at the beginning of every HIP API.
+2 -1
查看文件
@@ -66,7 +66,8 @@ static amd::Monitor g_hiprtcInitlock{"hiprtcInit lock"};
#define HIPRTC_INIT_API_INTERNAL(...) \
amd::Thread* thread = amd::Thread::current(); \
if (!VDI_CHECK_THREAD(thread)) { \
ClPrint(amd::LOG_INFO, amd::LOG_API, "Failed to create thread"); \
ClPrint(amd::LOG_NONE, amd::LOG_ALWAYS, "An internal error has occurred." \
" This may be due to insufficient memory."); \
HIPRTC_RETURN(HIPRTC_ERROR_INTERNAL_ERROR); \
} \
amd::ScopedLock lock(g_hiprtcInitlock); \