From d3b8a2835743d8e1e61c350b1f0adda66b57feb6 Mon Sep 17 00:00:00 2001 From: Friedrich Vock Date: Tue, 14 May 2024 06:51:02 +0200 Subject: [PATCH] aco/tests: Insert p_logical_start/end in reduce_temp tests Linear VGPR insertion will depend on a p_logical_end existing in the blocks the VGPR is inserted in. Cc: mesa-stable Part-of: (cherry picked from commit 84c1870b655d4987da722f03b315d41da57d13ec) --- .pick_status.json | 2 +- src/amd/compiler/tests/test_reduce_assign.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 071f3269c41..45c3b0cda2b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2494,7 +2494,7 @@ "description": "aco/tests: Insert p_logical_start/end in reduce_temp tests", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/compiler/tests/test_reduce_assign.cpp b/src/amd/compiler/tests/test_reduce_assign.cpp index 7f44e55486f..8aae778bd98 100644 --- a/src/amd/compiler/tests/test_reduce_assign.cpp +++ b/src/amd/compiler/tests/test_reduce_assign.cpp @@ -41,6 +41,11 @@ BEGIN_TEST(setup_reduce_temp.divergent_if_phi) if (!setup_cs("s2 v1", GFX9)) return; + //>> p_logical_start + //>> p_logical_end + bld.pseudo(aco_opcode::p_logical_start); + bld.pseudo(aco_opcode::p_logical_end); + //>> lv1: %lv = p_start_linear_vgpr emit_divergent_if_else( program.get(), bld, Operand(inputs[0]),