mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-22 00:43:23 +02:00
ShaderCache: Order Phi Arguments from farthest away to nearest.
This commit is contained in:
parent
a3a353edf2
commit
c50ad56bf5
@ -152,6 +152,17 @@ public:
|
|||||||
return instructions.crend();
|
return instructions.crend();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Set the order of the block, it can be set pre order, the user decides
|
||||||
|
void SetOrder(u32 new_order) {
|
||||||
|
order = new_order;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the order of the block.
|
||||||
|
// The higher, the closer is the block to the end.
|
||||||
|
[[nodiscard]] u32 GetOrder() const {
|
||||||
|
return order;
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/// Memory pool for instruction list
|
/// Memory pool for instruction list
|
||||||
ObjectPool<Inst>* inst_pool;
|
ObjectPool<Inst>* inst_pool;
|
||||||
@ -171,6 +182,9 @@ private:
|
|||||||
|
|
||||||
/// Intrusively stored host definition of this block.
|
/// Intrusively stored host definition of this block.
|
||||||
u32 definition{};
|
u32 definition{};
|
||||||
|
|
||||||
|
/// Order of the block.
|
||||||
|
u32 order{};
|
||||||
};
|
};
|
||||||
|
|
||||||
using BlockList = std::vector<Block*>;
|
using BlockList = std::vector<Block*>;
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
#include "shader_recompiler/exception.h"
|
#include "shader_recompiler/exception.h"
|
||||||
|
#include "shader_recompiler/frontend/ir/basic_block.h"
|
||||||
#include "shader_recompiler/frontend/ir/type.h"
|
#include "shader_recompiler/frontend/ir/type.h"
|
||||||
#include "shader_recompiler/frontend/ir/value.h"
|
#include "shader_recompiler/frontend/ir/value.h"
|
||||||
|
|
||||||
@ -291,6 +292,16 @@ void Inst::AddPhiOperand(Block* predecessor, const Value& value) {
|
|||||||
phi_args.emplace_back(predecessor, value);
|
phi_args.emplace_back(predecessor, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Inst::OrderPhiArgs() {
|
||||||
|
if (op != Opcode::Phi) {
|
||||||
|
throw LogicError("{} is not a Phi instruction", op);
|
||||||
|
}
|
||||||
|
std::sort(phi_args.begin(), phi_args.end(),
|
||||||
|
[](const std::pair<Block*, Value>& a, const std::pair<Block*, Value>& b) {
|
||||||
|
return a.first->GetOrder() < b.first->GetOrder();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void Inst::Invalidate() {
|
void Inst::Invalidate() {
|
||||||
ClearArgs();
|
ClearArgs();
|
||||||
ReplaceOpcode(Opcode::Void);
|
ReplaceOpcode(Opcode::Void);
|
||||||
|
@ -182,6 +182,9 @@ public:
|
|||||||
/// Add phi operand to a phi instruction.
|
/// Add phi operand to a phi instruction.
|
||||||
void AddPhiOperand(Block* predecessor, const Value& value);
|
void AddPhiOperand(Block* predecessor, const Value& value);
|
||||||
|
|
||||||
|
/// Orders the Phi arguments from farthest away to nearest.
|
||||||
|
void OrderPhiArgs();
|
||||||
|
|
||||||
void Invalidate();
|
void Invalidate();
|
||||||
void ClearArgs();
|
void ClearArgs();
|
||||||
|
|
||||||
|
@ -27,9 +27,11 @@ IR::BlockList GenerateBlocks(const IR::AbstractSyntaxList& syntax_list) {
|
|||||||
}
|
}
|
||||||
IR::BlockList blocks;
|
IR::BlockList blocks;
|
||||||
blocks.reserve(num_syntax_blocks);
|
blocks.reserve(num_syntax_blocks);
|
||||||
|
u32 order_index{};
|
||||||
for (const auto& node : syntax_list) {
|
for (const auto& node : syntax_list) {
|
||||||
if (node.type == IR::AbstractSyntaxNode::Type::Block) {
|
if (node.type == IR::AbstractSyntaxNode::Type::Block) {
|
||||||
blocks.push_back(node.data.block);
|
blocks.push_back(node.data.block);
|
||||||
|
blocks.back()->SetOrder(order_index++);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return blocks;
|
return blocks;
|
||||||
|
@ -378,6 +378,13 @@ void SsaRewritePass(IR::Program& program) {
|
|||||||
for (auto block = program.post_order_blocks.rbegin(); block != end; ++block) {
|
for (auto block = program.post_order_blocks.rbegin(); block != end; ++block) {
|
||||||
VisitBlock(pass, *block);
|
VisitBlock(pass, *block);
|
||||||
}
|
}
|
||||||
|
for (auto block = program.post_order_blocks.rbegin(); block != end; ++block) {
|
||||||
|
for (IR::Inst& inst : (*block)->Instructions()) {
|
||||||
|
if (inst.GetOpcode() == IR::Opcode::Phi) {
|
||||||
|
inst.OrderPhiArgs();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Shader::Optimization
|
} // namespace Shader::Optimization
|
||||||
|
Loading…
Reference in New Issue
Block a user