i965: perf: add mdapi pipeline statistics queries on gen10/11

The Gen10+ expected format adds an additional counter which we can't
disclose yet. We can still make the size of the expected query result
match.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Mark Janes <mark.a.janes@intel.com>
This commit is contained in:
Lionel Landwerlin 2018-06-18 11:40:24 +01:00
parent d855906366
commit a646485c28
2 changed files with 10 additions and 1 deletions

View file

@ -124,6 +124,7 @@ struct mdapi_pipeline_metrics {
uint64_t HSInvocations;
uint64_t DSInvocations;
uint64_t CSInvocations;
uint64_t Reserved1; /* Gen10+ */
};
int gen_perf_query_result_write_mdapi(void *data, uint32_t data_size,

View file

@ -207,7 +207,7 @@ brw_perf_query_register_mdapi_statistic_query(struct brw_context *brw)
{
const struct gen_device_info *devinfo = &brw->screen->devinfo;
if (!(devinfo->gen >= 7 && devinfo->gen <= 9))
if (!(devinfo->gen >= 7 && devinfo->gen <= 11))
return;
struct gen_perf_query_info *query =
@ -248,5 +248,13 @@ brw_perf_query_register_mdapi_statistic_query(struct brw_context *brw)
"N compute shader invocations");
}
if (devinfo->gen >= 10) {
/* Reuse existing CS invocation register until we can expose this new
* one.
*/
gen_perf_query_info_add_basic_stat_reg(query, CS_INVOCATION_COUNT,
"Reserved1");
}
query->data_size = sizeof(uint64_t) * query->n_counters;
}