r600g: add a query returning the amount of time spent during bo_map sync.
This commit is contained in:
parent
b3f1f665b0
commit
05fa3595e0
|
@ -1161,6 +1161,7 @@ static int r600_get_driver_query_info(struct pipe_screen *screen,
|
||||||
{"draw-calls", R600_QUERY_DRAW_CALLS, 0},
|
{"draw-calls", R600_QUERY_DRAW_CALLS, 0},
|
||||||
{"requested-VRAM", R600_QUERY_REQUESTED_VRAM, rscreen->info.vram_size, TRUE},
|
{"requested-VRAM", R600_QUERY_REQUESTED_VRAM, rscreen->info.vram_size, TRUE},
|
||||||
{"requested-GTT", R600_QUERY_REQUESTED_GTT, rscreen->info.gart_size, TRUE},
|
{"requested-GTT", R600_QUERY_REQUESTED_GTT, rscreen->info.gart_size, TRUE},
|
||||||
|
{"buffer-wait-time", R600_QUERY_BUFFER_WAIT_TIME, 0, FALSE}
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!info)
|
if (!info)
|
||||||
|
|
|
@ -78,6 +78,7 @@
|
||||||
#define R600_QUERY_DRAW_CALLS (PIPE_QUERY_DRIVER_SPECIFIC + 0)
|
#define R600_QUERY_DRAW_CALLS (PIPE_QUERY_DRIVER_SPECIFIC + 0)
|
||||||
#define R600_QUERY_REQUESTED_VRAM (PIPE_QUERY_DRIVER_SPECIFIC + 1)
|
#define R600_QUERY_REQUESTED_VRAM (PIPE_QUERY_DRIVER_SPECIFIC + 1)
|
||||||
#define R600_QUERY_REQUESTED_GTT (PIPE_QUERY_DRIVER_SPECIFIC + 2)
|
#define R600_QUERY_REQUESTED_GTT (PIPE_QUERY_DRIVER_SPECIFIC + 2)
|
||||||
|
#define R600_QUERY_BUFFER_WAIT_TIME (PIPE_QUERY_DRIVER_SPECIFIC + 3)
|
||||||
|
|
||||||
struct r600_context;
|
struct r600_context;
|
||||||
struct r600_bytecode;
|
struct r600_bytecode;
|
||||||
|
|
|
@ -47,6 +47,7 @@ static struct r600_resource *r600_new_query_buffer(struct r600_context *ctx, uns
|
||||||
case R600_QUERY_DRAW_CALLS:
|
case R600_QUERY_DRAW_CALLS:
|
||||||
case R600_QUERY_REQUESTED_VRAM:
|
case R600_QUERY_REQUESTED_VRAM:
|
||||||
case R600_QUERY_REQUESTED_GTT:
|
case R600_QUERY_REQUESTED_GTT:
|
||||||
|
case R600_QUERY_BUFFER_WAIT_TIME:
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -314,6 +315,7 @@ static struct pipe_query *r600_create_query(struct pipe_context *ctx, unsigned q
|
||||||
case R600_QUERY_DRAW_CALLS:
|
case R600_QUERY_DRAW_CALLS:
|
||||||
case R600_QUERY_REQUESTED_VRAM:
|
case R600_QUERY_REQUESTED_VRAM:
|
||||||
case R600_QUERY_REQUESTED_GTT:
|
case R600_QUERY_REQUESTED_GTT:
|
||||||
|
case R600_QUERY_BUFFER_WAIT_TIME:
|
||||||
skip_allocation = true;
|
skip_allocation = true;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -369,6 +371,9 @@ static void r600_begin_query(struct pipe_context *ctx, struct pipe_query *query)
|
||||||
case R600_QUERY_REQUESTED_GTT:
|
case R600_QUERY_REQUESTED_GTT:
|
||||||
rquery->begin_result = 0;
|
rquery->begin_result = 0;
|
||||||
return;
|
return;
|
||||||
|
case R600_QUERY_BUFFER_WAIT_TIME:
|
||||||
|
rquery->begin_result = rctx->ws->query_value(rctx->ws, RADEON_BUFFER_WAIT_TIME_NS);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Discard the old query buffers. */
|
/* Discard the old query buffers. */
|
||||||
|
@ -412,6 +417,9 @@ static void r600_end_query(struct pipe_context *ctx, struct pipe_query *query)
|
||||||
case R600_QUERY_REQUESTED_GTT:
|
case R600_QUERY_REQUESTED_GTT:
|
||||||
rquery->end_result = rctx->ws->query_value(rctx->ws, RADEON_REQUESTED_GTT_MEMORY);
|
rquery->end_result = rctx->ws->query_value(rctx->ws, RADEON_REQUESTED_GTT_MEMORY);
|
||||||
return;
|
return;
|
||||||
|
case R600_QUERY_BUFFER_WAIT_TIME:
|
||||||
|
rquery->end_result = rctx->ws->query_value(rctx->ws, RADEON_BUFFER_WAIT_TIME_NS);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
r600_emit_query_end(rctx, rquery);
|
r600_emit_query_end(rctx, rquery);
|
||||||
|
@ -453,6 +461,7 @@ static boolean r600_get_query_buffer_result(struct r600_context *ctx,
|
||||||
case R600_QUERY_DRAW_CALLS:
|
case R600_QUERY_DRAW_CALLS:
|
||||||
case R600_QUERY_REQUESTED_VRAM:
|
case R600_QUERY_REQUESTED_VRAM:
|
||||||
case R600_QUERY_REQUESTED_GTT:
|
case R600_QUERY_REQUESTED_GTT:
|
||||||
|
case R600_QUERY_BUFFER_WAIT_TIME:
|
||||||
result->u64 = query->end_result - query->begin_result;
|
result->u64 = query->end_result - query->begin_result;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
#include "util/u_double_list.h"
|
#include "util/u_double_list.h"
|
||||||
#include "os/os_thread.h"
|
#include "os/os_thread.h"
|
||||||
#include "os/os_mman.h"
|
#include "os/os_mman.h"
|
||||||
|
#include "os/os_time.h"
|
||||||
|
|
||||||
#include "state_tracker/drm_driver.h"
|
#include "state_tracker/drm_driver.h"
|
||||||
|
|
||||||
|
@ -478,6 +479,8 @@ static void *radeon_bo_map(struct radeon_winsys_cs_handle *buf,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
uint64_t time = os_time_get_nano();
|
||||||
|
|
||||||
if (!(usage & PIPE_TRANSFER_WRITE)) {
|
if (!(usage & PIPE_TRANSFER_WRITE)) {
|
||||||
/* Mapping for read.
|
/* Mapping for read.
|
||||||
*
|
*
|
||||||
|
@ -503,6 +506,8 @@ static void *radeon_bo_map(struct radeon_winsys_cs_handle *buf,
|
||||||
|
|
||||||
radeon_bo_wait((struct pb_buffer*)bo, RADEON_USAGE_READWRITE);
|
radeon_bo_wait((struct pb_buffer*)bo, RADEON_USAGE_READWRITE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bo->mgr->rws->buffer_wait_time += os_time_get_nano() - time;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -510,6 +510,8 @@ static uint64_t radeon_query_value(struct radeon_winsys *rws,
|
||||||
return ws->allocated_vram;
|
return ws->allocated_vram;
|
||||||
case RADEON_REQUESTED_GTT_MEMORY:
|
case RADEON_REQUESTED_GTT_MEMORY:
|
||||||
return ws->allocated_gtt;
|
return ws->allocated_gtt;
|
||||||
|
case RADEON_BUFFER_WAIT_TIME_NS:
|
||||||
|
return ws->buffer_wait_time;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,6 +48,7 @@ struct radeon_drm_winsys {
|
||||||
int num_cs; /* The number of command streams created. */
|
int num_cs; /* The number of command streams created. */
|
||||||
uint64_t allocated_vram;
|
uint64_t allocated_vram;
|
||||||
uint64_t allocated_gtt;
|
uint64_t allocated_gtt;
|
||||||
|
uint64_t buffer_wait_time; /* time spent in buffer_wait in ns */
|
||||||
|
|
||||||
enum radeon_generation gen;
|
enum radeon_generation gen;
|
||||||
struct radeon_info info;
|
struct radeon_info info;
|
||||||
|
|
|
@ -147,8 +147,9 @@ enum ring_type {
|
||||||
};
|
};
|
||||||
|
|
||||||
enum radeon_value_id {
|
enum radeon_value_id {
|
||||||
RADEON_REQUESTED_VRAM_MEMORY,
|
RADEON_REQUESTED_VRAM_MEMORY,
|
||||||
RADEON_REQUESTED_GTT_MEMORY,
|
RADEON_REQUESTED_GTT_MEMORY,
|
||||||
|
RADEON_BUFFER_WAIT_TIME_NS
|
||||||
};
|
};
|
||||||
|
|
||||||
struct winsys_handle;
|
struct winsys_handle;
|
||||||
|
|
Loading…
Reference in New Issue