diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2020-08-20 19:25:18 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-08-21 10:33:27 +0100 |
commit | 1972dc5f6e7a531598d5da9576ebaf305644a199 (patch) | |
tree | 31271ca6794db2b89b5b90669e930f36c1ec3424 | |
parent | 4e5f76be680b65780204668e302026cf638decc9 (diff) |
i915/perf: 32bit printf cleanup
Use PRI[du]64 as necessary for 32bit builds.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
-rw-r--r-- | tests/i915/perf.c | 8 | ||||
-rw-r--r-- | tools/i915-perf/i915_perf_recorder.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/i915/perf.c b/tests/i915/perf.c index 92edc9f1f..a894fd382 100644 --- a/tests/i915/perf.c +++ b/tests/i915/perf.c @@ -2077,7 +2077,7 @@ test_blocking(uint64_t requested_oa_period, bool set_kernel_hrtimer, uint64_t ke user_ns = (end_times.tms_utime - start_times.tms_utime) * tick_ns; kernel_ns = (end_times.tms_stime - start_times.tms_stime) * tick_ns; - igt_debug("%d blocking reads during test with %lu Hz OA sampling (expect no more than %d)\n", + igt_debug("%d blocking reads during test with %"PRIu64" Hz OA sampling (expect no more than %d)\n", n, NSEC_PER_SEC / oa_period, max_iterations); igt_debug("%d extra iterations seen, not related to periodic sampling (e.g. context switches)\n", n_extra_iterations); @@ -2265,7 +2265,7 @@ test_polling(uint64_t requested_oa_period, bool set_kernel_hrtimer, uint64_t ker user_ns = (end_times.tms_utime - start_times.tms_utime) * tick_ns; kernel_ns = (end_times.tms_stime - start_times.tms_stime) * tick_ns; - igt_debug("%d non-blocking reads during test with %lu Hz OA sampling (expect no more than %d)\n", + igt_debug("%d non-blocking reads during test with %"PRIu64" Hz OA sampling (expect no more than %d)\n", n, NSEC_PER_SEC / oa_period, max_iterations); igt_debug("%d extra iterations seen, not related to periodic sampling (e.g. context switches)\n", n_extra_iterations); @@ -2357,7 +2357,7 @@ num_valid_reports_captured(struct drm_i915_perf_open_param *param, int64_t start, end; int num_reports = 0; - igt_debug("Expected duration = %lu\n", *duration_ns); + igt_debug("Expected duration = %"PRId64"\n", *duration_ns); stream_fd = __perf_open(drm_fd, param, true); @@ -2389,7 +2389,7 @@ num_valid_reports_captured(struct drm_i915_perf_open_param *param, *duration_ns = end - start; - igt_debug("Actual duration = %lu\n", *duration_ns); + igt_debug("Actual duration = %"PRIu64"\n", *duration_ns); return num_reports; } diff --git a/tools/i915-perf/i915_perf_recorder.c b/tools/i915-perf/i915_perf_recorder.c index 7671f39b4..adc41c29f 100644 --- a/tools/i915-perf/i915_perf_recorder.c +++ b/tools/i915-perf/i915_perf_recorder.c @@ -1001,7 +1001,7 @@ main(int argc, char *argv[]) } ctx.oa_exponent = oa_exponent_for_period(ctx.timestamp_frequency, perf_period); - fprintf(stdout, "Opening perf stream with metric_id=%lu oa_exponent=%u\n", + fprintf(stdout, "Opening perf stream with metric_id=%"PRIu64" oa_exponent=%u\n", ctx.metric_set->perf_oa_metrics_set, ctx.oa_exponent); ctx.perf_fd = perf_open(&ctx); |