Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Throttle update sending when executing as fast as possible #365

Merged
merged 4 commits into from
Mar 28, 2024
Merged

Throttle update sending when executing as fast as possible #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ac8e65
Throttle update sending when executing as fast as possible
brooksmckinley Mar 27, 2024
df3b13b
Merge branch 'swim-v2' into worker-message-throttling
brooksmckinley Mar 27, 2024
0c6e4f2
Fix syscalls triggering multiple times when executing as fast as poss…
brooksmckinley Mar 27, 2024
930ec9d
Fix fibonacci example to actually halt at the end
brooksmckinley Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ cfg-if = "0.1"
log = "0.4"
console_log = { version = "1", features = ["color"] }
humantime = "2.1.0"
instant = { version = "0.1.12" , features = ["wasm-bindgen"] }
173 changes: 100 additions & 73 deletions src/agent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use crate::emulation_core::mips::datapath::MipsDatapath;
use crate::emulation_core::riscv::datapath::RiscDatapath;
use futures::{FutureExt, SinkExt, StreamExt};
use gloo_console::log;
use instant::Instant;
use messages::DatapathUpdate;
use std::collections::HashSet;
use std::time::Duration;
Expand Down Expand Up @@ -43,6 +44,8 @@ macro_rules! send_update_riscv {
};
}

const UPDATE_INTERVAL: Duration = Duration::from_millis(250);

/// The main logic for the emulation core agent. All code within this function runs on a worker thread as opposed to
/// the UI thread.
#[reactor(EmulationCoreAgent)]
Expand Down Expand Up @@ -84,79 +87,84 @@ pub async fn emulation_core_agent(scope: ReactorScope<Command, DatapathUpdate>)
state.execute_syscall_stage().await;

// Part 4: Processing State/Sending Updates to UI
match state.current_datapath.as_datapath_ref() {
DatapathRef::MIPS(datapath) => {
log!(format!("Updates: {:?}", state.updates));
// Stage always updates
send_update_mips!(
state.scope,
true,
MipsStateUpdate::UpdateStage(datapath.current_stage)
);

// Send all other updates based on the state.updates variable.
send_update_mips!(
state.scope,
state.updates.changed_state,
MipsStateUpdate::UpdateState(datapath.state.clone())
);
send_update_mips!(
state.scope,
state.updates.changed_registers,
MipsStateUpdate::UpdateRegisters(datapath.registers)
);
send_update_mips!(
state.scope,
state.updates.changed_coprocessor_state,
MipsStateUpdate::UpdateCoprocessorState(datapath.coprocessor.state.clone())
);
send_update_mips!(
state.scope,
state.updates.changed_coprocessor_registers,
MipsStateUpdate::UpdateCoprocessorRegisters(datapath.coprocessor.registers)
);
send_update_mips!(
state.scope,
state.updates.changed_memory,
MipsStateUpdate::UpdateMemory(datapath.memory.clone())
);
send_update_mips!(
state.scope,
state.updates.changed_stack,
MipsStateUpdate::UpdateStack(datapath.stack.clone())
);
}
DatapathRef::RISCV(datapath) => {
// Stage always updates
send_update_riscv!(
state.scope,
true,
RiscStateUpdate::UpdateStage(datapath.current_stage)
);

// Send all other updates based on the state.updates variable.
send_update_riscv!(
state.scope,
state.updates.changed_state,
RiscStateUpdate::UpdateState(datapath.state.clone())
);
send_update_riscv!(
state.scope,
state.updates.changed_registers,
RiscStateUpdate::UpdateRegisters(datapath.registers)
);
send_update_riscv!(
state.scope,
state.updates.changed_memory,
RiscStateUpdate::UpdateMemory(datapath.memory.clone())
);
send_update_riscv!(
state.scope,
state.updates.changed_stack,
RiscStateUpdate::UpdateStack(datapath.stack.clone())
);
if state.should_send_datapath_update() {
match state.current_datapath.as_datapath_ref() {
DatapathRef::MIPS(datapath) => {
log!(format!("Updates: {:?}", state.updates));
// Stage always updates
send_update_mips!(
state.scope,
true,
MipsStateUpdate::UpdateStage(datapath.current_stage)
);

// Send all other updates based on the state.updates variable.
send_update_mips!(
state.scope,
state.updates.changed_state,
MipsStateUpdate::UpdateState(datapath.state.clone())
);
send_update_mips!(
state.scope,
state.updates.changed_registers,
MipsStateUpdate::UpdateRegisters(datapath.registers)
);
send_update_mips!(
state.scope,
state.updates.changed_coprocessor_state,
MipsStateUpdate::UpdateCoprocessorState(datapath.coprocessor.state.clone())
);
send_update_mips!(
state.scope,
state.updates.changed_coprocessor_registers,
MipsStateUpdate::UpdateCoprocessorRegisters(datapath.coprocessor.registers)
);
send_update_mips!(
state.scope,
state.updates.changed_memory,
MipsStateUpdate::UpdateMemory(datapath.memory.clone())
);
send_update_mips!(
state.scope,
state.updates.changed_stack,
MipsStateUpdate::UpdateStack(datapath.stack.clone())
);
}
DatapathRef::RISCV(datapath) => {
// Stage always updates
send_update_riscv!(
state.scope,
true,
RiscStateUpdate::UpdateStage(datapath.current_stage)
);

// Send all other updates based on the state.updates variable.
send_update_riscv!(
state.scope,
state.updates.changed_state,
RiscStateUpdate::UpdateState(datapath.state.clone())
);
send_update_riscv!(
state.scope,
state.updates.changed_registers,
RiscStateUpdate::UpdateRegisters(datapath.registers)
);
send_update_riscv!(
state.scope,
state.updates.changed_memory,
RiscStateUpdate::UpdateMemory(datapath.memory.clone())
);
send_update_riscv!(
state.scope,
state.updates.changed_stack,
RiscStateUpdate::UpdateStack(datapath.stack.clone())
);
}
}
state.updates = Default::default();
state.last_update = Some(Instant::now());
}

// Part 5: Sending Non-Syscall System Updates to UI
send_update!(
state.scope,
Expand All @@ -173,7 +181,6 @@ pub async fn emulation_core_agent(scope: ReactorScope<Command, DatapathUpdate>)
state.speed != curr_speed,
DatapathUpdate::System(SystemUpdate::UpdateSpeed(state.speed))
);
state.updates = Default::default();
}
}

