#include "r600_pipe.h"
#include "r600d.h"
#include "util/u_memory.h"
-#include "r600_hw_context_priv.h"
static bool r600_is_timer_query(unsigned type)
{
type == PIPE_QUERY_TIMESTAMP_DISJOINT;
}
+static bool r600_query_needs_begin(unsigned type)
+{
+ return type != PIPE_QUERY_GPU_FINISHED &&
+ type != PIPE_QUERY_TIMESTAMP;
+}
+
static struct r600_resource *r600_new_query_buffer(struct r600_context *ctx, unsigned type)
{
unsigned j, i, num_results, buf_size = 4096;
switch (type) {
case PIPE_QUERY_OCCLUSION_COUNTER:
case PIPE_QUERY_OCCLUSION_PREDICATE:
- results = ctx->ws->buffer_map(buf->buf, ctx->cs, PIPE_TRANSFER_WRITE);
+ results = ctx->ws->buffer_map(buf->cs_buf, ctx->cs, PIPE_TRANSFER_WRITE);
memset(results, 0, buf_size);
/* Set top bits for unused backends. */
}
results += 4 * ctx->max_db;
}
- ctx->ws->buffer_unmap(buf->buf);
+ ctx->ws->buffer_unmap(buf->cs_buf);
break;
case PIPE_QUERY_TIME_ELAPSED:
+ case PIPE_QUERY_TIMESTAMP:
break;
case PIPE_QUERY_PRIMITIVES_EMITTED:
case PIPE_QUERY_PRIMITIVES_GENERATED:
case PIPE_QUERY_SO_STATISTICS:
case PIPE_QUERY_SO_OVERFLOW_PREDICATE:
- results = ctx->ws->buffer_map(buf->buf, ctx->cs, PIPE_TRANSFER_WRITE);
+ results = ctx->ws->buffer_map(buf->cs_buf, ctx->cs, PIPE_TRANSFER_WRITE);
memset(results, 0, buf_size);
- ctx->ws->buffer_unmap(buf->buf);
+ ctx->ws->buffer_unmap(buf->cs_buf);
break;
default:
assert(0);
r600_need_cs_space(ctx, query->num_cs_dw * 2, TRUE);
/* Get a new query buffer if needed. */
- if (query->buffer.results_end + query->result_size > query->buffer.buf->b.b.b.width0) {
+ if (query->buffer.results_end + query->result_size > query->buffer.buf->b.b.width0) {
struct r600_query_buffer *qbuf = MALLOC_STRUCT(r600_query_buffer);
*qbuf = query->buffer;
query->buffer.buf = r600_new_query_buffer(ctx, query->type);
struct radeon_winsys_cs *cs = ctx->cs;
uint64_t va;
+ /* The queries which need begin already called this in begin_query. */
+ if (!r600_query_needs_begin(query->type)) {
+ r600_need_cs_space(ctx, query->num_cs_dw, FALSE);
+ }
+
va = r600_resource_va(&ctx->screen->screen, (void*)query->buffer.buf);
/* emit end query */
switch (query->type) {
break;
case PIPE_QUERY_TIME_ELAPSED:
va += query->buffer.results_end + query->result_size/2;
+ /* fall through */
+ case PIPE_QUERY_TIMESTAMP:
cs->buf[cs->cdw++] = PKT3(PKT3_EVENT_WRITE_EOP, 4, 0);
cs->buf[cs->cdw++] = EVENT_TYPE(EVENT_TYPE_CACHE_FLUSH_AND_INV_TS_EVENT) | EVENT_INDEX(5);
cs->buf[cs->cdw++] = va;
query->buffer.results_end += query->result_size;
- if (r600_is_timer_query(query->type)) {
- ctx->num_cs_dw_timer_queries_suspend -= query->num_cs_dw;
- } else {
- ctx->num_cs_dw_nontimer_queries_suspend -= query->num_cs_dw;
+ if (r600_query_needs_begin(query->type)) {
+ if (r600_is_timer_query(query->type)) {
+ ctx->num_cs_dw_timer_queries_suspend -= query->num_cs_dw;
+ } else {
+ ctx->num_cs_dw_nontimer_queries_suspend -= query->num_cs_dw;
+ }
}
}
/* emit predicate packets for all data blocks */
for (qbuf = &query->buffer; qbuf; qbuf = qbuf->previous) {
unsigned results_base = 0;
- uint64_t va = r600_resource_va(&ctx->screen->screen, &qbuf->buf->b.b.b);
+ uint64_t va = r600_resource_va(&ctx->screen->screen, &qbuf->buf->b.b);
while (results_base < qbuf->results_end) {
cs->buf[cs->cdw++] = PKT3(PKT3_SET_PREDICATION, 1, 0);
query->result_size = 16;
query->num_cs_dw = 8;
break;
+ case PIPE_QUERY_TIMESTAMP:
+ query->result_size = 8;
+ query->num_cs_dw = 8;
+ break;
case PIPE_QUERY_PRIMITIVES_EMITTED:
case PIPE_QUERY_PRIMITIVES_GENERATED:
case PIPE_QUERY_SO_STATISTICS:
enable = rctx->num_occlusion_queries != 0;
- if (rctx->atom_db_misc_state.occlusion_query_enabled != enable) {
- rctx->atom_db_misc_state.occlusion_query_enabled = enable;
- r600_atom_dirty(rctx, &rctx->atom_db_misc_state.atom);
+ if (rctx->db_misc_state.occlusion_query_enabled != enable) {
+ rctx->db_misc_state.occlusion_query_enabled = enable;
+ r600_atom_dirty(rctx, &rctx->db_misc_state.atom);
}
}
}
{
struct r600_context *rctx = (struct r600_context *)ctx;
struct r600_query *rquery = (struct r600_query *)query;
- /* Discard the old query buffers. */
struct r600_query_buffer *prev = rquery->buffer.previous;
+ if (!r600_query_needs_begin(rquery->type)) {
+ assert(0);
+ return;
+ }
+
+ /* Discard the old query buffers. */
while (prev) {
struct r600_query_buffer *qbuf = prev;
prev = prev->previous;
}
/* Obtain a new buffer if the current one can't be mapped without a stall. */
- if (rctx->ws->cs_is_buffer_referenced(rctx->cs, rquery->buffer.buf->cs_buf) ||
+ if (rctx->ws->cs_is_buffer_referenced(rctx->cs, rquery->buffer.buf->cs_buf, RADEON_USAGE_READWRITE) ||
rctx->ws->buffer_is_busy(rquery->buffer.buf->buf, RADEON_USAGE_READWRITE)) {
pipe_resource_reference((struct pipe_resource**)&rquery->buffer.buf, NULL);
rquery->buffer.buf = r600_new_query_buffer(rctx, rquery->type);
struct r600_query *rquery = (struct r600_query *)query;
r600_emit_query_end(rctx, rquery);
- LIST_DELINIT(&rquery->list);
+
+ if (r600_query_needs_begin(rquery->type)) {
+ LIST_DELINIT(&rquery->list);
+ }
r600_update_occlusion_query_state(rctx, rquery->type, -1);
}
struct r600_query *query,
struct r600_query_buffer *qbuf,
boolean wait,
- union r600_query_result *result)
+ union pipe_query_result *result)
{
unsigned results_base = 0;
char *map;
- map = ctx->ws->buffer_map(qbuf->buf->buf, ctx->cs,
+ map = ctx->ws->buffer_map(qbuf->buf->cs_buf, ctx->cs,
PIPE_TRANSFER_READ |
(wait ? 0 : PIPE_TRANSFER_DONTBLOCK));
if (!map)
results_base += query->result_size;
}
break;
+ case PIPE_QUERY_TIMESTAMP:
+ {
+ uint32_t *current_result = (uint32_t*)map;
+ result->u64 = (uint64_t)current_result[0] |
+ (uint64_t)current_result[1] << 32;
+ break;
+ }
case PIPE_QUERY_PRIMITIVES_EMITTED:
/* SAMPLE_STREAMOUTSTATS stores this structure:
* {
break;
case PIPE_QUERY_SO_STATISTICS:
while (results_base != qbuf->results_end) {
- result->so.num_primitives_written +=
+ result->so_statistics.num_primitives_written +=
r600_query_read_result(map + results_base, 2, 6, true);
- result->so.primitives_storage_needed +=
+ result->so_statistics.primitives_storage_needed +=
r600_query_read_result(map + results_base, 0, 4, true);
results_base += query->result_size;
}
assert(0);
}
- ctx->ws->buffer_unmap(qbuf->buf->buf);
+ ctx->ws->buffer_unmap(qbuf->buf->cs_buf);
return TRUE;
}
static boolean r600_get_query_result(struct pipe_context *ctx,
struct pipe_query *query,
- boolean wait, void *vresult)
+ boolean wait, union pipe_query_result *result)
{
struct r600_context *rctx = (struct r600_context *)ctx;
struct r600_query *rquery = (struct r600_query *)query;
- boolean *result_b = (boolean*)vresult;
- uint64_t *result_u64 = (uint64_t*)vresult;
- union r600_query_result result;
- struct pipe_query_data_so_statistics *result_so =
- (struct pipe_query_data_so_statistics*)vresult;
struct r600_query_buffer *qbuf;
- memset(&result, 0, sizeof(result));
+ util_query_clear_result(result, rquery->type);
for (qbuf = &rquery->buffer; qbuf; qbuf = qbuf->previous) {
- if (!r600_get_query_buffer_result(rctx, rquery, qbuf, wait, &result)) {
+ if (!r600_get_query_buffer_result(rctx, rquery, qbuf, wait, result)) {
return FALSE;
}
}
- switch (rquery->type) {
- case PIPE_QUERY_OCCLUSION_COUNTER:
- case PIPE_QUERY_PRIMITIVES_EMITTED:
- case PIPE_QUERY_PRIMITIVES_GENERATED:
- *result_u64 = result.u64;
- break;
- case PIPE_QUERY_OCCLUSION_PREDICATE:
- case PIPE_QUERY_SO_OVERFLOW_PREDICATE:
- *result_b = result.b;
- break;
- case PIPE_QUERY_TIME_ELAPSED:
- *result_u64 = (1000000 * result.u64) / rctx->screen->info.r600_clock_crystal_freq;
- break;
- case PIPE_QUERY_SO_STATISTICS:
- *result_so = result.so;
- break;
- default:
- assert(0);
+ /* Convert the time to expected units. */
+ if (rquery->type == PIPE_QUERY_TIME_ELAPSED ||
+ rquery->type == PIPE_QUERY_TIMESTAMP) {
+ result->u64 = (1000000 * result->u64) / rctx->screen->info.r600_clock_crystal_freq;
}
return TRUE;
}
projects / mesa.git / blobdiff