mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-22 17:50:12 +01:00
Either replace the BRW prefix with ELK or add an extra ELK prefix. Used
the following sed script to perform the renames in this patch:
```
# Simple prefix changes.
s/\<BRW_/ELK_/g
s/\<brw_/elk_/g
s/nir_to_brw/nir_to_elk/g
s/\<as_brw_reg\>/as_elk_reg/g
s/\<_brw_/_elk_/g
# Add prefix to various symbols.
#
# Initially I've considered using C++ namespaces here, but in various
# cases the structs or functions had to be also visible from C code.
# So added explicit prefix instead.
s/\<backend_instruction/elk_\0/g
s/\<backend_reg/elk_\0/g
s/\<backend_shader/elk_\0/g
s/\<bblock_t\>/elk_\0/g
s/\<bblock_link\>/elk_\0/g
s/\<cfg_t\>/elk_\0/g
s/\<fs_visitor\>/elk_\0/g
s/\<fs_reg\>/elk_\0/g
s/\<fs_instruction_scheduler\>/elk_\0/g
s/\<vec4_instruction_scheduler\>/elk_\0/g
s/\<instruction_scheduler\>/elk_\0/g
s/\<schedule_node\>/elk_\0/g
s/\<schedule_node_child\>/elk_\0/g
s/\<\([a-z]*_\)\?thread_payload\>/elk_\1thread_payload/g
s/\<fs_generator\>/elk_\0/g
s/\<fs_inst\>/elk_\0/g
s/\<fs_reg_alloc\>/elk_\0/g
s/\<disasm_info\>/elk_\0/g
s/\<gfx._math\>/elk_\0/g
s/\<gfx7_block_read_scratch\>/elk_\0/g
s/\<gfx6_IF\>/elk_\0/g
s/\<gfx9_fb_READ\>/elk_\0/g
s/\<gfx6_resolve_implied_move\>/elk_\0/g
# Opcodes.
s/\<opcode op\>/elk_\0/g
s/\<opcode mov_op\>/elk_\0/g
s/\<opcode opcode\>/elk_\0/g
s/enum opcode\>/enum elk_opcode/g
s/static opcode\>/static elk_opcode/g
s/\<opcode elk_op/elk_opcode elk_op/g
s/struct opcode_desc/struct elk_opcode_desc/g
s/NUM_BRW_OPCODES/NUM_ELK_OPCODES/g
s/\<.._OPCODE_/ELK_\0/g
s/\<T.._OPCODE_/ELK_\0/g
s/\<VEC4_OPCODE_/ELK_\0/g
s/\<VEC4_...\?_OPCODE_/ELK_\0/g
s/\<SHADER_OPCODE_/ELK_\0/g
# Remaining specific cases.
s/\<wm_prog_data_barycentric_modes\>/elk_\0/g
s/\<encode_slm_size\>/elk_\0/g
s/\<intel_calculate_slm_size\>/elk_\0/g
s/\<gfx6_gather_sampler_wa\>/elk_\0/g
s/\<is_3src\>/elk_\0/g
s/\<WA_/ELK_\0/g
s/\<conditional_modifier\>/elk_\0/g
s/\<pred_ctrl_align16\>/elk_\0/g
s/\<shuffle_from_32bit_read\>/elk_\0/g
s/\<shuffle_src_to_dst\>/elk_\0/g
s/\<setup_imm_..\?\>/elk_\0/g
s/\<opt_predicated_break\>/elk_\0/g
s/\<has_bank_conflict\>/elk_\0/g
s/\<dead_control_flow_eliminate\>/elk_\0/g
s/\<disasm_new_inst_group\>/elk_\0/g
s/\<disasm_initialize\>/elk_\0/g
s/\<dump_assembly\>/elk_\0/g
s/\<disasm_insert_error\>/elk_\0/g
s/\<disasm_annotate\>/elk_\0/g
s/\<enum lsc_opcode\>/enum elk_lsc_opcode/g
s/\<lsc_opcode_/elk_lsc_opcode_/g
s/\<lsc_aop_[a-z_]\+\>/elk_\0/g
s/\<type_size_vec4\>/elk_\0/g
s/\<type_size_dvec4\>/elk_\0/g
s/\<type_size_xvec4\>/elk_\0/g
s/\<type_size_[a-z4]\+_bytes\>/elk_\0/g
s/\<gfx12_systolic_depth\>/elk_\0/g
```
Acked-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
121 lines
4.2 KiB
C++
121 lines
4.2 KiB
C++
/*
|
|
* 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 elk_dead_control_flow.cpp
|
|
*
|
|
* This file implements the dead control flow elimination optimization pass.
|
|
*/
|
|
|
|
#include "elk_shader.h"
|
|
#include "elk_cfg.h"
|
|
|
|
using namespace elk;
|
|
|
|
/* Look for and eliminate dead control flow:
|
|
*
|
|
* - if/endif
|
|
* - else in else/endif
|
|
* - then in if/else/endif
|
|
*/
|
|
bool
|
|
elk_dead_control_flow_eliminate(elk_backend_shader *s)
|
|
{
|
|
bool progress = false;
|
|
|
|
foreach_block_safe (block, s->cfg) {
|
|
elk_bblock_t *prev_block = block->prev();
|
|
|
|
if (!prev_block)
|
|
continue;
|
|
|
|
elk_backend_instruction *const inst = block->start();
|
|
elk_backend_instruction *const prev_inst = prev_block->end();
|
|
|
|
/* ENDIF instructions, by definition, can only be found at the start of
|
|
* basic blocks.
|
|
*/
|
|
if (inst->opcode == ELK_OPCODE_ENDIF &&
|
|
prev_inst->opcode == ELK_OPCODE_ELSE) {
|
|
elk_bblock_t *const else_block = prev_block;
|
|
elk_backend_instruction *const else_inst = prev_inst;
|
|
|
|
else_inst->remove(else_block);
|
|
progress = true;
|
|
} else if (inst->opcode == ELK_OPCODE_ENDIF &&
|
|
prev_inst->opcode == ELK_OPCODE_IF) {
|
|
elk_bblock_t *const endif_block = block;
|
|
elk_bblock_t *const if_block = prev_block;
|
|
elk_backend_instruction *const endif_inst = inst;
|
|
elk_backend_instruction *const if_inst = prev_inst;
|
|
|
|
elk_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 == ELK_OPCODE_ELSE &&
|
|
prev_inst->opcode == ELK_OPCODE_IF) {
|
|
elk_bblock_t *const else_block = block;
|
|
elk_backend_instruction *const if_inst = prev_inst;
|
|
elk_backend_instruction *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;
|
|
}
|
|
}
|
|
|
|
if (progress)
|
|
s->invalidate_analysis(DEPENDENCY_BLOCKS | DEPENDENCY_INSTRUCTIONS);
|
|
|
|
return progress;
|
|
}
|