From 3cb95ad0da68184b0ed282b288a71ffd97e43bf5 Mon Sep 17 00:00:00 2001 From: gopesh Date: Thu, 13 Jul 2023 00:50:05 -0500 Subject: [PATCH] Fixing navi v1 test hang Change-Id: I7416170c126a2d3ec564ed27111f1befc3778b4a - Added all gpu targets in build script. - Changed memory order to relaxed seem to work for navi hang - need to set power state for consistent results Change-Id: I7416170c126a2d3ec564ed27111f1befc3778b4a [ROCm/rocprofiler commit: 45903ec2099336cd1d996da3f0b0f75fd7eb8bb5] --- projects/rocprofiler/build.sh | 3 ++- projects/rocprofiler/test/ctrl/test_hsa.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/rocprofiler/build.sh b/projects/rocprofiler/build.sh index 4b13f19fa8..fffceef6d8 100755 --- a/projects/rocprofiler/build.sh +++ b/projects/rocprofiler/build.sh @@ -71,7 +71,8 @@ if [ -n "$ROCM_RPATH" ] ; then LD_RUNPATH_FLAG=" -Wl,--enable-new-dtags -Wl,--rp if [ -z "$TO_CLEAN" ] ; then TO_CLEAN=yes; fi if [ -z "$RUN_TEST" ] ; then RUN_TEST=no; fi if [ -z "$ASAN" ] ; then ASAN=False; fi -if [ -z "$GPU_LIST" ] ; then GPU_LIST="gfx900 gfx906 gfx908 gfx90a gfx1030 gfx1100"; fi +if [ -z "$GPU_LIST" ] ; then GPU_LIST="gfx900 gfx906 gfx908 gfx90a gfx940 gfx941 gfx942 gfx1030 gfx1100 gfx1101 gfx1102"; fi + ROCPROFILER_ROOT=$(cd $ROCPROFILER_ROOT && echo $PWD) diff --git a/projects/rocprofiler/test/ctrl/test_hsa.cpp b/projects/rocprofiler/test/ctrl/test_hsa.cpp index 5958edf341..7632cdcb71 100644 --- a/projects/rocprofiler/test/ctrl/test_hsa.cpp +++ b/projects/rocprofiler/test/ctrl/test_hsa.cpp @@ -223,7 +223,7 @@ bool TestHsa::Run() { // Wait on the dispatch signal until the kernel is finished. // Update wait condition to HSA_WAIT_STATE_ACTIVE for Polling - if (hsa_signal_wait_scacquire(hsa_signal_, HSA_SIGNAL_CONDITION_LT, 1, UINT64_MAX, + if (hsa_signal_wait_relaxed(hsa_signal_, HSA_SIGNAL_CONDITION_LT, 1, UINT64_MAX, HSA_WAIT_STATE_BLOCKED) != 0) { TEST_ASSERT("signal_wait failed"); } @@ -283,5 +283,5 @@ bool TestHsa::Cleanup() { if (my_queue_) hsa_queue_destroy(hsa_queue_); hsa_queue_ = NULL; agent_info_ = NULL; - return true; + return true; }