fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 19:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
mesa/src/intel/compiler/elk/elk_compiler.c

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

234 lines
7.9 KiB
C
Raw Normal View History

intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
/*
* Copyright © 2015-2016 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.
*/
intel/elk: Rename files to use elk prefix 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 15:24:34 -08:00
#include "elk_compiler.h"
#include "elk_shader.h"
#include "elk_eu.h"
#include "elk_nir.h"
intel/elk: Move nir_options to its own c/h file pair This will allow intel-clc tool to use the ELK nir_options in its NIR codepath without having to link with the entire ELK compiler. That way an Anv only build doesn't need to compile ELK. Iris uses that codepath for Gfx8. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-02-14 15:49:45 -08:00
#include "elk_nir_options.h"
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
#include "dev/intel_debug.h"
#include "compiler/nir/nir.h"
#include "util/u_debug.h"
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_compiler *
elk_compiler_create(void *mem_ctx, const struct intel_device_info *devinfo)
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
{
intel/elk: Compile ELK library, tests and tools For now is not linked to any driver. The tools were renamed to use elk prefix to avoid conflicting with the brw ones. The run-test.py script was also updated due to that change. Before the new compiler can be linked together with the old (going to be done for Iris and other tools), the symbol conflicts need to be fixed first. This will happen in a later commit. Reviewed-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 11:44:58 -08:00
assert(devinfo->ver <= 8);
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_compiler *compiler = rzalloc(mem_ctx, struct elk_compiler);
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
compiler->devinfo = devinfo;
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_init_isa_info(&compiler->isa, devinfo);
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
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_fs_alloc_reg_sets(compiler);
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
if (devinfo->ver < 8)
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_vec4_alloc_reg_set(compiler);
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
compiler->precise_trig = debug_get_bool_option("INTEL_PRECISE_TRIG", false);
/* Default to the sampler since that's what we've done since forever */
compiler->indirect_ubos_use_sampler = true;
/* There is no vec4 mode on Gfx10+, and we don't use it at all on Gfx8+. */
for (int i = MESA_SHADER_VERTEX; i < MESA_ALL_SHADER_STAGES; i++) {
compiler->scalar_stage[i] = devinfo->ver >= 8 ||
i == MESA_SHADER_FRAGMENT || i == MESA_SHADER_COMPUTE;
}
nir_lower_int64_options int64_options =
nir_lower_imul64 |
nir_lower_isign64 |
nir_lower_divmod64 |
nir_lower_imul_high64 |
nir_lower_find_lsb64 |
nir_lower_ufind_msb64 |
nir_lower_bit_count64;
nir_lower_doubles_options fp64_options =
nir_lower_drcp |
nir_lower_dsqrt |
nir_lower_drsq |
intel/elk: Remove dsign optimization This bit from the comment should have been a big red flag: There are currently zero instances of fsign(double(x))*IMM in shader-db or any test suite, so it is hard to care at this time. The implementation of that path was incorrect. The XOR instructions should be predicated like the OR instruction in the non-multiplication path. As a result, dsign(zero_value) * x will not produce the correct result. Instead of fixing this code that is never exercised by anything, replace it with the simple lowering in NIR. Ironically, the vec4 implementation is correct. The odds of encountering an application that is performace limited by dsign performance in vertex processing stages on Ivy Bridge or Haswell is infinitesimal. No shader-db changes on any Intel platform. v2: Delete 's' in emit_fsign as it is now unused. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> [v1] Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29095>
2024-05-01 17:01:24 -07:00
nir_lower_dsign |
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
nir_lower_dtrunc |
nir_lower_dfloor |
nir_lower_dceil |
nir_lower_dfract |
nir_lower_dround_even |
nir_lower_dmod |
nir_lower_dsub |
nir_lower_ddiv;
if (!devinfo->has_64bit_float || INTEL_DEBUG(DEBUG_SOFT64))
fp64_options |= nir_lower_fp64_full_software;
if (!devinfo->has_64bit_int)
int64_options |= (nir_lower_int64_options)~0;
/* The Bspec's section titled "Instruction_multiply[DevBDW+]" claims that
* destination type can be Quadword and source type Doubleword for Gfx8 and
* Gfx9. So, lower 64 bit multiply instruction on rest of the platforms.
*/
intel/elk: Remove remaining Gfx9+ code Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27629>
2024-02-13 13:20:08 -08:00
if (devinfo->ver < 8)
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
int64_options |= nir_lower_imul_2x32_64;
/* We want the GLSL compiler to emit code that uses condition codes */
for (int i = 0; i < MESA_ALL_SHADER_STAGES; i++) {
struct nir_shader_compiler_options *nir_options =
rzalloc(compiler, struct nir_shader_compiler_options);
bool is_scalar = compiler->scalar_stage[i];
if (is_scalar) {
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
*nir_options = elk_scalar_nir_options;
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
int64_options |= nir_lower_usub_sat64;
} else {
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
*nir_options = elk_vector_nir_options;
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
}
/* Prior to Gfx6, there are no three source operations, and Gfx11 loses
* LRP.
*/
nir_options->lower_ffma16 = devinfo->ver < 6;
nir_options->lower_ffma32 = devinfo->ver < 6;
nir_options->lower_ffma64 = devinfo->ver < 6;
intel/elk: Remove remaining Gfx9+ code Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27629>
2024-02-13 13:20:08 -08:00
nir_options->lower_flrp32 = devinfo->ver < 6;
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
nir_options->has_bfe = devinfo->ver >= 7;
nir_options->has_bfm = devinfo->ver >= 7;
nir_options->has_bfi = devinfo->ver >= 7;
nir_options->lower_bitfield_reverse = devinfo->ver < 7;
nir_options->lower_find_lsb = devinfo->ver < 7;
nir_options->lower_ifind_msb = devinfo->ver < 7;
nir_options->lower_int64_options = int64_options;
nir_options->lower_doubles_options = fp64_options;
nir_options->unify_interfaces = i < MESA_SHADER_FRAGMENT;
gallium: replace PIPE_SHADER_CAP_INDIRECT_INPUT/OUTPUT_ADDR with NIR options This is a prerequisite for enabling nir_opt_varyings for all gallium drivers. nir_lower_io_passes (called by the GLSL linker) only uses NIR options to lower indirect IO access before lowering IO and calling nir_opt_varyings. Most drivers report full support for indirect IO and lower it themselves, which prevents compaction of lowered indirectly accessed varyings because nir_opt_varyings doesn't touch indirect varyings. Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io> (Rb for asahi) Reviewed-by: Pavel Ondračka <pavel.ondracka@gmail.com> (for r300) Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32423>
2024-11-29 17:43:34 -05:00
nir_options->support_indirect_inputs = (uint8_t)BITFIELD_MASK(PIPE_SHADER_TYPES),
nir_options->support_indirect_outputs = (uint8_t)BITFIELD_MASK(PIPE_SHADER_TYPES),
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
nir_options->force_indirect_unrolling |=
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_nir_no_indirect_mask(compiler, i);
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
nir_options->force_indirect_unrolling_sampler = devinfo->ver < 7;
intel/elk: Remove remaining Gfx9+ code Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27629>
2024-02-13 13:20:08 -08:00
nir_options->divergence_analysis_options |=
nir_divergence_single_prim_per_subgroup;
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
compiler->nir_options[i] = nir_options;
}
return compiler;
}
static void
insert_u64_bit(uint64_t *val, bool add)
{
*val = (*val << 1) | !!add;
}
uint64_t
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_get_compiler_config_value(const struct elk_compiler *compiler)
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
{
uint64_t config = 0;
unsigned bits = 0;
insert_u64_bit(&config, compiler->precise_trig);
bits++;
uint64_t mask = DEBUG_DISK_CACHE_MASK;
bits += util_bitcount64(mask);
u_foreach_bit64(bit, mask)
insert_u64_bit(&config, INTEL_DEBUG(1ULL << bit));
mask = SIMD_DISK_CACHE_MASK;
bits += util_bitcount64(mask);
u_foreach_bit64(bit, mask)
insert_u64_bit(&config, (intel_simd & (1ULL << bit)) != 0);
mask = 3;
bits += util_bitcount64(mask);
assert(bits <= util_bitcount64(UINT64_MAX));
return config;
}
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_prog_data_size(gl_shader_stage stage)
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
{
static const size_t stage_sizes[] = {
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
[MESA_SHADER_VERTEX] = sizeof(struct elk_vs_prog_data),
[MESA_SHADER_TESS_CTRL] = sizeof(struct elk_tcs_prog_data),
[MESA_SHADER_TESS_EVAL] = sizeof(struct elk_tes_prog_data),
[MESA_SHADER_GEOMETRY] = sizeof(struct elk_gs_prog_data),
[MESA_SHADER_FRAGMENT] = sizeof(struct elk_wm_prog_data),
[MESA_SHADER_COMPUTE] = sizeof(struct elk_cs_prog_data),
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
};
assert((int)stage >= 0 && stage < ARRAY_SIZE(stage_sizes));
return stage_sizes[stage];
}
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_prog_key_size(gl_shader_stage stage)
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
{
static const size_t stage_sizes[] = {
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
[MESA_SHADER_VERTEX] = sizeof(struct elk_vs_prog_key),
[MESA_SHADER_TESS_CTRL] = sizeof(struct elk_tcs_prog_key),
[MESA_SHADER_TESS_EVAL] = sizeof(struct elk_tes_prog_key),
[MESA_SHADER_GEOMETRY] = sizeof(struct elk_gs_prog_key),
[MESA_SHADER_FRAGMENT] = sizeof(struct elk_wm_prog_key),
[MESA_SHADER_COMPUTE] = sizeof(struct elk_cs_prog_key),
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
};
assert((int)stage >= 0 && stage < ARRAY_SIZE(stage_sizes));
return stage_sizes[stage];
}
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_write_shader_relocs(const struct elk_isa_info *isa,
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
void *program,
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
const struct elk_stage_prog_data *prog_data,
struct elk_shader_reloc_value *values,
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
unsigned num_values)
{
for (unsigned i = 0; i < prog_data->num_relocs; i++) {
assert(prog_data->relocs[i].offset % 8 == 0);
void *dst = program + prog_data->relocs[i].offset;
for (unsigned j = 0; j < num_values; j++) {
if (prog_data->relocs[i].id == values[j].id) {
uint32_t value = values[j].value + prog_data->relocs[i].delta;
switch (prog_data->relocs[i].type) {
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
case ELK_SHADER_RELOC_TYPE_U32:
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
*(uint32_t *)dst = value;
break;
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
case ELK_SHADER_RELOC_TYPE_MOV_IMM:
elk_update_reloc_imm(isa, dst, value);
intel/elk: Fork Gfx8- compiler by copying existing code Based on code from commit c3ceec6cd8533a5a5f3ccaf687308dee2f097a99. Acked-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
2024-01-19 11:32:57 -08:00
break;
default:
unreachable("Invalid relocation type");
}
break;
}
}
}
}
Reference in a new issue Copy permalink