From 7b1a1fcf5e2b098c5c8aa05cad8377b9ca193e95 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Thu, 19 Mar 2026 10:24:08 +0000 Subject: [PATCH] ac: add gfx11.7 enums MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is just enough to compile future patches and run tests. Signed-off-by: Rhys Perry Reviewed-by: Samuel Pitoiset Reviewed-by: Marek Olšák Part-of: --- src/amd/common/amd_family.c | 5 +++++ src/amd/common/amd_family.h | 3 +++ src/amd/common/nir/tests/ac_nir_lower_mem_access_test.cpp | 4 ++-- src/amd/compiler/tests/framework.h | 4 +++- src/amd/compiler/tests/helpers.cpp | 1 + 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/amd/common/amd_family.c b/src/amd/common/amd_family.c index 2162223b1d0..8e4804429e9 100644 --- a/src/amd/common/amd_family.c +++ b/src/amd/common/amd_family.c @@ -60,6 +60,7 @@ const char *ac_get_family_name(enum radeon_family family) CASE(STRIX_HALO); CASE(KRACKAN1); CASE(GFX1153); + CASE(GFX1170); CASE(GFX1200); CASE(GFX1201); #undef CASE @@ -72,6 +73,8 @@ enum amd_gfx_level ac_get_gfx_level(enum radeon_family family) { if (family >= CHIP_GFX1200) return GFX12; + if (family >= CHIP_GFX1170) + return GFX11_7; if (family >= CHIP_STRIX1) return GFX11_5; if (family >= CHIP_NAVI31) @@ -183,6 +186,8 @@ const char *ac_get_llvm_processor_name(enum radeon_family family) return "gfx1152"; case CHIP_GFX1153: return "gfx1153"; + case CHIP_GFX1170: + return "gfx1170"; case CHIP_GFX1200: return "gfx1200"; case CHIP_GFX1201: diff --git a/src/amd/common/amd_family.h b/src/amd/common/amd_family.h index 5221b04c96d..9d6bbd5ca7d 100644 --- a/src/amd/common/amd_family.h +++ b/src/amd/common/amd_family.h @@ -127,6 +127,8 @@ enum radeon_family CHIP_STRIX_HALO, /* Ryzen AI MAX */ CHIP_KRACKAN1, /* Ryzen AI 330-350 */ CHIP_GFX1153, + /* GFX11.7 */ + CHIP_GFX1170, /* GFX12 (RDNA 4) */ CHIP_GFX1200, /* Radeon 9060 */ CHIP_GFX1201, /* Radeon 9070 */ @@ -151,6 +153,7 @@ enum amd_gfx_level GFX10_3, GFX11, GFX11_5, + GFX11_7, GFX12, NUM_GFX_VERSIONS, diff --git a/src/amd/common/nir/tests/ac_nir_lower_mem_access_test.cpp b/src/amd/common/nir/tests/ac_nir_lower_mem_access_test.cpp index 6739a053665..282bd8558c8 100644 --- a/src/amd/common/nir/tests/ac_nir_lower_mem_access_test.cpp +++ b/src/amd/common/nir/tests/ac_nir_lower_mem_access_test.cpp @@ -176,8 +176,8 @@ void create_shader(test_state *state, nir_shader_compiler_options *options) if (st->gfx_level != GFX11) { if (st->gfx_level >= GFX12) _mesa_string_buffer_printf(state->result, "gfx%u,", st->gfx_level - GFX12 + 12); - else if (st->gfx_level == GFX11_5) - _mesa_string_buffer_append(state->result, "gfx11.5,"); + else if (st->gfx_level >= GFX11_5) + _mesa_string_buffer_printf(state->result, "gfx11.%u,", (st->gfx_level > GFX11_5 ? 7u : 5u)); else if (st->gfx_level >= GFX11) _mesa_string_buffer_printf(state->result, "gfx%u,", st->gfx_level - GFX11 + 11); else if (st->gfx_level == GFX10_3) diff --git a/src/amd/compiler/tests/framework.h b/src/amd/compiler/tests/framework.h index 71c4169be8b..4be5da1e176 100644 --- a/src/amd/compiler/tests/framework.h +++ b/src/amd/compiler/tests/framework.h @@ -35,9 +35,11 @@ set_variant(amd_gfx_level cls, const char* rest = "") snprintf(buf, sizeof(buf), "gfx10_3%s", rest); } else if (cls == GFX11_5) { snprintf(buf, sizeof(buf), "gfx11_5%s", rest); + } else if (cls == GFX11_7) { + snprintf(buf, sizeof(buf), "gfx11_7%s", rest); } else { unsigned num = cls - GFX6 + 6; - num -= (cls > GFX10_3) + (cls > GFX11_5); + num -= (cls > GFX10_3) + ((cls > GFX11_7) ? 2 : 0); snprintf(buf, sizeof(buf), "gfx%d%s", num, rest); } return set_variant(buf); diff --git a/src/amd/compiler/tests/helpers.cpp b/src/amd/compiler/tests/helpers.cpp index d99f964961a..715e78caa39 100644 --- a/src/amd/compiler/tests/helpers.cpp +++ b/src/amd/compiler/tests/helpers.cpp @@ -76,6 +76,7 @@ get_family(enum amd_gfx_level gfx_level, enum radeon_family family) case GFX10_3: return CHIP_NAVI21; case GFX11: return CHIP_NAVI31; case GFX11_5: return CHIP_STRIX_HALO; + case GFX11_7: return CHIP_GFX1170; case GFX12: return CHIP_GFX1201; default: return CHIP_UNKNOWN; }