From 189fac5855d3a10189ee28be589f20495eacc5a8 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Thu, 30 Apr 2020 16:10:42 +0100 Subject: [PATCH] aco: preserve more fields when combining additions into SMEM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Totals from 11 (0.01% of 127638) affected shaders: Signed-off-by: Rhys Perry Fixes: 93c8ebfa780 ('aco: Initial commit of independent AMD compiler') Reviewed-by: Daniel Schürmann Part-of: (cherry picked from commit e1900ee2c70c15dea56027c21676174704f12348) --- .pick_status.json | 2 +- src/amd/compiler/aco_optimizer.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 159bc559806..5f5d8073cad 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4045,7 +4045,7 @@ "description": "aco: preserve more fields when combining additions into SMEM", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "93c8ebfa780ebd1495095e794731881aef29e7d3" }, diff --git a/src/amd/compiler/aco_optimizer.cpp b/src/amd/compiler/aco_optimizer.cpp index 9203f1c4b43..9cb7428da04 100644 --- a/src/amd/compiler/aco_optimizer.cpp +++ b/src/amd/compiler/aco_optimizer.cpp @@ -876,6 +876,10 @@ void label_instruction(opt_ctx &ctx, Block& block, aco_ptr& instr) new_instr->definitions[0] = smem->definitions[0]; new_instr->can_reorder = smem->can_reorder; new_instr->barrier = smem->barrier; + new_instr->glc = smem->glc; + new_instr->dlc = smem->dlc; + new_instr->nv = smem->nv; + new_instr->disable_wqm = smem->disable_wqm; instr.reset(new_instr); smem = static_cast(instr.get()); }