[PERF] Host Desktop Frame Pacing and Presentation
This commit is contained in:
@@ -20,6 +20,72 @@ use winit::event_loop::{ActiveEventLoop, ControlFlow};
|
||||
use winit::keyboard::{KeyCode, PhysicalKey};
|
||||
use winit::window::{Window, WindowAttributes, WindowId};
|
||||
|
||||
const IDLE_HOST_POLL_DT: Duration = Duration::from_millis(100);
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
struct PresentationState {
|
||||
latest_published_frame: u64,
|
||||
last_presented_frame: Option<u64>,
|
||||
host_invalidated: bool,
|
||||
redraw_requested: bool,
|
||||
}
|
||||
|
||||
impl Default for PresentationState {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
latest_published_frame: 0,
|
||||
last_presented_frame: None,
|
||||
host_invalidated: true,
|
||||
redraw_requested: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl PresentationState {
|
||||
fn note_published_frame(&mut self, frame_index: u64) {
|
||||
if frame_index > self.latest_published_frame {
|
||||
self.latest_published_frame = frame_index;
|
||||
}
|
||||
}
|
||||
|
||||
fn invalidate_host_surface(&mut self) {
|
||||
self.host_invalidated = true;
|
||||
}
|
||||
|
||||
fn needs_redraw(&self) -> bool {
|
||||
self.host_invalidated || self.last_presented_frame != Some(self.latest_published_frame)
|
||||
}
|
||||
|
||||
fn should_request_redraw(&mut self) -> bool {
|
||||
if self.needs_redraw() && !self.redraw_requested {
|
||||
self.redraw_requested = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
false
|
||||
}
|
||||
|
||||
fn mark_presented(&mut self) {
|
||||
self.redraw_requested = false;
|
||||
self.host_invalidated = false;
|
||||
self.last_presented_frame = Some(self.latest_published_frame);
|
||||
}
|
||||
}
|
||||
|
||||
fn desired_control_flow(
|
||||
now: Instant,
|
||||
machine_running: bool,
|
||||
accumulator: Duration,
|
||||
frame_target_dt: Duration,
|
||||
) -> ControlFlow {
|
||||
if machine_running {
|
||||
let remaining = frame_target_dt.saturating_sub(accumulator);
|
||||
ControlFlow::WaitUntil(now + remaining)
|
||||
} else {
|
||||
ControlFlow::WaitUntil(now + IDLE_HOST_POLL_DT)
|
||||
}
|
||||
}
|
||||
|
||||
/// The Desktop implementation of the PROMETEU Runtime.
|
||||
///
|
||||
/// This struct acts as the physical "chassis" of the virtual console. It is
|
||||
@@ -69,6 +135,8 @@ pub struct HostRunner {
|
||||
audio: HostAudio,
|
||||
/// Last known pause state to sync with audio.
|
||||
last_paused_state: bool,
|
||||
/// Tracks whether a new logical frame or host-only surface invalidation requires presentation.
|
||||
presentation: PresentationState,
|
||||
}
|
||||
|
||||
impl HostRunner {
|
||||
@@ -105,6 +173,7 @@ impl HostRunner {
|
||||
overlay_enabled: false,
|
||||
audio: HostAudio::new(),
|
||||
last_paused_state: false,
|
||||
presentation: PresentationState::default(),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -123,6 +192,20 @@ impl HostRunner {
|
||||
w.request_redraw();
|
||||
}
|
||||
}
|
||||
|
||||
fn invalidate_host_surface(&mut self) {
|
||||
self.presentation.invalidate_host_surface();
|
||||
}
|
||||
|
||||
fn request_redraw_if_needed(&mut self) {
|
||||
if self.presentation.should_request_redraw() {
|
||||
self.request_redraw();
|
||||
}
|
||||
}
|
||||
|
||||
fn machine_running(&self) -> bool {
|
||||
!self.firmware.os.paused && !self.debugger.waiting_for_start
|
||||
}
|
||||
}
|
||||
|
||||
impl ApplicationHandler for HostRunner {
|
||||
@@ -157,7 +240,9 @@ impl ApplicationHandler for HostRunner {
|
||||
eprintln!("[HostAudio] Disabled: {}", err);
|
||||
}
|
||||
|
||||
event_loop.set_control_flow(ControlFlow::Poll);
|
||||
self.invalidate_host_surface();
|
||||
self.request_redraw_if_needed();
|
||||
event_loop.set_control_flow(ControlFlow::Wait);
|
||||
}
|
||||
|
||||
fn window_event(&mut self, event_loop: &ActiveEventLoop, _id: WindowId, event: WindowEvent) {
|
||||
@@ -168,11 +253,15 @@ impl ApplicationHandler for HostRunner {
|
||||
|
||||
WindowEvent::Resized(size) => {
|
||||
self.resize_surface(size.width, size.height);
|
||||
self.invalidate_host_surface();
|
||||
self.request_redraw_if_needed();
|
||||
}
|
||||
|
||||
WindowEvent::ScaleFactorChanged { .. } => {
|
||||
let size = self.window().inner_size();
|
||||
self.resize_surface(size.width, size.height);
|
||||
self.invalidate_host_surface();
|
||||
self.request_redraw_if_needed();
|
||||
}
|
||||
|
||||
WindowEvent::RedrawRequested => {
|
||||
@@ -198,6 +287,8 @@ impl ApplicationHandler for HostRunner {
|
||||
|
||||
if pixels.render().is_err() {
|
||||
event_loop.exit();
|
||||
} else {
|
||||
self.presentation.mark_presented();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -207,11 +298,15 @@ impl ApplicationHandler for HostRunner {
|
||||
|
||||
if is_down && code == KeyCode::KeyD && self.debugger.waiting_for_start {
|
||||
self.debugger.waiting_for_start = false;
|
||||
self.invalidate_host_surface();
|
||||
self.request_redraw_if_needed();
|
||||
println!("[Debugger] Execution started!");
|
||||
}
|
||||
|
||||
if is_down && code == KeyCode::F1 {
|
||||
self.overlay_enabled = !self.overlay_enabled;
|
||||
self.invalidate_host_surface();
|
||||
self.request_redraw_if_needed();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -222,7 +317,11 @@ impl ApplicationHandler for HostRunner {
|
||||
|
||||
/// Called by `winit` when the application is idle and ready to perform updates.
|
||||
/// This is where the core execution loop lives.
|
||||
fn about_to_wait(&mut self, _event_loop: &ActiveEventLoop) {
|
||||
fn about_to_wait(&mut self, event_loop: &ActiveEventLoop) {
|
||||
let was_debugger_connected = self.debugger.stream.is_some();
|
||||
let was_waiting_for_start = self.debugger.waiting_for_start;
|
||||
let was_paused = self.firmware.os.paused;
|
||||
|
||||
// 1. Process pending debug commands from the network.
|
||||
self.debugger.check_commands(&mut self.firmware, &mut self.hardware);
|
||||
|
||||
@@ -283,6 +382,15 @@ impl ApplicationHandler for HostRunner {
|
||||
self.stats.record_frame();
|
||||
}
|
||||
|
||||
self.presentation.note_published_frame(self.firmware.os.logical_frame_index);
|
||||
|
||||
if was_debugger_connected != self.debugger.stream.is_some()
|
||||
|| was_waiting_for_start != self.debugger.waiting_for_start
|
||||
|| was_paused != self.firmware.os.paused
|
||||
{
|
||||
self.invalidate_host_surface();
|
||||
}
|
||||
|
||||
// 4. Feedback and Synchronization.
|
||||
self.audio.update_stats(&mut self.stats);
|
||||
|
||||
@@ -298,9 +406,15 @@ impl ApplicationHandler for HostRunner {
|
||||
};
|
||||
self.log_sink.process_events(new_events);
|
||||
|
||||
// 5. Request redraw so the host surface can present the latest machine frame
|
||||
// and, when enabled, compose the overlay in the host-only RGBA surface.
|
||||
self.request_redraw();
|
||||
// 5. Request redraw only when a new logical frame was published or the
|
||||
// host-owned presentation surface became invalid.
|
||||
self.request_redraw_if_needed();
|
||||
event_loop.set_control_flow(desired_control_flow(
|
||||
Instant::now(),
|
||||
self.machine_running(),
|
||||
self.accumulator,
|
||||
self.frame_target_dt,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -313,6 +427,70 @@ mod tests {
|
||||
use std::io::{Read, Write};
|
||||
use std::net::TcpStream;
|
||||
|
||||
#[test]
|
||||
fn presentation_state_requires_initial_redraw_only_once() {
|
||||
let mut state = PresentationState::default();
|
||||
|
||||
assert!(state.should_request_redraw());
|
||||
assert!(!state.should_request_redraw());
|
||||
|
||||
state.mark_presented();
|
||||
|
||||
assert!(!state.should_request_redraw());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn presentation_state_requests_redraw_for_new_frame_publication() {
|
||||
let mut state = PresentationState::default();
|
||||
state.mark_presented();
|
||||
|
||||
state.note_published_frame(1);
|
||||
|
||||
assert!(state.should_request_redraw());
|
||||
state.mark_presented();
|
||||
assert_eq!(state.last_presented_frame, Some(1));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn presentation_state_requests_redraw_for_host_invalidation_without_new_frame() {
|
||||
let mut state = PresentationState::default();
|
||||
state.mark_presented();
|
||||
|
||||
state.invalidate_host_surface();
|
||||
|
||||
assert!(state.should_request_redraw());
|
||||
state.mark_presented();
|
||||
assert!(!state.needs_redraw());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn desired_control_flow_waits_until_next_logical_deadline_while_running() {
|
||||
let now = Instant::now();
|
||||
let flow =
|
||||
desired_control_flow(now, true, Duration::from_millis(5), Duration::from_millis(16));
|
||||
|
||||
match flow {
|
||||
ControlFlow::WaitUntil(deadline) => {
|
||||
assert_eq!(deadline.duration_since(now), Duration::from_millis(11));
|
||||
}
|
||||
other => panic!("unexpected control flow: {:?}", other),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn desired_control_flow_uses_idle_poll_when_machine_is_not_running() {
|
||||
let now = Instant::now();
|
||||
let flow =
|
||||
desired_control_flow(now, false, Duration::from_millis(5), Duration::from_millis(16));
|
||||
|
||||
match flow {
|
||||
ControlFlow::WaitUntil(deadline) => {
|
||||
assert_eq!(deadline.duration_since(now), IDLE_HOST_POLL_DT);
|
||||
}
|
||||
other => panic!("unexpected control flow: {:?}", other),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn host_debugger_maps_cert_events_from_host_owned_sources() {
|
||||
let telemetry = TelemetryFrame {
|
||||
|
||||
Reference in New Issue
Block a user