Re: [Mesa-dev] [PATCH] gallium/radeon: add driver queries for compute/dma call stats and spills

2016-06-14 Thread Nicolai Hähnle 

Reviewed-by: Nicolai Hähnle 

On 13.06.2016 18:18, Marek Olšák wrote:

From: Marek Olšák 

also print the average count per frame
---
  src/gallium/drivers/radeon/r600_pipe_common.h |  3 +++
  src/gallium/drivers/radeon/r600_query.c   | 30 ++-
  src/gallium/drivers/radeon/r600_query.h   |  4 
  src/gallium/drivers/radeonsi/si_compute.c |  6 ++
  src/gallium/drivers/radeonsi/si_pipe.h|  1 +
  src/gallium/drivers/radeonsi/si_state_draw.c  |  2 ++
  6 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h 
b/src/gallium/drivers/radeon/r600_pipe_common.h
index eb8a25a..77dfc4f 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -509,6 +509,9 @@ struct r600_common_context {
unsignedmax_db; /* for OQ */
/* Misc stats. */
unsignednum_draw_calls;
+   unsignednum_spill_draw_calls;
+   unsignednum_compute_calls;
+   unsignednum_spill_compute_calls;
unsignednum_dma_calls;
uint64_tnum_alloc_tex_transfer_bytes;

diff --git a/src/gallium/drivers/radeon/r600_query.c 
b/src/gallium/drivers/radeon/r600_query.c
index e362614..f090f1c 100644
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -75,6 +75,18 @@ static boolean r600_query_sw_begin(struct 
r600_common_context *rctx,
case R600_QUERY_DRAW_CALLS:
query->begin_result = rctx->num_draw_calls;
break;
+   case R600_QUERY_SPILL_DRAW_CALLS:
+   query->begin_result = rctx->num_spill_draw_calls;
+   break;
+   case R600_QUERY_COMPUTE_CALLS:
+   query->begin_result = rctx->num_compute_calls;
+   break;
+   case R600_QUERY_SPILL_COMPUTE_CALLS:
+   query->begin_result = rctx->num_spill_compute_calls;
+   break;
+   case R600_QUERY_DMA_CALLS:
+   query->begin_result = rctx->num_dma_calls;
+   break;
case R600_QUERY_REQUESTED_VRAM:
case R600_QUERY_REQUESTED_GTT:
case R600_QUERY_VRAM_USAGE:
@@ -127,6 +139,18 @@ static bool r600_query_sw_end(struct r600_common_context 
*rctx,
case R600_QUERY_DRAW_CALLS:
query->end_result = rctx->num_draw_calls;
break;
+   case R600_QUERY_SPILL_DRAW_CALLS:
+   query->end_result = rctx->num_spill_draw_calls;
+   break;
+   case R600_QUERY_COMPUTE_CALLS:
+   query->end_result = rctx->num_compute_calls;
+   break;
+   case R600_QUERY_SPILL_COMPUTE_CALLS:
+   query->end_result = rctx->num_spill_compute_calls;
+   break;
+   case R600_QUERY_DMA_CALLS:
+   query->end_result = rctx->num_dma_calls;
+   break;
case R600_QUERY_REQUESTED_VRAM:
case R600_QUERY_REQUESTED_GTT:
case R600_QUERY_VRAM_USAGE:
@@ -1139,7 +1163,11 @@ err:
  static struct pipe_driver_query_info r600_driver_query_list[] = {
X("num-compilations", NUM_COMPILATIONS,   UINT64, 
CUMULATIVE),
X("num-shaders-created",  NUM_SHADERS_CREATED,UINT64, 
CUMULATIVE),
-   X("draw-calls",   DRAW_CALLS, UINT64, 
CUMULATIVE),
+   X("draw-calls",   DRAW_CALLS, UINT64, 
AVERAGE),
+   X("spill-draw-calls", SPILL_DRAW_CALLS,   UINT64, AVERAGE),
+   X("compute-calls",COMPUTE_CALLS,  UINT64, AVERAGE),
+   X("spill-compute-calls",  SPILL_COMPUTE_CALLS,UINT64, AVERAGE),
+   X("dma-calls",DMA_CALLS,  UINT64, 
AVERAGE),
X("requested-VRAM",   REQUESTED_VRAM, BYTES, AVERAGE),
X("requested-GTT",REQUESTED_GTT,  BYTES, AVERAGE),
X("buffer-wait-time", BUFFER_WAIT_TIME,   MICROSECONDS, 
CUMULATIVE),
diff --git a/src/gallium/drivers/radeon/r600_query.h 
b/src/gallium/drivers/radeon/r600_query.h
index a3c9aa2..b573a17 100644
--- a/src/gallium/drivers/radeon/r600_query.h
+++ b/src/gallium/drivers/radeon/r600_query.h
@@ -42,6 +42,10 @@ struct r600_resource;

  enum {
R600_QUERY_DRAW_CALLS = PIPE_QUERY_DRIVER_SPECIFIC,
+   R600_QUERY_SPILL_DRAW_CALLS,
+   R600_QUERY_COMPUTE_CALLS,
+   R600_QUERY_SPILL_COMPUTE_CALLS,
+   R600_QUERY_DMA_CALLS,
R600_QUERY_REQUESTED_VRAM,
R600_QUERY_REQUESTED_GTT,
R600_QUERY_BUFFER_WAIT_TIME,
diff --git a/src/gallium/drivers/radeonsi/si_compute.c 
b/src/gallium/drivers/radeonsi/si_compute.c
index 09cbe13..2f7e172 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++

[Mesa-dev] [PATCH] gallium/radeon: add driver queries for compute/dma call stats and spills

2016-06-13 Thread Marek Olšák 
From: Marek Olšák 

also print the average count per frame
---
 src/gallium/drivers/radeon/r600_pipe_common.h |  3 +++
 src/gallium/drivers/radeon/r600_query.c   | 30 ++-
 src/gallium/drivers/radeon/r600_query.h   |  4 
 src/gallium/drivers/radeonsi/si_compute.c |  6 ++
 src/gallium/drivers/radeonsi/si_pipe.h|  1 +
 src/gallium/drivers/radeonsi/si_state_draw.c  |  2 ++
 6 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h 
b/src/gallium/drivers/radeon/r600_pipe_common.h
index eb8a25a..77dfc4f 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -509,6 +509,9 @@ struct r600_common_context {
unsignedmax_db; /* for OQ */
/* Misc stats. */
unsignednum_draw_calls;
+   unsignednum_spill_draw_calls;
+   unsignednum_compute_calls;
+   unsignednum_spill_compute_calls;
unsignednum_dma_calls;
uint64_tnum_alloc_tex_transfer_bytes;
 
diff --git a/src/gallium/drivers/radeon/r600_query.c 
b/src/gallium/drivers/radeon/r600_query.c
index e362614..f090f1c 100644
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -75,6 +75,18 @@ static boolean r600_query_sw_begin(struct 
r600_common_context *rctx,
case R600_QUERY_DRAW_CALLS:
query->begin_result = rctx->num_draw_calls;
break;
+   case R600_QUERY_SPILL_DRAW_CALLS:
+   query->begin_result = rctx->num_spill_draw_calls;
+   break;
+   case R600_QUERY_COMPUTE_CALLS:
+   query->begin_result = rctx->num_compute_calls;
+   break;
+   case R600_QUERY_SPILL_COMPUTE_CALLS:
+   query->begin_result = rctx->num_spill_compute_calls;
+   break;
+   case R600_QUERY_DMA_CALLS:
+   query->begin_result = rctx->num_dma_calls;
+   break;
case R600_QUERY_REQUESTED_VRAM:
case R600_QUERY_REQUESTED_GTT:
case R600_QUERY_VRAM_USAGE:
@@ -127,6 +139,18 @@ static bool r600_query_sw_end(struct r600_common_context 
*rctx,
case R600_QUERY_DRAW_CALLS:
query->end_result = rctx->num_draw_calls;
break;
+   case R600_QUERY_SPILL_DRAW_CALLS:
+   query->end_result = rctx->num_spill_draw_calls;
+   break;
+   case R600_QUERY_COMPUTE_CALLS:
+   query->end_result = rctx->num_compute_calls;
+   break;
+   case R600_QUERY_SPILL_COMPUTE_CALLS:
+   query->end_result = rctx->num_spill_compute_calls;
+   break;
+   case R600_QUERY_DMA_CALLS:
+   query->end_result = rctx->num_dma_calls;
+   break;
case R600_QUERY_REQUESTED_VRAM:
case R600_QUERY_REQUESTED_GTT:
case R600_QUERY_VRAM_USAGE:
@@ -1139,7 +1163,11 @@ err:
 static struct pipe_driver_query_info r600_driver_query_list[] = {
X("num-compilations",   NUM_COMPILATIONS,   UINT64, 
CUMULATIVE),
X("num-shaders-created",NUM_SHADERS_CREATED,UINT64, 
CUMULATIVE),
-   X("draw-calls", DRAW_CALLS, UINT64, 
CUMULATIVE),
+   X("draw-calls", DRAW_CALLS, UINT64, 
AVERAGE),
+   X("spill-draw-calls",   SPILL_DRAW_CALLS,   UINT64, 
AVERAGE),
+   X("compute-calls",  COMPUTE_CALLS,  UINT64, 
AVERAGE),
+   X("spill-compute-calls",SPILL_COMPUTE_CALLS,UINT64, 
AVERAGE),
+   X("dma-calls",  DMA_CALLS,  UINT64, 
AVERAGE),
X("requested-VRAM", REQUESTED_VRAM, BYTES, AVERAGE),
X("requested-GTT",  REQUESTED_GTT,  BYTES, AVERAGE),
X("buffer-wait-time",   BUFFER_WAIT_TIME,   MICROSECONDS, 
CUMULATIVE),
diff --git a/src/gallium/drivers/radeon/r600_query.h 
b/src/gallium/drivers/radeon/r600_query.h
index a3c9aa2..b573a17 100644
--- a/src/gallium/drivers/radeon/r600_query.h
+++ b/src/gallium/drivers/radeon/r600_query.h
@@ -42,6 +42,10 @@ struct r600_resource;
 
 enum {
R600_QUERY_DRAW_CALLS = PIPE_QUERY_DRIVER_SPECIFIC,
+   R600_QUERY_SPILL_DRAW_CALLS,
+   R600_QUERY_COMPUTE_CALLS,
+   R600_QUERY_SPILL_COMPUTE_CALLS,
+   R600_QUERY_DMA_CALLS,
R600_QUERY_REQUESTED_VRAM,
R600_QUERY_REQUESTED_GTT,
R600_QUERY_BUFFER_WAIT_TIME,
diff --git a/src/gallium/drivers/radeonsi/si_compute.c 
b/src/gallium/drivers/radeonsi/si_compute.c
index 09cbe13..2f7e172 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -308,6 +308,8 @@ static bool