yuzu-emu/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-11-30 21:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

shader: Read branch conditions from an instruction

Browse Source 
Fixes the identity removal pass.
This commit is contained in:
ReinUsesLisp 2021-05-18 02:04:22 -03:00 committed by ameerj
parent 4bad415bca
commit 9bb3e008c9
12 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/shader_recompiler/backend/glasm/emit_glasm.cpp
View File

@ -200,7 +200,7 @@ void Precolor(EmitContext& ctx, const IR::Program& program) {
} }
// Add reference to the phi node on the phi predecessor to avoid overwritting it // Add reference to the phi node on the phi predecessor to avoid overwritting it
for (size_t i = 0; i < num_args; ++i) { for (size_t i = 0; i < num_args; ++i) {
IR::IREmitter{*phi.PhiBlock(i)}.DummyReference(IR::Value{&phi}); IR::IREmitter{*phi.PhiBlock(i)}.Reference(IR::Value{&phi});
} }
} }
} }

4
src/shader_recompiler/backend/glasm/emit_glasm_bitwise_conversion.cpp
View File

@ -22,6 +22,10 @@ void EmitIdentity(EmitContext&, IR::Inst& inst, const IR::Value& value) {
Alias(inst, value); Alias(inst, value);
} }
void EmitConditionRef(EmitContext&, IR::Inst& inst, const IR::Value& value) {
Alias(inst, value);
}
void EmitBitCastU16F16(EmitContext&, IR::Inst& inst, const IR::Value& value) { void EmitBitCastU16F16(EmitContext&, IR::Inst& inst, const IR::Value& value) {
Alias(inst, value); Alias(inst, value);
} }

3
src/shader_recompiler/backend/glasm/emit_glasm_instructions.h
View File

@ -22,7 +22,8 @@ class EmitContext;
void EmitPhi(EmitContext& ctx, IR::Inst& inst); void EmitPhi(EmitContext& ctx, IR::Inst& inst);
void EmitVoid(EmitContext& ctx); void EmitVoid(EmitContext& ctx);
void EmitIdentity(EmitContext& ctx, IR::Inst& inst, const IR::Value& value); void EmitIdentity(EmitContext& ctx, IR::Inst& inst, const IR::Value& value);
void EmitDummyReference(EmitContext&); void EmitConditionRef(EmitContext& ctx, IR::Inst& inst, const IR::Value& value);
void EmitReference(EmitContext&);
void EmitPhiMove(EmitContext& ctx, const IR::Value& phi, const IR::Value& value); void EmitPhiMove(EmitContext& ctx, const IR::Value& phi, const IR::Value& value);
void EmitJoin(EmitContext& ctx); void EmitJoin(EmitContext& ctx);
void EmitDemoteToHelperInvocation(EmitContext& ctx); void EmitDemoteToHelperInvocation(EmitContext& ctx);

2
src/shader_recompiler/backend/glasm/emit_glasm_not_implemented.cpp
View File

