mesa/src/intel/compiler/elk/elk_simd_selection.cpp

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

237 lines
7.3 KiB
C++
Raw Normal View History

/*
* Copyright © 2021 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.
*/
#include "elk_private.h"
#include "compiler/shader_info.h"
#include "intel/dev/intel_debug.h"
#include "intel/dev/intel_device_info.h"
#include "util/ralloc.h"
unsigned
intel/elk: Rename symbols 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>
2024-01-19 18:46:03 -08:00
elk_required_dispatch_width(const struct shader_info *info)
{
if ((int)info->subgroup_size >= (int)SUBGROUP_SIZE_REQUIRE_8) {
assert(gl_shader_stage_uses_workgroup(info->stage));
/* These enum values are expressly chosen to be equal to the subgroup
* size that they require.
*/
return (unsigned)info->subgroup_size;
} else {
return 0;
}
}
static inline bool
test_bit(unsigned mask, unsigned bit) {
return mask & (1u << bit);
}
namespace {
intel/elk: Rename symbols 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>
2024-01-19 18:46:03 -08:00
struct elk_cs_prog_data *
get_cs_prog_data(elk_simd_selection_state &state)
{
intel/elk: Rename symbols 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>
2024-01-19 18:46:03 -08:00
if (std::holds_alternative<struct elk_cs_prog_data *>(state.prog_data))
return std::get<struct elk_cs_prog_data *>(state.prog_data);
else
return nullptr;
}
intel/elk: Rename symbols 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>
2024-01-19 18:46:03 -08:00
struct elk_stage_prog_data *
get_prog_data(elk_simd_selection_state &state)
{
intel/elk: Rename symbols 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>
2024-01-19 18:46:03 -08:00
if (std::holds_alternative<struct elk_cs_prog_data *>(state.prog_data))
return &std::get<struct elk_cs_prog_data *>(state.prog_data)->base;
else
return nullptr;
}
}
bool
intel/elk: Rename symbols 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>
2024-01-19 18:46:03 -08:00
elk_simd_should_compile(elk_simd_selection_state &state, unsigned simd)
{
assert(simd < SIMD_COUNT);
assert(!state.compiled[simd]);
const auto cs_prog_data = get_cs_prog_data(state);
const auto prog_data = get_prog_data(state);
const unsigned width = 8u << simd;
/* For shaders with variable size workgroup, in most cases we can compile
* all the variants (exceptions are bindless dispatch & ray queries), since
* the choice will happen only at dispatch time.
*/
const bool workgroup_size_variable = cs_prog_data && cs_prog_data->local_size[0] == 0;
if (!workgroup_size_variable) {
if (state.spilled[simd]) {
state.error[simd] = "Would spill";
return false;
}
if (state.required_width && state.required_width != width) {
state.error[simd] = "Different than required dispatch width";
return false;
}
if (cs_prog_data) {
const unsigned workgroup_size = cs_prog_data->local_size[0] *
cs_prog_data->local_size[1] *
cs_prog_data->local_size[2];
unsigned max_threads = state.devinfo->max_cs_workgroup_threads;
if (simd > 0 && state.compiled[simd - 1] &&
workgroup_size <= (width / 2)) {
state.error[simd] = "Workgroup size already fits in smaller SIMD";
return false;
}
if (DIV_ROUND_UP(workgroup_size, width) > max_threads) {
state.error[simd] = "Would need more than max_threads to fit all invocations";
return false;
}
}
/* The SIMD32 is only enabled for cases it is needed unless forced.
*
* TODO: Use performance_analysis and drop this rule.
*/
if (width == 32) {
if (!INTEL_DEBUG(DEBUG_DO32) && (state.compiled[0] || state.compiled[1])) {
state.error[simd] = "SIMD32 not required (use INTEL_DEBUG=do32 to force)";
return false;
}
}
}
uint64_t start;
switch (prog_data->stage) {
case MESA_SHADER_COMPUTE:
start = DEBUG_CS_SIMD8;
break;
default:
intel/elk: Rename symbols 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>
2024-01-19 18:46:03 -08:00
unreachable("unknown shader stage in elk_simd_should_compile");
}
const bool env_skip[] = {
(intel_simd & (start << 0)) == 0,
(intel_simd & (start << 1)) == 0,
(intel_simd & (start << 2)) == 0,
};
static_assert(ARRAY_SIZE(env_skip) == SIMD_COUNT);
if (unlikely(env_skip[simd])) {
state.error[simd] = "Disabled by INTEL_DEBUG environment variable";
return false;
}
return true;
}
void
intel/elk: Rename symbols 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>
2024-01-19 18:46:03 -08:00
elk_simd_mark_compiled(elk_simd_selection_state &state, unsigned simd, bool spilled)
{
assert(simd < SIMD_COUNT);
assert(!state.compiled[simd]);
auto cs_prog_data = get_cs_prog_data(state);
state.compiled[simd] = true;
if (cs_prog_data)
cs_prog_data->prog_mask |= 1u << simd;
/* If a SIMD spilled, all the larger ones would spill too. */
if (spilled) {
for (unsigned i = simd; i < SIMD_COUNT; i++) {
state.spilled[i] = true;
if (cs_prog_data)
cs_prog_data->prog_spilled |= 1u << i;
}
}
}
int
intel/elk: Rename symbols 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>
2024-01-19 18:46:03 -08:00
elk_simd_select(const struct elk_simd_selection_state &state)
{
for (int i = SIMD_COUNT - 1; i >= 0; i--) {
if (state.compiled[i] && !state.spilled[i])
return i;
}
for (int i = SIMD_COUNT - 1; i >= 0; i--) {
if (state.compiled[i])
return i;
}
return -1;
}
int
intel/elk: Rename symbols 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>
2024-01-19 18:46:03 -08:00
elk_simd_select_for_workgroup_size(const struct intel_device_info *devinfo,
const struct elk_cs_prog_data *prog_data,
const unsigned *sizes)
{
if (!sizes || (prog_data->local_size[0] == sizes[0] &&
prog_data->local_size[1] == sizes[1] &&
prog_data->local_size[2] == sizes[2])) {
intel/elk: Rename symbols 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>
2024-01-19 18:46:03 -08:00
elk_simd_selection_state simd_state{
.prog_data = const_cast<struct elk_cs_prog_data *>(prog_data),
};
/* Propagate the prog_data information back to the simd_state,
* so we can use select() directly.
*/
for (int i = 0; i < SIMD_COUNT; i++) {
simd_state.compiled[i] = test_bit(prog_data->prog_mask, i);
simd_state.spilled[i] = test_bit(prog_data->prog_spilled, i);
}
intel/elk: Rename symbols 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>
2024-01-19 18:46:03 -08:00
return elk_simd_select(simd_state);
}
intel/elk: Rename symbols 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>
2024-01-19 18:46:03 -08:00
struct elk_cs_prog_data cloned = *prog_data;
for (unsigned i = 0; i < 3; i++)
cloned.local_size[i] = sizes[i];
cloned.prog_mask = 0;
cloned.prog_spilled = 0;
intel/elk: Rename symbols 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>
2024-01-19 18:46:03 -08:00
elk_simd_selection_state simd_state{
.devinfo = devinfo,
.prog_data = &cloned,
};
for (unsigned simd = 0; simd < SIMD_COUNT; simd++) {
/* We are not recompiling, so use original results of prog_mask and
* prog_spilled as they will already contain all possible compilations.
*/
intel/elk: Rename symbols 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>
2024-01-19 18:46:03 -08:00
if (elk_simd_should_compile(simd_state, simd) &&
test_bit(prog_data->prog_mask, simd)) {
intel/elk: Rename symbols 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>
2024-01-19 18:46:03 -08:00
elk_simd_mark_compiled(simd_state, simd, test_bit(prog_data->prog_spilled, simd));
}
}
intel/elk: Rename symbols 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>
2024-01-19 18:46:03 -08:00
return elk_simd_select(simd_state);
}