From 75a1e24519640aed87a902a405354139a8c2b724 Mon Sep 17 00:00:00 2001 From: Pierre Date: Mon, 13 Nov 2017 16:13:19 -0500 Subject: [PATCH] Fix missing MARKER_END Logging status of hipCtxSynchronize was missing Test if hip profiling is active for MARKER_END in ihipPostLaunchKernel Add MARKER_END after the completion of a kernel launched through the "grid launch" [ROCm/clr commit: e60a95d7ddc1fdf7a36fff7a9f3403758c26f4b9] --- projects/clr/hipamd/src/grid_launch.cpp | 3 +++ projects/clr/hipamd/src/hip_context.cpp | 2 +- projects/clr/hipamd/src/hip_hcc.cpp | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/projects/clr/hipamd/src/grid_launch.cpp b/projects/clr/hipamd/src/grid_launch.cpp index fd5c2a1573..9b3cf509c5 100644 --- a/projects/clr/hipamd/src/grid_launch.cpp +++ b/projects/clr/hipamd/src/grid_launch.cpp @@ -92,5 +92,8 @@ namespace hip_impl delete static_cast(locked_stream); locked_stream = nullptr; + if(HIP_PROFILE_API) { + MARKER_END(); + } } } diff --git a/projects/clr/hipamd/src/hip_context.cpp b/projects/clr/hipamd/src/hip_context.cpp index 69d75e7f31..d3d0691e55 100644 --- a/projects/clr/hipamd/src/hip_context.cpp +++ b/projects/clr/hipamd/src/hip_context.cpp @@ -269,7 +269,7 @@ hipError_t hipCtxGetSharedMemConfig ( hipSharedMemConfig * pConfig ) hipError_t hipCtxSynchronize ( void ) { HIP_INIT_API(1); - return ihipSynchronize(); //TODP Shall check validity of ctx? + return ihipLogStatus(ihipSynchronize()); //TODP Shall check validity of ctx? } hipError_t hipCtxGetFlags ( unsigned int* flags ) diff --git a/projects/clr/hipamd/src/hip_hcc.cpp b/projects/clr/hipamd/src/hip_hcc.cpp index 2d2d2745fe..2eff57f18b 100644 --- a/projects/clr/hipamd/src/hip_hcc.cpp +++ b/projects/clr/hipamd/src/hip_hcc.cpp @@ -1592,7 +1592,9 @@ void ihipPostLaunchKernel(const char *kernelName, hipStream_t stream, grid_launc tprintf(DB_SYNC, "ihipPostLaunchKernel, unlocking stream\n"); stream->lockclose_postKernelCommand(kernelName, lp.av); - MARKER_END(); + if(HIP_PROFILE_API) { + MARKER_END(); + } } //=================================================================================================