Skip to content

Commit 5cbdf19

Browse files
authored
Merge pull request #49016 from fwyzard/update_warpsize_for_ROCm_7.0
Use the GPU family macros for the ROCm warp size
2 parents 53c34a6 + 6970d6c commit 5cbdf19

File tree

1 file changed

+2
-8
lines changed
  • HeterogeneousCore/AlpakaInterface/interface

1 file changed

+2
-8
lines changed

HeterogeneousCore/AlpakaInterface/interface/warpsize.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,9 @@ namespace cms::alpakatools {
1313
inline constexpr int warpSize = 32;
1414
#elif defined(__HIP_DEVICE_COMPILE__)
1515
// HIP/ROCm may have a warp size of 32 or 64 depending on the target device
16-
#if defined(__gfx900__) or defined(__gfx902__) or defined(__gfx903__) or defined(__gfx906__) or defined(__gfx908__) or \
17-
defined(__gfx909__) or defined(__gfx90a__) or defined(__gfx90c__) or defined(__gfx942__) or defined(__gfx950__)
16+
#if defined(__GFX9__)
1817
inline constexpr int warpSize = 64;
19-
#elif defined(__gfx1010__) or defined(__gfx1011__) or defined(__gfx1012__) or defined(__gfx1013__) or \
20-
defined(__gfx1030__) or defined(__gfx1031__) or defined(__gfx1032__) or defined(__gfx1033__) or \
21-
defined(__gfx1034__) or defined(__gfx1035__) or defined(__gfx1036__) or defined(__gfx1100__) or \
22-
defined(__gfx1101__) or defined(__gfx1102__) or defined(__gfx1103__) or defined(__gfx1150__) or \
23-
defined(__gfx1151__) or defined(__gfx1152__) or defined(__gfx1153__) or defined(__gfx1200__) or \
24-
defined(__gfx1201__) or defined(__gfx1250__) or defined(__gfx1251__)
18+
#elif defined(__GFX10__) or defined(__GFX11__) or defined(__GFX12__)
2519
inline constexpr int warpSize = 32;
2620
#else
2721
#error "Unknown AMDGCN architecture"

0 commit comments

Comments
 (0)