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;
 }