artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

shader: Intrusively store register values in block for SSA pass

Browse source
This commit is contained in:
ReinUsesLisp 2021-04-21 00:27:55 -03:00 committed by ameerj
parent 6944cabb89
commit 4209828646
2 changed files with 53 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/shader_recompiler/frontend/ir/basic_block.h
View file

@ -101,6 +101,13 @@ public:
return branch_false; return branch_false;
} }
void SetSsaRegValue(IR::Reg reg, const Value& value) noexcept {
ssa_reg_values[RegIndex(reg)] = value;
}
const Value& SsaRegValue(IR::Reg reg) const noexcept {
return ssa_reg_values[RegIndex(reg)];
}
[[nodiscard]] bool empty() const { [[nodiscard]] bool empty() const {
return instructions.empty(); return instructions.empty();
} }
@ -182,6 +189,9 @@ private:
/// Block immediate predecessors /// Block immediate predecessors
std::vector<Block*> imm_predecessors; std::vector<Block*> imm_predecessors;
/// Intrusively store the value of a register in the block.
std::array<Value, NUM_REGS> ssa_reg_values;
/// Intrusively stored host definition of this block. /// Intrusively stored host definition of this block.
u32 definition{}; u32 definition{};
}; };

64
src/shader_recompiler/ir_opt/ssa_rewrite_pass.cpp
View file

@ -57,39 +57,62 @@ using Variant = std::variant<IR::Reg, IR::Pred, ZeroFlagTag, SignFlagTag, CarryF
using ValueMap = boost::container::flat_map<IR::Block*, IR::Value, std::less<IR::Block*>>; using ValueMap = boost::container::flat_map<IR::Block*, IR::Value, std::less<IR::Block*>>;
struct DefTable { struct DefTable {
[[nodiscard]] ValueMap& operator[](IR::Reg variable) noexcept { const IR::Value& Def(IR::Block* block, IR::Reg variable) noexcept {
return regs[IR::RegIndex(variable)]; return block->SsaRegValue(variable);
}
void SetDef(IR::Block* block, IR::Reg variable, const IR::Value& value) noexcept {
block->SetSsaRegValue(variable, value);
} }
[[nodiscard]] ValueMap& operator[](IR::Pred variable) noexcept { const IR::Value& Def(IR::Block* block, IR::Pred variable) noexcept {
return preds[IR::PredIndex(variable)]; return preds[IR::PredIndex(variable)][block];
}
void SetDef(IR::Block* block, IR::Pred variable, const IR::Value& value) noexcept {
preds[IR::PredIndex(variable)].insert_or_assign(block, value);
} }
[[nodiscard]] ValueMap& operator[](GotoVariable goto_variable) { const IR::Value& Def(IR::Block* block, GotoVariable variable) noexcept {
return goto_vars[goto_variable.index]; return goto_vars[variable.index][block];
}
void SetDef(IR::Block* block, GotoVariable variable, const IR::Value& value) noexcept {
goto_vars[variable.index].insert_or_assign(block, value);
} }
[[nodiscard]] ValueMap& operator[](IndirectBranchVariable) { const IR::Value& Def(IR::Block* block, IndirectBranchVariable) noexcept {
return indirect_branch_var; return indirect_branch_var[block];
}
void SetDef(IR::Block* block, IndirectBranchVariable, const IR::Value& value) noexcept {
indirect_branch_var.insert_or_assign(block, value);
} }
[[nodiscard]] ValueMap& operator[](ZeroFlagTag) noexcept { const IR::Value& Def(IR::Block* block, ZeroFlagTag) noexcept {
return zero_flag; return zero_flag[block];
}
void SetDef(IR::Block* block, ZeroFlagTag, const IR::Value& value) noexcept {
zero_flag.insert_or_assign(block, value);
} }
[[nodiscard]] ValueMap& operator[](SignFlagTag) noexcept { const IR::Value& Def(IR::Block* block, SignFlagTag) noexcept {
return sign_flag; return sign_flag[block];
}
void SetDef(IR::Block* block, SignFlagTag, const IR::Value& value) noexcept {
sign_flag.insert_or_assign(block, value);
} }
[[nodiscard]] ValueMap& operator[](CarryFlagTag) noexcept { const IR::Value& Def(IR::Block* block, CarryFlagTag) noexcept {
return carry_flag; return carry_flag[block];
}
void SetDef(IR::Block* block, CarryFlagTag, const IR::Value& value) noexcept {
carry_flag.insert_or_assign(block, value);
} }
[[nodiscard]] ValueMap& operator[](OverflowFlagTag) noexcept { const IR::Value& Def(IR::Block* block, OverflowFlagTag) noexcept {
return overflow_flag; return overflow_flag[block];
}
void SetDef(IR::Block* block, OverflowFlagTag, const IR::Value& value) noexcept {
overflow_flag.insert_or_assign(block, value);
} }
std::array<ValueMap, IR::NUM_USER_REGS> regs;
std::array<ValueMap, IR::NUM_USER_PREDS> preds; std::array<ValueMap, IR::NUM_USER_PREDS> preds;
boost::container::flat_map<u32, ValueMap> goto_vars; boost::container::flat_map<u32, ValueMap> goto_vars;
ValueMap indirect_branch_var; ValueMap indirect_branch_var;
@ -143,7 +166,7 @@ class Pass {
public: public:
template <typename Type> template <typename Type>
void WriteVariable(Type variable, IR::Block* block, const IR::Value& value) { void WriteVariable(Type variable, IR::Block* block, const IR::Value& value) {
current_def[variable].insert_or_assign(block, value); current_def.SetDef(block, variable, value);
} }
template <typename Type> template <typename Type>
@ -170,9 +193,8 @@ public:
IR::Block* const block{stack.back().block}; IR::Block* const block{stack.back().block};
switch (stack.back().pc) { switch (stack.back().pc) {
case Status::Start: { case Status::Start: {
const ValueMap& def{current_def[variable]}; if (const IR::Value& def = current_def.Def(block, variable); !def.IsEmpty()) {
if (const auto it{def.find(block)}; it != def.end()) { stack.back().result = def;
stack.back().result = it->second;
} else if (!sealed_blocks.contains(block)) { } else if (!sealed_blocks.contains(block)) {
// Incomplete CFG // Incomplete CFG
IR::Inst* phi{&*block->PrependNewInst(block->begin(), IR::Opcode::Phi)}; IR::Inst* phi{&*block->PrependNewInst(block->begin(), IR::Opcode::Phi)};