Expand All @@ -192,6 +199,7 @@ struct EmulatorCoreAgentState {
pub updates: DatapathUpdateSignal,
pub scope: ReactorScope<Command, DatapathUpdate>,
speed: u32,
last_update: Option<Instant>,
executing: bool,
initialized: bool,
messages: Vec<String>,
Expand All @@ -207,6 +215,7 @@ impl EmulatorCoreAgentState {
updates: DatapathUpdateSignal::default(),
scope,
speed: 0,
last_update: None,
executing: false,
initialized: false,
messages: Vec::new(),
Expand Down Expand Up @@ -295,8 +304,10 @@ impl EmulatorCoreAgentState {
DatapathRef::MIPS(datapath) => datapath.registers.pc,
DatapathRef::RISCV(datapath) => datapath.registers.pc,
};
if self.breakpoints.contains(&current_pc) {
if self.breakpoints.contains(&current_pc) && self.updates.hit_breakpoint {
self.executing = false;
// Unset the hit_breakpoint flag after processing
self.updates.hit_breakpoint = false;
}
}

Expand Down Expand Up @@ -482,6 +493,21 @@ impl EmulatorCoreAgentState {
}
}
}

// Now that the syscall is processed, unset the update signal
self.updates.hit_syscall = false;
}

/// Determines of datapath updates should be sent. Datapath updates should be sent at most once
/// per second when executing as fast as possible. If the last cycle was executed using the
/// debug buttons or we're going at at a specific speed, always send an update.
pub fn should_send_datapath_update(&self) -> bool {
if self.executing && self.speed == 0 {
self.last_update.is_none()
|| Instant::now().duration_since(self.last_update.unwrap()) > UPDATE_INTERVAL
} else {
true
}
}

async fn reset_system(&mut self) {
Expand All @@ -500,6 +526,7 @@ impl EmulatorCoreAgentState {
}

async fn add_message(&mut self, msg: String) {
log!("Pushed message");
self.messages.push(msg);
self.scope
.send(DatapathUpdate::System(SystemUpdate::UpdateMessages(
Expand Down
2 changes: 1 addition & 1 deletion static/assembly_examples/fibonacci.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ main: # PC starts here
lw $ra,36($sp)
lw $fp,32($sp)
addiu $sp,$sp,40
li $a0, 0 # Load 0 into $a0 to run the exit syscall
syscall # replaced jr $ra with syscall to prevent infinite execution
nop

# Here's the demo code in C:
#
Expand Down
Loading