fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 13:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aco: check instruction format before waiting for a previous SMEM store

Browse source 
Totals from 7 (0.01% of 127638) affected shaders:
CodeSize: 40336 -> 40320 (-0.04%)
Instrs: 7807 -> 7803 (-0.05%)
Cycles: 118588 -> 118344 (-0.21%); split: -0.23%, +0.02%
SMEM: 331 -> 339 (+2.42%)

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Fixes: 1749953ea3 ('aco/gfx10: Wait for pending SMEM stores before loads')
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4880>
(cherry picked from commit 95d5c1b8a1)
This commit is contained in:
Rhys Perry 2020-04-29 17:47:50 +01:00 • committed by Eric Engestrom
parent 7ff34259f1
commit 6e1c660ffd
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -4054,7 +4054,7 @@
"description": "aco: check instruction format before waiting for a previous SMEM store",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "1749953ea3eb2f3e33a61243cc11860795c658f3"
},

2
src/amd/compiler/aco_insert_waitcnt.cpp
View file

@ -457,7 +457,7 @@ wait_imm kill(Instruction* instr, wait_ctx& ctx)
imm.lgkm = 0;
}
if (ctx.chip_class >= GFX10) {
if (ctx.chip_class >= GFX10 && instr->format == Format::SMEM) {
/* GFX10: A store followed by a load at the same address causes a problem because
* the load doesn't load the correct values unless we wait for the store first.
* This is NOT mitigated by an s_nop.