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

intel/perf: reuse offset specified in the query

Browse Source 
The current code relies on the order of the function
gen_perf_query_result_accumulate() to match the descriptions written
by gen_perf.py. Let's just reuse the offset specified in the python
script.

v2: Use accumlator offsets more (Jason)

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2775>
This commit is contained in:
Lionel Landwerlin
2019-09-13 17:21:02 +03:00
parent 63c193e921
commit ceb822f9e0
1 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -939,7 +939,7 @@ gen_perf_query_result_accumulate(struct gen_perf_query_result *result,
const uint32_t *start, const uint32_t *start,
const uint32_t *end) const uint32_t *end)
{ {
int i, idx = 0; int i;
if (result->hw_id == OA_REPORT_INVALID_CTX_ID && if (result->hw_id == OA_REPORT_INVALID_CTX_ID &&
start[2] != OA_REPORT_INVALID_CTX_ID) start[2] != OA_REPORT_INVALID_CTX_ID)
@@ -950,27 +950,43 @@ gen_perf_query_result_accumulate(struct gen_perf_query_result *result,
switch (query->oa_format) { switch (query->oa_format) {
case I915_OA_FORMAT_A32u40_A4u32_B8_C8: case I915_OA_FORMAT_A32u40_A4u32_B8_C8:
accumulate_uint32(start + 1, end + 1, result->accumulator + idx++); /* timestamp */ accumulate_uint32(start + 1, end + 1,
accumulate_uint32(start + 3, end + 3, result->accumulator + idx++); /* clock */ result->accumulator + query->gpu_time_offset); /* timestamp */
accumulate_uint32(start + 3, end + 3,
result->accumulator + query->gpu_clock_offset); /* clock */
/* 32x 40bit A counters... */ /* 32x 40bit A counters... */
for (i = 0; i < 32; i++) for (i = 0; i < 32; i++) {
accumulate_uint40(i, start, end, result->accumulator + idx++); accumulate_uint40(i, start, end,
result->accumulator + query->a_offset + i);
}
/* 4x 32bit A counters... */ /* 4x 32bit A counters... */
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++) {
accumulate_uint32(start + 36 + i, end + 36 + i, result->accumulator + idx++); accumulate_uint32(start + 36 + i, end + 36 + i,
result->accumulator + query->a_offset + 32 + i);
}
/* 8x 32bit B counters + 8x 32bit C counters... */ /* 8x 32bit B counters */
for (i = 0; i < 16; i++) for (i = 0; i < 8; i++) {
accumulate_uint32(start + 48 + i, end + 48 + i, result->accumulator + idx++); accumulate_uint32(start + 48 + i, end + 48 + i,
result->accumulator + query->b_offset + i);
}
/* 8x 32bit C counters... */
for (i = 0; i < 8; i++) {
accumulate_uint32(start + 56 + i, end + 56 + i,
result->accumulator + query->c_offset + i);
}
break; break;
case I915_OA_FORMAT_A45_B8_C8: case I915_OA_FORMAT_A45_B8_C8:
accumulate_uint32(start + 1, end + 1, result->accumulator); /* timestamp */ accumulate_uint32(start + 1, end + 1, result->accumulator); /* timestamp */
for (i = 0; i < 61; i++) for (i = 0; i < 61; i++) {
accumulate_uint32(start + 3 + i, end + 3 + i, result->accumulator + 1 + i); accumulate_uint32(start + 3 + i, end + 3 + i,
result->accumulator + query->a_offset + i);
}
break; break;
default: default: