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

intel/perf: fix printf formatting of size_t for 32bit builds

Browse Source 
Fixes: bdacd6df5a ("intel/perf: add a non installable tool to print metrics")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7736
Reviewed-by: Ivan Briano <ivan.briano@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19856>
This commit is contained in:
Mark Janes
2022-11-18 10:59:41 -08:00
committed by Marge Bot
parent bc34217978
commit f0115ebc25
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/intel/perf/intel_perf_query_layout.c
View File

@@ -42,7 +42,7 @@ print_metric_set(const struct intel_perf_query_info *metric_set)
{ {
for (uint32_t c = 0; c < metric_set->n_counters; c++) { for (uint32_t c = 0; c < metric_set->n_counters; c++) {
const struct intel_perf_query_counter *counter = &metric_set->counters[c]; const struct intel_perf_query_counter *counter = &metric_set->counters[c];
fprintf(stdout, " %s: offset=%li/0x%lx name=%s\n", fprintf(stdout, " %s: offset=%zx/0x%zx name=%s\n",
counter->symbol_name, counter->offset, counter->offset, counter->name); counter->symbol_name, counter->offset, counter->offset, counter->name);
} }
} }
@@ -109,7 +109,7 @@ main(int argc, char *argv[])
const struct intel_perf_query_info *metric_set = &perf_cfg->queries[i]; const struct intel_perf_query_info *metric_set = &perf_cfg->queries[i];
if (metric_set->symbol_name && !strcmp(metric_set->symbol_name, print_metric)) { if (metric_set->symbol_name && !strcmp(metric_set->symbol_name, print_metric)) {
fprintf(stdout, "%s name=%s size=%li counters=%u:\n", fprintf(stdout, "%s name=%s size=%zx counters=%u:\n",
metric_set->symbol_name, metric_set->name, metric_set->symbol_name, metric_set->name,
metric_set->data_size, metric_set->n_counters); metric_set->data_size, metric_set->n_counters);
print_metric_set(metric_set); print_metric_set(metric_set);
@@ -126,7 +126,7 @@ main(int argc, char *argv[])
for (uint32_t i = 0; i < perf_cfg->n_queries; i++) { for (uint32_t i = 0; i < perf_cfg->n_queries; i++) {
const struct intel_perf_query_info *metric_set = &perf_cfg->queries[i]; const struct intel_perf_query_info *metric_set = &perf_cfg->queries[i];
fprintf(stdout, "%s name=%s size=%li counters=%u:\n", fprintf(stdout, "%s name=%s size=%zx counters=%u:\n",
metric_set->symbol_name, metric_set->name, metric_set->symbol_name, metric_set->name,
metric_set->data_size, metric_set->n_counters); metric_set->data_size, metric_set->n_counters);
print_metric_set(metric_set); print_metric_set(metric_set);