fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 04:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ac: add gfx11.7 enums

Browse source 
This is just enough to compile future patches and run tests.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40917>
This commit is contained in:
Rhys Perry 2026-03-19 10:24:08 +00:00 • committed by Marge Bot
parent 0c6019e265
commit 7b1a1fcf5e
5 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/amd/common/amd_family.c
View file

@ -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:

3
src/amd/common/amd_family.h
View file

@ -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,

4
src/amd/common/nir/tests/ac_nir_lower_mem_access_test.cpp
View file

@ -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)

4
src/amd/compiler/tests/framework.h
View file

@ -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);

1
src/amd/compiler/tests/helpers.cpp
View file

@ -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;
}