Exclude syscall resources when building trace data to save (#3752)

Closes #3399
Related #3744

commit-id:40786103

---

**Stack**:
- #3756
- #3755
- #3752 ⬅


⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*

Author: ddoktorski

crates/cheatnet/src/runtime_extensions/call_to_blockifier_runtime_extension/execution/entry_point.rs

@@ -2,7 +2,7 @@ use super::cairo1_execution::execute_entry_point_call_cairo1;
 use crate::runtime_extensions::call_to_blockifier_runtime_extension::execution::deprecated::cairo0_execution::execute_entry_point_call_cairo0;
 use crate::runtime_extensions::call_to_blockifier_runtime_extension::rpc::{AddressOrClassHash, CallResult};
 use crate::runtime_extensions::call_to_blockifier_runtime_extension::CheatnetState;
-use crate::runtime_extensions::common::{get_relocated_vm_trace, get_syscalls_gas_consumed, sum_syscall_usage};
+use crate::runtime_extensions::common::{get_relocated_vm_trace, sum_syscall_usage};
 use crate::state::CheatStatus;
 use blockifier::execution::call_info::{CallExecution, Retdata, StorageAccessTracker};
 use crate::runtime_extensions::forge_runtime_extension::{get_nested_calls_syscalls_sierra_gas, get_nested_calls_syscalls_vm_resources};
@@ -196,11 +196,10 @@ pub fn execute_call_entry_point(
             syscall_usage_sierra_gas,
             vm_trace,
         }) => {
-            remove_syscall_resources_and_exit_non_error_call(
+            exit_non_error_call(
                 &call_info,
                 &syscall_usage_vm_resources,
                 &syscall_usage_sierra_gas,
-                context,
                 cheatnet_state,
                 vm_trace,
                 cheated_data.tx_info.signature.unwrap_or_default(),
@@ -301,38 +300,19 @@ fn call_info_from_pre_execution_error(
     }
 }
 
-fn remove_syscall_resources_and_exit_non_error_call(
+fn exit_non_error_call(
     call_info: &CallInfo,
     syscall_usage_vm_resources: &SyscallUsageMap,
     syscall_usage_sierra_gas: &SyscallUsageMap,
-    context: &mut EntryPointExecutionContext,
     cheatnet_state: &mut CheatnetState,
     vm_trace: Option<Vec<RelocatedTraceEntry>>,
     signature: Vec<Felt>,
 ) {
-    let versioned_constants = context.tx_context.block_context.versioned_constants();
-    // We don't want the syscall resources to pollute the results
-    let mut resources = call_info.resources.clone();
-    let mut gas_consumed = call_info.execution.gas_consumed;
-
-    // Remove resources consumed by syscalls from the current call
-    // `syscall_usage_vm_resources` and `syscall_usage_sierra_gas` are flat, meaning they only include syscalls from the specific call
-    resources -=
-        &versioned_constants.get_additional_os_syscall_resources(syscall_usage_vm_resources);
-    gas_consumed -= get_syscalls_gas_consumed(syscall_usage_sierra_gas, versioned_constants);
-
-    // Below syscall usages are cumulative.
     let nested_syscall_usage_vm_resources =
         get_nested_calls_syscalls_vm_resources(&cheatnet_state.trace_data.current_call_stack.top());
     let nested_syscall_usage_sierra_gas =
         get_nested_calls_syscalls_sierra_gas(&cheatnet_state.trace_data.current_call_stack.top());
 
-    // Remove resources consumed by syscalls from nested calls
-    resources -= &versioned_constants
-        .get_additional_os_syscall_resources(&nested_syscall_usage_vm_resources);
-    gas_consumed -=
-        get_syscalls_gas_consumed(&nested_syscall_usage_sierra_gas, versioned_constants);
-
     let syscall_usage_vm_resources = sum_syscall_usage(
         nested_syscall_usage_vm_resources,
         syscall_usage_vm_resources,
@@ -341,8 +321,8 @@ fn remove_syscall_resources_and_exit_non_error_call(
         sum_syscall_usage(nested_syscall_usage_sierra_gas, syscall_usage_sierra_gas);
 
     cheatnet_state.trace_data.exit_nested_call(
-        resources,
-        gas_consumed,
+        call_info.resources.clone(),
+        call_info.execution.gas_consumed,
         syscall_usage_vm_resources,
         syscall_usage_sierra_gas,
         CallResult::from_non_error(call_info),

crates/forge-runner/src/build_trace_data.rs

@@ -5,6 +5,7 @@ use blockifier::execution::syscalls::vm_syscall_utils::{
     SyscallSelector, SyscallUsage, SyscallUsageMap,
 };
 
+use blockifier::blockifier_versioned_constants::VersionedConstants;
 use blockifier::execution::call_info::OrderedEvent;
 use cairo_annotations::trace_data::{
     CairoExecutionInfo, CallEntryPoint as ProfilerCallEntryPoint,
@@ -20,6 +21,7 @@ use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
 use cairo_vm::vm::trace::trace_entry::RelocatedTraceEntry;
 use camino::{Utf8Path, Utf8PathBuf};
 use cheatnet::forking::data::ForkData;
+use cheatnet::runtime_extensions::common::{get_syscalls_gas_consumed, sum_syscall_usage};
 use cheatnet::runtime_extensions::forge_runtime_extension::contracts_data::ContractsData;
 use cheatnet::state::{CallTrace, CallTraceNode};
 use conversions::IntoConv;
@@ -68,8 +70,9 @@ pub fn build_profiler_call_trace(
     ProfilerCallTrace {
         entry_point,
         cumulative_resources: build_profiler_execution_resources(
-            value.used_execution_resources.clone(),
-            value.get_total_used_syscalls(),
+            &value.used_execution_resources,
+            &value.used_syscalls_vm_resources,
+            &value.used_syscalls_sierra_gas,
             value.gas_consumed,
         ),
         used_l1_resources: value.used_l1_resources.clone(),
@@ -133,10 +136,21 @@ fn build_profiler_call_trace_node(
 
 #[must_use]
 pub fn build_profiler_execution_resources(
-    execution_resources: ExecutionResources,
-    syscall_usage: SyscallUsageMap,
+    execution_resources: &ExecutionResources,
+    syscall_usage_vm_resources: &SyscallUsageMap,
+    syscall_usage_sierra_gas: &SyscallUsageMap,
     gas_consumed: u64,
 ) -> ProfilerExecutionResources {
+    // Subtract syscall related resources to get the values expected by the profiler.
+    // The profiler operates on resources excluding syscall overhead.
+    let versioned_constants = VersionedConstants::latest_constants();
+    let execution_resources = execution_resources
+        - &versioned_constants.get_additional_os_syscall_resources(syscall_usage_vm_resources);
+    let gas_consumed =
+        gas_consumed - get_syscalls_gas_consumed(syscall_usage_sierra_gas, versioned_constants);
+
+    let syscall_usage =
+        sum_syscall_usage(syscall_usage_vm_resources.clone(), syscall_usage_sierra_gas);
     let profiler_syscall_counter = syscall_usage
         .into_iter()
         .map(|(key, val)| {

crates/forge-runner/src/running.rs

@@ -7,7 +7,9 @@ use anyhow::{Result, bail};
 use blockifier::execution::call_info::CallInfo;
 use blockifier::execution::contract_class::TrackedResource;
 use blockifier::execution::entry_point::EntryPointExecutionContext;
-use blockifier::execution::entry_point_execution::{prepare_call_arguments, run_entry_point};
+use blockifier::execution::entry_point_execution::{
+    extract_vm_resources, prepare_call_arguments, run_entry_point,
+};
 use blockifier::execution::errors::EntryPointExecutionError;
 use blockifier::state::cached_state::CachedState;
 use cairo_vm::Felt252;
@@ -289,10 +291,14 @@ pub fn run_test_case(
             )?;
 
             // TODO(#3744): Confirm if this is needed for the profiler
-            let vm_resources_without_inner_calls = runner
-                .get_execution_resources()
-                .expect("Execution resources missing")
-                .filter_unused_builtins();
+            let vm_resources_without_inner_calls = extract_vm_resources(
+                &runner,
+                &forge_runtime
+                    .extended_runtime
+                    .extended_runtime
+                    .extended_runtime
+                    .hint_handler,
+            )?;
 
             add_resources_to_top_call(
                 &mut forge_runtime,