Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion crates/vm/src/arch/aot/metered_execute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,12 @@ where
let mut vm_exec_state: Box<VmExecState<F, GuestMemory, MeteredCtx>> =
Box::new(vm_exec_state);

unsafe {
#[cfg(feature = "metrics")]
let start = std::time::Instant::now();
#[cfg(feature = "metrics")]
let start_instret = vm_exec_state.ctx.segmentation_ctx.instret;

tracing::info_span!("execute_metered").in_scope(|| unsafe {
let asm_run: libloading::Symbol<MeteredAsmRunFn> = self
.lib
.get(b"asm_run")
Expand All @@ -379,6 +384,16 @@ where
from_state_pc,
instret_until_end,
);
});

#[cfg(feature = "metrics")]
{
let elapsed = start.elapsed();
let insns = vm_exec_state.ctx.segmentation_ctx.instret - start_instret;
tracing::info!("instructions_executed={insns}");
metrics::counter!("execute_metered_insns").absolute(insns);
metrics::gauge!("execute_metered_insn_mi/s")
.set(insns as f64 / elapsed.as_micros() as f64);
}
Ok(*vm_exec_state)
}
Expand Down
17 changes: 16 additions & 1 deletion crates/vm/src/arch/aot/pure.rs
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,15 @@ where
let ctx = ExecutionCtx::new(num_insns);
let instret_left = ctx.instret_left;

#[cfg(feature = "metrics")]
let start = std::time::Instant::now();
#[cfg(feature = "metrics")]
let start_instret_left = instret_left;

let mut vm_exec_state: Box<VmExecState<F, GuestMemory, ExecutionCtx>> =
Box::new(VmExecState::new(from_state, ctx));
unsafe {

tracing::info_span!("execute_e1").in_scope(|| unsafe {
let asm_run: libloading::Symbol<AsmRunFn> = self
.lib
.get(b"asm_run")
Expand All @@ -306,6 +312,15 @@ where
from_state_pc,
instret_left,
);
});

#[cfg(feature = "metrics")]
{
let elapsed = start.elapsed();
let insns = start_instret_left - vm_exec_state.ctx.instret_left;
tracing::info!("instructions_executed={insns}");
metrics::counter!("execute_e1_insns").absolute(insns);
metrics::gauge!("execute_e1_insn_mi/s").set(insns as f64 / elapsed.as_micros() as f64);
}

if num_insns.is_some() {
Expand Down
Loading