mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-03-04 05:36:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

u/timing: Improve render code, predict when frame should be delivered

Browse source
This commit is contained in:
Jakob Bornecrantz 2021-01-21 14:44:52 +00:00
parent 55c7690185
commit b810c2df0a
2 changed files with 52 additions and 29 deletions

62
src/xrt/auxiliary/util/u_render_timing.c
View file

@ -1,4 +1,4 @@
// Copyright 2020, Collabora, Ltd. // Copyright 2020-2021, Collabora, Ltd.
// SPDX-License-Identifier: BSL-1.0 // SPDX-License-Identifier: BSL-1.0
/*! /*!
* @file * @file
@ -7,7 +7,9 @@
* @ingroup aux_util * @ingroup aux_util
*/ */
#include "util/u_time.h"
#include "util/u_misc.h" #include "util/u_misc.h"
#include "util/u_debug.h"
#include "util/u_logging.h" #include "util/u_logging.h"
#include "util/u_render_timing.h" #include "util/u_render_timing.h"
@ -22,13 +24,16 @@
* *
*/ */
#if 0 DEBUG_GET_ONCE_LOG_OPTION(ll, "U_RENDER_TIMING_LOG", U_LOGGING_WARN)
#define DEBUG_PRINT_FRAME_ID() U_LOG_RAW("%" PRIi64 " %s", frame_id, __func__)
#else #define RT_LOG_T(...) U_LOG_IFL_T(debug_get_log_option_ll(), __VA_ARGS__)
#define DEBUG_PRINT_FRAME_ID() \ #define RT_LOG_D(...) U_LOG_IFL_D(debug_get_log_option_ll(), __VA_ARGS__)
do { \ #define RT_LOG_I(...) U_LOG_IFL_I(debug_get_log_option_ll(), __VA_ARGS__)
} while (false) #define RT_LOG_W(...) U_LOG_IFL_W(debug_get_log_option_ll(), __VA_ARGS__)
#endif #define RT_LOG_E(...) U_LOG_IFL_E(debug_get_log_option_ll(), __VA_ARGS__)
#define DEBUG_PRINT_FRAME_ID() RT_LOG_T("%" PRIi64, frame_id)
#define GET_INDEX_FROM_ID(URTH, ID) ((uint64_t)(ID) % ARRAY_SIZE((URTH)->frames))
static uint64_t static uint64_t
min_period(const struct u_rt_helper *urth) min_period(const struct u_rt_helper *urth)
@ -112,13 +117,20 @@ u_rt_helper_predict(struct u_rt_helper *urth,
*predicted_display_period = min_period(urth); *predicted_display_period = min_period(urth);
*min_display_period = min_period(urth); *min_display_period = min_period(urth);
size_t index = (uint64_t)frame_id % ARRAY_SIZE(urth->frames); size_t index = GET_INDEX_FROM_ID(urth, frame_id);
assert(urth->frames[index].frame_id == -1); assert(urth->frames[index].frame_id == -1);
assert(urth->frames[index].state == U_RT_READY); assert(urth->frames[index].state == U_RT_READY);
urth->frames[index].predicted = os_monotonic_get_ns(); /*
* When the client should deliver the frame to us, take into account the
* extra time needed by the main loop, plus a bit of extra time.
*/
uint64_t delivery_time_ns = predict_ns - urth->last_input.extra_ns - U_TIME_HALF_MS_IN_NS;
urth->frames[index].when.predicted_ns = os_monotonic_get_ns();
urth->frames[index].state = U_RT_PREDICTED; urth->frames[index].state = U_RT_PREDICTED;
urth->frames[index].frame_id = frame_id; urth->frames[index].frame_id = frame_id;
urth->frames[index].predicted_delivery_time_ns = delivery_time_ns;
} }
void void
@ -126,11 +138,11 @@ u_rt_helper_mark_wait_woke(struct u_rt_helper *urth, int64_t frame_id)
{ {
DEBUG_PRINT_FRAME_ID(); DEBUG_PRINT_FRAME_ID();
size_t index = (uint64_t)frame_id % ARRAY_SIZE(urth->frames); size_t index = GET_INDEX_FROM_ID(urth, frame_id);
assert(urth->frames[index].frame_id == frame_id); assert(urth->frames[index].frame_id == frame_id);
assert(urth->frames[index].state == U_RT_PREDICTED); assert(urth->frames[index].state == U_RT_PREDICTED);
urth->frames[index].wait_woke = os_monotonic_get_ns(); urth->frames[index].when.wait_woke_ns = os_monotonic_get_ns();
urth->frames[index].state = U_RT_WAIT_LEFT; urth->frames[index].state = U_RT_WAIT_LEFT;
} }
@ -139,11 +151,11 @@ u_rt_helper_mark_begin(struct u_rt_helper *urth, int64_t frame_id)
{ {
DEBUG_PRINT_FRAME_ID(); DEBUG_PRINT_FRAME_ID();
size_t index = (uint64_t)frame_id % ARRAY_SIZE(urth->frames); size_t index = GET_INDEX_FROM_ID(urth, frame_id);
assert(urth->frames[index].frame_id == frame_id); assert(urth->frames[index].frame_id == frame_id);
assert(urth->frames[index].state == U_RT_WAIT_LEFT); assert(urth->frames[index].state == U_RT_WAIT_LEFT);
urth->frames[index].begin = os_monotonic_get_ns(); urth->frames[index].when.begin_ns = os_monotonic_get_ns();
urth->frames[index].state = U_RT_BEGUN; urth->frames[index].state = U_RT_BEGUN;
} }
@ -152,11 +164,11 @@ u_rt_helper_mark_discarded(struct u_rt_helper *urth, int64_t frame_id)
{ {
DEBUG_PRINT_FRAME_ID(); DEBUG_PRINT_FRAME_ID();
size_t index = (uint64_t)frame_id % ARRAY_SIZE(urth->frames); size_t index = GET_INDEX_FROM_ID(urth, frame_id);
assert(urth->frames[index].frame_id == frame_id); assert(urth->frames[index].frame_id == frame_id);
assert(urth->frames[index].state == U_RT_WAIT_LEFT || urth->frames[index].state == U_RT_BEGUN); assert(urth->frames[index].state == U_RT_WAIT_LEFT || urth->frames[index].state == U_RT_BEGUN);
urth->frames[index].end_frame = os_monotonic_get_ns(); urth->frames[index].when.delivered_ns = os_monotonic_get_ns();
urth->frames[index].state = U_RT_READY; urth->frames[index].state = U_RT_READY;
urth->frames[index].frame_id = -1; urth->frames[index].frame_id = -1;
} }
@ -166,23 +178,25 @@ u_rt_helper_mark_delivered(struct u_rt_helper *urth, int64_t frame_id)
{ {
DEBUG_PRINT_FRAME_ID(); DEBUG_PRINT_FRAME_ID();
size_t index = (uint64_t)frame_id % ARRAY_SIZE(urth->frames); size_t index = GET_INDEX_FROM_ID(urth, frame_id);
assert(urth->frames[index].frame_id == frame_id); assert(urth->frames[index].frame_id == frame_id);
assert(urth->frames[index].state == U_RT_BEGUN); assert(urth->frames[index].state == U_RT_BEGUN);
uint64_t now_ns = os_monotonic_get_ns(); uint64_t now_ns = os_monotonic_get_ns();
urth->frames[index].end_frame = now_ns; urth->frames[index].when.delivered_ns = now_ns;
urth->frames[index].state = U_RT_READY; urth->frames[index].state = U_RT_READY;
urth->frames[index].frame_id = -1; urth->frames[index].frame_id = -1;
#if 0 int64_t diff_ns = urth->frames[index].predicted_delivery_time_ns - now_ns;
uint64_t then_ns = urth->frames[index].wait_woke; bool late = false;
uint64_t diff_ns = now_ns - then_ns; if (diff_ns < 0) {
uint64_t ms100 = diff_ns / (1000 * 10); diff_ns = -diff_ns;
late = true;
}
U_LOG_RAW("Diff %i.%02ims", (int)ms100 / 100, (int)ms100 % 100); int64_t ms100 = diff_ns / (1000 * 10);
#endif RT_LOG_D("Delivered frame %i.%02ims %s.", (int)ms100 / 100, (int)ms100 % 100, late ? "late" : "early");
} }
void void

19
src/xrt/auxiliary/util/u_render_timing.h
View file

@ -1,4 +1,4 @@
// Copyright 2020, Collabora, Ltd. // Copyright 2020-2021, Collabora, Ltd.
// SPDX-License-Identifier: BSL-1.0 // SPDX-License-Identifier: BSL-1.0
/*! /*!
* @file * @file
@ -27,10 +27,19 @@ enum u_rt_state
struct u_rt_frame struct u_rt_frame
{ {
uint64_t predicted; //! When we predicted this frame to be shown.
uint64_t wait_woke; uint64_t predicted_display_time_ns;
uint64_t begin; //! When the client should have delivered the frame.
uint64_t end_frame; uint64_t predicted_delivery_time_ns;
struct
{
uint64_t predicted_ns;
uint64_t wait_woke_ns;
uint64_t begin_ns;
uint64_t delivered_ns;
} when; //!< When something happened.
int64_t frame_id; int64_t frame_id;
enum u_rt_state state; enum u_rt_state state;
}; };