Updated device synch on multi-launch scatter and fixed include statemnts

King · King · commit dff5f3d4b0f1 · 2025-04-16T23:00:09.000-04:00
diff --git a/src/Spatter/Configuration.hip.hh b/src/Spatter/Configuration.hip.hh
@@ -40,7 +40,7 @@ inline void hipAssert(
 }
 #endif
 
-#include "AlignedAllocator.hh"
+#include "AlignedAllocator.hip.hh"
 #include "SpatterTypes.hh"
 #include "Timer.hh"
 
diff --git a/src/Spatter/HipBackend.cpp b/src/Spatter/HipBackend.cpp
@@ -220,8 +220,9 @@ float hip_scatter_wrapper(const size_t *d_pattern, double *d_sparse,
             hipLaunchKernelGGL(hip_scatter_offset, dim3(blocks_this), dim3(threadsPerBlock), 0, 0,
                               d_pattern, d_sparse, d_dense, pattern_length,
                               delta, wrap, counts_this, offset);
-            hipDeviceSynchronize();
+            // hipDeviceSynchronize();
         }
+	hipDeviceSynchronize();
     }
 
     hipEventRecord(stop);
diff --git a/src/Spatter/Input.hip.hh b/src/Spatter/Input.hip.hh
@@ -20,7 +20,7 @@
 #endif
 
 #include "Configuration.hip.hh"
-#include "JSONParser.hh"
+#include "JSONParser.hip.hh"
 #include "PatternParser.hh"
 #include "SpatterTypes.hh"
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ inline void hipAssert(`
`40`	`40`	`}`
`41`	`41`	`#endif`
`42`	`42`
`43`		`-#include "AlignedAllocator.hh"`
	`43`	`+#include "AlignedAllocator.hip.hh"`
`44`	`44`	`#include "SpatterTypes.hh"`
`45`	`45`	`#include "Timer.hh"`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -220,8 +220,9 @@ float hip_scatter_wrapper(const size_t d_pattern, double d_sparse,`
`220`	`220`	`hipLaunchKernelGGL(hip_scatter_offset, dim3(blocks_this), dim3(threadsPerBlock), 0, 0,`
`221`	`221`	`d_pattern, d_sparse, d_dense, pattern_length,`
`222`	`222`	`delta, wrap, counts_this, offset);`
`223`		`- hipDeviceSynchronize();`
	`223`	`+ // hipDeviceSynchronize();`
`224`	`224`	`}`
	`225`	`+ hipDeviceSynchronize();`
`225`	`226`	`}`
`226`	`227`
`227`	`228`	`hipEventRecord(stop);`