mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-26 07:50:20 +01:00
Via the Coccinelle patch at the end of the commit message, followed by
sed -ie 's/progress = progress | /progress |=/g' $(git grep -l 'progress = prog')
ninja -C ~/mesa/build clang-format
cd ~/mesa/src/compiler/nir && clang-format -i *.c
agxfmt
@@
identifier prog;
expression impl, metadata;
@@
-if (prog) {
-nir_metadata_preserve(impl, metadata);
-} else {
-nir_metadata_preserve(impl, nir_metadata_all);
-}
-return prog;
+return nir_progress(prog, impl, metadata);
@@
expression prog_expr, impl, metadata;
@@
-if (prog_expr) {
-nir_metadata_preserve(impl, metadata);
-return true;
-} else {
-nir_metadata_preserve(impl, nir_metadata_all);
-return false;
-}
+bool progress = prog_expr;
+return nir_progress(progress, impl, metadata);
@@
identifier prog;
expression impl, metadata;
@@
-nir_metadata_preserve(impl, prog ? (metadata) : nir_metadata_all);
-return prog;
+return nir_progress(prog, impl, metadata);
@@
identifier prog;
expression impl, metadata;
@@
-nir_metadata_preserve(impl, prog ? (metadata) : nir_metadata_all);
+nir_progress(prog, impl, metadata);
@@
expression impl, metadata;
@@
-nir_metadata_preserve(impl, metadata);
-return true;
+return nir_progress(true, impl, metadata);
@@
expression impl;
@@
-nir_metadata_preserve(impl, nir_metadata_all);
-return false;
+return nir_no_progress(impl);
@@
identifier other_prog, prog;
expression impl, metadata;
@@
-if (prog) {
-nir_metadata_preserve(impl, metadata);
-} else {
-nir_metadata_preserve(impl, nir_metadata_all);
-}
-other_prog |= prog;
+other_prog = other_prog | nir_progress(prog, impl, metadata);
@@
identifier prog;
expression impl, metadata;
@@
-if (prog) {
-nir_metadata_preserve(impl, metadata);
-} else {
-nir_metadata_preserve(impl, nir_metadata_all);
-}
+nir_progress(prog, impl, metadata);
@@
identifier other_prog, prog;
expression impl, metadata;
@@
-if (prog) {
-nir_metadata_preserve(impl, metadata);
-other_prog = true;
-} else {
-nir_metadata_preserve(impl, nir_metadata_all);
-}
+other_prog = other_prog | nir_progress(prog, impl, metadata);
@@
expression prog_expr, impl, metadata;
identifier prog;
@@
-if (prog_expr) {
-nir_metadata_preserve(impl, metadata);
-prog = true;
-} else {
-nir_metadata_preserve(impl, nir_metadata_all);
-}
+bool impl_progress = prog_expr;
+prog = prog | nir_progress(impl_progress, impl, metadata);
@@
identifier other_prog, prog;
expression impl, metadata;
@@
-if (prog) {
-other_prog = true;
-nir_metadata_preserve(impl, metadata);
-} else {
-nir_metadata_preserve(impl, nir_metadata_all);
-}
+other_prog = other_prog | nir_progress(prog, impl, metadata);
@@
expression prog_expr, impl, metadata;
identifier prog;
@@
-if (prog_expr) {
-prog = true;
-nir_metadata_preserve(impl, metadata);
-} else {
-nir_metadata_preserve(impl, nir_metadata_all);
-}
+bool impl_progress = prog_expr;
+prog = prog | nir_progress(impl_progress, impl, metadata);
@@
expression prog_expr, impl, metadata;
@@
-if (prog_expr) {
-nir_metadata_preserve(impl, metadata);
-} else {
-nir_metadata_preserve(impl, nir_metadata_all);
-}
+bool impl_progress = prog_expr;
+nir_progress(impl_progress, impl, metadata);
@@
identifier prog;
expression impl, metadata;
@@
-nir_metadata_preserve(impl, metadata);
-prog = true;
+prog = nir_progress(true, impl, metadata);
@@
identifier prog;
expression impl, metadata;
@@
-if (prog) {
-nir_metadata_preserve(impl, metadata);
-}
-return prog;
+return nir_progress(prog, impl, metadata);
@@
identifier prog;
expression impl, metadata;
@@
-if (prog) {
-nir_metadata_preserve(impl, metadata);
-}
+nir_progress(prog, impl, metadata);
@@
expression impl;
@@
-nir_metadata_preserve(impl, nir_metadata_all);
+nir_no_progress(impl);
@@
expression impl, metadata;
@@
-nir_metadata_preserve(impl, metadata);
+nir_progress(true, impl, metadata);
squashme! sed -ie 's/progress = progress | /progress |=/g' $(git grep -l 'progress = prog')
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Acked-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33722>
229 lines
7.6 KiB
C
229 lines
7.6 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.
|
|
*/
|
|
|
|
/*
|
|
* This lowering pass converts references to variables with loads/stores to
|
|
* scratch space based on a few configurable parameters.
|
|
*/
|
|
|
|
#include "nir.h"
|
|
#include "nir_builder.h"
|
|
#include "nir_deref.h"
|
|
|
|
static void
|
|
lower_load_store(nir_builder *b,
|
|
nir_intrinsic_instr *intrin,
|
|
glsl_type_size_align_func size_align)
|
|
{
|
|
b->cursor = nir_before_instr(&intrin->instr);
|
|
|
|
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
|
|
nir_variable *var = nir_deref_instr_get_variable(deref);
|
|
|
|
nir_def *offset =
|
|
nir_iadd_imm(b, nir_build_deref_offset(b, deref, size_align),
|
|
var->data.location);
|
|
|
|
unsigned align, UNUSED size;
|
|
size_align(deref->type, &size, &align);
|
|
|
|
if (intrin->intrinsic == nir_intrinsic_load_deref) {
|
|
unsigned bit_size = intrin->def.bit_size;
|
|
nir_def *value = nir_load_scratch(
|
|
b, intrin->num_components, bit_size == 1 ? 32 : bit_size, offset, .align_mul = align);
|
|
if (bit_size == 1)
|
|
value = nir_b2b1(b, value);
|
|
|
|
nir_def_rewrite_uses(&intrin->def, value);
|
|
} else {
|
|
assert(intrin->intrinsic == nir_intrinsic_store_deref);
|
|
|
|
nir_def *value = intrin->src[1].ssa;
|
|
if (value->bit_size == 1)
|
|
value = nir_b2b32(b, value);
|
|
|
|
nir_store_scratch(b, value, offset, .align_mul = align,
|
|
.write_mask = nir_intrinsic_write_mask(intrin));
|
|
}
|
|
|
|
nir_instr_remove(&intrin->instr);
|
|
nir_deref_instr_remove_if_unused(deref);
|
|
}
|
|
|
|
static bool
|
|
only_used_for_load_store(nir_deref_instr *deref)
|
|
{
|
|
nir_foreach_use(src, &deref->def) {
|
|
if (!nir_src_parent_instr(src))
|
|
return false;
|
|
if (nir_src_parent_instr(src)->type == nir_instr_type_deref) {
|
|
if (!only_used_for_load_store(nir_instr_as_deref(nir_src_parent_instr(src))))
|
|
return false;
|
|
} else if (nir_src_parent_instr(src)->type != nir_instr_type_intrinsic) {
|
|
return false;
|
|
} else {
|
|
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(nir_src_parent_instr(src));
|
|
if (intrin->intrinsic != nir_intrinsic_load_deref &&
|
|
intrin->intrinsic != nir_intrinsic_store_deref)
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
nir_lower_vars_to_scratch(nir_shader *shader,
|
|
nir_variable_mode modes,
|
|
int size_threshold,
|
|
glsl_type_size_align_func variable_size_align,
|
|
glsl_type_size_align_func scratch_layout_size_align)
|
|
{
|
|
struct set *set = _mesa_pointer_set_create(NULL);
|
|
|
|
/* First, we walk the instructions and flag any variables we want to lower
|
|
* by removing them from their respective list and setting the mode to 0.
|
|
*/
|
|
nir_foreach_function_impl(impl, shader) {
|
|
nir_foreach_block(block, impl) {
|
|
nir_foreach_instr(instr, block) {
|
|
if (instr->type != nir_instr_type_intrinsic)
|
|
continue;
|
|
|
|
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
|
|
if (intrin->intrinsic != nir_intrinsic_load_deref &&
|
|
intrin->intrinsic != nir_intrinsic_store_deref)
|
|
continue;
|
|
|
|
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
|
|
if (!nir_deref_mode_is_one_of(deref, modes))
|
|
continue;
|
|
|
|
if (!nir_deref_instr_has_indirect(nir_src_as_deref(intrin->src[0])))
|
|
continue;
|
|
|
|
nir_variable *var = nir_deref_instr_get_variable(deref);
|
|
if (!var)
|
|
continue;
|
|
|
|
/* We set var->mode to 0 to indicate that a variable will be moved
|
|
* to scratch. Don't assign a scratch location twice.
|
|
*/
|
|
if (var->data.mode == 0)
|
|
continue;
|
|
|
|
unsigned var_size, var_align;
|
|
variable_size_align(var->type, &var_size, &var_align);
|
|
if (var_size <= size_threshold)
|
|
continue;
|
|
|
|
_mesa_set_add(set, var);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (set->entries == 0) {
|
|
_mesa_set_destroy(set, NULL);
|
|
return false;
|
|
}
|
|
|
|
bool progress = false;
|
|
|
|
nir_foreach_function_impl(impl, shader) {
|
|
nir_foreach_block(block, impl) {
|
|
nir_foreach_instr_safe(instr, block) {
|
|
if (instr->type != nir_instr_type_deref)
|
|
continue;
|
|
|
|
nir_deref_instr *deref = nir_instr_as_deref(instr);
|
|
|
|
if (nir_deref_instr_remove_if_unused(deref)) {
|
|
progress = true;
|
|
continue;
|
|
}
|
|
|
|
if (deref->deref_type != nir_deref_type_var)
|
|
continue;
|
|
|
|
struct set_entry *entry = _mesa_set_search(set, deref->var);
|
|
if (!entry)
|
|
continue;
|
|
|
|
if (!only_used_for_load_store(deref))
|
|
_mesa_set_remove(set, entry);
|
|
}
|
|
}
|
|
}
|
|
|
|
set_foreach(set, entry) {
|
|
nir_variable *var = (void *)entry->key;
|
|
|
|
/* Remove it from its list */
|
|
exec_node_remove(&var->node);
|
|
/* Invalid mode used to flag "moving to scratch" */
|
|
var->data.mode = 0;
|
|
|
|
/* We don't allocate space here as iteration in this loop is
|
|
* non-deterministic due to the nir_variable pointers. */
|
|
var->data.location = INT_MAX;
|
|
}
|
|
|
|
nir_foreach_function_impl(impl, shader) {
|
|
nir_builder build = nir_builder_create(impl);
|
|
|
|
bool impl_progress = false;
|
|
nir_foreach_block(block, impl) {
|
|
nir_foreach_instr_safe(instr, block) {
|
|
if (instr->type != nir_instr_type_intrinsic)
|
|
continue;
|
|
|
|
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
|
|
if (intrin->intrinsic != nir_intrinsic_load_deref &&
|
|
intrin->intrinsic != nir_intrinsic_store_deref)
|
|
continue;
|
|
|
|
nir_variable *var = nir_intrinsic_get_var(intrin, 0);
|
|
/* Variables flagged for lowering above have mode == 0 */
|
|
if (!var || var->data.mode)
|
|
continue;
|
|
|
|
if (var->data.location == INT_MAX) {
|
|
unsigned var_size, var_align;
|
|
scratch_layout_size_align(var->type, &var_size, &var_align);
|
|
|
|
var->data.location = ALIGN_POT(shader->scratch_size, var_align);
|
|
shader->scratch_size = var->data.location + var_size;
|
|
}
|
|
|
|
lower_load_store(&build, intrin, scratch_layout_size_align);
|
|
impl_progress = true;
|
|
}
|
|
}
|
|
|
|
progress |= nir_progress(impl_progress, impl,
|
|
nir_metadata_control_flow);
|
|
}
|
|
|
|
_mesa_set_destroy(set, NULL);
|
|
|
|
return progress;
|
|
}
|