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

r600/sfn: copy propagate register load chains

Browse source 
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 <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18619>
This commit is contained in:
Gert Wollny 2022-09-09 14:54:58 +02:00 • committed by Marge Bot
parent 1852f1e328
commit f3415cb26a
2 changed files with 40 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/gallium/drivers/r600/sfn/sfn_optimizer.cpp
View file

@ -350,13 +350,38 @@ void CopyPropFwdVisitor::visit(AluInstr *instr)
auto src = instr->psrc(0); auto src = instr->psrc(0);
auto dest = instr->dest(); 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 /* SSA can always be propagated, registers only in the same block
* and only if they are not assigned to more than once */ * and only if they are assigned in the same block */
if (dest->is_ssa() || bool can_propagate = dest->is_ssa();
(instr->block_id() == i->block_id() &&
instr->index() < i->index() && if (!can_propagate) {
dest->uses().size() == 1)) {
/* 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 " sfn_log << SfnLog::opt << " Try replace in "
<< i->block_id() << ":" << i->index() << i->block_id() << ":" << i->index()
<< *i<< "\n"; << *i<< "\n";
@ -584,8 +609,12 @@ void SimplifySourceVecVisitor::visit(TexInstr *instr)
++nvals; ++nvals;
if (nvals == 1) { if (nvals == 1) {
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)
if (src[i]->chan() < 4) if (src[i]->chan() < 4) {
src[i]->set_pin(pin_free); 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()) { for (auto& prep : instr->prepare_instr()) {

6
src/gallium/drivers/r600/sfn/tests/sfn_test_shaders.cpp
View file

@ -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} ALU MOV R3.x : R5.x {WL}
LOOP_END LOOP_END
ALU MOV R8.x : I[1.0] {WL} 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} ALU MOV R6.x : I[-1] {WL}
ELSE ELSE
ALU MOV R8.x : I[1.0] {WL} ALU MOV R8.x : I[1.0] {WL}
ALU MOV R7.x : I[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} ALU MOV R6.x : I[0] {WL}
ENDIF ENDIF
ELSE ELSE
ALU MOV R8.x : I[1.0] {WL} ALU MOV R8.x : I[1.0] {WL}
ALU MOV R7.x : I[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} ALU MOV R6.x : I[-1] {WL}
ENDIF ENDIF
ALU CNDE_INT S27.x@free : R6.x I[1.0] R4.x {WL} ALU CNDE_INT S27.x@free : R6.x I[1.0] R4.x {WL}