[gas] abstract gas algebra part 1 -- instructions & operations

Author: vgao1996

Cargo.lock

@@ -3,8 +3,8 @@
 
 use anyhow::{format_err, Result};
 use aptos_gas::{
-    AbstractValueSizeGasParameters, ChangeSetConfigs, NativeGasParameters, StandardGasMeter,
-    LATEST_GAS_FEATURE_VERSION,
+    AbstractValueSizeGasParameters, ChangeSetConfigs, NativeGasParameters, StandardGasAlgebra,
+    StandardGasMeter, LATEST_GAS_FEATURE_VERSION,
 };
 use aptos_gas_profiling::{GasProfiler, TransactionGasLog};
 use aptos_memory_usage_tracker::MemoryTrackedGasMeter;
@@ -80,12 +80,13 @@ impl AptosDebugger {
                 &txn,
                 &log_context,
                 |gas_feature_version, gas_params, storage_gas_params, balance| {
-                    let gas_meter = MemoryTrackedGasMeter::new(StandardGasMeter::new(
-                        gas_feature_version,
-                        gas_params,
-                        storage_gas_params,
-                        balance,
-                    ));
+                    let gas_meter =
+                        MemoryTrackedGasMeter::new(StandardGasMeter::new(StandardGasAlgebra::new(
+                            gas_feature_version,
+                            gas_params,
+                            storage_gas_params,
+                            balance,
+                        )));
                     let gas_profiler = match txn.payload() {
                         TransactionPayload::Script(_) => GasProfiler::new_script(gas_meter),
                         TransactionPayload::EntryFunction(entry_func) => GasProfiler::new_function(

aptos-move/aptos-debugger/src/lib.rs

@@ -5,7 +5,7 @@ use crate::log::{
     CallFrame, EventStorage, ExecutionAndIOCosts, ExecutionGasEvent, FrameName, StorageFees,
     TransactionGasLog, WriteOpType, WriteStorage, WriteTransient,
 };
-use aptos_gas::{AptosGasMeter, AptosGasParameters, Fee, Gas, GasScalingFactor};
+use aptos_gas::{AptosGasMeter, Fee};
 use aptos_types::{
     contract_event::ContractEvent, state_store::state_key::StateKey, write_set::WriteOp,
 };
@@ -474,16 +474,10 @@ impl<G> AptosGasMeter for GasProfiler<G>
 where
     G: AptosGasMeter,
 {
-    delegate! {
-        fn feature_version(&self) -> u64;
-
-        fn gas_params(&self) -> &AptosGasParameters;
-
-        fn balance(&self) -> Gas;
+    type Algebra = G::Algebra;
 
-        fn gas_unit_scaling_factor(&self) -> GasScalingFactor;
-
-        fn io_gas_per_write(&self, key: &StateKey, op: &WriteOp) -> InternalGas;
+    delegate! {
+        fn algebra(&self) -> &Self::Algebra;
 
         fn storage_fee_per_write(&self, key: &StateKey, op: &WriteOp) -> Fee;
 
@@ -492,20 +486,10 @@ where
         fn storage_discount_for_events(&self, total_cost: Fee) -> Fee;
 
         fn storage_fee_for_transaction_storage(&self, txn_size: NumBytes) -> Fee;
-
-        fn execution_gas_used(&self) -> Gas;
-
-        fn io_gas_used(&self) -> Gas;
-
-        fn storage_fee_used_in_gas_units(&self) -> Gas;
-
-        fn storage_fee_used(&self) -> Fee;
     }
 
     delegate_mut! {
-        fn charge_execution(&mut self, amount: InternalGas) -> PartialVMResult<()>;
-
-        fn charge_io(&mut self, amount: InternalGas) -> PartialVMResult<()>;
+        fn algebra_mut(&mut self) -> &mut Self::Algebra;
 
         fn charge_storage_fee(
             &mut self,
@@ -514,22 +498,17 @@ where
         ) -> PartialVMResult<()>;
     }
 
-    fn charge_io_gas_for_write_set<'a>(
-        &mut self,
-        ops: impl IntoIterator<Item = (&'a StateKey, &'a WriteOp)>,
-    ) -> VMResult<()> {
-        for (key, op) in ops {
-            let cost = self.io_gas_per_write(key, op);
-            self.total_exec_io += cost;
-            self.write_set_transient.push(WriteTransient {
-                key: key.clone(),
-                cost,
-                op_type: write_op_type(op),
-            });
-            self.charge_io(cost)
-                .map_err(|e| e.finish(Location::Undefined))?;
-        }
-        Ok(())
+    fn charge_io_gas_for_write(&mut self, key: &StateKey, op: &WriteOp) -> VMResult<()> {
+        let (cost, res) = self.delegate_charge(|base| base.charge_io_gas_for_write(key, op));
+
+        self.total_exec_io += cost;
+        self.write_set_transient.push(WriteTransient {
+            key: key.clone(),
+            cost,
+            op_type: write_op_type(op),
+        });
+
+        res
     }
 
     fn charge_storage_fee_for_all<'a>(

aptos-move/aptos-gas-profiling/src/profiler.rs

@@ -24,11 +24,13 @@ aptos-types = { workspace = true }
 aptos-vm-types = { workspace = true }
 bcs = { workspace = true }
 clap = { workspace = true }
+either = { workspace = true }
 move-binary-format = { workspace = true }
 move-core-types = { workspace = true }
 move-model = { workspace = true }
 move-table-extension = { workspace = true }
 move-vm-types = { workspace = true }
+paste = { workspace = true }
 
 [dev-dependencies]
 tempfile = { workspace = true }