Module: Mesa Branch: main Commit: 3fae614286edf461a72ed8b2b2328e7d1e134657 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3fae614286edf461a72ed8b2b2328e7d1e134657
Author: Gert Wollny <[email protected]> Date: Sun Oct 15 22:28:50 2023 +0200 r600/sfn: When simplifying src vec4 pinnings, also check all uses If a value would be used e.g. as Rn.x___ and also as Rn.xy__, in two different instructions , then the first use was removing the group property if Rn.x, which then broke the use in the second case, because RA didn't see anymore, that Rn.x and Rn.y must be allocated with the same register ID "n". Fixes: c23604324b (r600/sfn: copy-propagate single source texture values) Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9998 Signed-off-by: Gert Wollny <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25741> --- src/gallium/drivers/r600/sfn/sfn_optimizer.cpp | 54 +++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/r600/sfn/sfn_optimizer.cpp b/src/gallium/drivers/r600/sfn/sfn_optimizer.cpp index f8bc69fe0b0..c4d0a9fa727 100644 --- a/src/gallium/drivers/r600/sfn/sfn_optimizer.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_optimizer.cpp @@ -820,7 +820,52 @@ public: bool has_group_dest; }; +class HasVecSrcVisitor : public ConstInstrVisitor { +public: + HasVecSrcVisitor(): + has_group_src(false) + { + } + + void visit(UNUSED const AluInstr& instr) override { } + void visit(UNUSED const AluGroup& instr) override { } + void visit(UNUSED const FetchInstr& instr) override { }; + void visit(UNUSED const Block& instr) override { }; + void visit(UNUSED const ControlFlowInstr& instr) override{ } + void visit(UNUSED const IfInstr& instr) override{ } + void visit(UNUSED const LDSAtomicInstr& instr) override { }; + void visit(UNUSED const LDSReadInstr& instr) override { }; + + void visit(const TexInstr& instr) override { check(instr.src()); } + void visit(const ExportInstr& instr) override { check(instr.value()); } + void visit(const GDSInstr& instr) override { check(instr.src()); } + + // No swizzling supported, so we want to keep the register group + void visit(UNUSED const ScratchIOInstr& instr) override { has_group_src = true; }; + void visit(UNUSED const StreamOutInstr& instr) override { has_group_src = true; } + void visit(UNUSED const MemRingOutInstr& instr) override { has_group_src = true; } + void visit(UNUSED const RatInstr& instr) override { has_group_src = true; }; + + void visit(UNUSED const EmitVertexInstr& instr) override { } + + // We always emit at least two values + void visit(UNUSED const WriteTFInstr& instr) override { has_group_src = true; }; + + void check(const RegisterVec4& value); + + bool has_group_src; +}; + +void HasVecSrcVisitor::check(const RegisterVec4& value) +{ + int nval = 0; + for (int i = 0; i < 4 && nval < 2; ++i) { + if (value[i]->chan() < 4) + ++nval; + } + has_group_src = nval > 1; +} bool simplify_source_vectors(Shader& sh) @@ -854,7 +899,14 @@ SimplifySourceVecVisitor::visit(TexInstr *instr) break; } - if (check_dests.has_group_dest) + HasVecSrcVisitor check_src; + for (auto p : src[i]->uses()) { + p->accept(check_src); + if (check_src.has_group_src) + break; + } + + if (check_dests.has_group_dest || check_src.has_group_src) break; if (src[i]->pin() == pin_group)
