OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/perf: move snapshot_statistics_registers into perf

Browse Source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Mark Janes
2019-06-11 16:04:02 -07:00
parent 8ae6667992
commit a157f5acb1
3 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/intel/perf/gen_perf.c
View File

@@ -877,3 +877,29 @@ gen_perf_free_sample_bufs(struct gen_perf_context *perf_ctx)
exec_list_make_empty(&perf_ctx->free_sample_buffers);
}
/******************************************************************************/
/**
* Emit MI_STORE_REGISTER_MEM commands to capture all of the
* pipeline statistics for the performance query object.
*/
void
gen_perf_snapshot_statistics_registers(void *context,
struct gen_perf_config *perf,
struct gen_perf_query_object *obj,
uint32_t offset_in_bytes)
{
const struct gen_perf_query_info *query = obj->queryinfo;
const int n_counters = query->n_counters;
for (int i = 0; i < n_counters; i++) {
const struct gen_perf_query_counter *counter = &query->counters[i];
assert(counter->data_type == GEN_PERF_COUNTER_DATA_TYPE_UINT64);
perf->vtbl.store_register_mem64(context, obj->pipeline_stats.bo,
counter->pipeline_stat.reg,
offset_in_bytes + i * sizeof(uint64_t));
}
}

4
src/intel/perf/gen_perf.h
View File

@@ -582,5 +582,9 @@ struct oa_sample_buf * gen_perf_get_free_sample_buf(struct gen_perf_context *per
void gen_perf_reap_old_sample_buffers(struct gen_perf_context *perf_ctx);
void gen_perf_free_sample_bufs(struct gen_perf_context *perf_ctx);
void gen_perf_snapshot_statistics_registers(void *context,
struct gen_perf_config *perf,
struct gen_perf_query_object *obj,
uint32_t offset_in_bytes);
#endif /* GEN_PERF_H */

29
src/mesa/drivers/dri/i965/brw_performance_query.c
View File

@@ -243,31 +243,6 @@ brw_get_perf_counter_info(struct gl_context *ctx,
*raw_max = counter->raw_max;
}
/******************************************************************************/
/**
* Emit MI_STORE_REGISTER_MEM commands to capture all of the
* pipeline statistics for the performance query object.
*/
static void
snapshot_statistics_registers(struct brw_context *brw,
struct gen_perf_query_object *obj,
uint32_t offset_in_bytes)
{
const struct gen_perf_query_info *query = obj->queryinfo;
const int n_counters = query->n_counters;
for (int i = 0; i < n_counters; i++) {
const struct gen_perf_query_counter *counter = &query->counters[i];
assert(counter->data_type == GEN_PERF_COUNTER_DATA_TYPE_UINT64);
brw->perf_ctx.perf->vtbl.store_register_mem64(brw, obj->pipeline_stats.bo,
counter->pipeline_stat.reg,
offset_in_bytes + i * sizeof(uint64_t));
}
}
/**
* Add a query to the global list of "unaccumulated queries."
*
@@ -981,7 +956,7 @@ brw_begin_perf_query(struct gl_context *ctx,
STATS_BO_SIZE);
/* Take starting snapshots. */
snapshot_statistics_registers(brw, obj, 0);
gen_perf_snapshot_statistics_registers(brw, perf_cfg, obj, 0);
++brw->perf_ctx.n_active_pipeline_stats_queries;
break;
@@ -1046,7 +1021,7 @@ brw_end_perf_query(struct gl_context *ctx,
break;
case GEN_PERF_QUERY_TYPE_PIPELINE:
snapshot_statistics_registers(brw, obj,
gen_perf_snapshot_statistics_registers(brw, perf_cfg, obj,
STATS_BO_END_OFFSET_BYTES);
--brw->perf_ctx.n_active_pipeline_stats_queries;
break;