fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nir: extract round component helper

Browse source 
another nir pass will use this.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29398>
This commit is contained in:
Alyssa Rosenzweig 2024-06-16 15:21:30 -04:00 • committed by Marge Bot
parent c2684968de
commit e9303c0952
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/compiler/nir/nir.h
View file

@ -44,6 +44,7 @@
#include "util/macros.h"
#include "util/ralloc.h"
#include "util/set.h"
#include "util/u_math.h"
#include "util/u_printf.h"
#define XXH_INLINE_ALL
#include <stdio.h>
@ -124,6 +125,17 @@ nir_num_components_valid(unsigned num_components)
num_components == 16;
}
/*
* Round up a vector size to a vector size that's valid in NIR. At present, NIR
* supports only vec2-5, vec8, and vec16. Attempting to generate other sizes
* will fail validation.
*/
static inline unsigned
nir_round_up_components(unsigned n)
{
return (n > 5) ? util_next_power_of_two(n) : n;
}
static inline nir_component_mask_t
nir_component_mask(unsigned num_components)
{

17
src/compiler/nir/nir_opt_shrink_vectors.c
View file

@ -47,17 +47,6 @@
#include "nir.h"
#include "nir_builder.h"
/*
* Round up a vector size to a vector size that's valid in NIR. At present, NIR
* supports only vec2-5, vec8, and vec16. Attempting to generate other sizes
* will fail validation.
*/
static unsigned
round_up_components(unsigned n)
{
return (n > 5) ? util_next_power_of_two(n) : n;
}
static void
reswizzle_alu_uses(nir_def *def, uint8_t *reswizzle)
{
@ -117,7 +106,7 @@ shrink_dest_to_read_mask(nir_def *def, bool shrink_start)
int first_bit = shrink_start ? (ffs(mask) - 1) : 0;
const unsigned comps = last_bit - first_bit;
const unsigned rounded = round_up_components(comps);
const unsigned rounded = nir_round_up_components(comps);
assert(rounded <= def->num_components);
if ((def->num_components > rounded) || first_bit > 0) {
@ -313,7 +302,7 @@ opt_shrink_vectors_alu(nir_builder *b, nir_alu_instr *instr)
if (progress)
reswizzle_alu_uses(def, reswizzle);
unsigned rounded = round_up_components(num_components);
unsigned rounded = nir_round_up_components(num_components);
assert(rounded <= def->num_components);
if (rounded < def->num_components)
progress = true;
@ -430,7 +419,7 @@ opt_shrink_vectors_load_const(nir_load_const_instr *instr)
if (progress)
reswizzle_alu_uses(def, reswizzle);
unsigned rounded = round_up_components(num_components);
unsigned rounded = nir_round_up_components(num_components);
assert(rounded <= def->num_components);
if (rounded < def->num_components)
progress = true;