fix hip kernel and device sync multithreaded benchmarks

c3sr · Jul 12, 2023 · b87d652 · b87d652
1 parent ef1b7f7
commit b87d652
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/src/hip/hipDeviceSynchronize.cpp b/src/hip/hipDeviceSynchronize.cpp
@@ -9,20 +9,16 @@ auto Comm_hipDeviceSynchronize = [](benchmark::State &state, const int gpu,
                                     const int numaId) {
   numa::ScopedBind binder(numaId);
 
-  if (0 == state.thread_index()) {
-    OR_SKIP_AND_RETURN(scope::hip_reset_device(gpu),
-                       "failed to reset HIP device");
-  }
-
   OR_SKIP_AND_RETURN(hipSetDevice(gpu), "");
   OR_SKIP_AND_RETURN(hipFree(0), "failed to init");
+  OR_SKIP_AND_RETURN(hipDeviceSynchronize(), "failed to init sync");
 
   hipError_t err = hipSuccess;
   for (auto _ : state) {
     err = hipDeviceSynchronize();
   }
 
-  OR_SKIP_AND_RETURN(err, "failed to lsync");
+  OR_SKIP_AND_RETURN(err, "failed to sync");
 
   state.SetItemsProcessed(state.iterations());
   state.counters["gpu"] = gpu;

diff --git a/src/hip/kernel.cpp b/src/hip/kernel.cpp
@@ -19,13 +19,9 @@ auto Comm_hip_kernel = [](benchmark::State &state, const int gpu,
                           const int numaId) {
   numa::ScopedBind binder(numaId);
 
-  if (0 == state.thread_index()) {
-    OR_SKIP_AND_RETURN(scope::hip_reset_device(gpu),
-                       "failed to reset HIP device");
-  }
-
   OR_SKIP_AND_RETURN(hipSetDevice(gpu), "");
   OR_SKIP_AND_RETURN(hipFree(0), "failed to init");
+  OR_SKIP_AND_RETURN(hipDeviceSynchronize(), "failed to init sync");
 
   const size_t nArgs = state.range(0);
 
@@ -59,10 +55,10 @@ auto Comm_hip_kernel = [](benchmark::State &state, const int gpu,
   }
 #undef LAUNCH
   OR_SKIP_AND_RETURN(hipGetLastError(), "failed to launch kernel");
+  OR_SKIP_AND_RETURN(hipDeviceSynchronize(), "failed to synchronize");
 
   state.SetItemsProcessed(state.iterations());
   state.counters["gpu"] = gpu;
-  OR_SKIP_AND_RETURN(hipDeviceSynchronize(), "failed to synchronize");
 };
 
 static void registerer() {