freedreno/ir3: inline const emit
authorRob Clark <robdclark@chromium.org>
Wed, 22 Apr 2020 18:51:42 +0000 (11:51 -0700)
committerMarge Bot <eric+marge@anholt.net>
Thu, 30 Apr 2020 20:03:17 +0000 (20:03 +0000)
Drop vfunc callbacks for per-gen packet emit, and instead have a header
that is #include'd once per gen.

We'll end up with multiple copies of some of this, but since we never
have multiple gen's of adreno on a single device, only one copy will be
paged in (and hopefully in the I-cache for hot-paths)

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4813>

14 files changed:
src/gallium/drivers/freedreno/Makefile.sources
src/gallium/drivers/freedreno/a3xx/fd3_emit.c
src/gallium/drivers/freedreno/a4xx/fd4_emit.c
src/gallium/drivers/freedreno/a5xx/fd5_compute.c
src/gallium/drivers/freedreno/a5xx/fd5_emit.c
src/gallium/drivers/freedreno/a5xx/fd5_emit.h
src/gallium/drivers/freedreno/a6xx/fd6_const.c
src/gallium/drivers/freedreno/a6xx/fd6_const.h
src/gallium/drivers/freedreno/a6xx/fd6_emit.c
src/gallium/drivers/freedreno/freedreno_screen.h
src/gallium/drivers/freedreno/ir3/ir3_const.h [new file with mode: 0644]
src/gallium/drivers/freedreno/ir3/ir3_gallium.c
src/gallium/drivers/freedreno/ir3/ir3_gallium.h
src/gallium/drivers/freedreno/meson.build

index 7644da5..f6cb2bd 100644 (file)
@@ -205,6 +205,7 @@ a6xx_SOURCES := \
 ir3_SOURCES := \
        ir3/ir3_cache.c \
        ir3/ir3_cache.h \
+       ir3/ir3_const.h \
        ir3/ir3_gallium.c \
        ir3/ir3_gallium.h
 
index ee75455..6c53369 100644 (file)
@@ -43,6 +43,8 @@
 #include "fd3_format.h"
 #include "fd3_zsa.h"
 
+#include "ir3_const.h"
+
 static const enum adreno_state_block sb[] = {
        [MESA_SHADER_VERTEX]   = SB_VERT_SHADER,
        [MESA_SHADER_FRAGMENT] = SB_FRAG_SHADER,
@@ -123,6 +125,34 @@ fd3_emit_const_bo(struct fd_ringbuffer *ring, gl_shader_stage type, boolean writ
                OUT_RING(ring, 0xffffffff);
 }
 
+static bool
+is_stateobj(struct fd_ringbuffer *ring)
+{
+       return false;
+}
+
+void
+emit_const(struct fd_ringbuffer *ring,
+               const struct ir3_shader_variant *v, uint32_t dst_offset,
+               uint32_t offset, uint32_t size, const void *user_buffer,
+               struct pipe_resource *buffer)
+{
+       /* TODO inline this */
+       assert(dst_offset + size <= v->constlen * 4);
+       fd3_emit_const(ring, v->type, dst_offset,
+                       offset, size, user_buffer, buffer);
+}
+
+static void
+emit_const_bo(struct fd_ringbuffer *ring,
+               const struct ir3_shader_variant *v, bool write, uint32_t dst_offset,
+               uint32_t num, struct pipe_resource **prscs, uint32_t *offsets)
+{
+       /* TODO inline this */
+       assert(dst_offset + num < v->constlen * 4);
+       fd3_emit_const_bo(ring, v->type, write, dst_offset, num, prscs, offsets);
+}
+
 #define VERT_TEX_OFF    0
 #define FRAG_TEX_OFF    16
 #define BASETABLE_SZ    A3XX_MAX_MIP_LEVELS
@@ -942,8 +972,6 @@ void
 fd3_emit_init_screen(struct pipe_screen *pscreen)
 {
        struct fd_screen *screen = fd_screen(pscreen);
-       screen->emit_const = fd3_emit_const;
-       screen->emit_const_bo = fd3_emit_const_bo;
        screen->emit_ib = fd3_emit_ib;
 }
 
index 7394993..1654397 100644 (file)
@@ -43,6 +43,8 @@
 #include "fd4_format.h"
 #include "fd4_zsa.h"
 
+#include "ir3_const.h"
+
 /* regid:          base const register
  * prsc or dwords: buffer containing constant values
  * sizedwords:     size of const value buffer
@@ -118,6 +120,34 @@ fd4_emit_const_bo(struct fd_ringbuffer *ring, gl_shader_stage type, boolean writ
                OUT_RING(ring, 0xffffffff);
 }
 
+static bool
+is_stateobj(struct fd_ringbuffer *ring)
+{
+       return false;
+}
+
+void
+emit_const(struct fd_ringbuffer *ring,
+               const struct ir3_shader_variant *v, uint32_t dst_offset,
+               uint32_t offset, uint32_t size, const void *user_buffer,
+               struct pipe_resource *buffer)
+{
+       /* TODO inline this */
+       assert(dst_offset + size <= v->constlen * 4);
+       fd4_emit_const(ring, v->type, dst_offset,
+                       offset, size, user_buffer, buffer);
+}
+
+static void
+emit_const_bo(struct fd_ringbuffer *ring,
+               const struct ir3_shader_variant *v, bool write, uint32_t dst_offset,
+               uint32_t num, struct pipe_resource **prscs, uint32_t *offsets)
+{
+       /* TODO inline this */
+       assert(dst_offset + num < v->constlen * 4);
+       fd4_emit_const_bo(ring, v->type, write, dst_offset, num, prscs, offsets);
+}
+
 static void
 emit_textures(struct fd_context *ctx, struct fd_ringbuffer *ring,
                enum a4xx_state_block sb, struct fd_texture_stateobj *tex,
@@ -930,8 +960,6 @@ fd4_emit_init_screen(struct pipe_screen *pscreen)
 {
        struct fd_screen *screen = fd_screen(pscreen);
 
-       screen->emit_const = fd4_emit_const;
-       screen->emit_const_bo = fd4_emit_const_bo;
        screen->emit_ib = fd4_emit_ib;
        screen->mem_to_mem = fd4_mem_to_mem;
 }
index 97034d7..066948e 100644 (file)
@@ -196,7 +196,7 @@ fd5_launch_grid(struct fd_context *ctx, const struct pipe_grid_info *info)
                cs_program_emit(ring, v, info);
 
        fd5_emit_cs_state(ctx, ring, v);
-       ir3_emit_cs_consts(v, ring, ctx, info);
+       fd5_emit_cs_consts(v, ring, ctx, info);
 
        foreach_bit(i, ctx->global_bindings.enabled_mask)
                nglobal++;
index 5bd429e..140c7c5 100644 (file)
@@ -46,6 +46,8 @@
 #include "fd5_format.h"
 #include "fd5_zsa.h"
 
+#include "ir3_const.h"
+
 /* regid:          base const register
  * prsc or dwords: buffer containing constant values
  * sizedwords:     size of const value buffer
@@ -126,6 +128,41 @@ fd5_emit_const_bo(struct fd_ringbuffer *ring, gl_shader_stage type, boolean writ
        }
 }
 
+static bool
+is_stateobj(struct fd_ringbuffer *ring)
+{
+       return false;
+}
+
+void
+emit_const(struct fd_ringbuffer *ring,
+               const struct ir3_shader_variant *v, uint32_t dst_offset,
+               uint32_t offset, uint32_t size, const void *user_buffer,
+               struct pipe_resource *buffer)
+{
+       /* TODO inline this */
+       assert(dst_offset + size <= v->constlen * 4);
+       fd5_emit_const(ring, v->type, dst_offset,
+                       offset, size, user_buffer, buffer);
+}
+
+static void
+emit_const_bo(struct fd_ringbuffer *ring,
+               const struct ir3_shader_variant *v, bool write, uint32_t dst_offset,
+               uint32_t num, struct pipe_resource **prscs, uint32_t *offsets)
+{
+       /* TODO inline this */
+       assert(dst_offset + num < v->constlen * 4);
+       fd5_emit_const_bo(ring, v->type, write, dst_offset, num, prscs, offsets);
+}
+
+void
+fd5_emit_cs_consts(const struct ir3_shader_variant *v, struct fd_ringbuffer *ring,
+               struct fd_context *ctx, const struct pipe_grid_info *info)
+{
+       ir3_emit_cs_consts(v, ring, ctx, info);
+}
+
 /* Border color layout is diff from a4xx/a5xx.. if it turns out to be
  * the same as a6xx then move this somewhere common ;-)
  *
@@ -1116,8 +1153,6 @@ void
 fd5_emit_init_screen(struct pipe_screen *pscreen)
 {
        struct fd_screen *screen = fd_screen(pscreen);
-       screen->emit_const = fd5_emit_const;
-       screen->emit_const_bo = fd5_emit_const_bo;
        screen->emit_ib = fd5_emit_ib;
        screen->mem_to_mem = fd5_mem_to_mem;
 }
index 141fc05..abfdf12 100644 (file)
@@ -195,6 +195,8 @@ void fd5_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
 
 void fd5_emit_cs_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
                struct ir3_shader_variant *cp);
+void fd5_emit_cs_consts(const struct ir3_shader_variant *v, struct fd_ringbuffer *ring,
+               struct fd_context *ctx, const struct pipe_grid_info *info);
 
 void fd5_emit_restore(struct fd_batch *batch, struct fd_ringbuffer *ring);
 
index e934266..0c519c2 100644 (file)
 
 #include "fd6_const.h"
 
+#include "ir3_const.h"
+
 /* regid:          base const register
  * prsc or dwords: buffer containing constant values
  * sizedwords:     size of const value buffer
  */
