From 289dc507983788f0b2703e45c2f9879ddaeba8d1 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Thu, 14 Sep 2023 14:22:29 +0100 Subject: [PATCH] aco/optimizer_postRA: check overwritten_subdword in is_overwritten_since() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes crash for dEQP-VK.mesh_shader.ext.in_out.with_f16.permutation_0.mesh_only and similar tests on GFX11. Signed-off-by: Rhys Perry Reviewed-by: Timur Kristóf Fixes: 3d29779a25a9 ("aco/optimizer_postRA: Distinguish overwritten untrackable and subdword.") Part-of: (cherry picked from commit ac48334ecd307054bb4176089898c6e19e32fc6f) --- .pick_status.json | 2 +- src/amd/compiler/aco_optimizer_postRA.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 85c82763b3b..ccda2c00bec 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -526,7 +526,7 @@ "description": "aco/optimizer_postRA: check overwritten_subdword in is_overwritten_since()", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "3d29779a25a98898163b1dc9c687e6e6211d13c5" }, diff --git a/src/amd/compiler/aco_optimizer_postRA.cpp b/src/amd/compiler/aco_optimizer_postRA.cpp index a05f216c97f..3f692663f16 100644 --- a/src/amd/compiler/aco_optimizer_postRA.cpp +++ b/src/amd/compiler/aco_optimizer_postRA.cpp @@ -211,6 +211,8 @@ is_overwritten_since(pr_opt_ctx& ctx, PhysReg reg, RegClass rc, const Idx& since return true; else if (i == overwritten_untrackable || i == not_written_yet) continue; + else if (i == overwritten_subdword) + return true; assert(i.found());