From d05825d8236b9ca2fc90abe26357c8bd86c792b6 Mon Sep 17 00:00:00 2001
From: "assistant-librarian[bot]"
 <assistant-librarian[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 02:50:03 +0000
Subject: [PATCH] Merge commit 'a575acb245847d96d54c1e6d198748bda3e57952' into
 develop

---
 include/ck_tile/ops/epilogue/cshuffle_epilogue.hpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/ck_tile/ops/epilogue/cshuffle_epilogue.hpp b/include/ck_tile/ops/epilogue/cshuffle_epilogue.hpp
index 97f936fde9..4f636b5962 100644
--- a/include/ck_tile/ops/epilogue/cshuffle_epilogue.hpp
+++ b/include/ck_tile/ops/epilogue/cshuffle_epilogue.hpp
@@ -331,10 +331,15 @@ struct CShuffleEpilogue
             }
             else
             {
+#if defined(__gfx950__)
+                constexpr auto is_950 = true;
+#else
+                constexpr auto is_950 = false;
+#endif
                 constexpr int RakedXDLN_PerWarp = NumNXdlPerWavePerShuffle / BlockedXDLN_PerWarp;
                 // BlockedLayout
                 // this branch is for original a16w4
-                if constexpr(is_any_of<ADataType, pk_int4_t, pk_fp4_t>::value ||
+                if constexpr(is_950 || is_any_of<ADataType, pk_int4_t, pk_fp4_t>::value ||
                              is_any_of<BDataType, pk_int4_t, pk_fp4_t>::value)
                 {
                     return tile_distribution_encoding<