OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco: test for one and_savexec opcode in try_optimize_branching_sequence

Browse Source 
A situation where it doesn't match is probably not possible, so this
probably doesn't fix anything.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18077>
This commit is contained in:
Rhys Perry
2022-08-15 17:21:05 +01:00
committed by Marge Bot
parent 2587e75ee1
commit f7d02a9b5e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/amd/compiler/aco_ssa_elimination.cpp
View File

@@ -347,9 +347,10 @@ try_optimize_branching_sequence(ssa_elimination_ctx& ctx, Block& block, const in
aco_ptr<Instruction>& exec_val = block.instructions[exec_val_idx];
aco_ptr<Instruction>& exec_copy = block.instructions[exec_copy_idx];
if (exec_copy->opcode != aco_opcode::s_and_saveexec_b32 &&
exec_copy->opcode != aco_opcode::s_and_saveexec_b64 &&
exec_copy->opcode != aco_opcode::p_parallelcopy)
const aco_opcode and_saveexec = ctx.program->lane_mask == s2 ? aco_opcode::s_and_saveexec_b64
: aco_opcode::s_and_saveexec_b32;
if (exec_copy->opcode != and_saveexec && exec_copy->opcode != aco_opcode::p_parallelcopy)
return;
if (exec_val->definitions.size() > 1)
@@ -361,8 +362,7 @@ try_optimize_branching_sequence(ssa_elimination_ctx& ctx, Block& block, const in
const bool vopc = v_cmpx_op != aco_opcode::num_opcodes;
/* If s_and_saveexec is used, we'll need to insert a new instruction to save the old exec. */
const bool save_original_exec = exec_copy->opcode == aco_opcode::s_and_saveexec_b32 ||
exec_copy->opcode == aco_opcode::s_and_saveexec_b64;
const bool save_original_exec = exec_copy->opcode == and_saveexec;
/* Position where the original exec mask copy should be inserted. */
const int save_original_exec_idx = exec_val_idx;
/* The copy can be removed when it kills its operand.