mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-19 13:18:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

u/pacing: Add gpu done time tracking to app pacer

Browse source
This commit is contained in:
Jakob Bornecrantz 2022-03-30 17:36:53 +01:00 committed by Jakob Bornecrantz
parent 04b9602dd1
commit 8e8a0b38c6
3 changed files with 55 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/xrt/auxiliary/util/u_pacing.h
View file

@ -325,6 +325,15 @@ struct u_pacing_app
*/
void (*mark_delivered)(struct u_pacing_app *upa, int64_t frame_id, uint64_t when_ns);
/*!
* A frame has been completed rendered by the GPU, this can happen after `xrEndFrame` has returned.
*
* @param upa Render timing helper.
* @param[in] frame_id The frame ID to mark as delivered.
* @param[in] when_ns The time when it the gpu was finished, nominally from @ref os_monotonic_get_ns
*/
void (*mark_gpu_done)(struct u_pacing_app *upa, int64_t frame_id, uint64_t when_ns);
/*!
* Add a new sample point from the main render loop.
*
@ -416,6 +425,20 @@ u_pa_mark_delivered(struct u_pacing_app *upa, int64_t frame_id, uint64_t when_ns
upa->mark_delivered(upa, frame_id, when_ns);
}
/*!
* @copydoc u_pacing_app::mark_gpu_done
*
* Helper for calling through the function pointer.
*
* @public @memberof u_pacing_app
* @ingroup aux_pacing
*/
static inline void
u_pa_mark_gpu_done(struct u_pacing_app *upa, int64_t frame_id, uint64_t when_ns)
{
upa->mark_gpu_done(upa, frame_id, when_ns);
}
/*!
* @copydoc u_pacing_app::info
*

26
src/xrt/auxiliary/util/u_pacing_app.c
View file

@ -43,6 +43,7 @@ enum u_pa_state
U_RT_WAIT_LEFT,
U_RT_PREDICTED,
U_RT_BEGUN,
U_RT_DELIVERED,
};
struct u_pa_frame
@ -65,6 +66,7 @@ struct u_pa_frame
uint64_t wait_woke_ns;
uint64_t begin_ns;
uint64_t delivered_ns;
uint64_t gpu_done_ns;
} when;
enum u_pa_state state;
@ -318,8 +320,24 @@ pa_mark_delivered(struct u_pacing_app *upa, int64_t frame_id, uint64_t when_ns)
assert(f->frame_id == frame_id);
assert(f->state == U_RT_BEGUN);
// Update all data.
f->when.delivered_ns = when_ns;
f->state = U_RT_DELIVERED;
}
static void
pa_mark_gpu_done(struct u_pacing_app *upa, int64_t frame_id, uint64_t when_ns)
{
struct pacing_app *pa = pacing_app(upa);
DEBUG_PRINT_FRAME_ID();
size_t index = GET_INDEX_FROM_ID(pa, frame_id);
struct u_pa_frame *f = &pa->frames[index];
assert(f->frame_id == frame_id);
assert(f->state == U_RT_DELIVERED);
// Update all data.
f->when.gpu_done_ns = when_ns;
/*
@ -336,7 +354,7 @@ pa_mark_delivered(struct u_pacing_app *upa, int64_t frame_id, uint64_t when_ns)
#define NS_TO_MS_F(ns) (time_ns_to_s(ns) * 1000.0)
uint64_t diff_cpu_ns = f->when.begin_ns - f->when.wait_woke_ns;
uint64_t diff_draw_ns = f->when.delivered_ns - f->when.begin_ns;
uint64_t diff_draw_ns = f->when.gpu_done_ns - f->when.begin_ns;
UPA_LOG_D(
"Delivered frame %.2fms %s." //
@ -366,6 +384,9 @@ pa_mark_delivered(struct u_pacing_app *upa, int64_t frame_id, uint64_t when_ns)
TE_BEG(pa_draw, f->when.begin_ns, "draw");
TE_END(pa_draw, f->when.delivered_ns);
TE_BEG(pa_wait, f->when.delivered_ns, "wait");
TE_END(pa_wait, f->when.gpu_done_ns);
}
#undef TE_BEG
@ -411,6 +432,7 @@ u_pa_create(struct u_pacing_app **out_urt)
pa->base.mark_point = pa_mark_point;
pa->base.mark_discarded = pa_mark_discarded;
pa->base.mark_delivered = pa_mark_delivered;
pa->base.mark_gpu_done = pa_mark_gpu_done;
pa->base.info = pa_info;
pa->base.destroy = pa_destroy;
pa->app.cpu_time_ns = U_TIME_1MS_IN_NS * 2;

10
src/xrt/compositor/multi/comp_multi_compositor.c
View file

@ -324,6 +324,12 @@ multi_compositor_layer_begin(struct xrt_compositor *xc,
{
struct multi_compositor *mc = multi_compositor(xc);
// As early as possible.
uint64_t now_ns = os_monotonic_get_ns();
os_mutex_lock(&mc->msc->list_and_timing_lock);
u_pa_mark_delivered(mc->upa, frame_id, now_ns);
os_mutex_unlock(&mc->msc->list_and_timing_lock);
assert(mc->progress.layer_count == 0);
U_ZERO(&mc->progress);
@ -545,7 +551,7 @@ multi_compositor_layer_commit(struct xrt_compositor *xc, int64_t frame_id, xrt_g
uint64_t now_ns = os_monotonic_get_ns();
os_mutex_lock(&mc->msc->list_and_timing_lock);
u_pa_mark_delivered(mc->upa, frame_id, now_ns);
u_pa_mark_gpu_done(mc->upa, frame_id, now_ns);
os_mutex_unlock(&mc->msc->list_and_timing_lock);
return XRT_SUCCESS;
@ -587,7 +593,7 @@ multi_compositor_layer_commit_with_semaphore(struct xrt_compositor *xc,
uint64_t now_ns = os_monotonic_get_ns();
os_mutex_lock(&mc->msc->list_and_timing_lock);
u_pa_mark_delivered(mc->upa, frame_id, now_ns);
u_pa_mark_gpu_done(mc->upa, frame_id, now_ns);
os_mutex_unlock(&mc->msc->list_and_timing_lock);
return XRT_SUCCESS;