yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0

glasm: Initial implementation of phi nodes on GLASM

This commit is contained in:
ReinUsesLisp 2021-05-14 04:48:46 -03:00 committed by ameerj
parent 0f88fb5d72
commit bf5e48ffe4
12 changed files with 117 additions and 25 deletions

View File

@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <ranges>
#include <string> #include <string>
#include <tuple> #include <tuple>
@ -9,6 +10,7 @@
#include "shader_recompiler/backend/glasm/emit_context.h" #include "shader_recompiler/backend/glasm/emit_context.h"
#include "shader_recompiler/backend/glasm/emit_glasm.h" #include "shader_recompiler/backend/glasm/emit_glasm.h"
#include "shader_recompiler/backend/glasm/emit_glasm_instructions.h" #include "shader_recompiler/backend/glasm/emit_glasm_instructions.h"
#include "shader_recompiler/frontend/ir/ir_emitter.h"
#include "shader_recompiler/frontend/ir/program.h" #include "shader_recompiler/frontend/ir/program.h"
#include "shader_recompiler/profile.h" #include "shader_recompiler/profile.h"
@ -175,6 +177,34 @@ void EmitInst(EmitContext& ctx, IR::Inst* inst) {
throw LogicError("Invalid opcode {}", inst->GetOpcode()); throw LogicError("Invalid opcode {}", inst->GetOpcode());
} }
void Precolor(EmitContext& ctx, const IR::Program& program) {
for (IR::Block* const block : program.blocks) {
for (IR::Inst& phi : block->Instructions() | std::views::take_while(IR::IsPhi)) {
switch (phi.Arg(0).Type()) {
case IR::Type::U1:
case IR::Type::U32:
case IR::Type::F32:
ctx.reg_alloc.Define(phi);
break;
case IR::Type::U64:
case IR::Type::F64:
ctx.reg_alloc.LongDefine(phi);
break;
default:
throw NotImplementedException("Phi node type {}", phi.Type());
}
const size_t num_args{phi.NumArgs()};
for (size_t i = 0; i < num_args; ++i) {
IR::IREmitter{*phi.PhiBlock(i)}.PhiMove(phi, phi.Arg(i));
}
// Add reference to the phi node on the phi predecessor to avoid overwritting it
for (size_t i = 0; i < num_args; ++i) {
IR::IREmitter{*phi.PhiBlock(i)}.DummyReference(IR::Value{&phi});
}
}
}
}
void EmitCode(EmitContext& ctx, const IR::Program& program) { void EmitCode(EmitContext& ctx, const IR::Program& program) {
const auto eval{ const auto eval{
[&](const IR::U1& cond) { return ScalarS32{ctx.reg_alloc.Consume(IR::Value{cond})}; }}; [&](const IR::U1& cond) { return ScalarS32{ctx.reg_alloc.Consume(IR::Value{cond})}; }};
@ -186,7 +216,9 @@ void EmitCode(EmitContext& ctx, const IR::Program& program) {
} }
break; break;
case IR::AbstractSyntaxNode::Type::If: case IR::AbstractSyntaxNode::Type::If:
ctx.Add("MOV.S.CC RC,{};IF NE.x;", eval(node.if_node.cond)); ctx.Add("MOV.S.CC RC,{};"
"IF NE.x;",
eval(node.if_node.cond));
break; break;
case IR::AbstractSyntaxNode::Type::EndIf: case IR::AbstractSyntaxNode::Type::EndIf:
ctx.Add("ENDIF;"); ctx.Add("ENDIF;");
@ -195,10 +227,30 @@ void EmitCode(EmitContext& ctx, const IR::Program& program) {
ctx.Add("REP;"); ctx.Add("REP;");
break; break;
case IR::AbstractSyntaxNode::Type::Repeat: case IR::AbstractSyntaxNode::Type::Repeat:
ctx.Add("MOV.S.CC RC,{};BRK NE.x;ENDREP;", eval(node.repeat.cond)); if (node.repeat.cond.IsImmediate()) {
if (node.repeat.cond.U1()) {
ctx.Add("ENDREP;");
} else {
ctx.Add("BRK;"
"ENDREP;");
}
} else {
ctx.Add("MOV.S.CC RC,{};"
"BRK (EQ.x);"
"ENDREP;",
eval(node.repeat.cond));
}
break; break;
case IR::AbstractSyntaxNode::Type::Break: case IR::AbstractSyntaxNode::Type::Break:
ctx.Add("MOV.S.CC RC,{};BRK NE.x;", eval(node.repeat.cond)); if (node.break_node.cond.IsImmediate()) {
if (node.break_node.cond.U1()) {
ctx.Add("BRK;");
}
} else {
ctx.Add("MOV.S.CC RC,{};"
"BRK (NE.x);",
eval(node.break_node.cond));
}
break; break;
case IR::AbstractSyntaxNode::Type::Return: case IR::AbstractSyntaxNode::Type::Return:
case IR::AbstractSyntaxNode::Type::Unreachable: case IR::AbstractSyntaxNode::Type::Unreachable:
@ -233,6 +285,7 @@ void SetupOptions(std::string& header, Info info) {
std::string EmitGLASM(const Profile&, IR::Program& program, Bindings&) { std::string EmitGLASM(const Profile&, IR::Program& program, Bindings&) {
EmitContext ctx{program}; EmitContext ctx{program};
Precolor(ctx, program);
EmitCode(ctx, program); EmitCode(ctx, program);
std::string header = "!!NVcp5.0\n" std::string header = "!!NVcp5.0\n"
"OPTION NV_internal;"; "OPTION NV_internal;";

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 EmitBranchConditionRef(EmitContext&); void EmitDummyReference(EmitContext&);
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);
void EmitBarrier(EmitContext& ctx); void EmitBarrier(EmitContext& ctx);

View File

@ -17,13 +17,32 @@ namespace Shader::Backend::GLASM {
#define NotImplemented() throw NotImplementedException("GLASM instruction {}", __LINE__) #define NotImplemented() throw NotImplementedException("GLASM instruction {}", __LINE__)
void EmitPhi(EmitContext& ctx, IR::Inst& inst) { void EmitPhi(EmitContext&, IR::Inst&) {}
NotImplemented();
}
void EmitVoid(EmitContext&) {} void EmitVoid(EmitContext&) {}
void EmitBranchConditionRef(EmitContext&) {} void EmitDummyReference(EmitContext&) {}
void EmitPhiMove(EmitContext& ctx, const IR::Value& phi, const IR::Value& value) {
if (phi == value) {
return;
}
const Register phi_reg{ctx.reg_alloc.Consume(phi)};
const Value eval_value{ctx.reg_alloc.Consume(value)};
switch (phi.InstRecursive()->Arg(0).Type()) {
case IR::Type::U1:
case IR::Type::U32:
case IR::Type::F32:
ctx.Add("MOV.S {}.x,{};", phi_reg, ScalarS32{eval_value});
break;
case IR::Type::U64:
case IR::Type::F64:
ctx.Add("MOV.U64 {}.x,{};", phi_reg, ScalarRegister{eval_value});
break;
default:
throw NotImplementedException("Phi node type {}", phi.Type());
}
}
void EmitJoin(EmitContext& ctx) { void EmitJoin(EmitContext& ctx) {
NotImplemented(); NotImplemented();

View File

@ -468,7 +468,11 @@ Id EmitIdentity(EmitContext& ctx, const IR::Value& value) {
return id; return id;
} }
void EmitBranchConditionRef(EmitContext&) {} void EmitDummyReference(EmitContext&) {}
void EmitPhiMove(EmitContext&) {
throw LogicError("Unreachable instruction");
}
void EmitGetZeroFromOp(EmitContext&) { void EmitGetZeroFromOp(EmitContext&) {
throw LogicError("Unreachable instruction"); throw LogicError("Unreachable instruction");

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 EmitBranchConditionRef(EmitContext&); void EmitDummyReference(EmitContext&);
void EmitPhiMove(EmitContext&);
void EmitJoin(EmitContext& ctx); void EmitJoin(EmitContext& ctx);
void EmitDemoteToHelperInvocation(EmitContext& ctx); void EmitDemoteToHelperInvocation(EmitContext& ctx);
void EmitBarrier(EmitContext& ctx); void EmitBarrier(EmitContext& ctx);

View File

@ -61,6 +61,14 @@ F64 IREmitter::Imm64(f64 value) const {
return F64{Value{value}}; return F64{Value{value}};
} }
void IREmitter::DummyReference(const Value& value) {
Inst(Opcode::DummyReference, value);
}
void IREmitter::PhiMove(IR::Inst& phi, const Value& value) {
Inst(Opcode::PhiMove, Value{&phi}, value);
}
void IREmitter::Prologue() { void IREmitter::Prologue() {
Inst(Opcode::Prologue); Inst(Opcode::Prologue);
} }
@ -69,10 +77,6 @@ void IREmitter::Epilogue() {
Inst(Opcode::Epilogue); Inst(Opcode::Epilogue);
} }
void IREmitter::BranchConditionRef(const U1& cond) {
Inst(Opcode::BranchConditionRef, cond);
}
void IREmitter::DemoteToHelperInvocation() { void IREmitter::DemoteToHelperInvocation() {
Inst(Opcode::DemoteToHelperInvocation); Inst(Opcode::DemoteToHelperInvocation);
} }
@ -106,6 +110,9 @@ void IREmitter::SetReg(IR::Reg reg, const U32& value) {
} }
U1 IREmitter::GetPred(IR::Pred pred, bool is_negated) { U1 IREmitter::GetPred(IR::Pred pred, bool is_negated) {
if (pred == Pred::PT) {
return Imm1(!is_negated);
}
const U1 value{Inst<U1>(Opcode::GetPred, pred)}; const U1 value{Inst<U1>(Opcode::GetPred, pred)};
if (is_negated) { if (is_negated) {
return Inst<U1>(Opcode::LogicalNot, value); return Inst<U1>(Opcode::LogicalNot, value);
@ -264,6 +271,9 @@ static U1 GetFlowTest(IREmitter& ir, FlowTest flow_test) {
U1 IREmitter::Condition(IR::Condition cond) { U1 IREmitter::Condition(IR::Condition cond) {
const FlowTest flow_test{cond.GetFlowTest()}; const FlowTest flow_test{cond.GetFlowTest()};
const auto [pred, is_negated]{cond.GetPred()}; const auto [pred, is_negated]{cond.GetPred()};
if (flow_test == FlowTest::T) {
return GetPred(pred, is_negated);
}
return LogicalAnd(GetPred(pred, is_negated), GetFlowTest(*this, flow_test)); return LogicalAnd(GetPred(pred, is_negated), GetFlowTest(*this, flow_test));
} }

View File

@ -32,9 +32,11 @@ 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);
void PhiMove(IR::Inst& phi, const Value& value);
void Prologue(); void Prologue();
void Epilogue(); void Epilogue();
void BranchConditionRef(const U1& cond);
void DemoteToHelperInvocation(); void DemoteToHelperInvocation();
void EmitVertex(const U32& stream); void EmitVertex(const U32& stream);
void EndPrimitive(const U32& stream); void EndPrimitive(const U32& stream);

View File

@ -56,9 +56,10 @@ Inst::~Inst() {
bool Inst::MayHaveSideEffects() const noexcept { bool Inst::MayHaveSideEffects() const noexcept {
switch (op) { switch (op) {
case Opcode::DummyReference:
case Opcode::PhiMove:
case Opcode::Prologue: case Opcode::Prologue:
case Opcode::Epilogue: case Opcode::Epilogue:
case Opcode::BranchConditionRef:
case Opcode::Join: case Opcode::Join:
case Opcode::DemoteToHelperInvocation: case Opcode::DemoteToHelperInvocation:
case Opcode::Barrier: case Opcode::Barrier:

View File

@ -6,11 +6,12 @@
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(PhiMove, Void, Opaque, Opaque, )
// Special operations // Special operations
OPCODE(Prologue, Void, ) OPCODE(Prologue, Void, )
OPCODE(Epilogue, Void, ) OPCODE(Epilogue, Void, )
OPCODE(BranchConditionRef, Void, U1, )
OPCODE(Join, Void, ) OPCODE(Join, Void, )
OPCODE(DemoteToHelperInvocation, Void, ) OPCODE(DemoteToHelperInvocation, Void, )
OPCODE(EmitVertex, Void, U32, ) OPCODE(EmitVertex, Void, U32, )

View File

@ -391,4 +391,8 @@ inline f64 Value::F64() const {
return imm_f64; return imm_f64;
} }
[[nodiscard]] inline bool IsPhi(const Inst& inst) {
return inst.GetOpcode() == Opcode::Phi;
}
} // namespace Shader::IR } // namespace Shader::IR

View File

@ -704,7 +704,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{VisitExpr(ir, *stmt.cond)};
ir.BranchConditionRef(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();
@ -755,7 +755,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{VisitExpr(ir, *stmt.cond)};
ir.BranchConditionRef(cond); ir.DummyReference(cond);
IR::Block* const body_block{syntax_list.at(body_block_index).block}; IR::Block* const body_block{syntax_list.at(body_block_index).block};
loop_header_block->AddBranch(body_block); loop_header_block->AddBranch(body_block);
@ -792,7 +792,7 @@ private:
IR::IREmitter ir{*current_block}; IR::IREmitter ir{*current_block};
const IR::U1 cond{VisitExpr(ir, *stmt.cond)}; const IR::U1 cond{VisitExpr(ir, *stmt.cond)};
ir.BranchConditionRef(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;

View File

@ -138,10 +138,6 @@ IR::Opcode UndefOpcode(IndirectBranchVariable) noexcept {
return IR::Opcode::UndefU32; return IR::Opcode::UndefU32;
} }
[[nodiscard]] bool IsPhi(const IR::Inst& inst) noexcept {
return inst.GetOpcode() == IR::Opcode::Phi;
}
enum class Status { enum class Status {
Start, Start,
SetValue, SetValue,
@ -283,7 +279,7 @@ private:
list.erase(IR::Block::InstructionList::s_iterator_to(phi)); list.erase(IR::Block::InstructionList::s_iterator_to(phi));
// Find the first non-phi instruction and use it as an insertion point // Find the first non-phi instruction and use it as an insertion point
IR::Block::iterator reinsert_point{std::ranges::find_if_not(list, IsPhi)}; IR::Block::iterator reinsert_point{std::ranges::find_if_not(list, IR::IsPhi)};
if (same.IsEmpty()) { if (same.IsEmpty()) {
// The phi is unreachable or in the start block // The phi is unreachable or in the start block
// Insert an undefined instruction and make it the phi node replacement // Insert an undefined instruction and make it the phi node replacement