gallium/radeon: add GPU-shaders-busy HUD query

It should be close to the GPU load, but it can be much lower if something
is stalling shader execution (e.g. CP DMA).

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/radeon/r600_gpu_load.c b/src/gallium/drivers/radeon/r600_gpu_load.c
index 764d9b57262249a56e577bcc1b6dd212c2a419bc..e3488b3ac757b05c984b7b62dcaa7f3fcacd7ded 100644 (file)
--- a/src/gallium/drivers/radeon/r600_gpu_load.c
+++ b/src/gallium/drivers/radeon/r600_gpu_load.c
@@ -42,6 +42,7 @@
 #define SAMPLES_PER_SEC 10000
 
 #define GRBM_STATUS            0x8010
+#define SPI_BUSY(x)            (((x) >> 22) & 0x1)
 #define GUI_ACTIVE(x)          (((x) >> 31) & 0x1)
 
 static void r600_update_grbm_counters(struct r600_common_screen *rscreen,
@@ -51,6 +52,11 @@ static void r600_update_grbm_counters(struct r600_common_screen *rscreen,
 
        rscreen->ws->read_registers(rscreen->ws, GRBM_STATUS, 1, &value);
 
+       if (SPI_BUSY(value))
+               p_atomic_inc(&counters->named.spi_busy);
+       else
+               p_atomic_inc(&counters->named.spi_idle);
+
        if (GUI_ACTIVE(value))
                p_atomic_inc(&counters->named.gui_busy);
        else
@@ -144,6 +150,16 @@ static unsigned r600_end_counter(struct r600_common_screen *rscreen,
 #define BUSY_INDEX(rscreen, field) (&rscreen->grbm_counters.named.field##_busy - \
                                    rscreen->grbm_counters.array)
 
+uint64_t r600_begin_counter_spi(struct r600_common_screen *rscreen)
+{
+       return r600_read_counter(rscreen, BUSY_INDEX(rscreen, spi));
+}
+
+unsigned r600_end_counter_spi(struct r600_common_screen *rscreen, uint64_t begin)
+{
+       return r600_end_counter(rscreen, begin, BUSY_INDEX(rscreen, spi));
+}
+
 uint64_t r600_begin_counter_gui(struct r600_common_screen *rscreen)
 {
        return r600_read_counter(rscreen, BUSY_INDEX(rscreen, gui));

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index 9f692985401ae91b5f30ab5dc553f988efaef362..97e944186eb91fcd4daf69c2aeeecefdbf609fd0 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -354,6 +354,8 @@ struct r600_surface {
 
 union r600_grbm_counters {
        struct {
+               unsigned spi_busy;
+               unsigned spi_idle;
                unsigned gui_busy;
                unsigned gui_idle;
        } named;
@@ -746,6 +748,8 @@ bool r600_check_device_reset(struct r600_common_context *rctx);
 
 /* r600_gpu_load.c */
 void r600_gpu_load_kill_thread(struct r600_common_screen *rscreen);
+uint64_t r600_begin_counter_spi(struct r600_common_screen *rscreen);
+unsigned r600_end_counter_spi(struct r600_common_screen *rscreen, uint64_t begin);
 uint64_t r600_begin_counter_gui(struct r600_common_screen *rscreen);
 unsigned r600_end_counter_gui(struct r600_common_screen *rscreen, uint64_t begin);
 

diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c
index b7fbd373b420e8a5b6c49e38b76f83fcc4139931..5712cbe63fb240acf635bb12cf218203c34e03ac 100644 (file)
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -147,6 +147,9 @@ static bool r600_query_sw_begin(struct r600_common_context *rctx,
        case R600_QUERY_GPU_LOAD:
                query->begin_result = r600_begin_counter_gui(rctx->screen);
                break;
+       case R600_QUERY_GPU_SHADERS_BUSY:
+               query->begin_result = r600_begin_counter_spi(rctx->screen);
+               break;
        case R600_QUERY_NUM_COMPILATIONS:
                query->begin_result = p_atomic_read(&rctx->screen->num_compilations);
                break;
@@ -240,6 +243,11 @@ static bool r600_query_sw_end(struct r600_common_context *rctx,
                                                         query->begin_result);
                query->begin_result = 0;
                break;
+       case R600_QUERY_GPU_SHADERS_BUSY:
+               query->end_result = r600_end_counter_spi(rctx->screen,
+                                                        query->begin_result);
+               query->begin_result = 0;
+               break;
        case R600_QUERY_NUM_COMPILATIONS:
                query->end_result = p_atomic_read(&rctx->screen->num_compilations);
                break;
@@ -1716,6 +1724,7 @@ static struct pipe_driver_query_info r600_driver_query_list[] = {
        /* The following queries must be at the end of the list because their
         * availability is adjusted dynamically based on the DRM version. */
        X("GPU-load",                   GPU_LOAD,               UINT64, AVERAGE),
+       X("GPU-shaders-busy",           GPU_SHADERS_BUSY,       UINT64, AVERAGE),
        X("temperature",                GPU_TEMPERATURE,        UINT64, AVERAGE),
        X("shader-clock",               CURRENT_GPU_SCLK,       HZ, AVERAGE),
        X("memory-clock",               CURRENT_GPU_MCLK,       HZ, AVERAGE),
@@ -1732,7 +1741,7 @@ static unsigned r600_get_num_queries(struct r600_common_screen *rscreen)
        else if (rscreen->info.drm_major == 3)
                return ARRAY_SIZE(r600_driver_query_list) - 3;
        else
-               return ARRAY_SIZE(r600_driver_query_list) - 4;
+               return ARRAY_SIZE(r600_driver_query_list) - 5;
 }
 
 static int r600_get_driver_query_info(struct pipe_screen *screen,

diff --git a/src/gallium/drivers/radeon/r600_query.h b/src/gallium/drivers/radeon/r600_query.h
index 3791ec6096e4b7edaa9e5f9e111ad3c8ce7c514e..43bca2bab94a6e5db86220585c7c47e18c7020ff 100644 (file)
--- a/src/gallium/drivers/radeon/r600_query.h
+++ b/src/gallium/drivers/radeon/r600_query.h
@@ -70,6 +70,7 @@ enum {
        R600_QUERY_CURRENT_GPU_SCLK,
        R600_QUERY_CURRENT_GPU_MCLK,
        R600_QUERY_GPU_LOAD,
+       R600_QUERY_GPU_SHADERS_BUSY,
        R600_QUERY_NUM_COMPILATIONS,
        R600_QUERY_NUM_SHADERS_CREATED,
        R600_QUERY_BACK_BUFFER_PS_DRAW_RATIO,