fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/brw: Delete the brw_fs_opt_dead_control_flow_eliminate() pass

Browse source 
With the select peephole gone, this no longer does much of anything.

No instruction changes in fossil-db on Alchemist.

Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30498>
This commit is contained in:
Kenneth Graunke 2024-08-02 21:12:02 -07:00
parent 06e8335e11
commit fad63d6483
4 changed files with 0 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
src/intel/compiler/brw_dead_control_flow.cpp
View file

@ -1,128 +0,0 @@
/*
* Copyright © 2013 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
/** @file
*
* This file implements the dead control flow elimination optimization pass.
*/
#include "brw_fs.h"
#include "brw_cfg.h"
using namespace brw;
/* Look for and eliminate dead control flow:
*
* - if/endif
* - else in else/endif
* - then in if/else/endif
*/
bool
brw_fs_opt_dead_control_flow_eliminate(fs_visitor &s)
{
bool progress = false;
foreach_block_safe (block, s.cfg) {
bblock_t *prev_block = block->prev();
if (!prev_block)
continue;
fs_inst *const inst = block->start();
fs_inst *const prev_inst = prev_block->end();
/* ENDIF instructions, by definition, can only be found at the start of
* basic blocks.
*/
if (inst->opcode == BRW_OPCODE_ENDIF &&
prev_inst->opcode == BRW_OPCODE_ELSE) {
bblock_t *const else_block = prev_block;
fs_inst *const else_inst = prev_inst;
else_inst->remove(else_block);
progress = true;
} else if (inst->opcode == BRW_OPCODE_ENDIF &&
prev_inst->opcode == BRW_OPCODE_IF) {
bblock_t *const endif_block = block;
bblock_t *const if_block = prev_block;
fs_inst *const endif_inst = inst;
fs_inst *const if_inst = prev_inst;
bblock_t *earlier_block = NULL, *later_block = NULL;
if (if_block->start_ip == if_block->end_ip) {
earlier_block = if_block->prev();
} else {
earlier_block = if_block;
}
if_inst->remove(if_block);
if (endif_block->start_ip == endif_block->end_ip) {
later_block = endif_block->next();
} else {
later_block = endif_block;
}
endif_inst->remove(endif_block);
assert((earlier_block == NULL) == (later_block == NULL));
if (earlier_block && earlier_block->can_combine_with(later_block)) {
earlier_block->combine_with(later_block);
/* If ENDIF was in its own block, then we've now deleted it and
* merged the two surrounding blocks, the latter of which the
* __next block pointer was pointing to.
*/
if (endif_block != later_block) {
__next = earlier_block->next();
}
}
progress = true;
} else if (inst->opcode == BRW_OPCODE_ELSE &&
prev_inst->opcode == BRW_OPCODE_IF) {
bblock_t *const else_block = block;
fs_inst *const if_inst = prev_inst;
fs_inst *const else_inst = inst;
/* Since the else-branch is becoming the new then-branch, the
* condition has to be inverted.
*/
if_inst->predicate_inverse = !if_inst->predicate_inverse;
else_inst->remove(else_block);
progress = true;
} else if (inst->opcode == BRW_OPCODE_NOP &&
prev_block->can_combine_with(block) &&
exec_list_is_singular(&block->parents) &&
exec_list_is_singular(&prev_block->children)) {
prev_block->combine_with(block);
inst->remove(prev_block);
progress = true;
}
}
if (progress)
s.invalidate_analysis(DEPENDENCY_BLOCKS | DEPENDENCY_INSTRUCTIONS);
return progress;
}

1
src/intel/compiler/brw_fs.h
View file

@ -642,7 +642,6 @@ bool brw_fs_opt_copy_propagation(fs_visitor &s);
bool brw_fs_opt_copy_propagation_defs(fs_visitor &s);
bool brw_fs_opt_cse_defs(fs_visitor &s);
bool brw_fs_opt_dead_code_eliminate(fs_visitor &s);
bool brw_fs_opt_dead_control_flow_eliminate(fs_visitor &s);
bool brw_fs_opt_eliminate_find_live_channel(fs_visitor &s);
bool brw_fs_opt_predicated_break(fs_visitor &s);
bool brw_fs_opt_register_coalesce(fs_visitor &s);

1
src/intel/compiler/brw_fs_opt.cpp
View file

@ -67,7 +67,6 @@ brw_fs_optimize(fs_visitor &s)
OPT(brw_fs_opt_copy_propagation);
OPT(brw_fs_opt_cmod_propagation);
OPT(brw_fs_opt_dead_code_eliminate);
OPT(brw_fs_opt_dead_control_flow_eliminate);
OPT(brw_fs_opt_saturate_propagation);
OPT(brw_fs_opt_register_coalesce);

1
src/intel/compiler/meson.build
View file

@ -33,7 +33,6 @@ libintel_compiler_brw_files = files(
'brw_compile_vs.cpp',
'brw_compiler.c',
'brw_compiler.h',
'brw_dead_control_flow.cpp',
'brw_debug_recompile.c',
'brw_def_analysis.cpp',
'brw_disasm.c',