v3d,v3dv: Use udiv_imm/umod_imm

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22010>

diff --git a/src/broadcom/vulkan/v3dv_query.c b/src/broadcom/vulkan/v3dv_query.c
index e9d4c00..216dd15 100644 (file)
--- a/src/broadcom/vulkan/v3dv_query.c
+++ b/src/broadcom/vulkan/v3dv_query.c
@@ -1407,8 +1407,8 @@ get_set_query_availability_cs()
 static inline nir_ssa_def *
 nir_get_occlusion_counter_offset(nir_builder *b, nir_ssa_def *query_idx)
 {
-   nir_ssa_def *query_group = nir_udiv(b, query_idx, nir_imm_int(b, 16));
-   nir_ssa_def *query_group_offset = nir_umod(b, query_idx, nir_imm_int(b, 16));
+   nir_ssa_def *query_group = nir_udiv_imm(b, query_idx, 16);
+   nir_ssa_def *query_group_offset = nir_umod_imm(b, query_idx, 16);
    nir_ssa_def *offset =
       nir_iadd(b, nir_imul(b, query_group, nir_imm_int(b, 1024)),
                   nir_imul(b, query_group_offset, nir_imm_int(b, 4)));

diff --git a/src/gallium/drivers/v3d/v3d_blit.c b/src/gallium/drivers/v3d/v3d_blit.c
index b04882f..c5dede6 100644 (file)
--- a/src/gallium/drivers/v3d/v3d_blit.c
+++ b/src/gallium/drivers/v3d/v3d_blit.c
@@ -986,7 +986,7 @@ v3d_get_sand30_fs(struct pipe_context *pctx)
          * for UV frame, but as we are reading 4 10-bit-values at a time we
          * will have 24 groups (pixels) of 4 10-bit values.
          */
-        nir_ssa_def *pixels_stripe = nir_imm_int(&b, 24);
+        uint32_t pixels_stripe = 24;
 
         nir_ssa_def *x = nir_f2i32(&b, nir_channel(&b, pos, 0));
         nir_ssa_def *y = nir_f2i32(&b, nir_channel(&b, pos, 1));
@@ -1033,7 +1033,7 @@ v3d_get_sand30_fs(struct pipe_context *pctx)
         nir_ssa_def *real_x = nir_ior(&b, nir_iand_imm(&b, x, 1),
                                       nir_ishl_imm(&b,nir_ushr_imm(&b, x, 2),
                                       1));
-        nir_ssa_def *x_pos_in_stripe = nir_umod(&b, real_x, pixels_stripe);
+        nir_ssa_def *x_pos_in_stripe = nir_umod_imm(&b, real_x, pixels_stripe);
         nir_ssa_def *component = nir_umod(&b, real_x, three);
         nir_ssa_def *intra_utile_x_offset = nir_ishl_imm(&b, component, 2);
 
@@ -1043,7 +1043,7 @@ v3d_get_sand30_fs(struct pipe_context *pctx)
         nir_ssa_def *stripe_offset=
                 nir_ishl_imm(&b,
                              nir_imul(&b,
-                                      nir_udiv(&b, real_x, pixels_stripe),
+                                      nir_udiv_imm(&b, real_x, pixels_stripe),
                                       stride),
                              7);