Merge pull request #46443 from AuroraPerego/fixWarpSize_14_0

[14.0.X] Generalize warp size in pixel clustering kernel
cms-sw · Oct 29, 2024 · 3bfb7f7 · 3bfb7f7
2 parents 39c747b + e1ae84c
commit 3bfb7f7
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/alpaka/PixelClustering.h b/RecoLocalTracker/SiPixelClusterizer/plugins/alpaka/PixelClustering.h
@@ -182,8 +182,13 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::pixelClustering {
                                                       TrackerTraits::maxPixInModule,
                                                       TrackerTraits::clusterBits,
                                                       uint16_t>;
+#if defined(__HIP_DEVICE_COMPILE__)
+        constexpr auto warpSize = __AMDGCN_WAVEFRONT_SIZE;
+#else
+        constexpr auto warpSize = 32;
+#endif
         auto& hist = alpaka::declareSharedVar<Hist, __COUNTER__>(acc);
-        auto& ws = alpaka::declareSharedVar<typename Hist::Counter[32], __COUNTER__>(acc);
+        auto& ws = alpaka::declareSharedVar<typename Hist::Counter[warpSize], __COUNTER__>(acc);
         for (uint32_t j : cms::alpakatools::independent_group_elements(acc, Hist::totbins())) {
           hist.off[j] = 0;
         }
@@ -254,7 +259,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::pixelClustering {
           }
         }
         alpaka::syncBlockThreads(acc);  // FIXME this can be removed
-        for (uint32_t i : cms::alpakatools::independent_group_elements(acc, 32u)) {
+        for (uint32_t i : cms::alpakatools::independent_group_elements(acc, warpSize)) {
           ws[i] = 0;  // used by prefix scan...
         }
         alpaka::syncBlockThreads(acc);