matrixfurry.com / monado
The open source OpenXR runtime
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

u/pacing: Rename wait time to gpu time [NFC]

Jakob Bornecrantz 56026535 21fd68e8

+16 -16
+16 -16
src/xrt/auxiliary/util/u_pacing_app.c
··· 136 136 //! Time between begin and frame data being delivered. 137 137 uint64_t draw_time_ns; 138 138 //! Time between the frame data being delivered and GPU completing. 139 - uint64_t wait_time_ns; 139 + uint64_t gpu_time_ns; 140 140 //! Extra time between end of draw time and when the compositor wakes up. 141 141 uint64_t margin_ns; 142 142 } app; //!< App statistics. ··· 239 239 static uint64_t 240 240 total_app_time_ns(const struct pacing_app *pa) 241 241 { 242 - uint64_t total_ns = pa->app.cpu_time_ns + pa->app.draw_time_ns + pa->app.wait_time_ns; 242 + uint64_t total_ns = pa->app.cpu_time_ns + pa->app.draw_time_ns + pa->app.gpu_time_ns; 243 243 uint64_t min_ns = min_app_time(pa); 244 244 245 245 if (total_ns < min_ns) { ··· 281 281 period_ns += base_period_ns; 282 282 } 283 283 284 - while (pa->app.wait_time_ns > period_ns) { 284 + while (pa->app.gpu_time_ns > period_ns) { 285 285 period_ns += base_period_ns; 286 286 } 287 287 ··· 571 571 572 572 uint64_t diff_cpu_ns = f->when.begin_ns - f->when.wait_woke_ns; 573 573 uint64_t diff_draw_ns = f->when.delivered_ns - f->when.begin_ns; 574 - uint64_t diff_wait_ns = f->when.gpu_done_ns - f->when.delivered_ns; 574 + uint64_t diff_gpu_ns = f->when.gpu_done_ns - f->when.delivered_ns; 575 575 576 576 UPA_LOG_D( 577 - "Delivered frame %.2fms %s." // 578 - "\n\tperiod: %.2f" // 579 - "\n\tcpu o: %.2f, n: %.2f" // 580 - "\n\tdraw o: %.2f, n: %.2f" // 581 - "\n\twait o: %.2f, n: %.2f", // 582 - time_ns_to_ms_f(diff_ns), late ? "late" : "early", // 583 - time_ns_to_ms_f(f->predicted_display_period_ns), // 584 - time_ns_to_ms_f(pa->app.cpu_time_ns), time_ns_to_ms_f(diff_cpu_ns), // 585 - time_ns_to_ms_f(pa->app.draw_time_ns), time_ns_to_ms_f(diff_draw_ns), // 586 - time_ns_to_ms_f(pa->app.wait_time_ns), time_ns_to_ms_f(diff_wait_ns)); // 577 + "Delivered frame %.2fms %s." // 578 + "\n\tperiod: %.2f" // 579 + "\n\tcpu o: %.2f, n: %.2f" // 580 + "\n\tdraw o: %.2f, n: %.2f" // 581 + "\n\tgpu o: %.2f, n: %.2f", // 582 + time_ns_to_ms_f(diff_ns), late ? "late" : "early", // 583 + time_ns_to_ms_f(f->predicted_display_period_ns), // 584 + time_ns_to_ms_f(pa->app.cpu_time_ns), time_ns_to_ms_f(diff_cpu_ns), // 585 + time_ns_to_ms_f(pa->app.draw_time_ns), time_ns_to_ms_f(diff_draw_ns), // 586 + time_ns_to_ms_f(pa->app.gpu_time_ns), time_ns_to_ms_f(diff_gpu_ns)); // 587 587 588 588 do_iir_filter(&pa->app.cpu_time_ns, IIR_ALPHA_LT, IIR_ALPHA_GT, diff_cpu_ns); 589 589 do_iir_filter(&pa->app.draw_time_ns, IIR_ALPHA_LT, IIR_ALPHA_GT, diff_draw_ns); 590 - do_iir_filter(&pa->app.wait_time_ns, IIR_ALPHA_LT, IIR_ALPHA_GT, diff_wait_ns); 590 + do_iir_filter(&pa->app.gpu_time_ns, IIR_ALPHA_LT, IIR_ALPHA_GT, diff_gpu_ns); 591 591 592 592 // Write out metrics and tracing data. 593 593 do_metrics(pa, f, false); ··· 700 700 u_var_add_draggable_f32(pa, &pa->min_app_time_ms, "Minimum app time(ms)"); 701 701 u_var_add_ro_u64(pa, &pa->app.cpu_time_ns, "CPU time(ns)"); 702 702 u_var_add_ro_u64(pa, &pa->app.draw_time_ns, "Draw time(ns)"); 703 - u_var_add_ro_u64(pa, &pa->app.wait_time_ns, "GPU time(ns)"); 703 + u_var_add_ro_u64(pa, &pa->app.gpu_time_ns, "GPU time(ns)"); 704 704 705 705 *out_upa = &pa->base; 706 706