mirror of
https://github.com/KytyPS5/KytyPS5.git
synced 2026-10-20 10:56:58 +02:00
shader: keep fragment layer values under lane masks
Co-authored-by: shadowbeat070 <70843316+shadowbeat070@users.noreply.github.com>
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
#include "graphics/shader/recompiler/ir/passes/ConstantPropagation.h"
|
||||
#include "graphics/shader/recompiler/ir/ShaderIR.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <bit>
|
||||
#include <cstdint>
|
||||
#include <unordered_map>
|
||||
|
||||
namespace Libs::Graphics::ShaderRecompiler::IR {
|
||||
namespace {
|
||||
@@ -116,6 +118,87 @@ bool FoldSelect(Inst& inst) {
|
||||
return false;
|
||||
}
|
||||
|
||||
bool IsSelect(ValueOpcode opcode) {
|
||||
return opcode == ValueOpcode::SelectU1 || opcode == ValueOpcode::SelectU32 ||
|
||||
opcode == ValueOpcode::SelectF32;
|
||||
}
|
||||
|
||||
bool Implies(Value condition, Value required, uint32_t depth = 0) {
|
||||
condition = condition.Resolve();
|
||||
if (condition == required) return true;
|
||||
const auto* inst = condition.TryInstruction();
|
||||
return depth < 64u && inst != nullptr && inst->GetOpcode() == ValueOpcode::LogicalAnd &&
|
||||
(Implies(inst->Arg(0), required, depth + 1u) ||
|
||||
Implies(inst->Arg(1), required, depth + 1u));
|
||||
}
|
||||
|
||||
bool IsAcyclic(const BlockList& blocks) {
|
||||
std::unordered_map<const Block*, bool> completed;
|
||||
const auto visit = [&](auto&& self, const Block* block) -> bool {
|
||||
const auto [entry, added] = completed.emplace(block, false);
|
||||
if (!added) return entry->second;
|
||||
for (const auto* successor: block->ImmSuccessors()) {
|
||||
if (!self(self, successor)) return false;
|
||||
}
|
||||
completed[block] = true;
|
||||
return true;
|
||||
};
|
||||
for (const auto* block: blocks) {
|
||||
if (!visit(visit, block)) return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
class MaskedUses {
|
||||
public:
|
||||
MaskedUses(const Program& program, Value condition)
|
||||
: program(program), condition(condition.Resolve()) {}
|
||||
|
||||
bool OnlyWhenActive(const Inst& inst) {
|
||||
const auto [entry, added] = completed.emplace(&inst, false);
|
||||
if (!added) return entry->second;
|
||||
for (const auto& use: inst.Uses()) {
|
||||
const auto& user = *use.user;
|
||||
const auto op = user.GetOpcode();
|
||||
if (IsSelect(op)) {
|
||||
if (use.operand == 0) return false;
|
||||
if (use.operand == 1 && Implies(user.Arg(0), condition)) continue;
|
||||
} else if (op == ValueOpcode::SetAttribute) {
|
||||
if (use.operand == 0 && Implies(user.Arg(1), condition)) continue;
|
||||
return false;
|
||||
} else if (!IsLaneLocal(user, use.operand)) {
|
||||
return false;
|
||||
}
|
||||
if (!OnlyWhenActive(user)) return false;
|
||||
}
|
||||
completed[&inst] = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
private:
|
||||
bool IsLaneLocal(const Inst& inst, size_t operand) const {
|
||||
const auto op = inst.GetOpcode();
|
||||
// These opcode-table groups contain only construction, conversion and arithmetic.
|
||||
if ((op >= ValueOpcode::BitCastU16F16 && op <= ValueOpcode::BitFieldSExtract) ||
|
||||
(op >= ValueOpcode::WqmU64 && op <= ValueOpcode::FPFract32) ||
|
||||
op == ValueOpcode::Identity || op == ValueOpcode::Phi ||
|
||||
op == ValueOpcode::MakeImageAddress) {
|
||||
return true;
|
||||
}
|
||||
if (op != ValueOpcode::ImageSampleRaw || operand != 2) return false;
|
||||
// Explicit LOD or gradients keep coordinates local; implicit derivatives read neighbors.
|
||||
const auto index = inst.Flags<MemoryFlags>().index;
|
||||
return index < program.memory_info.size() &&
|
||||
(program.memory_info[index].image_sample_flags &
|
||||
(Decoder::ImageSampleFlagLod | Decoder::ImageSampleFlagLevelZero |
|
||||
Decoder::ImageSampleFlagDerivative)) != 0;
|
||||
}
|
||||
|
||||
const Program& program;
|
||||
Value condition;
|
||||
std::unordered_map<const Inst*, bool> completed;
|
||||
};
|
||||
|
||||
bool FoldPhi(Inst& inst) {
|
||||
Value same;
|
||||
for (size_t index = 0; index < inst.NumArgs(); index++) {
|
||||
@@ -192,7 +275,8 @@ bool FoldCompositeExtract(Inst& inst, ValueOpcode construct, size_t components)
|
||||
return false;
|
||||
}
|
||||
|
||||
void FoldInstruction(Inst& inst) {
|
||||
void FoldInstruction(Block& block, Block::iterator instruction) {
|
||||
auto& inst = *instruction;
|
||||
switch (inst.GetOpcode()) {
|
||||
case ValueOpcode::Phi: FoldPhi(inst); return;
|
||||
case ValueOpcode::SelectU1:
|
||||
@@ -223,6 +307,21 @@ void FoldInstruction(Inst& inst) {
|
||||
const auto value = Arg(inst, 0);
|
||||
const auto offset = Arg(inst, 1);
|
||||
const auto count = Arg(inst, 2);
|
||||
const auto* source = value.TryInstruction();
|
||||
if (source != nullptr && source->GetOpcode() == ValueOpcode::GetBuiltin &&
|
||||
source->Arg(0) == Value(static_cast<uint32_t>(StageInputKind::PackedAncillary)) &&
|
||||
IsImmediate(offset, Type::U32) && IsImmediate(count, Type::U32) &&
|
||||
offset.U32() >= 16u && offset.U32() < 27u && count.U32() != 0u &&
|
||||
count.U32() <= 27u - offset.U32()) {
|
||||
// Preserve the extraction (including sign extension) while exposing only its
|
||||
// used hardware field. Other live ancillary fields remain unsupported.
|
||||
const auto layer = block.PrependNewInst(
|
||||
instruction, ValueOpcode::GetBuiltin,
|
||||
{Value(static_cast<uint32_t>(StageInputKind::Layer)), Value(0u)});
|
||||
inst.SetArg(0, Value(&*layer));
|
||||
inst.SetArg(1, Value(offset.U32() - 16u));
|
||||
return;
|
||||
}
|
||||
if (!IsImmediate(value, Type::U32) || !IsImmediate(offset, Type::U32) ||
|
||||
!IsImmediate(count, Type::U32) || offset.U32() > 32u ||
|
||||
count.U32() > 32u - offset.U32()) {
|
||||
@@ -584,8 +683,22 @@ void FoldInstruction(Inst& inst) {
|
||||
|
||||
void ConstantPropagationPass(const BlockList& blocks) {
|
||||
for (auto* block: blocks) {
|
||||
for (auto& inst: block->Instructions()) {
|
||||
FoldInstruction(inst);
|
||||
for (auto inst = block->begin(); inst != block->end(); ++inst) {
|
||||
FoldInstruction(*block, inst);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void EliminateMaskedValues(Program& program) {
|
||||
// A loop-carried value may have been produced under a previous iteration's predicate.
|
||||
if (!IsAcyclic(program.blocks)) return;
|
||||
for (auto block = program.blocks.rbegin(); block != program.blocks.rend(); ++block) {
|
||||
auto& instructions = (*block)->Instructions();
|
||||
for (auto inst = instructions.rbegin(); inst != instructions.rend(); ++inst) {
|
||||
if (IsSelect(inst->GetOpcode()) &&
|
||||
MaskedUses(program, inst->Arg(0)).OnlyWhenActive(*inst)) {
|
||||
Replace(*inst, inst->Arg(1));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user