mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-01 23:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix subprogram generation

Browse Source
This commit is contained in:
Lander Gallastegi 2025-03-04 19:04:43 +01:00 committed by Lander Gallastegi
parent 068573e9d6
commit c1a577b598
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/shader_recompiler/ir/subprogram.cpp
View File

@ -7,6 +7,11 @@
#include "shader_recompiler/ir/post_order.h" #include "shader_recompiler/ir/post_order.h"
#include "shader_recompiler/ir/subprogram.h" #include "shader_recompiler/ir/subprogram.h"
// Given an IR program, this class is used to create a subprogram that contains
// only the blocks and instructions that relevant to a group of given instructions.
// Taking into account only the given instructions, the instructions that it uses and
// conditions.
namespace Shader::IR { namespace Shader::IR {
SubProgram::SubProgram(Program* super_program, Pools& pools) SubProgram::SubProgram(Program* super_program, Pools& pools)
@ -60,6 +65,8 @@ Inst* SubProgram::GetInst(Inst* orig_inst) {
} }
Program SubProgram::GetSubProgram() { Program SubProgram::GetSubProgram() {
ASSERT_MSG(!completed, "SubProgram already completed");
completed = true;
Program sub_program(super_program->info); Program sub_program(super_program->info);
BuildBlockListAndASL(sub_program); BuildBlockListAndASL(sub_program);
sub_program.post_order_blocks = PostOrder(sub_program.syntax_list.front()); sub_program.post_order_blocks = PostOrder(sub_program.syntax_list.front());
@ -155,8 +162,8 @@ void SubProgram::BuildBlockListAndASL(Program& sub_program) {
asl_node.data.if_node.cond = U1(Value(cond)); asl_node.data.if_node.cond = U1(Value(cond));
asl_node.data.if_node.body = body_block; asl_node.data.if_node.body = body_block;
asl_node.data.if_node.merge = merge_block; asl_node.data.if_node.merge = merge_block;
block->AddBranch(merge_block);
block->AddBranch(body_block); block->AddBranch(body_block);
block->AddBranch(merge_block);
filter_blocks.insert(merge_block); filter_blocks.insert(merge_block);
break; break;
} }
@ -209,8 +216,8 @@ void SubProgram::BuildBlockListAndASL(Program& sub_program) {
asl_node.data.break_node.cond = U1(Value(&block->back())); asl_node.data.break_node.cond = U1(Value(&block->back()));
asl_node.data.break_node.merge = merge_block; asl_node.data.break_node.merge = merge_block;
asl_node.data.break_node.skip = skip_block; asl_node.data.break_node.skip = skip_block;
block->AddBranch(merge_block);
block->AddBranch(skip_block); block->AddBranch(skip_block);
block->AddBranch(merge_block);
break; break;
} }
case AbstractSyntaxNode::Type::Unreachable: case AbstractSyntaxNode::Type::Unreachable:

1
src/shader_recompiler/ir/subprogram.h
View File

@ -29,6 +29,7 @@ private:
void BuildBlockListAndASL(Program& sub_program); void BuildBlockListAndASL(Program& sub_program);
bool completed = false;
Program* super_program; Program* super_program;
Pools& pools; Pools& pools;
boost::container::flat_map<Block*, Block*> orig_block_to_block; boost::container::flat_map<Block*, Block*> orig_block_to_block;