freedreno/a6xx: GL_ARB_transform_feedback_overflow_query

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

diff --git a/docs/features.txt b/docs/features.txt
index dad0725..e7c4744 100644 (file)
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -236,7 +236,7 @@ GL 4.6, GLSL 4.60 -- all DONE: radeonsi, virgl, zink
   GL_ARB_shader_group_vote                              DONE (freedreno/a6xx, i965, nvc0, llvmpipe)
   GL_ARB_spirv_extensions                               DONE (freedreno, i965/gen7+, llvmpipe)
   GL_ARB_texture_filter_anisotropic                     DONE (etnaviv/HALTI0, freedreno, i965, nv50, nvc0, r600, softpipe, llvmpipe, d3d12, v3d, panfrost/g72+, asahi)
-  GL_ARB_transform_feedback_overflow_query              DONE (i965/gen6+, nvc0, llvmpipe, softpipe)
+  GL_ARB_transform_feedback_overflow_query              DONE (freedreno/a6xx+, i965/gen6+, nvc0, llvmpipe, softpipe)
   GL_KHR_no_error                                       DONE (all drivers)
 
 These are the extensions cherry-picked to make GLES 3.1

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_query.cc b/src/gallium/drivers/freedreno/a6xx/fd6_query.cc
index a9d0171..66a161d 100644 (file)
--- a/src/gallium/drivers/freedreno/a6xx/fd6_query.cc
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_query.cc
@@ -506,6 +506,34 @@ primitives_emitted_resume(struct fd_acc_query *aq,
 }
 
 static void
+accumultate_primitives_emitted(struct fd_acc_query *aq,
+                               struct fd_ringbuffer *ring,
+                               int idx)
+{
+   /* result += stop - start: */
+   OUT_PKT7(ring, CP_MEM_TO_MEM, 9);
+   OUT_RING(ring, CP_MEM_TO_MEM_0_DOUBLE | CP_MEM_TO_MEM_0_NEG_C | 0x80000000);
+   primitives_reloc(ring, aq, result.emitted);
+   primitives_reloc(ring, aq, result.emitted);
+   primitives_reloc(ring, aq, stop[idx].emitted);
+   primitives_reloc(ring, aq, start[idx].emitted);
+}
+
+static void
+accumultate_primitives_generated(struct fd_acc_query *aq,
+                                 struct fd_ringbuffer *ring,
+                                 int idx)
+{
+   /* result += stop - start: */
+   OUT_PKT7(ring, CP_MEM_TO_MEM, 9);
+   OUT_RING(ring, CP_MEM_TO_MEM_0_DOUBLE | CP_MEM_TO_MEM_0_NEG_C | 0x80000000);
+   primitives_reloc(ring, aq, result.generated);
+   primitives_reloc(ring, aq, result.generated);
+   primitives_reloc(ring, aq, stop[idx].generated);
+   primitives_reloc(ring, aq, start[idx].generated);
+}
+
+static void
 primitives_emitted_pause(struct fd_acc_query *aq,
                          struct fd_batch *batch) assert_dt
 {
@@ -522,13 +550,18 @@ primitives_emitted_pause(struct fd_acc_query *aq,
 
    fd6_event_write(batch, batch->draw, CACHE_FLUSH_TS, true);
 
-   /* result += stop - start: */
-   OUT_PKT7(ring, CP_MEM_TO_MEM, 9);
-   OUT_RING(ring, CP_MEM_TO_MEM_0_DOUBLE | CP_MEM_TO_MEM_0_NEG_C | 0x80000000);
-   primitives_reloc(ring, aq, result.emitted);
-   primitives_reloc(ring, aq, result.emitted);
-   primitives_reloc(ring, aq, stop[aq->base.index].emitted);
-   primitives_reloc(ring, aq, start[aq->base.index].emitted);
+   if (aq->provider->query_type == PIPE_QUERY_SO_OVERFLOW_ANY_PREDICATE) {
+      /* Need results from all channels: */
+      for (int i = 0; i < PIPE_MAX_SO_BUFFERS; i++) {
+         accumultate_primitives_emitted(aq, ring, i);
+         accumultate_primitives_generated(aq, ring, i);
+      }
+   } else {
+      accumultate_primitives_emitted(aq, ring, aq->base.index);
+      /* Only need primitives generated counts for the overflow queries: */
+      if (aq->provider->query_type == PIPE_QUERY_SO_OVERFLOW_PREDICATE)
+         accumultate_primitives_generated(aq, ring, aq->base.index);
+   }
 }
 
 static void
@@ -554,6 +587,48 @@ primitives_emitted_result_resource(struct fd_acc_query *aq,
                offsetof(struct fd6_primitives_sample, result.emitted));
 }
 
