Use DependentCost for aloc opcode

CHANGELOG.md

@@ -7,24 +7,23 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 
 ### Changed
+- [#1934](https://github.com/FuelLabs/fuel-core/pull/1934): Updated benchmark for the `aloc` opcode to be `DependentCost`. Updated `vm_initialization` benchmark to exclude growing of memory(It is handled by VM reuse).
 - [#1916](https://github.com/FuelLabs/fuel-core/pull/1916): Speed up synchronisation of the blocks for the `fuel-core-sync` service.
+- [#1888](https://github.com/FuelLabs/fuel-core/pull/1888): optimization: Reuse VM memory across executions.
 
 #### Breaking
 
+- [#1934](https://github.com/FuelLabs/fuel-core/pull/1934): Changed `GasCosts` endpoint to return `DependentCost` for the `aloc` opcode via `alocDependentCost`.
+- [#1934](https://github.com/FuelLabs/fuel-core/pull/1934): Updated default gas costs for the local testnet configuration. All opcodes became cheaper.
 - [#1924](https://github.com/FuelLabs/fuel-core/pull/1924): `dry_run_opt` has new `gas_price: Option<u64>` argument
+- [#1888](https://github.com/FuelLabs/fuel-core/pull/1888): Upgraded `fuel-vm` to `0.51.0`. See [release](https://github.com/FuelLabs/fuel-vm/releases/tag/v0.51.0) for more information.
 
 ### Added
 - [#1929](https://github.com/FuelLabs/fuel-core/pull/1929): Added support of customization of the state transition version in the `ChainConfig`.
 
 ### Removed
 - [#1913](https://github.com/FuelLabs/fuel-core/pull/1913): Removed dead code from the project.
 
-### Changed
-- [#1888](https://github.com/FuelLabs/fuel-core/pull/1888): optimization: Reuse VM memory across executions.
-
-#### Breaking
-- [#1888](https://github.com/FuelLabs/fuel-core/pull/1888): Upgraded `fuel-vm` to `0.51.0`. See [release](https://github.com/FuelLabs/fuel-vm/releases/tag/v0.51.0) for more information.
-
 ### Fixed
 - [#1921](https://github.com/FuelLabs/fuel-core/pull/1921): Fixed unstable `gossipsub_broadcast_tx_with_accept` test.
 - [#1915](https://github.com/FuelLabs/fuel-core/pull/1915): Fixed reconnection issue in the dev cluster with AWS cluster.

Cargo.toml

@@ -81,7 +81,7 @@ fuel-core-wasm-executor = { version = "0.27.0", path = "./crates/services/upgrad
 fuel-core-xtask = { version = "0.0.0", path = "./xtask" }
 
 # Fuel dependencies
-fuel-vm-private = { version = "0.51.0", package = "fuel-vm", default-features = false }
+fuel-vm-private = { version = "0.52.0", package = "fuel-vm", default-features = false }
 
 # Common dependencies
 anyhow = "1.0"

benches/benches-outputs/src/lib.rs

@@ -1,5 +1,5 @@
 use fuel_core_types::fuel_tx::{
-    consensus_parameters::gas::GasCostsValuesV1,
+    consensus_parameters::gas::GasCostsValuesV2,
     DependentCost,
     GasCostsValues,
 };

benches/benches/utils.rs

@@ -1,3 +1,5 @@
+#![allow(dead_code)]
+
 use core::iter::successors;
 use ethnum::U256;
 use fuel_core_types::{
@@ -80,7 +82,6 @@ pub fn set_full_word(r: RegisterId, v: Word) -> Vec<Instruction> {
 const BENCH_RECEIPTS: usize = (u16::MAX - 4) as usize;
 
 /// Testing receipt context
-#[allow(dead_code)] // Unsure why this is needed, as the code is used
 pub fn make_receipts(rng: &mut StdRng) -> ReceiptsCtx {
     let mut ctx = ReceiptsCtx::default();
     for _ in 0..BENCH_RECEIPTS {
@@ -97,3 +98,22 @@ pub fn make_receipts(rng: &mut StdRng) -> ReceiptsCtx {
     }
     ctx
 }
+
+const LAST_VALUE: u64 = 100_000;
+
+pub fn linear_short() -> Vec<u64> {
+    let mut linear_short = vec![1, 10, 100, 1000, 10_000];
+    linear_short.push(LAST_VALUE);
+    linear_short
+}
+
+pub fn linear() -> Vec<u64> {
+    let mut linear: Vec<u64> = vec![1, 10, 100, 1000, 10_000];
+    let mut l = successors(Some(LAST_VALUE as f64), |n| Some(n / 1.5))
+        .take(5)
+        .map(|f| f as u64)
+        .collect::<Vec<_>>();
+    l.sort_unstable();
+    linear.extend(l);
+    linear
+}

benches/benches/vm_initialization.rs

@@ -3,7 +3,6 @@ use criterion::{
     Criterion,
     Throughput,
 };
-use fuel_core_storage::InterpreterStorage;
 use fuel_core_types::{
     fuel_asm::{
         op,
@@ -23,17 +22,8 @@ use fuel_core_types::{
         checked_transaction::{
             Checked,
             IntoChecked,
-            Ready,
-        },
-        constraints::reg_key::{
-            Reg,
-            RegMut,
-        },
-        consts::VM_MAX_RAM,
-        interpreter::{
-            MemoryInstance,
-            NotSupportedEcal,
         },
+        interpreter::NotSupportedEcal,
         Interpreter,
     },
 };
@@ -110,56 +100,14 @@ pub fn vm_initialization(c: &mut Criterion) {
         group.throughput(Throughput::Bytes(tx_size as u64));
         group.bench_function(name, |b| {
             b.iter(|| {
-                unoptimized_vm_initialization_with_allocating_full_range_of_memory(
-                    &mut vm, &tx,
+                #[allow(clippy::unit_arg)]
+                black_box(
+                    vm.init_script(tx.clone())
+                        .expect("Should be able to execute transaction"),
                 );
             })
         });
     }
 
     group.finish();
 }
-
-#[allow(clippy::unit_arg)]
-fn unoptimized_vm_initialization_with_allocating_full_range_of_memory<S>(
-    vm: &mut Interpreter<MemoryInstance, S, Script>,
-    ready_tx: &Ready<Script>,
-) where
-    S: InterpreterStorage,
-{
-    black_box(initialize_vm_with_allocated_full_range_of_memory(
-        black_box(ready_tx.clone()),
-        vm,
-    ));
-}
-
-fn initialize_vm_with_allocated_full_range_of_memory<S>(
-    ready_tx: Ready<Script>,
-    vm: &mut Interpreter<MemoryInstance, S, Script>,
-) where
-    S: InterpreterStorage,
-{
-    vm.init_script(ready_tx)
-        .expect("Should be able to execute transaction");
-
-    const POWER_OF_TWO_OF_HALF_VM: u64 = 25;
-    const VM_MEM_HALF: u64 = 1 << POWER_OF_TWO_OF_HALF_VM;
-    assert_eq!(VM_MEM_HALF, VM_MAX_RAM / 2);
-    let mut hp = VM_MAX_RAM;
-
-    for i in 0..=POWER_OF_TWO_OF_HALF_VM {
-        let stack = 1 << i;
-        let heap = stack / 2;
-
-        vm.memory_mut()
-            .grow_stack(stack)
-            .expect("Should be able to grow stack");
-        vm.memory_mut()
-            .grow_heap_by(Reg::new(&0), RegMut::new(&mut hp), heap)
-            .expect("Should be able to grow heap");
-    }
-
-    vm.memory_mut()
-        .grow_heap_by(Reg::new(&0), RegMut::new(&mut hp), VM_MEM_HALF)
-        .expect("Should be able to grow heap");
-}

benches/benches/vm_set/alu.rs

@@ -1,10 +1,17 @@
 use super::run_group_ref;
 
-use criterion::Criterion;
+use criterion::{
+    Criterion,
+    Throughput,
+};
 use ethnum::U256;
 use fuel_core_benches::*;
 use fuel_core_types::fuel_asm::*;
 
+use crate::utils::{
+    linear_short,
+    set_full_word,
+};
 use fuel_core_types::fuel_asm::wideint::{
     CompareArgs,
     CompareMode,
@@ -20,6 +27,8 @@ use super::utils::{
 };
 
 pub fn run(c: &mut Criterion) {
+    let linear_short = linear_short();
+
     run_group_ref(
         &mut c.benchmark_group("add"),
         "add",
@@ -34,12 +43,23 @@ pub fn run(c: &mut Criterion) {
             .with_prepare_script(vec![op::movi(0x11, 100000)]),
     );
 
-    run_group_ref(
-        &mut c.benchmark_group("aloc"),
-        "aloc",
-        VmBench::new(op::aloc(0x10))
-            .with_prepare_script(vec![op::movi(0x10, (1 << 18) - 1)]),
-    );
+    // aloc
+    {
+        let mut aloc = c.benchmark_group("aloc");
+
+        let mut aloc_linear = linear_short.clone();
+        aloc_linear.push(1_000_000);
+        aloc_linear.push(10_000_000);
+        aloc_linear.push(30_000_000);
+        for i in aloc_linear {
+            let bench =
+                VmBench::new(op::aloc(0x10)).with_prepare_script(set_full_word(0x10, i));
+            aloc.throughput(Throughput::Bytes(i));
+            run_group_ref(&mut aloc, format!("{i}"), bench);
+        }
+
+        aloc.finish();
+    }
 
     run_group_ref(
         &mut c.benchmark_group("and"),

benches/benches/vm_set/blockchain.rs

@@ -1,9 +1,10 @@
-use std::{
-    iter::successors,
-    sync::Arc,
-};
+use std::sync::Arc;
 
-use crate::utils::make_receipts;
+use crate::utils::{
+    linear,
+    linear_short,
+    make_receipts,
+};
 
 use super::run_group_ref;
 
@@ -151,16 +152,8 @@ impl BenchDb {
 pub fn run(c: &mut Criterion) {
     let rng = &mut StdRng::seed_from_u64(2322u64);
 
-    const LAST_VALUE: u64 = 100_000;
-    let mut linear: Vec<u64> = vec![1, 10, 100, 1000, 10_000];
-    let mut linear_short = linear.clone();
-    linear_short.push(LAST_VALUE);
-    let mut l = successors(Some(LAST_VALUE as f64), |n| Some(n / 1.5))
-        .take(5)
-        .map(|f| f as u64)
-        .collect::<Vec<_>>();
-    l.sort_unstable();
-    linear.extend(l);
+    let linear_short = linear_short();
+    let linear = linear();
 
     let asset = AssetId::zeroed();
     let contract: ContractId = VmBench::CONTRACT;
@@ -287,7 +280,7 @@ pub fn run(c: &mut Criterion) {
     let mut call = c.benchmark_group("call");
 
     for i in linear.clone() {
-        let mut code = vec![0u8; i as usize];
+        let mut code = vec![123u8; i as usize];
 
         rng.fill_bytes(&mut code);
 

benches/src/bin/collect.rs

@@ -1,6 +1,6 @@
 use clap::Parser;
 use fuel_core_types::fuel_tx::{
-    consensus_parameters::gas::GasCostsValuesV1,
+    consensus_parameters::gas::GasCostsValuesV2,
     ConsensusParameters,
     GasCosts,
 };
@@ -371,7 +371,7 @@ pub const GIT: &str = ""#,
     r#"";"#,
     r##"
 pub fn default_gas_costs() -> GasCostsValues {
-    GasCostsValuesV1 {"##,
+    GasCostsValuesV2 {"##,
     r##"    }.into()
 }
 "##,
@@ -495,7 +495,7 @@ impl State {
         )
     }
 
-    fn to_gas_costs(&self) -> GasCostsValuesV1 {
+    fn to_gas_costs(&self) -> GasCostsValuesV2 {
         serde_yaml::from_value(self.to_yaml()).unwrap()
     }