Module: Mesa Branch: main Commit: f3415cb26a62289fed9cb5f202088168add43cfd URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f3415cb26a62289fed9cb5f202088168add43cfd
Author: Gert Wollny <[email protected]> Date: Fri Sep 9 14:54:58 2022 +0200 r600/sfn: copy propagate register load chains NIR sometimes produces load chains like r0 mov value r1 mov r0 r2 mov r1 Add copy propagation for these cases Signed-off-by: Gert Wollny <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18619> --- src/gallium/drivers/r600/sfn/sfn_optimizer.cpp | 45 ++++++++++++++++++---- .../drivers/r600/sfn/tests/sfn_test_shaders.cpp | 6 +-- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/src/gallium/drivers/r600/sfn/sfn_optimizer.cpp b/src/gallium/drivers/r600/sfn/sfn_optimizer.cpp index 1cd5c41f490..2047b305965 100644 --- a/src/gallium/drivers/r600/sfn/sfn_optimizer.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_optimizer.cpp @@ -350,13 +350,38 @@ void CopyPropFwdVisitor::visit(AluInstr *instr) auto src = instr->psrc(0); auto dest = instr->dest(); - for (auto& i : instr->dest()->uses()) { + for (auto& i : dest->uses()) { /* SSA can always be propagated, registers only in the same block - * and only if they are not assigned to more than once */ - if (dest->is_ssa() || - (instr->block_id() == i->block_id() && - instr->index() < i->index() && - dest->uses().size() == 1)) { + * and only if they are assigned in the same block */ + bool can_propagate = dest->is_ssa(); + + if (!can_propagate) { + + /* Register can propagate if the assigment was in the same + * block, and we don't have a second assignment coming later + * (e.g. helper invocation evaluation does + * + * 1: MOV R0.x, -1 + * 2: FETCH R0.0 VPM + * 3: MOV SN.x, R0.x + * + * Here we can't prpagate the move in 1 to SN.x in 3 */ + if ((instr->block_id() == i->block_id() && + instr->index() < i->index())) { + can_propagate = true; + if (dest->parents().size() > 1) { + for (auto p : dest->parents()) { + if (p->block_id() == i->block_id() && + p->index() > instr->index()) { + can_propagate = false; + break; + } + } + } + } + } + + if (can_propagate) { sfn_log << SfnLog::opt << " Try replace in " << i->block_id() << ":" << i->index() << *i<< "\n"; @@ -584,8 +609,12 @@ void SimplifySourceVecVisitor::visit(TexInstr *instr) ++nvals; if (nvals == 1) { for (int i = 0; i < 4; ++i) - if (src[i]->chan() < 4) - src[i]->set_pin(pin_free); + if (src[i]->chan() < 4) { + if (src[i]->pin() == pin_group) + src[i]->set_pin(pin_free); + else if (src[i]->pin() == pin_chgr) + src[i]->set_pin(pin_chan); + } } } for (auto& prep : instr->prepare_instr()) { diff --git a/src/gallium/drivers/r600/sfn/tests/sfn_test_shaders.cpp b/src/gallium/drivers/r600/sfn/tests/sfn_test_shaders.cpp index fe28e2deeb4..b95829a145f 100644 --- a/src/gallium/drivers/r600/sfn/tests/sfn_test_shaders.cpp +++ b/src/gallium/drivers/r600/sfn/tests/sfn_test_shaders.cpp @@ -1121,18 +1121,18 @@ IF (( ALU PREDE_INT __.x@free : KC0[0].x I[1] {LEP} PUSH_BEFORE )) ALU MOV R3.x : R5.x {WL} LOOP_END ALU MOV R8.x : I[1.0] {WL} - ALU MOV R7.x : R8.x {WL} + ALU MOV R7.x : I[1.0] {WL} ALU MOV R6.x : I[-1] {WL} ELSE ALU MOV R8.x : I[1.0] {WL} ALU MOV R7.x : I[0] {WL} - ALU MOV R4.x : R8.x {WL} + ALU MOV R4.x : I[1.0] {WL} ALU MOV R6.x : I[0] {WL} ENDIF ELSE ALU MOV R8.x : I[1.0] {WL} ALU MOV R7.x : I[0] {WL} - ALU MOV R4.x : R8.x {WL} + ALU MOV R4.x : I[1.0] {WL} ALU MOV R6.x : I[-1] {WL} ENDIF ALU CNDE_INT S27.x@free : R6.x I[1.0] R4.x {WL}
