mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-25 08:40:11 +01:00
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>
133 lines
5.1 KiB
Python
133 lines
5.1 KiB
Python
#
|
|
# Copyright (C) 2014 Connor Abbott
|
|
#
|
|
# 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.
|
|
#
|
|
# Authors:
|
|
# Connor Abbott (cwabbott0@gmail.com)
|
|
|
|
from nir_opcodes import opcodes, type_sizes
|
|
from mako.template import Template
|
|
|
|
template = Template("""
|
|
#include "nir.h"
|
|
|
|
nir_op
|
|
nir_type_conversion_op(nir_alu_type src, nir_alu_type dst, nir_rounding_mode rnd)
|
|
{
|
|
nir_alu_type src_base = (nir_alu_type) nir_alu_type_get_base_type(src);
|
|
nir_alu_type dst_base = (nir_alu_type) nir_alu_type_get_base_type(dst);
|
|
unsigned src_bit_size = nir_alu_type_get_type_size(src);
|
|
unsigned dst_bit_size = nir_alu_type_get_type_size(dst);
|
|
|
|
if (src == dst && src_base == nir_type_float) {
|
|
return nir_op_mov;
|
|
} else if (src == dst && src_base == nir_type_bool) {
|
|
return nir_op_mov;
|
|
} else if ((src_base == nir_type_int || src_base == nir_type_uint) &&
|
|
(dst_base == nir_type_int || dst_base == nir_type_uint) &&
|
|
src_bit_size == dst_bit_size) {
|
|
/* Integer <-> integer conversions with the same bit-size on both
|
|
* ends are just no-op moves.
|
|
*/
|
|
return nir_op_mov;
|
|
}
|
|
|
|
/* f2b, i2b, and u2b do not exist. Use ine or fne (via nir_type_conversion)
|
|
* instead.
|
|
*/
|
|
assert(src_base == dst_base || dst_base != nir_type_bool);
|
|
|
|
switch (src_base) {
|
|
% for src_t in ['int', 'uint', 'float', 'bool']:
|
|
case nir_type_${src_t}:
|
|
switch (dst_base) {
|
|
% for dst_t in ['int', 'uint', 'float', 'bool']:
|
|
case nir_type_${dst_t}:
|
|
% if src_t in ['int', 'uint'] and dst_t in ['int', 'uint']:
|
|
% if dst_t == 'int':
|
|
<% continue %>
|
|
% else:
|
|
<% dst_t = src_t %>
|
|
% endif
|
|
% elif src_t == 'bool' and dst_t in ['int', 'uint']:
|
|
% if dst_t == 'int':
|
|
<% continue %>
|
|
% else:
|
|
<% dst_t = 'int' %>
|
|
% endif
|
|
% elif src_t != 'bool' and dst_t == 'bool':
|
|
<% continue %>
|
|
% endif
|
|
switch (dst_bit_size) {
|
|
% for dst_bits in type_sizes(dst_t):
|
|
case ${dst_bits}:
|
|
% if src_t == 'float' and dst_t == 'float' and dst_bits == 16:
|
|
switch(rnd) {
|
|
% for rnd_t in [('rtne', '_rtne'), ('rtz', '_rtz'), ('undef', '')]:
|
|
case nir_rounding_mode_${rnd_t[0]}:
|
|
return ${'nir_op_{0}2{1}{2}{3}'.format(src_t[0], dst_t[0],
|
|
dst_bits, rnd_t[1])};
|
|
% endfor
|
|
default:
|
|
UNREACHABLE("Invalid 16-bit nir rounding mode");
|
|
}
|
|
% else:
|
|
assert(rnd == nir_rounding_mode_undef);
|
|
return ${'nir_op_{0}2{1}{2}'.format(src_t[0], dst_t[0], dst_bits)};
|
|
% endif
|
|
% endfor
|
|
default:
|
|
UNREACHABLE("Invalid nir alu bit size");
|
|
}
|
|
% endfor
|
|
default:
|
|
UNREACHABLE("Invalid nir alu base type");
|
|
}
|
|
% endfor
|
|
default:
|
|
UNREACHABLE("Invalid nir alu base type");
|
|
}
|
|
}
|
|
|
|
const nir_op_info nir_op_infos[nir_num_opcodes] = {
|
|
% for name, opcode in sorted(opcodes.items()):
|
|
{
|
|
.name = "${name}",
|
|
.num_inputs = ${opcode.num_inputs},
|
|
.output_size = ${opcode.output_size},
|
|
.output_type = ${"nir_type_" + opcode.output_type},
|
|
.input_sizes = {
|
|
${ ", ".join(str(size) for size in opcode.input_sizes) }
|
|
},
|
|
.input_types = {
|
|
${ ", ".join("nir_type_" + type for type in opcode.input_types) }
|
|
},
|
|
.is_conversion = ${"true" if opcode.is_conversion else "false"},
|
|
.algebraic_properties =
|
|
${ "0" if opcode.algebraic_properties == "" else " | ".join(
|
|
"NIR_OP_IS_" + prop.upper() for prop in
|
|
opcode.algebraic_properties.strip().split(" ")) }
|
|
},
|
|
% endfor
|
|
};
|
|
""")
|
|
|
|
print(template.render(opcodes=opcodes, type_sizes=type_sizes))
|