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

aco/tests: fix assembler tests with LLVM 22

Browse source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Backport-to: 26.0
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
(cherry picked from commit 0826685f1b)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40752>
This commit is contained in:
Rhys Perry 2026-03-19 15:36:45 +00:00 • committed by Eric Engestrom
parent b26c4014c6
commit 4f859cf584
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -5324,7 +5324,7 @@
"description": "aco/tests: fix assembler tests with LLVM 22",
"nominated": true,
"nomination_type": 4,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

14
src/amd/compiler/tests/test_assembler.cpp
View file

@ -298,6 +298,10 @@ BEGIN_TEST(assembler.long_jump.constaddr)
if (!setup_cs(NULL, (amd_gfx_level)GFX10))
return;
//! llvm_version: #llvm_ver
fprintf(output, "llvm_version: %u\n", LLVM_VERSION_MAJOR);
//; funcs['lit'] = lambda v: 'lit(%s)' % hex(int(v)) if llvm_ver >= 22 else v
//>> s_branch 16369 ; bf823ff1
bld.sopp(aco_opcode::s_branch, 2);
@ -309,7 +313,7 @@ BEGIN_TEST(assembler.long_jump.constaddr)
bld.reset(program->create_and_insert_block());
//>> s_getpc_b64 s[0:1] ; be801f00
//! s_add_u32 s0, s0, 32 ; 8000ff00 00000020
//! s_add_u32 s0, s0, @lit(32) ; 8000ff00 00000020
bld.sop1(aco_opcode::p_constaddr_getpc, Definition(PhysReg(0), s2), Operand::zero());
bld.sop2(aco_opcode::p_constaddr_addlo, Definition(PhysReg(0), s1), bld.def(s1, scc),
Operand(PhysReg(0), s1), Operand::zero(), Operand::zero());
@ -424,12 +428,16 @@ BEGIN_TEST(assembler.p_constaddr)
dst0.setFixed(PhysReg(0));
dst1.setFixed(PhysReg(2));
//! llvm_version: #llvm_ver
fprintf(output, "llvm_version: %u\n", LLVM_VERSION_MAJOR);
//; funcs['lit'] = lambda v: 'lit(%s)' % hex(int(v)) if llvm_ver >= 22 else v
//>> s_getpc_b64 s[0:1] ; be801c00
//! s_add_u32 s0, s0, 44 ; 8000ff00 0000002c
//! s_add_u32 s0, s0, @lit(44) ; 8000ff00 0000002c
bld.pseudo(aco_opcode::p_constaddr, dst0, bld.def(s1, scc), Operand::zero());
//! s_getpc_b64 s[2:3] ; be821c00
//! s_add_u32 s2, s2, 64 ; 8002ff02 00000040
//! s_add_u32 s2, s2, @lit(64) ; 8002ff02 00000040
bld.pseudo(aco_opcode::p_constaddr, dst1, bld.def(s1, scc), Operand::c32(32));
aco::lower_to_hw_instr(program.get());