2017-06-22 12:13:25 -07:00
|
|
|
/*
|
|
|
|
|
* Copyright © 2017 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"
|
|
|
|
|
#include "nir_builder.h"
|
nir,amd: optimize front_face ? a : -a
Foz-DB Navi31:
Totals from 3345 (4.21% of 79395) affected shaders:
MaxWaves: 96182 -> 96174 (-0.01%)
Instrs: 3135439 -> 3129508 (-0.19%); split: -0.24%, +0.05%
CodeSize: 16776088 -> 16718048 (-0.35%); split: -0.38%, +0.03%
VGPRs: 190884 -> 190848 (-0.02%); split: -0.03%, +0.01%
Latency: 32624132 -> 32621734 (-0.01%); split: -0.16%, +0.16%
InvThroughput: 5759987 -> 5749957 (-0.17%); split: -0.23%, +0.05%
VClause: 51044 -> 51086 (+0.08%); split: -0.12%, +0.20%
SClause: 103415 -> 103223 (-0.19%); split: -0.64%, +0.45%
Copies: 170398 -> 170555 (+0.09%); split: -0.64%, +0.74%
PreSGPRs: 135567 -> 133887 (-1.24%)
PreVGPRs: 140569 -> 141317 (+0.53%)
VALU: 1959144 -> 1953839 (-0.27%); split: -0.30%, +0.03%
SALU: 217956 -> 217676 (-0.13%); split: -0.20%, +0.07%
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32791>
2024-12-27 20:26:25 +01:00
|
|
|
#include "nir_search_helpers.h"
|
2017-06-22 12:13:25 -07:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* \file nir_opt_intrinsics.c
|
|
|
|
|
*/
|
|
|
|
|
|
2020-10-23 16:48:38 -05:00
|
|
|
static bool
|
2023-08-12 16:17:15 -04:00
|
|
|
src_is_single_use_shuffle(nir_src src, nir_def **data, nir_def **index)
|
2020-10-23 16:48:38 -05:00
|
|
|
{
|
|
|
|
|
nir_intrinsic_instr *shuffle = nir_src_as_intrinsic(src);
|
|
|
|
|
if (shuffle == NULL || shuffle->intrinsic != nir_intrinsic_shuffle)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
/* This is only called when src is part of an ALU op so requiring no if
|
|
|
|
|
* uses is reasonable. If we ever want to use this from an if statement,
|
|
|
|
|
* we can change it then.
|
|
|
|
|
*/
|
2023-08-14 11:56:00 -05:00
|
|
|
if (!list_is_singular(&shuffle->def.uses))
|
2023-04-06 13:19:31 -04:00
|
|
|
return false;
|
|
|
|
|
|
2023-08-14 11:56:00 -05:00
|
|
|
if (nir_def_used_by_if(&shuffle->def))
|
2020-10-23 16:48:38 -05:00
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
*data = shuffle->src[0].ssa;
|
|
|
|
|
*index = shuffle->src[1].ssa;
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-12 16:17:15 -04:00
|
|
|
static nir_def *
|
2021-02-04 15:45:11 -06:00
|
|
|
try_opt_bcsel_of_shuffle(nir_builder *b, nir_alu_instr *alu,
|
|
|
|
|
bool block_has_discard)
|
2020-10-23 16:48:38 -05:00
|
|
|
{
|
|
|
|
|
assert(alu->op == nir_op_bcsel);
|
|
|
|
|
|
2021-02-04 15:45:11 -06:00
|
|
|
/* If we've seen a discard in this block, don't do the optimization. We
|
|
|
|
|
* could try to do something fancy where we check if the shuffle is on our
|
|
|
|
|
* side of the discard or not but this is good enough for correctness for
|
|
|
|
|
* now and subgroup ops in the presence of discard aren't common.
|
|
|
|
|
*/
|
|
|
|
|
if (block_has_discard)
|
2025-03-11 15:36:30 -04:00
|
|
|
return NULL;
|
2021-02-04 15:45:11 -06:00
|
|
|
|
2020-10-23 16:48:38 -05:00
|
|
|
if (!nir_alu_src_is_trivial_ssa(alu, 0))
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2023-08-12 16:17:15 -04:00
|
|
|
nir_def *data1, *index1;
|
2020-10-23 16:48:38 -05:00
|
|
|
if (!nir_alu_src_is_trivial_ssa(alu, 1) ||
|
2025-07-31 09:37:16 -04:00
|
|
|
nir_def_block(alu->src[1].src.ssa) != alu->instr.block ||
|
2020-10-23 16:48:38 -05:00
|
|
|
!src_is_single_use_shuffle(alu->src[1].src, &data1, &index1))
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2023-08-12 16:17:15 -04:00
|
|
|
nir_def *data2, *index2;
|
2020-10-23 16:48:38 -05:00
|
|
|
if (!nir_alu_src_is_trivial_ssa(alu, 2) ||
|
2025-07-31 09:37:16 -04:00
|
|
|
nir_def_block(alu->src[2].src.ssa) != alu->instr.block ||
|
2020-10-23 16:48:38 -05:00
|
|
|
!src_is_single_use_shuffle(alu->src[2].src, &data2, &index2))
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
if (data1 != data2)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2023-08-12 16:17:15 -04:00
|
|
|
nir_def *index = nir_bcsel(b, alu->src[0].src.ssa, index1, index2);
|
|
|
|
|
nir_def *shuffle = nir_shuffle(b, data1, index);
|
2021-01-01 20:37:53 +01:00
|
|
|
|
|
|
|
|
return shuffle;
|
2020-10-23 16:48:38 -05:00
|
|
|
}
|
|
|
|
|
|
nir,amd: optimize front_face ? a : -a
Foz-DB Navi31:
Totals from 3345 (4.21% of 79395) affected shaders:
MaxWaves: 96182 -> 96174 (-0.01%)
Instrs: 3135439 -> 3129508 (-0.19%); split: -0.24%, +0.05%
CodeSize: 16776088 -> 16718048 (-0.35%); split: -0.38%, +0.03%
VGPRs: 190884 -> 190848 (-0.02%); split: -0.03%, +0.01%
Latency: 32624132 -> 32621734 (-0.01%); split: -0.16%, +0.16%
InvThroughput: 5759987 -> 5749957 (-0.17%); split: -0.23%, +0.05%
VClause: 51044 -> 51086 (+0.08%); split: -0.12%, +0.20%
SClause: 103415 -> 103223 (-0.19%); split: -0.64%, +0.45%
Copies: 170398 -> 170555 (+0.09%); split: -0.64%, +0.74%
PreSGPRs: 135567 -> 133887 (-1.24%)
PreVGPRs: 140569 -> 141317 (+0.53%)
VALU: 1959144 -> 1953839 (-0.27%); split: -0.30%, +0.03%
SALU: 217956 -> 217676 (-0.13%); split: -0.20%, +0.07%
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32791>
2024-12-27 20:26:25 +01:00
|
|
|
/* load_front_face ? a : -a -> load_front_face_sign * a */
|
|
|
|
|
static nir_def *
|
|
|
|
|
try_opt_front_face_fsign(nir_builder *b, nir_alu_instr *alu)
|
|
|
|
|
{
|
|
|
|
|
if (alu->def.bit_size != 32 ||
|
|
|
|
|
!nir_src_as_intrinsic(alu->src[0].src) ||
|
|
|
|
|
nir_src_as_intrinsic(alu->src[0].src)->intrinsic != nir_intrinsic_load_front_face ||
|
|
|
|
|
!is_only_used_as_float(alu) ||
|
|
|
|
|
!nir_alu_srcs_negative_equal_typed(alu, alu, 1, 2, nir_type_float))
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
nir_def *src = nir_ssa_for_alu_src(b, alu, 1);
|
|
|
|
|
|
|
|
|
|
return nir_fmul(b, nir_load_front_face_fsign(b), src);
|
|
|
|
|
}
|
|
|
|
|
|
2023-06-13 14:07:53 +01:00
|
|
|
static bool
|
|
|
|
|
src_is_quad_broadcast(nir_block *block, nir_src src, nir_intrinsic_instr **intrin)
|
|
|
|
|
{
|
|
|
|
|
nir_intrinsic_instr *broadcast = nir_src_as_intrinsic(src);
|
|
|
|
|
if (broadcast == NULL || broadcast->instr.block != block)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
switch (broadcast->intrinsic) {
|
|
|
|
|
case nir_intrinsic_quad_broadcast:
|
|
|
|
|
if (!nir_src_is_const(broadcast->src[1]))
|
|
|
|
|
return false;
|
|
|
|
|
FALLTHROUGH;
|
|
|
|
|
case nir_intrinsic_quad_swap_horizontal:
|
|
|
|
|
case nir_intrinsic_quad_swap_vertical:
|
|
|
|
|
case nir_intrinsic_quad_swap_diagonal:
|
|
|
|
|
case nir_intrinsic_quad_swizzle_amd:
|
|
|
|
|
*intrin = broadcast;
|
|
|
|
|
return true;
|
|
|
|
|
default:
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool
|
|
|
|
|
src_is_alu(nir_op op, nir_src src, nir_src srcs[2])
|
|
|
|
|
{
|
|
|
|
|
nir_alu_instr *alu = nir_src_as_alu_instr(src);
|
|
|
|
|
if (alu == NULL || alu->op != op)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
if (!nir_alu_src_is_trivial_ssa(alu, 0) || !nir_alu_src_is_trivial_ssa(alu, 1))
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
srcs[0] = alu->src[0].src;
|
|
|
|
|
srcs[1] = alu->src[1].src;
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-12 16:17:15 -04:00
|
|
|
static nir_def *
|
2023-06-13 14:07:53 +01:00
|
|
|
try_opt_quad_vote(nir_builder *b, nir_alu_instr *alu, bool block_has_discard)
|
|
|
|
|
{
|
|
|
|
|
if (block_has_discard)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
if (!nir_alu_src_is_trivial_ssa(alu, 0) || !nir_alu_src_is_trivial_ssa(alu, 1))
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
nir_intrinsic_instr *quad_broadcasts[4];
|
|
|
|
|
nir_src srcs[2][2];
|
|
|
|
|
bool found = false;
|
|
|
|
|
|
|
|
|
|
/* Match (broadcast0 op broadcast1) op (broadcast2 op broadcast3). */
|
|
|
|
|
found = src_is_alu(alu->op, alu->src[0].src, srcs[0]) &&
|
|
|
|
|
src_is_alu(alu->op, alu->src[1].src, srcs[1]) &&
|
|
|
|
|
src_is_quad_broadcast(alu->instr.block, srcs[0][0], &quad_broadcasts[0]) &&
|
|
|
|
|
src_is_quad_broadcast(alu->instr.block, srcs[0][1], &quad_broadcasts[1]) &&
|
|
|
|
|
src_is_quad_broadcast(alu->instr.block, srcs[1][0], &quad_broadcasts[2]) &&
|
|
|
|
|
src_is_quad_broadcast(alu->instr.block, srcs[1][1], &quad_broadcasts[3]);
|
|
|
|
|
|
|
|
|
|
/* Match ((broadcast2 op broadcast3) op broadcast1) op broadcast0). */
|
|
|
|
|
if (!found) {
|
|
|
|
|
if ((src_is_alu(alu->op, alu->src[0].src, srcs[0]) &&
|
|
|
|
|
src_is_quad_broadcast(alu->instr.block, alu->src[1].src, &quad_broadcasts[0])) ||
|
|
|
|
|
(src_is_alu(alu->op, alu->src[1].src, srcs[0]) &&
|
|
|
|
|
src_is_quad_broadcast(alu->instr.block, alu->src[0].src, &quad_broadcasts[0]))) {
|
|
|
|
|
/* ((broadcast2 || broadcast3) || broadcast1) */
|
|
|
|
|
if ((src_is_alu(alu->op, srcs[0][0], srcs[1]) &&
|
|
|
|
|
src_is_quad_broadcast(alu->instr.block, srcs[0][1], &quad_broadcasts[1])) ||
|
|
|
|
|
(src_is_alu(alu->op, srcs[0][1], srcs[1]) &&
|
|
|
|
|
src_is_quad_broadcast(alu->instr.block, srcs[0][0], &quad_broadcasts[1]))) {
|
|
|
|
|
/* (broadcast2 || broadcast3) */
|
|
|
|
|
found = src_is_quad_broadcast(alu->instr.block, srcs[1][0], &quad_broadcasts[2]) &&
|
|
|
|
|
src_is_quad_broadcast(alu->instr.block, srcs[1][1], &quad_broadcasts[3]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!found)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
/* Check if each lane in a quad reduces all lanes in the quad, and if all broadcasts read the
|
|
|
|
|
* same data.
|
|
|
|
|
*/
|
|
|
|
|
uint16_t lanes_read = 0;
|
|
|
|
|
for (unsigned i = 0; i < 4; i++) {
|
|
|
|
|
if (!nir_srcs_equal(quad_broadcasts[i]->src[0], quad_broadcasts[0]->src[0]))
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
for (unsigned j = 0; j < 4; j++) {
|
|
|
|
|
unsigned lane;
|
|
|
|
|
switch (quad_broadcasts[i]->intrinsic) {
|
|
|
|
|
case nir_intrinsic_quad_broadcast:
|
|
|
|
|
lane = nir_src_as_uint(quad_broadcasts[i]->src[1]) & 0x3;
|
|
|
|
|
break;
|
|
|
|
|
case nir_intrinsic_quad_swap_horizontal:
|
|
|
|
|
lane = j ^ 1;
|
|
|
|
|
break;
|
|
|
|
|
case nir_intrinsic_quad_swap_vertical:
|
|
|
|
|
lane = j ^ 2;
|
|
|
|
|
break;
|
|
|
|
|
case nir_intrinsic_quad_swap_diagonal:
|
|
|
|
|
lane = 3 - j;
|
|
|
|
|
break;
|
|
|
|
|
case nir_intrinsic_quad_swizzle_amd:
|
|
|
|
|
lane = (nir_intrinsic_swizzle_mask(quad_broadcasts[i]) >> (j * 2)) & 0x3;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
2025-07-23 09:17:35 +02:00
|
|
|
UNREACHABLE("");
|
2023-06-13 14:07:53 +01:00
|
|
|
}
|
|
|
|
|
lanes_read |= (1 << lane) << (j * 4);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (lanes_read != 0xffff)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2023-11-01 16:37:46 +01:00
|
|
|
/* Create quad vote. */
|
|
|
|
|
if (alu->op == nir_op_iand)
|
|
|
|
|
return nir_quad_vote_all(b, 1, quad_broadcasts[0]->src[0].ssa);
|
|
|
|
|
else
|
|
|
|
|
return nir_quad_vote_any(b, 1, quad_broadcasts[0]->src[0].ssa);
|
2023-06-13 14:07:53 +01:00
|
|
|
}
|
|
|
|
|
|
2020-10-23 16:48:38 -05:00
|
|
|
static bool
|
2025-10-10 14:40:39 +02:00
|
|
|
opt_intrinsics_alu(nir_builder *b, nir_alu_instr *alu, bool block_has_discard)
|
2020-10-23 16:48:38 -05:00
|
|
|
{
|
2023-08-12 16:17:15 -04:00
|
|
|
nir_def *replacement = NULL;
|
2020-10-23 16:48:38 -05:00
|
|
|
|
|
|
|
|
switch (alu->op) {
|
|
|
|
|
case nir_op_bcsel:
|
2021-02-04 15:45:11 -06:00
|
|
|
replacement = try_opt_bcsel_of_shuffle(b, alu, block_has_discard);
|
2025-10-10 14:40:39 +02:00
|
|
|
if (!replacement && b->shader->options->optimize_load_front_face_fsign)
|
nir,amd: optimize front_face ? a : -a
Foz-DB Navi31:
Totals from 3345 (4.21% of 79395) affected shaders:
MaxWaves: 96182 -> 96174 (-0.01%)
Instrs: 3135439 -> 3129508 (-0.19%); split: -0.24%, +0.05%
CodeSize: 16776088 -> 16718048 (-0.35%); split: -0.38%, +0.03%
VGPRs: 190884 -> 190848 (-0.02%); split: -0.03%, +0.01%
Latency: 32624132 -> 32621734 (-0.01%); split: -0.16%, +0.16%
InvThroughput: 5759987 -> 5749957 (-0.17%); split: -0.23%, +0.05%
VClause: 51044 -> 51086 (+0.08%); split: -0.12%, +0.20%
SClause: 103415 -> 103223 (-0.19%); split: -0.64%, +0.45%
Copies: 170398 -> 170555 (+0.09%); split: -0.64%, +0.74%
PreSGPRs: 135567 -> 133887 (-1.24%)
PreVGPRs: 140569 -> 141317 (+0.53%)
VALU: 1959144 -> 1953839 (-0.27%); split: -0.30%, +0.03%
SALU: 217956 -> 217676 (-0.13%); split: -0.20%, +0.07%
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32791>
2024-12-27 20:26:25 +01:00
|
|
|
replacement = try_opt_front_face_fsign(b, alu);
|
2020-10-23 16:48:38 -05:00
|
|
|
break;
|
2023-06-13 14:07:53 +01:00
|
|
|
case nir_op_iand:
|
|
|
|
|
case nir_op_ior:
|
2025-10-10 14:40:39 +02:00
|
|
|
if (alu->def.bit_size == 1 && b->shader->options->optimize_quad_vote_to_reduce)
|
2023-06-13 14:07:53 +01:00
|
|
|
replacement = try_opt_quad_vote(b, alu, block_has_discard);
|
|
|
|
|
break;
|
2020-10-23 16:48:38 -05:00
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (replacement) {
|
2024-06-20 12:07:26 -04:00
|
|
|
nir_def_replace(&alu->def, replacement);
|
2020-10-23 16:48:38 -05:00
|
|
|
return true;
|
|
|
|
|
} else {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-08 14:48:50 +02:00
|
|
|
static bool
|
2025-06-17 16:10:07 +02:00
|
|
|
try_opt_exclusive_scan_to_inclusive(nir_builder *b, nir_intrinsic_instr *intrin)
|
2023-08-08 14:48:50 +02:00
|
|
|
{
|
2023-08-14 11:56:00 -05:00
|
|
|
if (intrin->def.num_components != 1)
|
2023-08-08 14:48:50 +02:00
|
|
|
return false;
|
|
|
|
|
|
2025-06-17 16:10:07 +02:00
|
|
|
nir_op reduction_op = nir_intrinsic_reduction_op(intrin);
|
|
|
|
|
|
2023-08-14 11:56:00 -05:00
|
|
|
nir_foreach_use_including_if(src, &intrin->def) {
|
2023-08-14 09:58:47 -04:00
|
|
|
if (nir_src_is_if(src) || nir_src_parent_instr(src)->type != nir_instr_type_alu)
|
2023-08-08 14:48:50 +02:00
|
|
|
return false;
|
|
|
|
|
|
2023-08-14 09:58:47 -04:00
|
|
|
nir_alu_instr *alu = nir_instr_as_alu(nir_src_parent_instr(src));
|
2023-08-08 14:48:50 +02:00
|
|
|
|
2025-06-17 16:10:07 +02:00
|
|
|
if (alu->op != reduction_op)
|
2023-08-08 14:48:50 +02:00
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
/* Don't reassociate exact float operations. */
|
2024-02-08 21:22:32 +01:00
|
|
|
if (nir_alu_type_get_base_type(nir_op_infos[alu->op].output_type) == nir_type_float && alu->exact)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
/* SPIR-V rules for fmax/fmin scans are *very* stupid.
|
|
|
|
|
* The required identity is Inf instead of NaN but if one input
|
|
|
|
|
* is NaN, the other value has to be returned.
|
|
|
|
|
*
|
|
|
|
|
* This means for invocation 0:
|
|
|
|
|
* min(subgroupExclusiveMin(NaN), NaN) -> Inf
|
|
|
|
|
* subgroupInclusiveMin(NaN) -> undefined (NaN for any sane backend)
|
|
|
|
|
*
|
|
|
|
|
* SPIR-V [NF]Min/Max don't allow undefined result, even with standard
|
|
|
|
|
* float controls.
|
|
|
|
|
*/
|
|
|
|
|
if (alu->op == nir_op_fmax || alu->op == nir_op_fmin)
|
2023-08-08 14:48:50 +02:00
|
|
|
return false;
|
|
|
|
|
|
2023-08-14 11:43:35 -05:00
|
|
|
if (alu->def.num_components != 1)
|
2023-08-08 14:48:50 +02:00
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
nir_alu_src *alu_src = list_entry(src, nir_alu_src, src);
|
|
|
|
|
unsigned src_index = alu_src - alu->src;
|
|
|
|
|
|
|
|
|
|
assert(src_index < 2 && nir_op_infos[alu->op].num_inputs == 2);
|
|
|
|
|
|
2023-08-12 16:17:15 -04:00
|
|
|
nir_scalar scan_scalar = nir_scalar_resolved(intrin->src[0].ssa, 0);
|
|
|
|
|
nir_scalar op_scalar = nir_scalar_resolved(alu->src[!src_index].src.ssa,
|
|
|
|
|
alu->src[!src_index].swizzle[0]);
|
2023-08-08 14:48:50 +02:00
|
|
|
|
2023-08-13 00:14:29 +02:00
|
|
|
if (!nir_scalar_equal(scan_scalar, op_scalar))
|
2023-08-08 14:48:50 +02:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Convert to inclusive scan. */
|
2025-06-17 16:10:07 +02:00
|
|
|
nir_def *incl_scan = nir_inclusive_scan(b, intrin->src[0].ssa, .reduction_op = reduction_op);
|
2023-08-08 14:48:50 +02:00
|
|
|
|
2023-08-14 11:56:00 -05:00
|
|
|
nir_foreach_use_including_if_safe(src, &intrin->def) {
|
2023-08-08 14:48:50 +02:00
|
|
|
/* Remove alu. */
|
2023-08-14 09:58:47 -04:00
|
|
|
nir_alu_instr *alu = nir_instr_as_alu(nir_src_parent_instr(src));
|
2025-06-17 16:10:07 +02:00
|
|
|
nir_def_replace(&alu->def, incl_scan);
|
2023-08-08 14:48:50 +02:00
|
|
|
}
|
|
|
|
|
|
2025-06-17 16:10:07 +02:00
|
|
|
nir_instr_remove(&intrin->instr);
|
|
|
|
|
|
2023-08-08 14:48:50 +02:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2025-10-04 14:36:14 +02:00
|
|
|
static bool
|
2025-10-10 14:40:39 +02:00
|
|
|
try_opt_atomic_isub(nir_builder *b, nir_intrinsic_instr *intrin, unsigned data_idx)
|
2025-10-04 14:36:14 +02:00
|
|
|
{
|
2025-10-10 14:40:39 +02:00
|
|
|
if (nir_intrinsic_atomic_op(intrin) != nir_atomic_op_iadd || !b->shader->options->has_atomic_isub)
|
2025-10-04 14:36:14 +02:00
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
nir_scalar data = nir_scalar_resolved(intrin->src[data_idx].ssa, 0);
|
|
|
|
|
|
|
|
|
|
if (!nir_scalar_is_alu(data) || nir_scalar_alu_op(data) != nir_op_ineg)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
data = nir_scalar_chase_alu_src(data, 0);
|
|
|
|
|
|
|
|
|
|
nir_src_rewrite(&intrin->src[data_idx], nir_mov_scalar(b, data));
|
|
|
|
|
nir_intrinsic_set_atomic_op(intrin, nir_atomic_op_isub);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2025-10-10 14:32:05 +02:00
|
|
|
static bool
|
|
|
|
|
try_opt_atomic_to_exchange(nir_builder *b, nir_intrinsic_instr *intrin,
|
|
|
|
|
unsigned data_idx)
|
|
|
|
|
{
|
|
|
|
|
nir_scalar data = nir_scalar_resolved(intrin->src[data_idx].ssa, 0);
|
|
|
|
|
if (!nir_scalar_is_const(data))
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
int64_t value;
|
|
|
|
|
switch (nir_intrinsic_atomic_op(intrin)) {
|
|
|
|
|
case nir_atomic_op_ior:
|
|
|
|
|
case nir_atomic_op_umax:
|
|
|
|
|
value = -1;
|
|
|
|
|
break;
|
|
|
|
|
case nir_atomic_op_iand:
|
|
|
|
|
case nir_atomic_op_umin:
|
|
|
|
|
value = 0;
|
|
|
|
|
break;
|
|
|
|
|
case nir_atomic_op_imin:
|
|
|
|
|
value = u_intN_min(intrin->def.bit_size);
|
|
|
|
|
break;
|
|
|
|
|
case nir_atomic_op_imax:
|
|
|
|
|
value = u_intN_max(intrin->def.bit_size);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (nir_scalar_as_int(data) != value)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
nir_intrinsic_set_atomic_op(intrin, nir_atomic_op_xchg);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static nir_alu_type
|
|
|
|
|
image_atomic_type(nir_intrinsic_instr *intrin)
|
|
|
|
|
{
|
|
|
|
|
enum pipe_format format = nir_intrinsic_format(intrin);
|
|
|
|
|
|
|
|
|
|
nir_alu_type base_type = nir_type_float;
|
|
|
|
|
if (util_format_is_pure_sint(format))
|
|
|
|
|
base_type = nir_type_int;
|
|
|
|
|
else if (util_format_is_pure_uint(format))
|
|
|
|
|
base_type = nir_type_uint;
|
|
|
|
|
|
|
|
|
|
return base_type | intrin->def.bit_size;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool
|
|
|
|
|
try_opt_atomic_exchange_to_store(nir_builder *b, nir_intrinsic_instr *intrin)
|
|
|
|
|
{
|
|
|
|
|
if (!b->shader->options->has_atomic_load_store)
|
|
|
|
|
return false;
|
|
|
|
|
if (nir_intrinsic_atomic_op(intrin) != nir_atomic_op_xchg)
|
|
|
|
|
return false;
|
|
|
|
|
if (!nir_def_is_unused(&intrin->def))
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
/* We need to know the storage image format to get the type of the image access. */
|
|
|
|
|
if (nir_intrinsic_has_format(intrin) && nir_intrinsic_format(intrin) == PIPE_FORMAT_NONE)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
switch (intrin->intrinsic) {
|
|
|
|
|
case nir_intrinsic_deref_atomic: {
|
|
|
|
|
uint32_t access = nir_intrinsic_access(intrin) | ACCESS_ATOMIC;
|
|
|
|
|
if (!nir_deref_mode_must_be(nir_src_as_deref(intrin->src[0]), nir_var_mem_shared))
|
|
|
|
|
access |= ACCESS_COHERENT;
|
|
|
|
|
nir_build_store_deref(b, intrin->src[0].ssa, intrin->src[1].ssa, .access = access);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case nir_intrinsic_shared_atomic:
|
|
|
|
|
nir_store_shared(b, intrin->src[1].ssa, intrin->src[0].ssa,
|
|
|
|
|
.access = ACCESS_ATOMIC,
|
|
|
|
|
.base = nir_intrinsic_base(intrin));
|
|
|
|
|
break;
|
|
|
|
|
case nir_intrinsic_global_atomic:
|
2025-10-20 17:27:55 +02:00
|
|
|
nir_store_global(b, intrin->src[1].ssa, intrin->src[0].ssa,
|
|
|
|
|
.access = ACCESS_ATOMIC | ACCESS_COHERENT);
|
2025-10-10 14:32:05 +02:00
|
|
|
break;
|
|
|
|
|
case nir_intrinsic_global_atomic_amd:
|
|
|
|
|
nir_store_global_amd(b, intrin->src[1].ssa, intrin->src[0].ssa, intrin->src[2].ssa,
|
|
|
|
|
.access = ACCESS_ATOMIC | ACCESS_COHERENT,
|
|
|
|
|
.base = nir_intrinsic_base(intrin));
|
|
|
|
|
break;
|
|
|
|
|
case nir_intrinsic_ssbo_atomic:
|
|
|
|
|
nir_store_ssbo(b, intrin->src[2].ssa, intrin->src[0].ssa, intrin->src[1].ssa,
|
|
|
|
|
.access = nir_intrinsic_access(intrin) | ACCESS_ATOMIC | ACCESS_COHERENT,
|
|
|
|
|
.offset_shift = nir_intrinsic_offset_shift(intrin));
|
|
|
|
|
break;
|
|
|
|
|
case nir_intrinsic_image_deref_atomic:
|
|
|
|
|
nir_image_deref_store(b, intrin->src[0].ssa,
|
|
|
|
|
intrin->src[1].ssa,
|
|
|
|
|
intrin->src[2].ssa,
|
|
|
|
|
intrin->src[3].ssa,
|
|
|
|
|
nir_imm_int(b, 0),
|
|
|
|
|
.image_dim = nir_intrinsic_image_dim(intrin),
|
|
|
|
|
.image_array = nir_intrinsic_image_array(intrin),
|
|
|
|
|
.format = nir_intrinsic_format(intrin),
|
|
|
|
|
.access = nir_intrinsic_access(intrin) | ACCESS_ATOMIC | ACCESS_COHERENT,
|
|
|
|
|
.src_type = image_atomic_type(intrin));
|
|
|
|
|
break;
|
|
|
|
|
case nir_intrinsic_image_atomic:
|
|
|
|
|
nir_image_store(b, intrin->src[0].ssa,
|
|
|
|
|
intrin->src[1].ssa,
|
|
|
|
|
intrin->src[2].ssa,
|
|
|
|
|
intrin->src[3].ssa,
|
|
|
|
|
nir_imm_int(b, 0),
|
|
|
|
|
.image_dim = nir_intrinsic_image_dim(intrin),
|
|
|
|
|
.image_array = nir_intrinsic_image_array(intrin),
|
|
|
|
|
.format = nir_intrinsic_format(intrin),
|
|
|
|
|
.access = nir_intrinsic_access(intrin) | ACCESS_ATOMIC | ACCESS_COHERENT,
|
|
|
|
|
.range_base = nir_intrinsic_range_base(intrin),
|
|
|
|
|
.src_type = image_atomic_type(intrin));
|
|
|
|
|
break;
|
|
|
|
|
case nir_intrinsic_bindless_image_atomic:
|
|
|
|
|
nir_bindless_image_store(b, intrin->src[0].ssa,
|
|
|
|
|
intrin->src[1].ssa,
|
|
|
|
|
intrin->src[2].ssa,
|
|
|
|
|
intrin->src[3].ssa,
|
|
|
|
|
nir_imm_int(b, 0),
|
|
|
|
|
.image_dim = nir_intrinsic_image_dim(intrin),
|
|
|
|
|
.image_array = nir_intrinsic_image_array(intrin),
|
|
|
|
|
.format = nir_intrinsic_format(intrin),
|
|
|
|
|
.access = nir_intrinsic_access(intrin) | ACCESS_ATOMIC | ACCESS_COHERENT,
|
|
|
|
|
.src_type = image_atomic_type(intrin));
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
UNREACHABLE("unhandled atomic intrinsic");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nir_instr_remove(&intrin->instr);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool
|
|
|
|
|
try_opt_atomic_to_load(nir_builder *b, nir_intrinsic_instr *intrin,
|
|
|
|
|
unsigned data_idx)
|
|
|
|
|
{
|
|
|
|
|
if (!b->shader->options->has_atomic_load_store)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
nir_scalar data = nir_scalar_resolved(intrin->src[data_idx].ssa, 0);
|
|
|
|
|
if (!nir_scalar_is_const(data))
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
int64_t value;
|
|
|
|
|
switch (nir_intrinsic_atomic_op(intrin)) {
|
|
|
|
|
case nir_atomic_op_iadd:
|
|
|
|
|
case nir_atomic_op_isub:
|
|
|
|
|
case nir_atomic_op_ior:
|
|
|
|
|
case nir_atomic_op_ixor:
|
|
|
|
|
case nir_atomic_op_umax:
|
|
|
|
|
value = 0;
|
|
|
|
|
break;
|
|
|
|
|
case nir_atomic_op_iand:
|
|
|
|
|
case nir_atomic_op_umin:
|
|
|
|
|
value = -1;
|
|
|
|
|
break;
|
|
|
|
|
case nir_atomic_op_imin:
|
|
|
|
|
value = u_intN_max(intrin->def.bit_size);
|
|
|
|
|
break;
|
|
|
|
|
case nir_atomic_op_imax:
|
|
|
|
|
value = u_intN_min(intrin->def.bit_size);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (nir_scalar_as_int(data) != value)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
/* We need to know the storage image format to get the type of the image access. */
|
|
|
|
|
if (nir_intrinsic_has_format(intrin) && nir_intrinsic_format(intrin) == PIPE_FORMAT_NONE)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
unsigned bit_size = intrin->def.bit_size;
|
|
|
|
|
|
|
|
|
|
nir_def *def;
|
|
|
|
|
switch (intrin->intrinsic) {
|
|
|
|
|
case nir_intrinsic_deref_atomic: {
|
|
|
|
|
uint32_t access = nir_intrinsic_access(intrin) | ACCESS_ATOMIC;
|
|
|
|
|
if (!nir_deref_mode_must_be(nir_src_as_deref(intrin->src[0]), nir_var_mem_shared))
|
|
|
|
|
access |= ACCESS_COHERENT;
|
|
|
|
|
def = nir_build_load_deref(b, 1, bit_size, intrin->src[0].ssa, .access = access);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case nir_intrinsic_shared_atomic:
|
|
|
|
|
def = nir_load_shared(b, 1, bit_size, intrin->src[0].ssa,
|
|
|
|
|
.access = ACCESS_ATOMIC,
|
|
|
|
|
.base = nir_intrinsic_base(intrin));
|
|
|
|
|
break;
|
|
|
|
|
case nir_intrinsic_global_atomic:
|
2025-10-20 16:51:09 +02:00
|
|
|
def = nir_load_global(b, 1, bit_size, intrin->src[0].ssa,
|
|
|
|
|
.access = ACCESS_ATOMIC | ACCESS_COHERENT);
|
2025-10-10 14:32:05 +02:00
|
|
|
break;
|
|
|
|
|
case nir_intrinsic_global_atomic_amd:
|
|
|
|
|
def = nir_load_global_amd(b, 1, bit_size, intrin->src[0].ssa, intrin->src[2].ssa,
|
|
|
|
|
.access = ACCESS_ATOMIC | ACCESS_COHERENT,
|
|
|
|
|
.base = nir_intrinsic_base(intrin));
|
|
|
|
|
break;
|
|
|
|
|
case nir_intrinsic_ssbo_atomic:
|
|
|
|
|
def = nir_load_ssbo(b, 1, bit_size, intrin->src[0].ssa, intrin->src[1].ssa,
|
|
|
|
|
.access = nir_intrinsic_access(intrin) | ACCESS_ATOMIC | ACCESS_COHERENT,
|
|
|
|
|
.offset_shift = nir_intrinsic_offset_shift(intrin));
|
|
|
|
|
break;
|
|
|
|
|
case nir_intrinsic_image_deref_atomic:
|
|
|
|
|
def = nir_image_deref_load(b, 1, bit_size,
|
|
|
|
|
intrin->src[0].ssa,
|
|
|
|
|
intrin->src[1].ssa,
|
|
|
|
|
intrin->src[2].ssa,
|
|
|
|
|
nir_imm_int(b, 0),
|
|
|
|
|
.image_dim = nir_intrinsic_image_dim(intrin),
|
|
|
|
|
.image_array = nir_intrinsic_image_array(intrin),
|
|
|
|
|
.format = nir_intrinsic_format(intrin),
|
|
|
|
|
.access = nir_intrinsic_access(intrin) | ACCESS_ATOMIC | ACCESS_COHERENT,
|
|
|
|
|
.dest_type = image_atomic_type(intrin));
|
|
|
|
|
break;
|
|
|
|
|
case nir_intrinsic_image_atomic:
|
|
|
|
|
def = nir_image_load(b, 1, bit_size,
|
|
|
|
|
intrin->src[0].ssa,
|
|
|
|
|
intrin->src[1].ssa,
|
|
|
|
|
intrin->src[2].ssa,
|
|
|
|
|
nir_imm_int(b, 0),
|
|
|
|
|
.image_dim = nir_intrinsic_image_dim(intrin),
|
|
|
|
|
.image_array = nir_intrinsic_image_array(intrin),
|
|
|
|
|
.format = nir_intrinsic_format(intrin),
|
|
|
|
|
.access = nir_intrinsic_access(intrin) | ACCESS_ATOMIC | ACCESS_COHERENT,
|
|
|
|
|
.range_base = nir_intrinsic_range_base(intrin),
|
|
|
|
|
.dest_type = image_atomic_type(intrin));
|
|
|
|
|
break;
|
|
|
|
|
case nir_intrinsic_bindless_image_atomic:
|
|
|
|
|
def = nir_bindless_image_load(b, 1, bit_size,
|
|
|
|
|
intrin->src[0].ssa,
|
|
|
|
|
intrin->src[1].ssa,
|
|
|
|
|
intrin->src[2].ssa,
|
|
|
|
|
nir_imm_int(b, 0),
|
|
|
|
|
.image_dim = nir_intrinsic_image_dim(intrin),
|
|
|
|
|
.image_array = nir_intrinsic_image_array(intrin),
|
|
|
|
|
.format = nir_intrinsic_format(intrin),
|
|
|
|
|
.access = nir_intrinsic_access(intrin) | ACCESS_ATOMIC | ACCESS_COHERENT,
|
|
|
|
|
.dest_type = image_atomic_type(intrin));
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
UNREACHABLE("unhandled atomic intrinsic");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nir_def_replace(&intrin->def, def);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2020-10-23 16:05:29 -05:00
|
|
|
static bool
|
2025-10-10 14:40:39 +02:00
|
|
|
opt_intrinsics_intrin(nir_builder *b, nir_intrinsic_instr *intrin)
|
2020-10-23 16:05:29 -05:00
|
|
|
{
|
2025-10-10 14:32:05 +02:00
|
|
|
bool progress = false;
|
2020-10-23 16:05:29 -05:00
|
|
|
switch (intrin->intrinsic) {
|
|
|
|
|
case nir_intrinsic_load_sample_mask_in: {
|
|
|
|
|
/* Transform:
|
|
|
|
|
* gl_SampleMaskIn == 0 ---> gl_HelperInvocation
|
|
|
|
|
* gl_SampleMaskIn != 0 ---> !gl_HelperInvocation
|
|
|
|
|
*/
|
2025-10-10 14:40:39 +02:00
|
|
|
if (!b->shader->options->optimize_sample_mask_in)
|
2020-10-23 16:05:29 -05:00
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
bool progress = false;
|
2023-08-14 11:56:00 -05:00
|
|
|
nir_foreach_use_safe(use_src, &intrin->def) {
|
2023-08-14 09:58:47 -04:00
|
|
|
if (nir_src_parent_instr(use_src)->type == nir_instr_type_alu) {
|
|
|
|
|
nir_alu_instr *alu = nir_instr_as_alu(nir_src_parent_instr(use_src));
|
2020-10-23 16:05:29 -05:00
|
|
|
|
2024-11-25 14:04:48 +01:00
|
|
|
if ((alu->op != nir_op_ieq && alu->op != nir_op_ine) || alu->def.num_components != 1)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
nir_alu_src *alu_src = list_entry(use_src, nir_alu_src, src);
|
|
|
|
|
unsigned src_index = alu_src - alu->src;
|
|
|
|
|
nir_scalar other = nir_scalar_chase_alu_src(nir_get_scalar(&alu->def, 0), !src_index);
|
|
|
|
|
|
|
|
|
|
if (!nir_scalar_is_const(other) || nir_scalar_as_uint(other))
|
|
|
|
|
continue;
|
|
|
|
|
|
2024-11-25 14:19:39 +01:00
|
|
|
nir_cf_node *cf_node = &intrin->instr.block->cf_node;
|
|
|
|
|
while (cf_node->parent)
|
|
|
|
|
cf_node = cf_node->parent;
|
|
|
|
|
|
|
|
|
|
nir_function_impl *func_impl = nir_cf_node_as_function(cf_node);
|
|
|
|
|
|
|
|
|
|
/* We need to insert load_helper before any demote,
|
|
|
|
|
* which is only possible in the entry point function
|
|
|
|
|
*/
|
|
|
|
|
if (func_impl != nir_shader_get_entrypoint(b->shader))
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
b->cursor = nir_before_impl(func_impl);
|
|
|
|
|
|
2024-11-25 14:04:48 +01:00
|
|
|
nir_def *new_expr = nir_load_helper_invocation(b, 1);
|
|
|
|
|
|
|
|
|
|
if (alu->op == nir_op_ine)
|
|
|
|
|
new_expr = nir_inot(b, new_expr);
|
|
|
|
|
|
|
|
|
|
nir_def_replace(&alu->def, new_expr);
|
|
|
|
|
progress = true;
|
2020-10-23 16:05:29 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return progress;
|
|
|
|
|
}
|
2023-08-08 14:48:50 +02:00
|
|
|
case nir_intrinsic_exclusive_scan:
|
2025-06-17 16:10:07 +02:00
|
|
|
return try_opt_exclusive_scan_to_inclusive(b, intrin);
|
2025-10-04 14:36:14 +02:00
|
|
|
case nir_intrinsic_shared_atomic:
|
|
|
|
|
case nir_intrinsic_global_atomic:
|
|
|
|
|
case nir_intrinsic_global_atomic_amd:
|
|
|
|
|
case nir_intrinsic_deref_atomic:
|
2025-10-10 14:32:05 +02:00
|
|
|
progress |= try_opt_atomic_isub(b, intrin, 1);
|
|
|
|
|
progress |= try_opt_atomic_to_exchange(b, intrin, 1);
|
|
|
|
|
progress |= try_opt_atomic_exchange_to_store(b, intrin);
|
|
|
|
|
progress |= try_opt_atomic_to_load(b, intrin, 1);
|
|
|
|
|
return progress;
|
2025-10-04 14:36:14 +02:00
|
|
|
case nir_intrinsic_ssbo_atomic:
|
2025-10-10 14:32:05 +02:00
|
|
|
progress |= try_opt_atomic_isub(b, intrin, 2);
|
|
|
|
|
progress |= try_opt_atomic_to_exchange(b, intrin, 2);
|
|
|
|
|
progress |= try_opt_atomic_exchange_to_store(b, intrin);
|
|
|
|
|
progress |= try_opt_atomic_to_load(b, intrin, 2);
|
|
|
|
|
return progress;
|
2025-10-04 14:36:14 +02:00
|
|
|
case nir_intrinsic_image_deref_atomic:
|
|
|
|
|
case nir_intrinsic_image_atomic:
|
|
|
|
|
case nir_intrinsic_bindless_image_atomic:
|
2025-10-10 14:32:05 +02:00
|
|
|
progress |= try_opt_atomic_isub(b, intrin, 3);
|
|
|
|
|
progress |= try_opt_atomic_to_exchange(b, intrin, 3);
|
|
|
|
|
progress |= try_opt_atomic_exchange_to_store(b, intrin);
|
|
|
|
|
progress |= try_opt_atomic_to_load(b, intrin, 3);
|
|
|
|
|
return progress;
|
2020-10-23 16:05:29 -05:00
|
|
|
default:
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-22 12:13:25 -07:00
|
|
|
static bool
|
2025-10-10 14:40:39 +02:00
|
|
|
opt_intrinsics_impl(nir_function_impl *impl)
|
2017-06-22 12:13:25 -07:00
|
|
|
{
|
2023-06-26 10:42:29 -04:00
|
|
|
nir_builder b = nir_builder_create(impl);
|
2017-06-22 12:13:25 -07:00
|
|
|
bool progress = false;
|
|
|
|
|
|
|
|
|
|
nir_foreach_block(block, impl) {
|
2021-02-04 15:45:11 -06:00
|
|
|
bool block_has_discard = false;
|
|
|
|
|
|
2017-06-22 12:13:25 -07:00
|
|
|
nir_foreach_instr_safe(instr, block) {
|
|
|
|
|
b.cursor = nir_before_instr(instr);
|
|
|
|
|
|
2020-10-23 16:05:29 -05:00
|
|
|
switch (instr->type) {
|
2020-10-23 16:48:38 -05:00
|
|
|
case nir_instr_type_alu:
|
2021-02-04 15:45:11 -06:00
|
|
|
if (opt_intrinsics_alu(&b, nir_instr_as_alu(instr),
|
2025-10-10 14:40:39 +02:00
|
|
|
block_has_discard))
|
2020-10-23 16:48:38 -05:00
|
|
|
progress = true;
|
|
|
|
|
break;
|
|
|
|
|
|
2021-02-04 15:45:11 -06:00
|
|
|
case nir_instr_type_intrinsic: {
|
|
|
|
|
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
|
2024-02-14 15:32:31 +01:00
|
|
|
if (intrin->intrinsic == nir_intrinsic_demote ||
|
2021-02-04 15:45:11 -06:00
|
|
|
intrin->intrinsic == nir_intrinsic_demote_if ||
|
|
|
|
|
intrin->intrinsic == nir_intrinsic_terminate ||
|
|
|
|
|
intrin->intrinsic == nir_intrinsic_terminate_if)
|
|
|
|
|
block_has_discard = true;
|
|
|
|
|
|
2025-10-10 14:40:39 +02:00
|
|
|
if (opt_intrinsics_intrin(&b, intrin))
|
2020-10-23 16:05:29 -05:00
|
|
|
progress = true;
|
|
|
|
|
break;
|
2021-02-04 15:45:11 -06:00
|
|
|
}
|
2020-10-23 16:05:29 -05:00
|
|
|
|
2017-06-22 12:13:25 -07:00
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return progress;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
nir_opt_intrinsics(nir_shader *shader)
|
|
|
|
|
{
|
|
|
|
|
bool progress = false;
|
|
|
|
|
|
2023-06-22 13:27:59 -04:00
|
|
|
nir_foreach_function_impl(impl, shader) {
|
2025-10-10 14:40:39 +02:00
|
|
|
bool impl_progress = opt_intrinsics_impl(impl);
|
treewide: Switch to nir_progress
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>
2025-02-24 15:10:33 -05:00
|
|
|
progress |= nir_progress(impl_progress, impl,
|
|
|
|
|
nir_metadata_control_flow);
|
2017-06-22 12:13:25 -07:00
|
|
|
}
|
|
|
|
|
|
2017-08-22 12:18:32 -07:00
|
|
|
return progress;
|
2017-06-22 12:13:25 -07:00
|
|
|
}
|