+static void
+so_overflow_predicate_result(struct fd_acc_query *aq,
+                             struct fd_acc_query_sample *s,
+                             union pipe_query_result *result)
+{
+   struct fd6_primitives_sample *ps = fd6_primitives_sample(s);
+
+   log_counters(ps);
+
+   result->b = ps->result.emitted != ps->result.generated;
+}
+
+static void
+so_overflow_predicate_result_resource(struct fd_acc_query *aq,
+                                      struct fd_ringbuffer *ring,
+                                      enum pipe_query_value_type result_type,
+                                      int index, struct fd_resource *dst,
+                                      unsigned offset)
+{
+   /* result = generated - emitted: */
+   OUT_PKT7(ring, CP_MEM_TO_MEM, 7);
+   OUT_RING(ring, CP_MEM_TO_MEM_0_NEG_B |
+            COND(result_type >= PIPE_QUERY_TYPE_I64, CP_MEM_TO_MEM_0_DOUBLE));
+   OUT_RELOC(ring, dst->bo, offset, 0, 0);
+   primitives_reloc(ring, aq, result.generated);
+   primitives_reloc(ring, aq, result.emitted);
+
+   /* This is a bit awkward, but glcts expects the result to be 1 or 0
+    * rather than non-zero vs zero:
+    */
+   OUT_PKT7(ring, CP_COND_WRITE5, 9);
+   OUT_RING(ring, CP_COND_WRITE5_0_FUNCTION(WRITE_NE) |
+                  CP_COND_WRITE5_0_POLL_MEMORY |
+                  CP_COND_WRITE5_0_WRITE_MEMORY);
+   OUT_RELOC(ring, dst->bo, offset, 0, 0);    /* POLL_ADDR_LO/HI */
+   OUT_RING(ring, CP_COND_WRITE5_3_REF(0));
+   OUT_RING(ring, CP_COND_WRITE5_4_MASK(~0));
+   OUT_RELOC(ring, dst->bo, offset, 0, 0);    /* WRITE_ADDR_LO/HI */
+   OUT_RING(ring, 1);
+   OUT_RING(ring, 0);
+}
+
 static const struct fd_acc_sample_provider primitives_emitted = {
    .query_type = PIPE_QUERY_PRIMITIVES_EMITTED,
    .size = sizeof(struct fd6_primitives_sample),
@@ -563,6 +638,24 @@ static const struct fd_acc_sample_provider primitives_emitted = {
    .result_resource = primitives_emitted_result_resource,
 };
 
+static const struct fd_acc_sample_provider so_overflow_any_predicate = {
+   .query_type = PIPE_QUERY_SO_OVERFLOW_ANY_PREDICATE,
+   .size = sizeof(struct fd6_primitives_sample),
+   .resume = primitives_emitted_resume,
+   .pause = primitives_emitted_pause,
+   .result = so_overflow_predicate_result,
+   .result_resource = so_overflow_predicate_result_resource,
+};
+
+static const struct fd_acc_sample_provider so_overflow_predicate = {
+   .query_type = PIPE_QUERY_SO_OVERFLOW_PREDICATE,
+   .size = sizeof(struct fd6_primitives_sample),
+   .resume = primitives_emitted_resume,
+   .pause = primitives_emitted_pause,
+   .result = so_overflow_predicate_result,
+   .result_resource = so_overflow_predicate_result_resource,
+};
+
 /*
  * Performance Counter (batch) queries:
  *
@@ -781,4 +874,6 @@ fd6_query_context_init(struct pipe_context *pctx) disable_thread_safety_analysis
 
    fd_acc_query_register_provider(pctx, &primitives_generated);
    fd_acc_query_register_provider(pctx, &primitives_emitted);
+   fd_acc_query_register_provider(pctx, &so_overflow_any_predicate);
+   fd_acc_query_register_provider(pctx, &so_overflow_predicate);
 }

diff --git a/src/gallium/drivers/freedreno/freedreno_context.h b/src/gallium/drivers/freedreno/freedreno_context.h
index c593cad..de068fe 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_context.h
+++ b/src/gallium/drivers/freedreno/freedreno_context.h
@@ -265,7 +265,7 @@ enum fd_buffer_mask {
    FD_BUFFER_LRZ = BIT(15),
 };
 
-#define MAX_HW_SAMPLE_PROVIDERS 7
+#define MAX_HW_SAMPLE_PROVIDERS 9
 struct fd_hw_sample_provider;
 struct fd_hw_sample;
 

diff --git a/src/gallium/drivers/freedreno/freedreno_query.h b/src/gallium/drivers/freedreno/freedreno_query.h
index 8cb8363..28a58f8 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_query.h
+++ b/src/gallium/drivers/freedreno/freedreno_query.h
@@ -131,6 +131,10 @@ pidx(unsigned query_type)
       return 5;
    case PIPE_QUERY_PRIMITIVES_EMITTED:
       return 6;
+   case PIPE_QUERY_SO_OVERFLOW_ANY_PREDICATE:
+      return 7;
+   case PIPE_QUERY_SO_OVERFLOW_PREDICATE:
+      return 8;
 
    default:
       return -1;

diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
index d0e46bb..2bfaca3 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_screen.c
+++ b/src/gallium/drivers/freedreno/freedreno_screen.c
@@ -543,6 +543,7 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
       return (screen->max_freq > 0) &&
              (is_a4xx(screen) || is_a5xx(screen) || is_a6xx(screen));
    case PIPE_CAP_QUERY_BUFFER_OBJECT:
+   case PIPE_CAP_QUERY_SO_OVERFLOW:
       return is_a6xx(screen);
 
    case PIPE_CAP_VENDOR_ID: