From f41200d289880fd722ee296275a3b9c1268e6ef4 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Wed, 16 Jun 2021 15:31:24 +0100 Subject: [PATCH] aco/tests: fix finish_ra_test() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rhys Perry Reviewed-by: Daniel Schürmann Part-of: --- src/amd/compiler/tests/helpers.cpp | 3 +-- src/amd/compiler/tests/test_regalloc.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/amd/compiler/tests/helpers.cpp b/src/amd/compiler/tests/helpers.cpp index 7b6859c4e29..024116a6b61 100644 --- a/src/amd/compiler/tests/helpers.cpp +++ b/src/amd/compiler/tests/helpers.cpp @@ -186,8 +186,7 @@ void finish_ra_test(ra_test_policy policy) return; } - finish_program(program.get()); - aco::optimize_postRA(program.get()); + aco_print_program(program.get(), output); } void finish_optimizer_postRA_test() diff --git a/src/amd/compiler/tests/test_regalloc.cpp b/src/amd/compiler/tests/test_regalloc.cpp index 52449a41b85..4fa58ff0048 100644 --- a/src/amd/compiler/tests/test_regalloc.cpp +++ b/src/amd/compiler/tests/test_regalloc.cpp @@ -46,7 +46,7 @@ BEGIN_TEST(regalloc.subdword_alloc.reuse_16bit_operands) //! v2b: %_:v[#a][0:16], v2b: %res1:v[#a][16:32] = p_split_vector %_:v[#a] Builder::Result tmp = bld.pseudo(aco_opcode::p_split_vector, bld.def(v2b), bld.def(v2b), inputs[0]); - //! v1: %_:v[#b] = v_cvt_f32_f16 %_:v[#a][16:32] + //! v1: %_:v[#b] = v_cvt_f32_f16 %_:v[#a][16:32] dst_sel:dword src0_sel:uword1 //! v1: %_:v[#a] = v_cvt_f32_f16 %_:v[#a][0:16] //; success = (b != a) auto result1 = bld.vop1(aco_opcode::v_cvt_f32_f16, bld.def(v1), tmp.def(1).getTemp()); @@ -69,7 +69,7 @@ BEGIN_TEST(regalloc.32bit_partial_write) Temp hi = bld.pseudo(aco_opcode::p_split_vector, bld.def(v2b), bld.def(v2b), inputs[0]).def(1).getTemp(); /* This test checks if this instruction uses SDWA. */ - //! v2b: %_:v[0][0:16] = v_not_b32 0 dst_preserve + //! v2b: %_:v[0][0:16] = v_not_b32 0 dst_sel:uword0 dst_preserve src0_sel:dword Temp lo = bld.vop1(aco_opcode::v_not_b32, bld.def(v2b), Operand::zero()); //! v1: %_:v[0] = p_create_vector %_:v[0][0:16], %_:v[0][16:32]