@ -21,7 +21,7 @@ void EmitPhi(EmitContext&, IR::Inst&) {}
void EmitVoid(EmitContext&) {} void EmitVoid(EmitContext&) {}
void EmitDummyReference(EmitContext&) {} void EmitReference(EmitContext&) {}
void EmitPhiMove(EmitContext& ctx, const IR::Value& phi, const IR::Value& value) { void EmitPhiMove(EmitContext& ctx, const IR::Value& phi, const IR::Value& value) {
if (phi == value) { if (phi == value) {

1
src/shader_recompiler/backend/glasm/reg_alloc.cpp
View File

@ -139,6 +139,7 @@ void RegAlloc::Free(Id id) {
/*static*/ bool RegAlloc::IsAliased(const IR::Inst& inst) { /*static*/ bool RegAlloc::IsAliased(const IR::Inst& inst) {
switch (inst.GetOpcode()) { switch (inst.GetOpcode()) {
case IR::Opcode::Identity: case IR::Opcode::Identity:
case IR::Opcode::ConditionRef:
case IR::Opcode::BitCastU16F16: case IR::Opcode::BitCastU16F16:
case IR::Opcode::BitCastU32F32: case IR::Opcode::BitCastU32F32:
case IR::Opcode::BitCastU64F64: case IR::Opcode::BitCastU64F64:

10
src/shader_recompiler/backend/spirv/emit_spirv.cpp
View File

@ -469,7 +469,15 @@ Id EmitIdentity(EmitContext& ctx, const IR::Value& value) {
return id; return id;
} }
void EmitDummyReference(EmitContext&) {} Id EmitConditionRef(EmitContext& ctx, const IR::Value& value) {
const Id id{ctx.Def(value)};
if (!Sirit::ValidId(id)) {
throw NotImplementedException("Forward identity declaration");
}
return id;
}
void EmitReference(EmitContext&) {}
void EmitPhiMove(EmitContext&) { void EmitPhiMove(EmitContext&) {
throw LogicError("Unreachable instruction"); throw LogicError("Unreachable instruction");

3
src/shader_recompiler/backend/spirv/emit_spirv_instructions.h
View File

@ -23,7 +23,8 @@ class EmitContext;
Id EmitPhi(EmitContext& ctx, IR::Inst* inst); Id EmitPhi(EmitContext& ctx, IR::Inst* inst);
void EmitVoid(EmitContext& ctx); void EmitVoid(EmitContext& ctx);
Id EmitIdentity(EmitContext& ctx, const IR::Value& value); Id EmitIdentity(EmitContext& ctx, const IR::Value& value);
void EmitDummyReference(EmitContext&); Id EmitConditionRef(EmitContext& ctx, const IR::Value& value);
void EmitReference(EmitContext&);
void EmitPhiMove(EmitContext&); void EmitPhiMove(EmitContext&);
void EmitJoin(EmitContext& ctx); void EmitJoin(EmitContext& ctx);
void EmitDemoteToHelperInvocation(EmitContext& ctx); void EmitDemoteToHelperInvocation(EmitContext& ctx);

8
src/shader_recompiler/frontend/ir/ir_emitter.cpp
View File

@ -61,8 +61,12 @@ F64 IREmitter::Imm64(f64 value) const {
return F64{Value{value}}; return F64{Value{value}};
} }
void IREmitter::DummyReference(const Value& value) { U1 IREmitter::ConditionRef(const U1& value) {
Inst(Opcode::DummyReference, value); return Inst<U1>(Opcode::ConditionRef, value);
}
void IREmitter::Reference(const Value& value) {
Inst(Opcode::Reference, value);
} }
void IREmitter::PhiMove(IR::Inst& phi, const Value& value) { void IREmitter::PhiMove(IR::Inst& phi, const Value& value) {

4
src/shader_recompiler/frontend/ir/ir_emitter.h
View File

@ -32,7 +32,9 @@ public:
[[nodiscard]] U64 Imm64(s64 value) const; [[nodiscard]] U64 Imm64(s64 value) const;
[[nodiscard]] F64 Imm64(f64 value) const; [[nodiscard]] F64 Imm64(f64 value) const;
void DummyReference(const Value& value); U1 ConditionRef(const U1& value);
void Reference(const Value& value);
void PhiMove(IR::Inst& phi, const Value& value); void PhiMove(IR::Inst& phi, const Value& value);
void Prologue(); void Prologue();

3
src/shader_recompiler/frontend/ir/microinstruction.cpp
View File

@ -56,7 +56,8 @@ Inst::~Inst() {
bool Inst::MayHaveSideEffects() const noexcept { bool Inst::MayHaveSideEffects() const noexcept {
switch (op) { switch (op) {
case Opcode::DummyReference: case Opcode::ConditionRef:
case Opcode::Reference:
case Opcode::PhiMove: case Opcode::PhiMove:
case Opcode::Prologue: case Opcode::Prologue:
case Opcode::Epilogue: case Opcode::Epilogue:

3
src/shader_recompiler/frontend/ir/opcodes.inc
View File

@ -6,7 +6,8 @@
OPCODE(Phi, Opaque, ) OPCODE(Phi, Opaque, )
OPCODE(Identity, Opaque, Opaque, ) OPCODE(Identity, Opaque, Opaque, )
OPCODE(Void, Void, ) OPCODE(Void, Void, )
OPCODE(DummyReference, Void, Opaque, ) OPCODE(ConditionRef, U1, U1, )
OPCODE(Reference, Void, Opaque, )
OPCODE(PhiMove, Void, Opaque, Opaque, ) OPCODE(PhiMove, Void, Opaque, Opaque, )
// Special operations // Special operations

9
src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp
View File

@ -703,8 +703,7 @@ private:
// Implement if header block // Implement if header block
IR::IREmitter ir{*current_block}; IR::IREmitter ir{*current_block};
const IR::U1 cond{VisitExpr(ir, *stmt.cond)}; const IR::U1 cond{ir.ConditionRef(VisitExpr(ir, *stmt.cond))};
ir.DummyReference(cond);
const size_t if_node_index{syntax_list.size()}; const size_t if_node_index{syntax_list.size()};
syntax_list.emplace_back(); syntax_list.emplace_back();
@ -754,8 +753,7 @@ private:
// The continue block is located at the end of the loop // The continue block is located at the end of the loop
IR::IREmitter ir{*continue_block}; IR::IREmitter ir{*continue_block};
const IR::U1 cond{VisitExpr(ir, *stmt.cond)}; const IR::U1 cond{ir.ConditionRef(VisitExpr(ir, *stmt.cond))};
ir.DummyReference(cond);
IR::Block* const body_block{syntax_list.at(body_block_index).data.block}; IR::Block* const body_block{syntax_list.at(body_block_index).data.block};
loop_header_block->AddBranch(body_block); loop_header_block->AddBranch(body_block);
@ -791,8 +789,7 @@ private:
IR::Block* const skip_block{MergeBlock(parent, stmt)}; IR::Block* const skip_block{MergeBlock(parent, stmt)};
IR::IREmitter ir{*current_block}; IR::IREmitter ir{*current_block};
const IR::U1 cond{VisitExpr(ir, *stmt.cond)}; const IR::U1 cond{ir.ConditionRef(VisitExpr(ir, *stmt.cond))};
ir.DummyReference(cond);
current_block->AddBranch(break_block); current_block->AddBranch(break_block);
current_block->AddBranch(skip_block); current_block->AddBranch(skip_block);
current_block = skip_block; current_block = skip_block;