diff options
| author | Rhys Perry <pendingchaos02@gmail.com> | 2020-04-30 16:10:42 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-05-28 11:16:39 -0700 |
| commit | 41962e06607547a6bad936d5f33671a6a0ef2e7d (patch) | |
| tree | 2ce87848c08d9ca7287c0c3ce3f222d9d7c10e33 | |
| parent | 94850e33fbe15e86551a44c5710a90f0fbe86a81 (diff) | |
aco: preserve more fields when combining additions into SMEM
Totals from 11 (0.01% of 127638) affected shaders:
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Fixes: 93c8ebfa780 ('aco: Initial commit of independent AMD compiler')
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4880>
(cherry picked from commit e1900ee2c70c15dea56027c21676174704f12348)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/amd/compiler/aco_optimizer.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 96524d54f97..6e13e255f7b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -85,7 +85,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 5f2e5637b71..95fd454c437 100644 --- a/src/amd/compiler/aco_optimizer.cpp +++ b/src/amd/compiler/aco_optimizer.cpp @@ -859,6 +859,10 @@ void label_instruction(opt_ctx &ctx, Block& block, aco_ptr<Instruction>& 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<SMEM_instruction *>(instr.get()); } |