mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-18 18:08:15 +02: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>
217 lines
6.3 KiB
C
217 lines
6.3 KiB
C
/*
|
|
* Copyright © 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.
|
|
*/
|
|
|
|
#include "nir.h"
|
|
|
|
static void
|
|
add_src(nir_src *src, struct set *invariants)
|
|
{
|
|
_mesa_set_add(invariants, src->ssa);
|
|
}
|
|
|
|
static bool
|
|
add_src_cb(nir_src *src, void *state)
|
|
{
|
|
add_src(src, state);
|
|
return true;
|
|
}
|
|
|
|
static bool
|
|
def_is_invariant(nir_def *def, struct set *invariants)
|
|
{
|
|
return _mesa_set_search(invariants, def);
|
|
}
|
|
|
|
static void
|
|
add_cf_node(nir_cf_node *cf, struct set *invariants)
|
|
{
|
|
if (cf->type == nir_cf_node_if) {
|
|
nir_if *if_stmt = nir_cf_node_as_if(cf);
|
|
add_src(&if_stmt->condition, invariants);
|
|
}
|
|
|
|
if (cf->parent)
|
|
add_cf_node(cf->parent, invariants);
|
|
}
|
|
|
|
static void
|
|
add_var(nir_variable *var, struct set *invariants)
|
|
{
|
|
/* Because we pass the result of nir_intrinsic_get_var directly to this
|
|
* function, it's possible for var to be NULL if, for instance, there's a
|
|
* cast somewhere in the chain.
|
|
*/
|
|
if (var != NULL)
|
|
_mesa_set_add(invariants, var);
|
|
}
|
|
|
|
static bool
|
|
var_is_invariant(nir_variable *var, struct set *invariants)
|
|
{
|
|
/* Because we pass the result of nir_intrinsic_get_var directly to this
|
|
* function, it's possible for var to be NULL if, for instance, there's a
|
|
* cast somewhere in the chain.
|
|
*/
|
|
return var && (var->data.invariant || _mesa_set_search(invariants, var));
|
|
}
|
|
|
|
static void
|
|
propagate_invariant_instr(nir_instr *instr, struct set *invariants)
|
|
{
|
|
switch (instr->type) {
|
|
case nir_instr_type_alu: {
|
|
nir_alu_instr *alu = nir_instr_as_alu(instr);
|
|
if (!def_is_invariant(&alu->def, invariants))
|
|
break;
|
|
|
|
alu->exact = true;
|
|
nir_foreach_src(instr, add_src_cb, invariants);
|
|
break;
|
|
}
|
|
|
|
case nir_instr_type_tex: {
|
|
nir_tex_instr *tex = nir_instr_as_tex(instr);
|
|
if (def_is_invariant(&tex->def, invariants))
|
|
nir_foreach_src(instr, add_src_cb, invariants);
|
|
break;
|
|
}
|
|
|
|
case nir_instr_type_intrinsic: {
|
|
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
|
|
switch (intrin->intrinsic) {
|
|
case nir_intrinsic_copy_deref:
|
|
/* If the destination is invariant then so is the source */
|
|
if (var_is_invariant(nir_intrinsic_get_var(intrin, 0), invariants))
|
|
add_var(nir_intrinsic_get_var(intrin, 1), invariants);
|
|
break;
|
|
|
|
case nir_intrinsic_load_deref:
|
|
if (def_is_invariant(&intrin->def, invariants))
|
|
add_var(nir_intrinsic_get_var(intrin, 0), invariants);
|
|
break;
|
|
|
|
case nir_intrinsic_store_deref:
|
|
if (var_is_invariant(nir_intrinsic_get_var(intrin, 0), invariants))
|
|
add_src(&intrin->src[1], invariants);
|
|
break;
|
|
|
|
default:
|
|
/* Nothing to do */
|
|
break;
|
|
}
|
|
FALLTHROUGH;
|
|
}
|
|
|
|
case nir_instr_type_deref:
|
|
case nir_instr_type_jump:
|
|
case nir_instr_type_undef:
|
|
case nir_instr_type_load_const:
|
|
break; /* Nothing to do */
|
|
|
|
case nir_instr_type_phi: {
|
|
nir_phi_instr *phi = nir_instr_as_phi(instr);
|
|
if (!def_is_invariant(&phi->def, invariants))
|
|
break;
|
|
|
|
nir_foreach_phi_src(src, phi) {
|
|
add_src(&src->src, invariants);
|
|
add_cf_node(&src->pred->cf_node, invariants);
|
|
}
|
|
break;
|
|
}
|
|
|
|
case nir_instr_type_call:
|
|
UNREACHABLE("This pass must be run after function inlining");
|
|
|
|
case nir_instr_type_parallel_copy:
|
|
default:
|
|
UNREACHABLE("Cannot have this instruction type");
|
|
}
|
|
}
|
|
|
|
static bool
|
|
propagate_invariant_impl(nir_function_impl *impl, struct set *invariants)
|
|
{
|
|
bool progress = false;
|
|
|
|
while (true) {
|
|
uint32_t prev_entries = invariants->entries;
|
|
|
|
nir_foreach_block_reverse(block, impl) {
|
|
nir_foreach_instr_reverse(instr, block)
|
|
propagate_invariant_instr(instr, invariants);
|
|
}
|
|
|
|
/* Keep running until we make no more progress. */
|
|
if (invariants->entries > prev_entries) {
|
|
progress = true;
|
|
continue;
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
return nir_progress(progress, impl,
|
|
nir_metadata_control_flow | nir_metadata_live_defs);
|
|
}
|
|
|
|
/* If invariant_prim=true, this pass considers all geometry-affecting
|
|
* outputs as invariant. Doing this works around a common class of application
|
|
* bugs appearing as flickering.
|
|
*/
|
|
bool
|
|
nir_propagate_invariant(nir_shader *shader, bool invariant_prim)
|
|
{
|
|
/* Hash set of invariant things */
|
|
struct set *invariants = _mesa_pointer_set_create(NULL);
|
|
|
|
if (shader->info.stage != MESA_SHADER_FRAGMENT && invariant_prim) {
|
|
nir_foreach_shader_out_variable(var, shader) {
|
|
switch (var->data.location) {
|
|
case VARYING_SLOT_POS:
|
|
case VARYING_SLOT_PSIZ:
|
|
case VARYING_SLOT_CLIP_DIST0:
|
|
case VARYING_SLOT_CLIP_DIST1:
|
|
case VARYING_SLOT_CULL_DIST0:
|
|
case VARYING_SLOT_CULL_DIST1:
|
|
case VARYING_SLOT_TESS_LEVEL_OUTER:
|
|
case VARYING_SLOT_TESS_LEVEL_INNER:
|
|
if (!var->data.invariant)
|
|
_mesa_set_add(invariants, var);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
bool progress = false;
|
|
nir_foreach_function_impl(impl, shader) {
|
|
if (propagate_invariant_impl(impl, invariants))
|
|
progress = true;
|
|
}
|
|
|
|
_mesa_set_destroy(invariants, NULL);
|
|
|
|
return progress;
|
|
}
|