mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-04-24 22:20:38 +02:00
nir/lower_ssbo: rewrite
This pass was a mess. Rewrite it as modern NIR, fixing the metadata issues in the process. Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io> Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26976>
This commit is contained in:
parent
93b29cd40a
commit
29bd0a8ffa
1 changed files with 43 additions and 150 deletions
|
|
@ -1,182 +1,75 @@
|
|||
/*
|
||||
* Copyright © 2019 Collabora, Ltd.
|
||||
*
|
||||
* 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 (Collabora):
|
||||
* Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
|
||||
* Copyright 2024 Valve Corporation
|
||||
* Copyright 2019 Collabora, Ltd.
|
||||
* SPDX-License-Identifier: MIT
|
||||
*/
|
||||
|
||||
#include "nir.h"
|
||||
#include "nir_builder.h"
|
||||
|
||||
/*
|
||||
* Lowers SSBOs to globals, for hardware that lack native SSBO support. When
|
||||
* lowering, *_ssbo_* instructions will become *_global_* instructions,
|
||||
* augmented with load_ssbo_address.
|
||||
*
|
||||
* DOES NOT PERFORM BOUNDS CHECKING. DO NOT USE IN PRODUCTION ON UNTRUSTED
|
||||
* CONTEXTS INCLUDING WEBGL 2.
|
||||
* Lowers SSBOs to global memory. SSBO base addresses are passed via
|
||||
* load_ssbo_address. Run nir_lower_robust_access first for bounds checks.
|
||||
*/
|
||||
|
||||
static nir_intrinsic_op
|
||||
lower_ssbo_op(nir_intrinsic_op op)
|
||||
{
|
||||
switch (op) {
|
||||
case nir_intrinsic_load_ssbo:
|
||||
return nir_intrinsic_load_global;
|
||||
|
||||
case nir_intrinsic_store_ssbo:
|
||||
return nir_intrinsic_store_global;
|
||||
|
||||
case nir_intrinsic_ssbo_atomic:
|
||||
return nir_intrinsic_global_atomic;
|
||||
case nir_intrinsic_ssbo_atomic_swap:
|
||||
return nir_intrinsic_global_atomic_swap;
|
||||
|
||||
default:
|
||||
unreachable("Invalid SSBO op");
|
||||
}
|
||||
}
|
||||
|
||||
/* Like SSBO property sysvals, though SSBO index may be indirect. C.f.
|
||||
* nir_load_system_value */
|
||||
|
||||
static inline nir_def *
|
||||
nir_load_ssbo_prop(nir_builder *b, nir_intrinsic_op op,
|
||||
nir_src *idx, unsigned bitsize)
|
||||
{
|
||||
nir_intrinsic_instr *load = nir_intrinsic_instr_create(b->shader, op);
|
||||
load->num_components = 1;
|
||||
load->src[0] = nir_src_for_ssa(idx->ssa);
|
||||
nir_def_init(&load->instr, &load->def, 1, bitsize);
|
||||
nir_builder_instr_insert(b, &load->instr);
|
||||
return &load->def;
|
||||
}
|
||||
|
||||
#define nir_ssbo_prop(b, prop, index, bitsize) \
|
||||
nir_load_ssbo_prop(b, nir_intrinsic_##prop, index, bitsize)
|
||||
|
||||
static nir_def *
|
||||
lower_ssbo_instr(nir_builder *b, nir_intrinsic_instr *intr)
|
||||
calc_address(nir_builder *b, nir_intrinsic_instr *intr)
|
||||
{
|
||||
nir_intrinsic_op op = lower_ssbo_op(intr->intrinsic);
|
||||
bool is_store = op == nir_intrinsic_store_global;
|
||||
bool is_atomic = !is_store && op != nir_intrinsic_load_global;
|
||||
unsigned index_src = intr->intrinsic == nir_intrinsic_store_ssbo ? 1 : 0;
|
||||
nir_def *base = nir_load_ssbo_address(b, 1, 64, intr->src[index_src].ssa);
|
||||
|
||||
/* We have to calculate the address:
|
||||
*
|
||||
* &(SSBO[offset]) = &SSBO + offset
|
||||
*/
|
||||
|
||||
nir_src index = intr->src[is_store ? 1 : 0];
|
||||
nir_src *offset_src = nir_get_io_offset_src(intr);
|
||||
nir_def *offset = offset_src->ssa;
|
||||
|
||||
nir_def *address =
|
||||
nir_iadd(b,
|
||||
nir_ssbo_prop(b, load_ssbo_address, &index, 64),
|
||||
nir_u2u64(b, offset));
|
||||
|
||||
/* Create the replacement intrinsic */
|
||||
|
||||
nir_intrinsic_instr *global =
|
||||
nir_intrinsic_instr_create(b->shader, op);
|
||||
|
||||
global->num_components = intr->num_components;
|
||||
global->src[is_store ? 1 : 0] = nir_src_for_ssa(address);
|
||||
|
||||
if (nir_intrinsic_has_atomic_op(intr))
|
||||
nir_intrinsic_set_atomic_op(global, nir_intrinsic_atomic_op(intr));
|
||||
|
||||
if (!is_atomic) {
|
||||
nir_intrinsic_set_align_mul(global, nir_intrinsic_align_mul(intr));
|
||||
nir_intrinsic_set_align_offset(global, nir_intrinsic_align_offset(intr));
|
||||
}
|
||||
|
||||
if (is_store) {
|
||||
global->src[0] = nir_src_for_ssa(intr->src[0].ssa);
|
||||
nir_intrinsic_set_write_mask(global, nir_intrinsic_write_mask(intr));
|
||||
} else {
|
||||
nir_def_init(&global->instr, &global->def,
|
||||
intr->def.num_components, intr->def.bit_size);
|
||||
|
||||
if (is_atomic) {
|
||||
global->src[1] = nir_src_for_ssa(intr->src[2].ssa);
|
||||
if (nir_intrinsic_infos[op].num_srcs > 2)
|
||||
global->src[2] = nir_src_for_ssa(intr->src[3].ssa);
|
||||
}
|
||||
}
|
||||
|
||||
nir_builder_instr_insert(b, &global->instr);
|
||||
return is_store ? NULL : &global->def;
|
||||
return nir_iadd(b, base, nir_u2u64(b, nir_get_io_offset_src(intr)->ssa));
|
||||
}
|
||||
|
||||
static bool
|
||||
should_lower_ssbo_instr(const nir_instr *instr)
|
||||
pass(nir_builder *b, nir_intrinsic_instr *intr, UNUSED void *data)
|
||||
{
|
||||
if (instr->type != nir_instr_type_intrinsic)
|
||||
return false;
|
||||
|
||||
const nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
|
||||
b->cursor = nir_before_instr(&intr->instr);
|
||||
|
||||
nir_def *def = NULL;
|
||||
switch (intr->intrinsic) {
|
||||
case nir_intrinsic_load_ssbo:
|
||||
def = nir_build_load_global(b, intr->def.num_components,
|
||||
intr->def.bit_size, calc_address(b, intr),
|
||||
.align_mul = nir_intrinsic_align_mul(intr),
|
||||
.align_offset = nir_intrinsic_align_offset(intr));
|
||||
break;
|
||||
|
||||
case nir_intrinsic_store_ssbo:
|
||||
nir_build_store_global(b, intr->src[0].ssa, calc_address(b, intr),
|
||||
.align_mul = nir_intrinsic_align_mul(intr),
|
||||
.align_offset = nir_intrinsic_align_offset(intr),
|
||||
.write_mask = nir_intrinsic_write_mask(intr));
|
||||
break;
|
||||
|
||||
case nir_intrinsic_ssbo_atomic:
|
||||
def = nir_global_atomic(b, intr->def.bit_size, calc_address(b, intr),
|
||||
intr->src[2].ssa,
|
||||
.atomic_op = nir_intrinsic_atomic_op(intr));
|
||||
break;
|
||||
|
||||
case nir_intrinsic_ssbo_atomic_swap:
|
||||
return true;
|
||||
def = nir_global_atomic_swap(b, intr->def.bit_size, calc_address(b, intr),
|
||||
intr->src[2].ssa, intr->src[3].ssa,
|
||||
.atomic_op = nir_intrinsic_atomic_op(intr));
|
||||
break;
|
||||
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
return false;
|
||||
if (def)
|
||||
nir_def_rewrite_uses(&intr->def, def);
|
||||
|
||||
nir_instr_remove(&intr->instr);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
nir_lower_ssbo(nir_shader *shader)
|
||||
{
|
||||
bool progress = false;
|
||||
|
||||
nir_foreach_function_impl(impl, shader) {
|
||||
nir_builder b = nir_builder_create(impl);
|
||||
|
||||
nir_foreach_block(block, impl) {
|
||||
nir_foreach_instr_safe(instr, block) {
|
||||
if (!should_lower_ssbo_instr(instr))
|
||||
continue;
|
||||
progress = true;
|
||||
b.cursor = nir_before_instr(instr);
|
||||
|
||||
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
|
||||
nir_def *replace = lower_ssbo_instr(&b, intr);
|
||||
|
||||
if (replace) {
|
||||
nir_def_rewrite_uses(&intr->def,
|
||||
replace);
|
||||
}
|
||||
|
||||
nir_instr_remove(instr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return progress;
|
||||
return nir_shader_intrinsics_pass(shader, pass,
|
||||
nir_metadata_dominance |
|
||||
nir_metadata_block_index,
|
||||
NULL);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue