Module: Mesa
Branch: staging/20.0
Commit: 41962e06607547a6bad936d5f33671a6a0ef2e7d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=41962e06607547a6bad936d5f33671a6a0ef2e7d
Author: Rhys Perry <pendingchao...@gmail.com>
Date: Thu Apr 30 16:10:42 2020 +0100
aco: preserve more fields when combining additions into SMEM
Totals from 11 (0.01% of 127638) affected shaders:
Signed-off-by: Rhys Perry <pendingchao...@gmail.com>
Fixes: 93c8ebfa780 ('aco: Initial commit of independent AMD compiler')
Reviewed-by: Daniel Schürmann <dan...@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4880>
(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 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());
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
