From e2ebcba11b8d606a7e292282aabdacdd529b6e0c Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Thu, 19 Mar 2026 16:12:44 +0000 Subject: [PATCH] aco/tests: fix assembler/isel tests with LLVM 23 Signed-off-by: Rhys Perry Backport-to: 26.0 Reviewed-by: Georg Lehmann Part-of: --- src/amd/compiler/tests/test_assembler.cpp | 19 +++++++++++-------- src/amd/compiler/tests/test_isel.cpp | 14 ++++++++++---- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/amd/compiler/tests/test_assembler.cpp b/src/amd/compiler/tests/test_assembler.cpp index 03f0286d960..c1920f5a0be 100644 --- a/src/amd/compiler/tests/test_assembler.cpp +++ b/src/amd/compiler/tests/test_assembler.cpp @@ -1064,20 +1064,23 @@ BEGIN_TEST(assembler.exp) Operand op_m0(bld.tmp(s1)); op_m0.setFixed(m0); - //~gfx11>> exp mrt3 v1, v0, v3, v2 ; f800003f 02030001 - //~gfx12>> export mrt3 v1, v0, v3, v2 ; f800003f 02030001 + //! mrt3: @match_func(mrt3) + fprintf(output, "mrt3: mrt3%s\n", LLVM_VERSION_MAJOR >= 23 ? "," : ""); + + //~gfx11>> exp @mrt3 v1, v0, v3, v2 ; f800003f 02030001 + //~gfx12>> export @mrt3 v1, v0, v3, v2 ; f800003f 02030001 bld.exp(aco_opcode::exp, op[1], op[0], op[3], op[2], 0xf, 3); - //~gfx11! exp mrt3 v1, off, v0, off ; f8000035 80008001 - //~gfx12! export mrt3 v1, off, v0, off ; f8000035 80008001 + //~gfx11! exp @mrt3 v1, off, v0, off ; f8000035 80008001 + //~gfx12! export @mrt3 v1, off, v0, off ; f8000035 80008001 bld.exp(aco_opcode::exp, op[1], Operand(v1), op[0], Operand(v1), 0x5, 3); - //~gfx11! exp mrt3 v1, v0, v3, v2 done ; f800083f 02030001 - //~gfx12! export mrt3 v1, v0, v3, v2 done ; f800083f 02030001 + //~gfx11! exp @mrt3 v1, v0, v3, v2 done ; f800083f 02030001 + //~gfx12! export @mrt3 v1, v0, v3, v2 done ; f800083f 02030001 bld.exp(aco_opcode::exp, op[1], op[0], op[3], op[2], 0xf, 3, false, true); - //~gfx11! exp mrt3 v1, v0, v3, v2 row_en ; f800203f 02030001 - //~gfx12! export mrt3 v1, v0, v3, v2 row_en ; f800203f 02030001 + //~gfx11! exp @mrt3 v1, v0, v3, v2 row_en ; f800203f 02030001 + //~gfx12! export @mrt3 v1, v0, v3, v2 row_en ; f800203f 02030001 bld.exp(aco_opcode::exp, op[1], op[0], op[3], op[2], op_m0, 0xf, 3)->exp().row_en = true; finish_assembler_test(); diff --git a/src/amd/compiler/tests/test_isel.cpp b/src/amd/compiler/tests/test_isel.cpp index eab9baabc28..6ee80ac117a 100644 --- a/src/amd/compiler/tests/test_isel.cpp +++ b/src/amd/compiler/tests/test_isel.cpp @@ -172,11 +172,14 @@ BEGIN_TEST(isel.discard_early_exit.mrtz) } ); + //! mrtz: @match_func(mrtz) + fprintf(output, "mrtz: mrtz%s\n", LLVM_VERSION_MAJOR >= 23 ? "," : ""); + /* On GFX11, the discard early exit must use mrtz if the shader exports only depth. */ - //>> exp mrtz v#_, off, off, off done ; $_ $_ + //>> exp @mrtz v#_, off, off, off done ; $_ $_ //! s_endpgm ; $_ //! BB1: - //! exp mrtz off, off, off, off done ; $_ $_ + //! exp @mrtz off, off, off, off done ; $_ $_ //! s_endpgm ; $_ PipelineBuilder pbld(get_vk_device(GFX11)); @@ -197,11 +200,14 @@ BEGIN_TEST(isel.discard_early_exit.mrt0) } ); + //! mrt0: @match_func(mrt0) + fprintf(output, "mrt0: mrt0%s\n", LLVM_VERSION_MAJOR >= 23 ? "," : ""); + /* On GFX11, the discard early exit must use mrt0 if the shader exports color. */ - //>> exp mrt0 v#x, v#x, v#x, v#x done ; $_ $_ + //>> exp @mrt0 v#x, v#x, v#x, v#x done ; $_ $_ //! s_endpgm ; $_ //! BB1: - //! exp mrt0 off, off, off, off done ; $_ $_ + //! exp @mrt0 off, off, off, off done ; $_ $_ //! s_endpgm ; $_ PipelineBuilder pbld(get_vk_device(GFX11));