4 Commits

Author	SHA1	Message	Date
Antonio Ospite	ddf2aa3a4d	build: avoid redefining unreachable() which is standard in C23 ... In the C23 standard unreachable() is now a predefined function-like macro in <stddef.h> See https://android.googlesource.com/platform/bionic/+/HEAD/docs/c23.md#is-now-a-predefined-function_like-macro-in And this causes build errors when building for C23: ----------------------------------------------------------------------- In file included from ../src/util/log.h:30, from ../src/util/log.c:30: ../src/util/macros.h:123:9: warning: "unreachable" redefined 123 | #define unreachable(str) \ | ^~~~~~~~~~~ In file included from ../src/util/macros.h:31: /usr/lib/gcc/x86_64-linux-gnu/14/include/stddef.h:456:9: note: this is the location of the previous definition 456 | #define unreachable() (__builtin_unreachable ()) | ^~~~~~~~~~~ ----------------------------------------------------------------------- So don't redefine it with the same name, but use the name UNREACHABLE() to also signify it's a macro. Using a different name also makes sense because the behavior of the macro was extending the one of __builtin_unreachable() anyway, and it also had a different signature, accepting one argument, compared to the standard unreachable() with no arguments. This change improves the chances of building mesa with the C23 standard, which for instance is the default in recent AOSP versions. All the instances of the macro, including the definition, were updated with the following command line: git grep -l '[^_]unreachable(' -- "src/**" | sort | uniq | \ while read file; \ do \ sed -e 's/\([^_]\)unreachable(/\1UNREACHABLE(/g' -i "$file"; \ done && \ sed -e 's/#undef unreachable/#undef UNREACHABLE/g' -i src/intel/isl/isl_aux_info.c Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36437>	2025-07-31 17:49:42 +00:00
Caio Oliveira	80de55801e	intel/elk: Remove tests for Gfx9+ ... These are covered in the regular "brw" compiler. Acked-by: Ivan Briano <ivan.briano@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27770>	2024-02-24 01:41:31 +00:00
Caio Oliveira	6648e0ebd3	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-02-24 00:24:31 +00:00
Caio Oliveira	e6022281f2	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-02-24 00:24:31 +00:00