Mesa (main): radeonsi/gfx11: allocate more space for pipeline statistics

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: fa25eba744b84876bd7ebc72ace5e86052cda1bf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fa25eba744b84876bd7ebc72ace5e86052cda1bf

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri May 20 08:06:04 2022 -0400

radeonsi/gfx11: allocate more space for pipeline statistics

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16990>

---

 src/gallium/drivers/radeonsi/si_query.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_query.c b/src/gallium/drivers/radeonsi/si_query.c
index 704826f6c06..5964517f1e2 100644
--- a/src/gallium/drivers/radeonsi/si_query.c
+++ b/src/gallium/drivers/radeonsi/si_query.c
@@ -639,7 +639,7 @@ static bool si_query_hw_prepare_buffer(struct si_context *sctx, struct si_query_
 
 static unsigned si_query_pipestats_num_results(struct si_screen *sscreen)
 {
-   return 11;
+   return sscreen->info.gfx_level >= GFX11 ? 14 : 11;
 }
 
 static unsigned si_query_pipestat_dw_offset(enum pipe_statistics_query_index index)
@@ -656,6 +656,9 @@ static unsigned si_query_pipestat_dw_offset(enum pipe_statistics_query_index ind
    case PIPE_STAT_QUERY_HS_INVOCATIONS: return 16;
    case PIPE_STAT_QUERY_DS_INVOCATIONS: return 18;
    case PIPE_STAT_QUERY_CS_INVOCATIONS: return 20;
+   /* gfx11: MS_INVOCATIONS */
+   /* gfx11: MS_PRIMITIVES */
+   /* gfx11: TS_INVOCATIONS */
    default:
       assert(false);
    }