-void
+static void
 fd6_emit_const(struct fd_ringbuffer *ring, gl_shader_stage type,
                uint32_t regid, uint32_t offset, uint32_t sizedwords,
                const uint32_t *dwords, struct pipe_resource *prsc)
@@ -73,7 +75,7 @@ fd6_emit_const(struct fd_ringbuffer *ring, gl_shader_stage type,
        }
 }
 
-void
+static void
 fd6_emit_const_bo(struct fd_ringbuffer *ring, gl_shader_stage type, boolean write,
                uint32_t regid, uint32_t num, struct pipe_resource **prscs, uint32_t *offsets)
 {
@@ -110,6 +112,34 @@ fd6_emit_const_bo(struct fd_ringbuffer *ring, gl_shader_stage type, boolean writ
        }
 }
 
+static bool
+is_stateobj(struct fd_ringbuffer *ring)
+{
+       return true;
+}
+
+void
+emit_const(struct fd_ringbuffer *ring,
+               const struct ir3_shader_variant *v, uint32_t dst_offset,
+               uint32_t offset, uint32_t size, const void *user_buffer,
+               struct pipe_resource *buffer)
+{
+       /* TODO inline this */
+       assert(dst_offset + size <= v->constlen * 4);
+       fd6_emit_const(ring, v->type, dst_offset,
+                       offset, size, user_buffer, buffer);
+}
+
+static void
+emit_const_bo(struct fd_ringbuffer *ring,
+               const struct ir3_shader_variant *v, bool write, uint32_t dst_offset,
+               uint32_t num, struct pipe_resource **prscs, uint32_t *offsets)
+{
+       /* TODO inline this */
+       assert(dst_offset + num < v->constlen * 4);
+       fd6_emit_const_bo(ring, v->type, write, dst_offset, num, prscs, offsets);
+}
+
 static void
 emit_tess_bos(struct fd_ringbuffer *ring, struct fd6_emit *emit, struct ir3_shader_variant *s)
 {
index d53bf82..3583abc 100644 (file)
 
 #include "fd6_emit.h"
 
-void fd6_emit_const(struct fd_ringbuffer *ring, gl_shader_stage type,
-               uint32_t regid, uint32_t offset, uint32_t sizedwords,
-               const uint32_t *dwords, struct pipe_resource *prsc);
-void fd6_emit_const_bo(struct fd_ringbuffer *ring, gl_shader_stage type, boolean write,
-               uint32_t regid, uint32_t num, struct pipe_resource **prscs, uint32_t *offsets);
-
 void fd6_emit_consts(struct fd6_emit *emit);
 void fd6_emit_ibo_consts(struct fd6_emit *emit, const struct ir3_shader_variant *v,
                enum pipe_shader_type stage, struct fd_ringbuffer *ring);
index 3ec1c6c..4cb0d1e 100644 (file)
@@ -1220,8 +1220,6 @@ void
 fd6_emit_init_screen(struct pipe_screen *pscreen)
 {
        struct fd_screen *screen = fd_screen(pscreen);
-       screen->emit_const = fd6_emit_const;
-       screen->emit_const_bo = fd6_emit_const_bo;
        screen->emit_ib = fd6_emit_ib;
        screen->mem_to_mem = fd6_mem_to_mem;
 }
index c70eb3b..d6bd17d 100644 (file)
@@ -97,14 +97,6 @@ struct fd_screen {
        unsigned (*tile_mode)(const struct pipe_resource *prsc);
        int (*layout_resource_for_modifier)(struct fd_resource *rsc, uint64_t modifier);
 
-       /* constant emit:  (note currently not used/needed for a2xx) */
-       void (*emit_const)(struct fd_ringbuffer *ring, gl_shader_stage type,
-                       uint32_t regid, uint32_t offset, uint32_t sizedwords,
-                       const uint32_t *dwords, struct pipe_resource *prsc);
-       /* emit bo addresses as constant: */
-       void (*emit_const_bo)(struct fd_ringbuffer *ring, gl_shader_stage type, boolean write,
-                       uint32_t regid, uint32_t num, struct pipe_resource **prscs, uint32_t *offsets);
-
        /* indirect-branch emit: */
        void (*emit_ib)(struct fd_ringbuffer *ring, struct fd_ringbuffer *target);
 
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_const.h b/src/gallium/drivers/freedreno/ir3/ir3_const.h
new file mode 100644 (file)
index 0000000..1112d62
--- /dev/null
@@ -0,0 +1,577 @@
+/*
+ * Copyright (C) 2014 Rob Clark <robclark@freedesktop.org>
+ *
+ * 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:
+ *    Rob Clark <robclark@freedesktop.org>
+ */
+
+#include "ir3/ir3_nir.h"
+
+/* This has to reach into the fd_context a bit more than the rest of
+ * ir3, but it needs to be aligned with the compiler, so both agree
+ * on which const regs hold what.  And the logic is identical between
+ * ir3 generations, the only difference is small details in the actual
+ * CP_LOAD_STATE packets (which is handled inside the generation
+ * specific ctx->emit_const(_bo)() fxns)
+ *
+ * This file should be included in only a single .c file per gen, which
+ * defines the following functions:
+ */
+
+static bool is_stateobj(struct fd_ringbuffer *ring);
+
+static void emit_const(struct fd_ringbuffer *ring,
+               const struct ir3_shader_variant *v, uint32_t dst_offset,
+               uint32_t offset, uint32_t size,
+               const void *user_buffer, struct pipe_resource *buffer);
+
+static void emit_const_bo(struct fd_ringbuffer *ring,
+               const struct ir3_shader_variant *v, bool write, uint32_t dst_offset,
+               uint32_t num, struct pipe_resource **prscs, uint32_t *offsets);
+
+
+static void
+ring_wfi(struct fd_batch *batch, struct fd_ringbuffer *ring)
+{
+       /* when we emit const state via ring (IB2) we need a WFI, but when
+        * it is emit'd via stateobj, we don't
+        */
+       if (is_stateobj(ring))
+               return;
+
+       fd_wfi(batch, ring);
+}
+
+/**
+ * Indirectly calculates size of cmdstream needed for ir3_emit_user_consts().
+ * Returns number of packets, and total size of all the payload.
+ *
+ * The value can be a worst-case, ie. some shader variants may not read all
+ * consts, etc.
+ *
+ * Returns size in dwords.
+ */
+static inline void
+ir3_user_consts_size(struct ir3_ubo_analysis_state *state,
+               unsigned *packets, unsigned *size)
+{
+       *packets = *size = 0;
+
+       for (uint32_t i = 0; i < ARRAY_SIZE(state->range); i++) {
+               if (state->range[i].start < state->range[i].end) {
+                       *size += state->range[i].end - state->range[i].start;
+                       (*packets)++;
+               }
+       }
+}
+
+/**
+ * Uploads sub-ranges of UBOs to the hardware's constant buffer (UBO access
+ * outside of these ranges will be done using full UBO accesses in the
+ * shader).
+ */
+static inline void
+ir3_emit_user_consts(struct fd_screen *screen, const struct ir3_shader_variant *v,
+               struct fd_ringbuffer *ring, struct fd_constbuf_stateobj *constbuf)
+{
+       struct ir3_ubo_analysis_state *state;
+       state = &v->shader->ubo_state;
+
+       for (unsigned i = 0; i < state->num_enabled; i++) {
+               assert(!state->range[i].bindless);
+               unsigned ubo = state->range[i].block;
+               if (!(constbuf->enabled_mask & (1 << ubo)))
+                       continue;
+               struct pipe_constant_buffer *cb = &constbuf->cb[ubo];
+
+               uint32_t size = state->range[i].end - state->range[i].start;
+               uint32_t offset = cb->buffer_offset + state->range[i].start;
+
+               /* and even if the start of the const buffer is before
+                * first_immediate, the end may not be:
+                */
+               size = MIN2(size, (16 * v->constlen) - state->range[i].offset);
+
+               if (size == 0)
+                       continue;
+
+               /* things should be aligned to vec4: */
+               debug_assert((state->range[i].offset % 16) == 0);
+               debug_assert((size % 16) == 0);
+               debug_assert((offset % 16) == 0);
+
+               emit_const(ring, v, state->range[i].offset / 4,
+                               offset, size / 4, cb->user_buffer, cb->buffer);
+       }
+}
+
+static inline void
+ir3_emit_ubos(struct fd_screen *screen, const struct ir3_shader_variant *v,
+               struct fd_ringbuffer *ring, struct fd_constbuf_stateobj *constbuf)
+{
+       const struct ir3_const_state *const_state = &v->shader->const_state;
+       uint32_t offset = const_state->offsets.ubo;
+       if (v->constlen > offset) {
+               uint32_t params = const_state->num_ubos;
+               uint32_t offsets[params];
+               struct pipe_resource *prscs[params];
+
+               for (uint32_t i = 0; i < params; i++) {
+                       const uint32_t index = i + 1;   /* UBOs start at index 1 */
+                       struct pipe_constant_buffer *cb = &constbuf->cb[index];
+                       assert(!cb->user_buffer);
+
+                       if ((constbuf->enabled_mask & (1 << index)) && cb->buffer) {
+                               offsets[i] = cb->buffer_offset;
+                               prscs[i] = cb->buffer;
+                       } else {
+                               offsets[i] = 0;
+                               prscs[i] = NULL;
+                       }
+               }
+
+               assert(offset * 4 + params < v->constlen * 4);
+
+               emit_const_bo(ring, v, false, offset * 4, params, prscs, offsets);
+       }
+}
+
+static inline void
+ir3_emit_ssbo_sizes(struct fd_screen *screen, const struct ir3_shader_variant *v,
+               struct fd_ringbuffer *ring, struct fd_shaderbuf_stateobj *sb)
+{
+       const struct ir3_const_state *const_state = &v->shader->const_state;
+       uint32_t offset = const_state->offsets.ssbo_sizes;
+       if (v->constlen > offset) {
+               uint32_t sizes[align(const_state->ssbo_size.count, 4)];
+               unsigned mask = const_state->ssbo_size.mask;
+
+               while (mask) {
+                       unsigned index = u_bit_scan(&mask);
+                       unsigned off = const_state->ssbo_size.off[index];
+                       sizes[off] = sb->sb[index].buffer_size;
+               }
+
+               emit_const(ring, v, offset * 4, 0, ARRAY_SIZE(sizes), sizes, NULL);
+       }
+}
+
+static inline void
+ir3_emit_image_dims(struct fd_screen *screen, const struct ir3_shader_variant *v,
+               struct fd_ringbuffer *ring, struct fd_shaderimg_stateobj *si)
+{
+       const struct ir3_const_state *const_state = &v->shader->const_state;
+       uint32_t offset = const_state->offsets.image_dims;
+       if (v->constlen > offset) {
+               uint32_t dims[align(const_state->image_dims.count, 4)];
+               unsigned mask = const_state->image_dims.mask;
+
+               while (mask) {
+                       struct pipe_image_view *img;
+                       struct fd_resource *rsc;
+                       unsigned index = u_bit_scan(&mask);
+                       unsigned off = const_state->image_dims.off[index];
+
+                       img = &si->si[index];
+                       rsc = fd_resource(img->resource);
+
+                       dims[off + 0] = util_format_get_blocksize(img->format);
+                       if (img->resource->target != PIPE_BUFFER) {
+                               struct fdl_slice *slice =
+                                       fd_resource_slice(rsc, img->u.tex.level);
+                               /* note for 2d/cube/etc images, even if re-interpreted
+                                * as a different color format, the pixel size should
+                                * be the same, so use original dimensions for y and z
+                                * stride:
+                                */
+                               dims[off + 1] = slice->pitch;
+                               /* see corresponding logic in fd_resource_offset(): */
+                               if (rsc->layout.layer_first) {
+                                       dims[off + 2] = rsc->layout.layer_size;
+                               } else {
+                                       dims[off + 2] = slice->size0;
+                               }
+                       } else {
+                               /* For buffer-backed images, the log2 of the format's
+                                * bytes-per-pixel is placed on the 2nd slot. This is useful
+                                * when emitting image_size instructions, for which we need
+                                * to divide by bpp for image buffers. Since the bpp
+                                * can only be power-of-two, the division is implemented
+                                * as a SHR, and for that it is handy to have the log2 of
+                                * bpp as a constant. (log2 = first-set-bit - 1)
+                                */
+                               dims[off + 1] = ffs(dims[off + 0]) - 1;
+                       }
+               }
+               uint32_t size = MIN2(ARRAY_SIZE(dims), v->constlen * 4 - offset * 4);
+
+               emit_const(ring, v, offset * 4, 0, size, dims, NULL);
+       }
+}
+
+static inline void
+ir3_emit_immediates(struct fd_screen *screen, const struct ir3_shader_variant *v,
+               struct fd_ringbuffer *ring)
+{
+       const struct ir3_const_state *const_state = &v->shader->const_state;
+       uint32_t base = const_state->offsets.immediate;
+       int size = const_state->immediates_count;
+
+       /* truncate size to avoid writing constants that shader
+        * does not use:
+        */
+       size = MIN2(size + base, v->constlen) - base;
+
+       /* convert out of vec4: */
+       base *= 4;
+       size *= 4;
+
+       if (size > 0)
+               emit_const(ring, v, base, 0, size, const_state->immediates[0].val, NULL);
+}
+
+static inline void
+ir3_emit_link_map(struct fd_screen *screen,
+               const struct ir3_shader_variant *producer,
+               const struct ir3_shader_variant *v, struct fd_ringbuffer *ring)
+{
+       const struct ir3_const_state *const_state = &v->shader->const_state;
+       uint32_t base = const_state->offsets.primitive_map;
+       uint32_t patch_locs[MAX_VARYING] = { }, num_loc;
+
+       num_loc = ir3_link_geometry_stages(producer, v, patch_locs);
+
+       int size = DIV_ROUND_UP(num_loc, 4);
+
+       /* truncate size to avoid writing constants that shader
+        * does not use:
+        */
+       size = MIN2(size + base, v->constlen) - base;
+
+       /* convert out of vec4: */
+       base *= 4;
+       size *= 4;
+
+       if (size > 0)
+               emit_const(ring, v, base, 0, size, patch_locs, NULL);
+}
+
+/* emit stream-out buffers: */
+static inline void
+emit_tfbos(struct fd_context *ctx, const struct ir3_shader_variant *v,
+               struct fd_ringbuffer *ring)
+{
+       /* streamout addresses after driver-params: */
+       const struct ir3_const_state *const_state = &v->shader->const_state;
+       uint32_t offset = const_state->offsets.tfbo;
+       if (v->constlen > offset) {
+               struct fd_streamout_stateobj *so = &ctx->streamout;
+               struct ir3_stream_output_info *info = &v->shader->stream_output;
+               uint32_t params = 4;
+               uint32_t offsets[params];
+               struct pipe_resource *prscs[params];
+
+               for (uint32_t i = 0; i < params; i++) {
+                       struct pipe_stream_output_target *target = so->targets[i];
+
+                       if (target) {
+                               offsets[i] = (so->offsets[i] * info->stride[i] * 4) +
+                                               target->buffer_offset;
+                               prscs[i] = target->buffer;
+                       } else {
+                               offsets[i] = 0;
+                               prscs[i] = NULL;
+                       }
+               }
+
+               assert(offset * 4 + params < v->constlen * 4);
+
+               emit_const_bo(ring, v, true, offset * 4, params, prscs, offsets);
+       }
+}
+
+static inline uint32_t
+max_tf_vtx(struct fd_context *ctx, const struct ir3_shader_variant *v)
+{
+       struct fd_streamout_stateobj *so = &ctx->streamout;
+       struct ir3_stream_output_info *info = &v->shader->stream_output;
+       uint32_t maxvtxcnt = 0x7fffffff;
+
+       if (ctx->screen->gpu_id >= 500)
+               return 0;
+       if (v->binning_pass)
+               return 0;
+       if (v->shader->stream_output.num_outputs == 0)
+               return 0;
+       if (so->num_targets == 0)
+               return 0;
+
+       /* offset to write to is:
+        *
+        *   total_vtxcnt = vtxcnt + offsets[i]
+        *   offset = total_vtxcnt * stride[i]
+        *
+        *   offset =   vtxcnt * stride[i]       ; calculated in shader
+        *            + offsets[i] * stride[i]   ; calculated at emit_tfbos()
+        *
+        * assuming for each vtx, each target buffer will have data written
+        * up to 'offset + stride[i]', that leaves maxvtxcnt as:
+        *
+        *   buffer_size = (maxvtxcnt * stride[i]) + stride[i]
+        *   maxvtxcnt   = (buffer_size - stride[i]) / stride[i]
+        *
+        * but shader is actually doing a less-than (rather than less-than-
+        * equal) check, so we can drop the -stride[i].
+        *
+        * TODO is assumption about `offset + stride[i]` legit?
+        */
+       for (unsigned i = 0; i < so->num_targets; i++) {
+               struct pipe_stream_output_target *target = so->targets[i];
+               unsigned stride = info->stride[i] * 4;   /* convert dwords->bytes */
+               if (target) {
+                       uint32_t max = target->buffer_size / stride;
+                       maxvtxcnt = MIN2(maxvtxcnt, max);
+               }
+       }
+
+       return maxvtxcnt;
+}
+
+static inline void
+emit_common_consts(const struct ir3_shader_variant *v, struct fd_ringbuffer *ring,
+               struct fd_context *ctx, enum pipe_shader_type t)
+{
+       enum fd_dirty_shader_state dirty = ctx->dirty_shader[t];
+
+       /* When we use CP_SET_DRAW_STATE objects to emit constant state,
+        * if we emit any of it we need to emit all.  This is because
+        * we are using the same state-group-id each time for uniform
+        * state, and if previous update is never evaluated (due to no
+        * visible primitives in the current tile) then the new stateobj
+        * completely replaces the old one.
+        *
+        * Possibly if we split up different parts of the const state to
+        * different state-objects we could avoid this.
+        */
+       if (dirty && is_stateobj(ring))
+               dirty = ~0;
+
+       if (dirty & (FD_DIRTY_SHADER_PROG | FD_DIRTY_SHADER_CONST)) {
+               struct fd_constbuf_stateobj *constbuf;
+               bool shader_dirty;
+
+               constbuf = &ctx->constbuf[t];
+               shader_dirty = !!(dirty & FD_DIRTY_SHADER_PROG);
+
+               ring_wfi(ctx->batch, ring);
+
+               ir3_emit_user_consts(ctx->screen, v, ring, constbuf);
+               ir3_emit_ubos(ctx->screen, v, ring, constbuf);
+               if (shader_dirty)
+                       ir3_emit_immediates(ctx->screen, v, ring);
+       }
+
+       if (dirty & (FD_DIRTY_SHADER_PROG | FD_DIRTY_SHADER_SSBO)) {
+               struct fd_shaderbuf_stateobj *sb = &ctx->shaderbuf[t];
+               ring_wfi(ctx->batch, ring);
+               ir3_emit_ssbo_sizes(ctx->screen, v, ring, sb);
+       }
+
+       if (dirty & (FD_DIRTY_SHADER_PROG | FD_DIRTY_SHADER_IMAGE)) {
+               struct fd_shaderimg_stateobj *si = &ctx->shaderimg[t];
+               ring_wfi(ctx->batch, ring);
+               ir3_emit_image_dims(ctx->screen, v, ring, si);
+       }
+}
+
+static inline bool
+ir3_needs_vs_driver_params(const struct ir3_shader_variant *v)
+{
+       const struct ir3_const_state *const_state = &v->shader->const_state;
+       uint32_t offset = const_state->offsets.driver_param;
+
+       return v->constlen > offset;
+}
+
+static inline void
+ir3_emit_vs_driver_params(const struct ir3_shader_variant *v,
+               struct fd_ringbuffer *ring, struct fd_context *ctx,
+               const struct pipe_draw_info *info)
+{
+       debug_assert(ir3_needs_vs_driver_params(v));
+
+       const struct ir3_const_state *const_state = &v->shader->const_state;
+       uint32_t offset = const_state->offsets.driver_param;
+       uint32_t vertex_params[IR3_DP_VS_COUNT] = {
+                       [IR3_DP_VTXID_BASE] = info->index_size ?
+                                       info->index_bias : info->start,
+                                       [IR3_DP_VTXCNT_MAX] = max_tf_vtx(ctx, v),
+       };
+       /* if no user-clip-planes, we don't need to emit the
+        * entire thing:
+        */
+       uint32_t vertex_params_size = 4;
+
+       if (v->key.ucp_enables) {
+               struct pipe_clip_state *ucp = &ctx->ucp;
+               unsigned pos = IR3_DP_UCP0_X;
+               for (unsigned i = 0; pos <= IR3_DP_UCP7_W; i++) {
+                       for (unsigned j = 0; j < 4; j++) {
+                               vertex_params[pos] = fui(ucp->ucp[i][j]);
+                               pos++;
+                       }
+               }
+               vertex_params_size = ARRAY_SIZE(vertex_params);
+       }
+
+       vertex_params_size = MAX2(vertex_params_size, const_state->num_driver_params);
+
+       bool needs_vtxid_base =
+               ir3_find_sysval_regid(v, SYSTEM_VALUE_VERTEX_ID_ZERO_BASE) != regid(63, 0);
+
+       /* for indirect draw, we need to copy VTXID_BASE from
+        * indirect-draw parameters buffer.. which is annoying
+        * and means we can't easily emit these consts in cmd
+        * stream so need to copy them to bo.
+        */
+       if (info->indirect && needs_vtxid_base) {
+               struct pipe_draw_indirect_info *indirect = info->indirect;
+               struct pipe_resource *vertex_params_rsc =
+                               pipe_buffer_create(&ctx->screen->base,
+                                               PIPE_BIND_CONSTANT_BUFFER, PIPE_USAGE_STREAM,
+                                               vertex_params_size * 4);
+               unsigned src_off = info->indirect->offset;;
+               void *ptr;
+
+               ptr = fd_bo_map(fd_resource(vertex_params_rsc)->bo);
+               memcpy(ptr, vertex_params, vertex_params_size * 4);
+
+               if (info->index_size) {
+                       /* indexed draw, index_bias is 4th field: */
+                       src_off += 3 * 4;
+               } else {
+                       /* non-indexed draw, start is 3rd field: */
+                       src_off += 2 * 4;
+               }
+
+               /* copy index_bias or start from draw params: */
+               ctx->screen->mem_to_mem(ring, vertex_params_rsc, 0,
+                               indirect->buffer, src_off, 1);
+
+               emit_const(ring, v, offset * 4, 0,
+                               vertex_params_size, NULL, vertex_params_rsc);
+
+               pipe_resource_reference(&vertex_params_rsc, NULL);
+       } else {
+               emit_const(ring, v, offset * 4, 0,
+                               vertex_params_size, vertex_params, NULL);
+       }
+
+       /* if needed, emit stream-out buffer addresses: */
+       if (vertex_params[IR3_DP_VTXCNT_MAX] > 0) {
+               emit_tfbos(ctx, v, ring);
+       }
+}
+
+static inline void
+ir3_emit_vs_consts(const struct ir3_shader_variant *v, struct fd_ringbuffer *ring,
+               struct fd_context *ctx, const struct pipe_draw_info *info)
+{
+       debug_assert(v->type == MESA_SHADER_VERTEX);
+
+       emit_common_consts(v, ring, ctx, PIPE_SHADER_VERTEX);
+
+       /* emit driver params every time: */
+       if (info && ir3_needs_vs_driver_params(v)) {
+               ring_wfi(ctx->batch, ring);
+               ir3_emit_vs_driver_params(v, ring, ctx, info);
+       }
+}
+
+static inline void
+ir3_emit_fs_consts(const struct ir3_shader_variant *v, struct fd_ringbuffer *ring,
+               struct fd_context *ctx)
+{
+       debug_assert(v->type == MESA_SHADER_FRAGMENT);
+
+       emit_common_consts(v, ring, ctx, PIPE_SHADER_FRAGMENT);
+}
+
+/* emit compute-shader consts: */
+static inline void
+ir3_emit_cs_consts(const struct ir3_shader_variant *v, struct fd_ringbuffer *ring,
+               struct fd_context *ctx, const struct pipe_grid_info *info)
+{
+       debug_assert(gl_shader_stage_is_compute(v->type));
+
+       emit_common_consts(v, ring, ctx, PIPE_SHADER_COMPUTE);
+
+       /* emit compute-shader driver-params: */
+       const struct ir3_const_state *const_state = &v->shader->const_state;
+       uint32_t offset = const_state->offsets.driver_param;
+       if (v->constlen > offset) {
+               ring_wfi(ctx->batch, ring);
+
+               if (info->indirect) {
+                       struct pipe_resource *indirect = NULL;
+                       unsigned indirect_offset;
+
+                       /* This is a bit awkward, but CP_LOAD_STATE.EXT_SRC_ADDR needs
+                        * to be aligned more strongly than 4 bytes.  So in this case
+                        * we need a temporary buffer to copy NumWorkGroups.xyz to.
+                        *
+                        * TODO if previous compute job is writing to info->indirect,
+                        * we might need a WFI.. but since we currently flush for each
+                        * compute job, we are probably ok for now.
+                        */
+                       if (info->indirect_offset & 0xf) {
+                               indirect = pipe_buffer_create(&ctx->screen->base,
+                                       PIPE_BIND_COMMAND_ARGS_BUFFER, PIPE_USAGE_STREAM,
+                                       0x1000);
+                               indirect_offset = 0;
+
+                               ctx->screen->mem_to_mem(ring, indirect, 0, info->indirect,
+                                               info->indirect_offset, 3);
+                       } else {
+                               pipe_resource_reference(&indirect, info->indirect);
+                               indirect_offset = info->indirect_offset;
+                       }
+
+                       emit_const(ring, v, offset * 4, indirect_offset, 4, NULL, indirect);
+
+                       pipe_resource_reference(&indirect, NULL);
+               } else {
+                       uint32_t compute_params[IR3_DP_CS_COUNT] = {
+                               [IR3_DP_NUM_WORK_GROUPS_X] = info->grid[0],
+                               [IR3_DP_NUM_WORK_GROUPS_Y] = info->grid[1],
+                               [IR3_DP_NUM_WORK_GROUPS_Z] = info->grid[2],
+                               [IR3_DP_LOCAL_GROUP_SIZE_X] = info->block[0],
+                               [IR3_DP_LOCAL_GROUP_SIZE_Y] = info->block[1],
+                               [IR3_DP_LOCAL_GROUP_SIZE_Z] = info->block[2],
+                       };
+                       uint32_t size = MIN2(const_state->num_driver_params,
+                                       v->constlen * 4 - offset * 4);
+
+                       emit_const(ring, v, offset * 4, 0, size, compute_params, NULL);
+               }
+       }
+}
index 0447409..8b8a403 100644 (file)
@@ -185,558 +185,6 @@ ir3_shader_create_compute(struct ir3_compiler *compiler,
        return shader;
 }
 
-/* This has to reach into the fd_context a bit more than the rest of
- * ir3, but it needs to be aligned with the compiler, so both agree
- * on which const regs hold what.  And the logic is identical between
- * a3xx/a4xx, the only difference is small details in the actual
- * CP_LOAD_STATE packets (which is handled inside the generation
- * specific ctx->emit_const(_bo)() fxns)
- */
-
-#include "freedreno_resource.h"
-
-static inline bool
-is_stateobj(struct fd_ringbuffer *ring)
-{
-       /* XXX this is an ugly way to differentiate.. */
-       return !!(ring->flags & FD_RINGBUFFER_STREAMING);
-}
-
-static inline void
-ring_wfi(struct fd_batch *batch, struct fd_ringbuffer *ring)
-{
-       /* when we emit const state via ring (IB2) we need a WFI, but when
-        * it is emit'd via stateobj, we don't
-        */
-       if (is_stateobj(ring))
-               return;
-
-       fd_wfi(batch, ring);
-}
-
-static void
-emit_const(struct fd_screen *screen, struct fd_ringbuffer *ring,
-               const struct ir3_shader_variant *v, uint32_t dst_offset,
-               uint32_t offset, uint32_t size,
-               const void *user_buffer, struct pipe_resource *buffer)
-{
-       assert(dst_offset + size <= v->constlen * 4);
-
-       screen->emit_const(ring, v->type, dst_offset,
-                       offset, size, user_buffer, buffer);
-}
-
-/**
- * Indirectly calculates size of cmdstream needed for ir3_emit_user_consts().
- * Returns number of packets, and total size of all the payload.
- *
- * The value can be a worst-case, ie. some shader variants may not read all
- * consts, etc.
- *
- * Returns size in dwords.
- */
-void
-ir3_user_consts_size(struct ir3_ubo_analysis_state *state,
-               unsigned *packets, unsigned *size)
-{
-       *packets = *size = 0;
-
-       for (uint32_t i = 0; i < ARRAY_SIZE(state->range); i++) {
-               if (state->range[i].start < state->range[i].end) {
-                       *size += state->range[i].end - state->range[i].start;
-                       (*packets)++;
-               }
-       }
-}
-
-/**
- * Uploads sub-ranges of UBOs to the hardware's constant buffer (UBO access
- * outside of these ranges will be done using full UBO accesses in the
- * shader).
- */
-void
-ir3_emit_user_consts(struct fd_screen *screen, const struct ir3_shader_variant *v,
-               struct fd_ringbuffer *ring, struct fd_constbuf_stateobj *constbuf)
-{
-       struct ir3_ubo_analysis_state *state;
-       state = &v->shader->ubo_state;
-
-       for (unsigned i = 0; i < state->num_enabled; i++) {
-               assert(!state->range[i].bindless);
-               unsigned ubo = state->range[i].block;
-               if (!(constbuf->enabled_mask & (1 << ubo)))
-                       continue;
-               struct pipe_constant_buffer *cb = &constbuf->cb[ubo];
-
-               uint32_t size = state->range[i].end - state->range[i].start;
-               uint32_t offset = cb->buffer_offset + state->range[i].start;
-
-               /* and even if the start of the const buffer is before
-                * first_immediate, the end may not be:
-                */
-               size = MIN2(size, (16 * v->constlen) - state->range[i].offset);
-
-               if (size == 0)
-                       continue;
-
-               /* things should be aligned to vec4: */
-               debug_assert((state->range[i].offset % 16) == 0);
-               debug_assert((size % 16) == 0);
-               debug_assert((offset % 16) == 0);
-
-               emit_const(screen, ring, v, state->range[i].offset / 4,
-                               offset, size / 4, cb->user_buffer, cb->buffer);
-       }
-}
-
-void
-ir3_emit_ubos(struct fd_screen *screen, const struct ir3_shader_variant *v,
-               struct fd_ringbuffer *ring, struct fd_constbuf_stateobj *constbuf)
-{
-       const struct ir3_const_state *const_state = &v->shader->const_state;
-       uint32_t offset = const_state->offsets.ubo;
-       if (v->constlen > offset) {
-               uint32_t params = const_state->num_ubos;
-               uint32_t offsets[params];
-               struct pipe_resource *prscs[params];
-
-               for (uint32_t i = 0; i < params; i++) {
-                       const uint32_t index = i + 1;   /* UBOs start at index 1 */
-                       struct pipe_constant_buffer *cb = &constbuf->cb[index];
-                       assert(!cb->user_buffer);
-
-                       if ((constbuf->enabled_mask & (1 << index)) && cb->buffer) {
-                               offsets[i] = cb->buffer_offset;
-                               prscs[i] = cb->buffer;
-                       } else {
-                               offsets[i] = 0;
-                               prscs[i] = NULL;
-                       }
-               }
-
-               assert(offset * 4 + params < v->constlen * 4);
-
-               screen->emit_const_bo(ring, v->type, false, offset * 4, params, prscs, offsets);
-       }
-}
-
-void
-ir3_emit_ssbo_sizes(struct fd_screen *screen, const struct ir3_shader_variant *v,
-               struct fd_ringbuffer *ring, struct fd_shaderbuf_stateobj *sb)
-{
-       const struct ir3_const_state *const_state = &v->shader->const_state;
-       uint32_t offset = const_state->offsets.ssbo_sizes;
-       if (v->constlen > offset) {
-               uint32_t sizes[align(const_state->ssbo_size.count, 4)];
-               unsigned mask = const_state->ssbo_size.mask;
-
-               while (mask) {
-                       unsigned index = u_bit_scan(&mask);
-                       unsigned off = const_state->ssbo_size.off[index];
-                       sizes[off] = sb->sb[index].buffer_size;
-               }
-
-               emit_const(screen, ring, v, offset * 4,
-                       0, ARRAY_SIZE(sizes), sizes, NULL);
-       }
-}
-
-void
-ir3_emit_image_dims(struct fd_screen *screen, const struct ir3_shader_variant *v,
-               struct fd_ringbuffer *ring, struct fd_shaderimg_stateobj *si)
-{
-       const struct ir3_const_state *const_state = &v->shader->const_state;
-       uint32_t offset = const_state->offsets.image_dims;
-       if (v->constlen > offset) {
-               uint32_t dims[align(const_state->image_dims.count, 4)];
-               unsigned mask = const_state->image_dims.mask;
-
-               while (mask) {
-                       struct pipe_image_view *img;
-                       struct fd_resource *rsc;
-                       unsigned index = u_bit_scan(&mask);
-                       unsigned off = const_state->image_dims.off[index];
-
-                       img = &si->si[index];
-                       rsc = fd_resource(img->resource);
-
-                       dims[off + 0] = util_format_get_blocksize(img->format);
-                       if (img->resource->target != PIPE_BUFFER) {
-                               struct fdl_slice *slice =
-                                       fd_resource_slice(rsc, img->u.tex.level);
-                               /* note for 2d/cube/etc images, even if re-interpreted
-                                * as a different color format, the pixel size should
-                                * be the same, so use original dimensions for y and z
-                                * stride:
-                                */
-                               dims[off + 1] = slice->pitch;
-                               /* see corresponding logic in fd_resource_offset(): */
-                               if (rsc->layout.layer_first) {
-                                       dims[off + 2] = rsc->layout.layer_size;
-                               } else {
-                                       dims[off + 2] = slice->size0;
-                               }
-                       } else {
-                               /* For buffer-backed images, the log2 of the format's
-                                * bytes-per-pixel is placed on the 2nd slot. This is useful
-                                * when emitting image_size instructions, for which we need
-                                * to divide by bpp for image buffers. Since the bpp
-                                * can only be power-of-two, the division is implemented
-                                * as a SHR, and for that it is handy to have the log2 of
-                                * bpp as a constant. (log2 = first-set-bit - 1)
-                                */
-                               dims[off + 1] = ffs(dims[off + 0]) - 1;
-                       }
-               }
-               uint32_t size = MIN2(ARRAY_SIZE(dims), v->constlen * 4 - offset * 4);
-
-               emit_const(screen, ring, v, offset * 4, 0, size, dims, NULL);
-       }
-}
-
-void
-ir3_emit_immediates(struct fd_screen *screen, const struct ir3_shader_variant *v,
-               struct fd_ringbuffer *ring)
-{
-       const struct ir3_const_state *const_state = &v->shader->const_state;
-       uint32_t base = const_state->offsets.immediate;
-       int size = const_state->immediates_count;
-
-       /* truncate size to avoid writing constants that shader
-        * does not use:
-        */
-       size = MIN2(size + base, v->constlen) - base;
-
-       /* convert out of vec4: */
-       base *= 4;
-       size *= 4;
-
-       if (size > 0) {
-               emit_const(screen, ring, v, base,
-                       0, size, const_state->immediates[0].val, NULL);
-       }
-}
-
-void
-ir3_emit_link_map(struct fd_screen *screen,
-               const struct ir3_shader_variant *producer,
-               const struct ir3_shader_variant *v, struct fd_ringbuffer *ring)
-{
-       const struct ir3_const_state *const_state = &v->shader->const_state;
-       uint32_t base = const_state->offsets.primitive_map;
-       uint32_t patch_locs[MAX_VARYING] = { }, num_loc;
-
-       num_loc = ir3_link_geometry_stages(producer, v, patch_locs);
-
-       int size = DIV_ROUND_UP(num_loc, 4);
-
-       /* truncate size to avoid writing constants that shader
-        * does not use:
-        */
-       size = MIN2(size + base, v->constlen) - base;
-
-       /* convert out of vec4: */
-       base *= 4;
-       size *= 4;
-
-       if (size > 0)
-               emit_const(screen, ring, v, base, 0, size, patch_locs, NULL);
-}
-
-/* emit stream-out buffers: */
-static void
-emit_tfbos(struct fd_context *ctx, const struct ir3_shader_variant *v,
-               struct fd_ringbuffer *ring)
-{
-       /* streamout addresses after driver-params: */
-       const struct ir3_const_state *const_state = &v->shader->const_state;
-       uint32_t offset = const_state->offsets.tfbo;
-       if (v->constlen > offset) {
-               struct fd_streamout_stateobj *so = &ctx->streamout;
-               struct ir3_stream_output_info *info = &v->shader->stream_output;
-               uint32_t params = 4;
-               uint32_t offsets[params];
-               struct pipe_resource *prscs[params];
-
-               for (uint32_t i = 0; i < params; i++) {
-                       struct pipe_stream_output_target *target = so->targets[i];
-
-                       if (target) {
-                               offsets[i] = (so->offsets[i] * info->stride[i] * 4) +
-                                               target->buffer_offset;
-                               prscs[i] = target->buffer;
-                       } else {
-                               offsets[i] = 0;
-                               prscs[i] = NULL;
-                       }
-               }
-
-               assert(offset * 4 + params < v->constlen * 4);
-
-               ctx->screen->emit_const_bo(ring, v->type, true, offset * 4, params, prscs, offsets);
-       }
-}
-
-static uint32_t
-max_tf_vtx(struct fd_context *ctx, const struct ir3_shader_variant *v)
-{
-       struct fd_streamout_stateobj *so = &ctx->streamout;
-       struct ir3_stream_output_info *info = &v->shader->stream_output;
-       uint32_t maxvtxcnt = 0x7fffffff;
-
-       if (ctx->screen->gpu_id >= 500)
-               return 0;
-       if (v->binning_pass)
-               return 0;
-       if (v->shader->stream_output.num_outputs == 0)
-               return 0;
-       if (so->num_targets == 0)
-               return 0;
-
-       /* offset to write to is:
-        *
-        *   total_vtxcnt = vtxcnt + offsets[i]
-        *   offset = total_vtxcnt * stride[i]
-        *
-        *   offset =   vtxcnt * stride[i]       ; calculated in shader
-        *            + offsets[i] * stride[i]   ; calculated at emit_tfbos()
-        *
-        * assuming for each vtx, each target buffer will have data written
-        * up to 'offset + stride[i]', that leaves maxvtxcnt as:
-        *
-        *   buffer_size = (maxvtxcnt * stride[i]) + stride[i]
-        *   maxvtxcnt   = (buffer_size - stride[i]) / stride[i]
-        *
-        * but shader is actually doing a less-than (rather than less-than-
-        * equal) check, so we can drop the -stride[i].
-        *
-        * TODO is assumption about `offset + stride[i]` legit?
-        */
-       for (unsigned i = 0; i < so->num_targets; i++) {
-               struct pipe_stream_output_target *target = so->targets[i];
-               unsigned stride = info->stride[i] * 4;   /* convert dwords->bytes */
-               if (target) {
-                       uint32_t max = target->buffer_size / stride;
-                       maxvtxcnt = MIN2(maxvtxcnt, max);
-               }
-       }
-
-       return maxvtxcnt;
-}
-
-static void
-emit_common_consts(const struct ir3_shader_variant *v, struct fd_ringbuffer *ring,
-               struct fd_context *ctx, enum pipe_shader_type t)
-{
-       enum fd_dirty_shader_state dirty = ctx->dirty_shader[t];
-
-       /* When we use CP_SET_DRAW_STATE objects to emit constant state,
-        * if we emit any of it we need to emit all.  This is because
-        * we are using the same state-group-id each time for uniform
-        * state, and if previous update is never evaluated (due to no
-        * visible primitives in the current tile) then the new stateobj
-        * completely replaces the old one.
-        *
-        * Possibly if we split up different parts of the const state to
-        * different state-objects we could avoid this.
-        */
-       if (dirty && is_stateobj(ring))
-               dirty = ~0;
-
-       if (dirty & (FD_DIRTY_SHADER_PROG | FD_DIRTY_SHADER_CONST)) {
-               struct fd_constbuf_stateobj *constbuf;
-               bool shader_dirty;
-
-               constbuf = &ctx->constbuf[t];
-               shader_dirty = !!(dirty & FD_DIRTY_SHADER_PROG);
-
-               ring_wfi(ctx->batch, ring);
-
-               ir3_emit_user_consts(ctx->screen, v, ring, constbuf);
-               ir3_emit_ubos(ctx->screen, v, ring, constbuf);
-               if (shader_dirty)
-                       ir3_emit_immediates(ctx->screen, v, ring);
-       }
-
-       if (dirty & (FD_DIRTY_SHADER_PROG | FD_DIRTY_SHADER_SSBO)) {
-               struct fd_shaderbuf_stateobj *sb = &ctx->shaderbuf[t];
-               ring_wfi(ctx->batch, ring);
-               ir3_emit_ssbo_sizes(ctx->screen, v, ring, sb);
-       }
-
-       if (dirty & (FD_DIRTY_SHADER_PROG | FD_DIRTY_SHADER_IMAGE)) {
-               struct fd_shaderimg_stateobj *si = &ctx->shaderimg[t];
-               ring_wfi(ctx->batch, ring);
-               ir3_emit_image_dims(ctx->screen, v, ring, si);
-       }
-}
-
-void
-ir3_emit_vs_driver_params(const struct ir3_shader_variant *v,
-               struct fd_ringbuffer *ring, struct fd_context *ctx,
-               const struct pipe_draw_info *info)
-{
-       debug_assert(ir3_needs_vs_driver_params(v));
-
-       const struct ir3_const_state *const_state = &v->shader->const_state;
-       uint32_t offset = const_state->offsets.driver_param;
-       uint32_t vertex_params[IR3_DP_VS_COUNT] = {
-                       [IR3_DP_VTXID_BASE] = info->index_size ?
-                                       info->index_bias : info->start,
-                                       [IR3_DP_VTXCNT_MAX] = max_tf_vtx(ctx, v),
-       };
-       /* if no user-clip-planes, we don't need to emit the
-        * entire thing:
-        */
-       uint32_t vertex_params_size = 4;
-
-       if (v->key.ucp_enables) {
-               struct pipe_clip_state *ucp = &ctx->ucp;
-               unsigned pos = IR3_DP_UCP0_X;
-               for (unsigned i = 0; pos <= IR3_DP_UCP7_W; i++) {
-                       for (unsigned j = 0; j < 4; j++) {
-                               vertex_params[pos] = fui(ucp->ucp[i][j]);
-                               pos++;
-                       }
-               }
-               vertex_params_size = ARRAY_SIZE(vertex_params);
-       }
-
-       vertex_params_size = MAX2(vertex_params_size, const_state->num_driver_params);
-
-       bool needs_vtxid_base =
-               ir3_find_sysval_regid(v, SYSTEM_VALUE_VERTEX_ID_ZERO_BASE) != regid(63, 0);
-
-       /* for indirect draw, we need to copy VTXID_BASE from
-        * indirect-draw parameters buffer.. which is annoying
-        * and means we can't easily emit these consts in cmd
-        * stream so need to copy them to bo.
-        */
-       if (info->indirect && needs_vtxid_base) {
-               struct pipe_draw_indirect_info *indirect = info->indirect;
-               struct pipe_resource *vertex_params_rsc =
-                               pipe_buffer_create(&ctx->screen->base,
-                                               PIPE_BIND_CONSTANT_BUFFER, PIPE_USAGE_STREAM,
-                                               vertex_params_size * 4);
-               unsigned src_off = info->indirect->offset;;
-               void *ptr;
-
-               ptr = fd_bo_map(fd_resource(vertex_params_rsc)->bo);
-               memcpy(ptr, vertex_params, vertex_params_size * 4);
-
-               if (info->index_size) {
-                       /* indexed draw, index_bias is 4th field: */
-                       src_off += 3 * 4;
-               } else {
-                       /* non-indexed draw, start is 3rd field: */
-                       src_off += 2 * 4;
-               }
-
-               /* copy index_bias or start from draw params: */
-               ctx->screen->mem_to_mem(ring, vertex_params_rsc, 0,
-                               indirect->buffer, src_off, 1);
-
-               emit_const(ctx->screen, ring, v, offset * 4, 0,
-                               vertex_params_size, NULL, vertex_params_rsc);
-
-               pipe_resource_reference(&vertex_params_rsc, NULL);
-       } else {
-               emit_const(ctx->screen, ring, v, offset * 4, 0,
-                               vertex_params_size, vertex_params, NULL);
-       }
-
-       /* if needed, emit stream-out buffer addresses: */
-       if (vertex_params[IR3_DP_VTXCNT_MAX] > 0) {
-               emit_tfbos(ctx, v, ring);
-       }
-}
-
-void
-ir3_emit_vs_consts(const struct ir3_shader_variant *v, struct fd_ringbuffer *ring,
-               struct fd_context *ctx, const struct pipe_draw_info *info)
-{
-       debug_assert(v->type == MESA_SHADER_VERTEX);
-
-       emit_common_consts(v, ring, ctx, PIPE_SHADER_VERTEX);
-
-       /* emit driver params every time: */
-       if (info && ir3_needs_vs_driver_params(v)) {
-               ring_wfi(ctx->batch, ring);
-               ir3_emit_vs_driver_params(v, ring, ctx, info);
-       }
-}
-
-void
-ir3_emit_fs_consts(const struct ir3_shader_variant *v, struct fd_ringbuffer *ring,
-               struct fd_context *ctx)
-{
-       debug_assert(v->type == MESA_SHADER_FRAGMENT);
-
-       emit_common_consts(v, ring, ctx, PIPE_SHADER_FRAGMENT);
-}
-
-/* emit compute-shader consts: */
-void
-ir3_emit_cs_consts(const struct ir3_shader_variant *v, struct fd_ringbuffer *ring,
-               struct fd_context *ctx, const struct pipe_grid_info *info)
-{
-       debug_assert(gl_shader_stage_is_compute(v->type));
-
-       emit_common_consts(v, ring, ctx, PIPE_SHADER_COMPUTE);
-
-       /* emit compute-shader driver-params: */
-       const struct ir3_const_state *const_state = &v->shader->const_state;
-       uint32_t offset = const_state->offsets.driver_param;
-       if (v->constlen > offset) {
-               ring_wfi(ctx->batch, ring);
-
-               if (info->indirect) {
-                       struct pipe_resource *indirect = NULL;
-                       unsigned indirect_offset;
-
-                       /* This is a bit awkward, but CP_LOAD_STATE.EXT_SRC_ADDR needs
-                        * to be aligned more strongly than 4 bytes.  So in this case
-                        * we need a temporary buffer to copy NumWorkGroups.xyz to.
-                        *
-                        * TODO if previous compute job is writing to info->indirect,
-                        * we might need a WFI.. but since we currently flush for each
-                        * compute job, we are probably ok for now.
-                        */
-                       if (info->indirect_offset & 0xf) {
-                               indirect = pipe_buffer_create(&ctx->screen->base,
-                                       PIPE_BIND_COMMAND_ARGS_BUFFER, PIPE_USAGE_STREAM,
-                                       0x1000);
-                               indirect_offset = 0;
-
-                               ctx->screen->mem_to_mem(ring, indirect, 0, info->indirect,
-                                               info->indirect_offset, 3);
-                       } else {
-                               pipe_resource_reference(&indirect, info->indirect);
-                               indirect_offset = info->indirect_offset;
-                       }
-
-                       emit_const(ctx->screen, ring, v, offset * 4,
-                                       indirect_offset, 4, NULL, indirect);
-
-                       pipe_resource_reference(&indirect, NULL);
-               } else {
-                       uint32_t compute_params[IR3_DP_CS_COUNT] = {
-                               [IR3_DP_NUM_WORK_GROUPS_X] = info->grid[0],
-                               [IR3_DP_NUM_WORK_GROUPS_Y] = info->grid[1],
-                               [IR3_DP_NUM_WORK_GROUPS_Z] = info->grid[2],
-                               [IR3_DP_LOCAL_GROUP_SIZE_X] = info->block[0],
-                               [IR3_DP_LOCAL_GROUP_SIZE_Y] = info->block[1],
-                               [IR3_DP_LOCAL_GROUP_SIZE_Z] = info->block[2],
-                       };
-                       uint32_t size = MIN2(const_state->num_driver_params,
-                                       v->constlen * 4 - offset * 4);
-
-                       emit_const(ctx->screen, ring, v, offset * 4, 0, size,
-                                       compute_params, NULL);
-               }
-       }
-}
-
 static void *
 ir3_shader_state_create(struct pipe_context *pctx, const struct pipe_shader_state *cso)
 {
index 33a94a6..da83eb7 100644 (file)
@@ -44,48 +44,6 @@ struct ir3_shader_variant * ir3_shader_variant(struct ir3_shader *shader,
                struct ir3_shader_key key, bool binning_pass,
                struct pipe_debug_callback *debug);
 
-struct fd_ringbuffer;
-struct fd_context;
-struct fd_screen;
-struct fd_constbuf_stateobj;
-struct fd_shaderbuf_stateobj;
-struct fd_shaderimg_stateobj;
-
-void ir3_user_consts_size(struct ir3_ubo_analysis_state *state,
-               unsigned *packets, unsigned *size);
-void ir3_emit_user_consts(struct fd_screen *screen, const struct ir3_shader_variant *v,
-               struct fd_ringbuffer *ring, struct fd_constbuf_stateobj *constbuf);
-void ir3_emit_ubos(struct fd_screen *screen, const struct ir3_shader_variant *v,
-               struct fd_ringbuffer *ring, struct fd_constbuf_stateobj *constbuf);
-void ir3_emit_ssbo_sizes(struct fd_screen *screen, const struct ir3_shader_variant *v,
-               struct fd_ringbuffer *ring, struct fd_shaderbuf_stateobj *sb);
-void ir3_emit_image_dims(struct fd_screen *screen, const struct ir3_shader_variant *v,
-               struct fd_ringbuffer *ring, struct fd_shaderimg_stateobj *si);
-void ir3_emit_immediates(struct fd_screen *screen, const struct ir3_shader_variant *v,
-               struct fd_ringbuffer *ring);
-void ir3_emit_link_map(struct fd_screen *screen,
-               const struct ir3_shader_variant *producer,
-               const struct ir3_shader_variant *v, struct fd_ringbuffer *ring);
-
-static inline bool
-ir3_needs_vs_driver_params(const struct ir3_shader_variant *v)
-{
-       const struct ir3_const_state *const_state = &v->shader->const_state;
-       uint32_t offset = const_state->offsets.driver_param;
-
-       return v->constlen > offset;
-}
-
-void ir3_emit_vs_driver_params(const struct ir3_shader_variant *v,
-               struct fd_ringbuffer *ring, struct fd_context *ctx,
-               const struct pipe_draw_info *info);
-void ir3_emit_vs_consts(const struct ir3_shader_variant *v, struct fd_ringbuffer *ring,
-               struct fd_context *ctx, const struct pipe_draw_info *info);
-void ir3_emit_fs_consts(const struct ir3_shader_variant *v, struct fd_ringbuffer *ring,
-               struct fd_context *ctx);
-void ir3_emit_cs_consts(const struct ir3_shader_variant *v, struct fd_ringbuffer *ring,
-               struct fd_context *ctx, const struct pipe_grid_info *info);
-
 void ir3_prog_init(struct pipe_context *pctx);
 
 #endif /* IR3_GALLIUM_H_ */
index 86d4534..77fe981 100644 (file)
@@ -213,6 +213,7 @@ files_libfreedreno = files(
   'a6xx/fd6_zsa.h',
   'ir3/ir3_cache.c',
   'ir3/ir3_cache.h',
+  'ir3/ir3_const.h',
   'ir3/ir3_gallium.c',
   'ir3/ir3_gallium.h',
 )