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

Merge pull request #10699 from liamwhite/conditional-barrier

Browse source 
shader_recompiler: remove barriers in conditional control flow when device lacks support
This commit is contained in:
Matías Locatti 2023-06-12 16:50:59 -03:00 • committed by GitHub
commit 42b2bc204f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 65 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/shader_recompiler/ir_opt/conditional_barrier_pass.cpp Normal file
View file

@ -0,0 +1,44 @@
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include "shader_recompiler/frontend/ir/program.h"
#include "shader_recompiler/ir_opt/passes.h"
namespace Shader::Optimization {
void ConditionalBarrierPass(IR::Program& program) {
s32 conditional_control_flow_count{0};
s32 conditional_return_count{0};
for (IR::AbstractSyntaxNode& node : program.syntax_list) {
switch (node.type) {
case IR::AbstractSyntaxNode::Type::If:
case IR::AbstractSyntaxNode::Type::Loop:
conditional_control_flow_count++;
break;
case IR::AbstractSyntaxNode::Type::EndIf:
case IR::AbstractSyntaxNode::Type::Repeat:
conditional_control_flow_count--;
break;
case IR::AbstractSyntaxNode::Type::Unreachable:
case IR::AbstractSyntaxNode::Type::Return:
if (conditional_control_flow_count > 0) {
conditional_return_count++;
}
break;
case IR::AbstractSyntaxNode::Type::Block:
for (IR::Inst& inst : node.data.block->Instructions()) {
if ((conditional_control_flow_count > 0 || conditional_return_count > 0) &&
inst.GetOpcode() == IR::Opcode::Barrier) {
LOG_WARNING(Shader, "Barrier within conditional control flow");
inst.ReplaceOpcode(IR::Opcode::Identity);
}
}
break;
default:
break;
}
}
ASSERT(conditional_control_flow_count == 0);
}
} // namespace Shader::Optimization

1
src/shader_recompiler/ir_opt/passes.h
View file

@ -13,6 +13,7 @@ struct HostTranslateInfo;
namespace Shader::Optimization {
void CollectShaderInfoPass(Environment& env, IR::Program& program);
void ConditionalBarrierPass(IR::Program& program);
void ConstantPropagationPass(Environment& env, IR::Program& program);
void DeadCodeEliminationPass(IR::Program& program);
void GlobalMemoryToStorageBufferPass(IR::Program& program);