Uninline storage_base_address_from_felt252 to reduce code size.

Author: ilyalesokhin-starkware

corelib/src/starknet/storage_access.cairo

@@ -68,12 +68,22 @@ impl StorageBaseAddressDrop of Drop<StorageBaseAddress>;
 /// ```
 pub extern fn storage_base_address_const<const address: felt252>() -> StorageBaseAddress nopanic;
 
-/// Returns a `StorageBaseAddress` given a `felt252` value.
-///
-/// Wraps around the value if it is not in the range `[0, 2**251 - 256)`.
-pub extern fn storage_base_address_from_felt252(
-    addr: felt252,
-) -> StorageBaseAddress implicits(RangeCheck) nopanic;
+
+mod internal {
+    /// Returns a `StorageBaseAddress` given a `felt252` value.
+    ///
+    /// Wraps around the value if it is not in the range `[0, 2**251 - 256)`.
+    pub extern fn storage_base_address_from_felt252(
+        addr: felt252,
+    ) -> super::StorageBaseAddress implicits(super::RangeCheck) nopanic;
+}
+
+
+#[inline(never)]
+pub fn storage_base_address_from_felt252(addr: felt252) -> StorageBaseAddress nopanic {
+    internal::storage_base_address_from_felt252(addr)
+}
+
 
 pub(crate) extern fn storage_address_to_felt252(address: StorageAddress) -> felt252 nopanic;
 

crates/cairo-lang-lowering/src/optimizations/const_folding.rs

@@ -288,6 +288,21 @@ impl ConstFoldingContext<'_> {
                 )
                 .lowered(self.db);
             return None;
+        } else if stmt.function == self.storage_base_address_from_felt252 {
+            let input_var = stmt.inputs[0].var_id;
+            if let Some(ConstValue::Int(val, ty)) = self.as_const(input_var) {
+                stmt.inputs.clear();
+                stmt.function =
+                    ModuleHelper { db: self.db.upcast(), id: self.storage_access_module }
+                        .function_id(
+                            "storage_base_address_const",
+                            vec![GenericArgumentId::Constant(
+                                ConstValue::Int(val.clone(), *ty).intern(self.db),
+                            )],
+                        )
+                        .lowered(self.db);
+            }
+            return None;
         }
         let (id, _generic_args) = stmt.function.get_extern(self.db)?;
         if id == self.felt_sub {
@@ -329,21 +344,6 @@ impl ConstFoldingContext<'_> {
             self.var_info.insert(r_output, VarInfo::Const(r_value.clone()));
             additional_consts.push(StatementConst { value: r_value, output: r_output });
             Some(StatementConst { value: q_value, output: q_output })
-        } else if id == self.storage_base_address_from_felt252 {
-            let input_var = stmt.inputs[0].var_id;
-            if let Some(ConstValue::Int(val, ty)) = self.as_const(input_var) {
-                stmt.inputs.clear();
-                stmt.function =
-                    ModuleHelper { db: self.db.upcast(), id: self.storage_access_module }
-                        .function_id(
-                            "storage_base_address_const",
-                            vec![GenericArgumentId::Constant(
-                                ConstValue::Int(val.clone(), *ty).intern(self.db),
-                            )],
-                        )
-                        .lowered(self.db);
-            }
-            None
         } else if id == self.into_box {
             let const_value = match self.var_info.get(&stmt.inputs[0].var_id)? {
                 VarInfo::Const(val) => val,
@@ -647,7 +647,7 @@ pub struct ConstFoldingLibfuncInfo {
     /// The storage access module.
     storage_access_module: ModuleId,
     /// The `storage_base_address_from_felt252` libfunc.
-    storage_base_address_from_felt252: ExternFunctionId,
+    storage_base_address_from_felt252: FunctionId,
     /// The `core::panic_with_felt252` function.
     panic_with_felt252: FunctionId,
     /// The `core::panic_with_const_felt252` function.
@@ -669,8 +669,9 @@ impl ConstFoldingLibfuncInfo {
         let array_get = array_module.extern_function_id("array_get");
         let starknet_module = core.submodule("starknet");
         let storage_access_module = starknet_module.submodule("storage_access");
-        let storage_base_address_from_felt252 =
-            storage_access_module.extern_function_id("storage_base_address_from_felt252");
+        let storage_base_address_from_felt252 = storage_access_module
+            .function_id("storage_base_address_from_felt252", vec![])
+            .lowered(db);
         let nz_fns = OrderedHashSet::<_>::from_iter(chain!(
             [
                 core.extern_function_id("felt252_is_zero"),

crates/cairo-lang-runner/src/profiling_test_data/major_test_cases

@@ -820,10 +820,7 @@ erc20_transfer
 
 //! > expected_profiling_info
 Weight by sierra statement:
-  statement 331: 10 (storage_base_address_from_felt252([0], [31]) -> ([32], [33]))
-  statement 427: 10 (storage_base_address_from_felt252([95], [116]) -> ([117], [118]))
-  statement 462: 10 (storage_base_address_from_felt252([117], [148]) -> ([149], [150]))
-  statement 558: 10 (storage_base_address_from_felt252([212], [233]) -> ([234], [235]))
+  statement 933: 40 (storage_base_address_from_felt252([0], [1]) -> ([2], [3]))
   statement 599: 9 (emit_event_syscall([255], [251], [268], [269]) { fallthrough([270], [271]) 612([272], [273], [274]) })
   statement 437: 8 (storage_write_syscall([108], [59], [123], [121], [119]) { fallthrough([124], [125]) 782([126], [127], [128]) })
   statement 447: 8 (storage_write_syscall([129], [125], [122], [132], [130]) { fallthrough([133], [134]) 766([135], [136], [137]) })
@@ -837,6 +834,9 @@ Weight by sierra statement:
   statement 124: 6 (withdraw_gas_all([39], [51], [52]) { fallthrough([53], [54]) 194([55], [56]) })
   statement 129: 5 (get_execution_info_v2_syscall([57], [3]) { fallthrough([58], [59], [60]) 179([61], [62], [63]) })
   statement 588: 5 (store_temp<test::erc_20::Event>([261]) -> ([261]))
+  statement 934: 4 (store_temp<RangeCheck>([2]) -> ([2]))
+  statement 935: 4 (store_temp<StorageBaseAddress>([3]) -> ([3]))
+  statement 936: 4 (return([2], [3]))
   statement 43: 3 (store_temp<core::panics::PanicResult::<((),)>>([33]) -> ([33]))
   statement 57: 3 (withdraw_gas([1], [2]) { fallthrough([5], [6]) 262([7], [8]) })
   statement 102: 3 (array_snapshot_pop_front<felt252>([33]) { fallthrough([45], [46]) 118([47]) })
@@ -868,8 +868,8 @@ Weight by sierra statement:
   statement 556: 2 (pedersen([147], [231], [227]) -> ([232], [233]))
   statement 589: 2 (store_temp<Array<felt252>>([256]) -> ([256]))
   statement 590: 2 (store_temp<Array<felt252>>([257]) -> ([257]))
-  statement 966: 2 (store_temp<Array<felt252>>([6]) -> ([6]))
-  statement 967: 2 (store_temp<Array<felt252>>([34]) -> ([34]))
+  statement 970: 2 (store_temp<Array<felt252>>([6]) -> ([6]))
+  statement 971: 2 (store_temp<Array<felt252>>([34]) -> ([34]))
   statement 6: 1 (store_temp<Tuple<felt252>>([8]) -> ([8]))
   statement 7: 1 (into_box<Tuple<felt252>>([8]) -> ([9]))
   statement 11: 1 (cheatcode<10052436086942832998170947883001859293934451>([11]) -> ([12]))
@@ -929,11 +929,12 @@ Weight by sierra statement:
   statement 301: 1 (store_temp<GasBuiltin>([14]) -> ([14]))
   statement 302: 1 (felt252_is_zero([16]) { fallthrough() 317([17]) })
   statement 328: 1 (store_temp<felt252>([29]) -> ([29]))
-  statement 330: 1 (store_temp<felt252>([31]) -> ([31]))
-  statement 341: 1 (store_temp<GasBuiltin>([21]) -> ([21]))
-  statement 342: 1 (store_temp<u32>([42]) -> ([42]))
-  statement 343: 1 (store_temp<Pedersen>([30]) -> ([30]))
-  statement 344: 1 (store_temp<RangeCheck>([32]) -> ([32]))
+  statement 330: 1 (store_temp<RangeCheck>([0]) -> ([0]))
+  statement 331: 1 (store_temp<felt252>([31]) -> ([31]))
+  statement 332: 1 (function_call<user@core::starknet::storage_access::storage_base_address_from_felt252>([0], [31]) -> ([32], [33]))
+  statement 342: 1 (store_temp<GasBuiltin>([21]) -> ([21]))
+  statement 343: 1 (store_temp<u32>([42]) -> ([42]))
+  statement 344: 1 (store_temp<Pedersen>([30]) -> ([30]))
   statement 347: 1 (store_temp<GasBuiltin>([43]) -> ([43]))
   statement 349: 1 (store_temp<felt252>([45]) -> ([45]))
   statement 350: 1 (store_temp<System>([44]) -> ([44]))
@@ -961,22 +962,24 @@ Weight by sierra statement:
   statement 401: 1 (jump() { 414() })
   statement 414: 1 (enum_match<core::bool>([86]) { fallthrough([106]) 801([107]) })
   statement 424: 1 (store_temp<felt252>([114]) -> ([114]))
-  statement 426: 1 (store_temp<felt252>([116]) -> ([116]))
-  statement 433: 1 (store_temp<GasBuiltin>([108]) -> ([108]))
-  statement 434: 1 (store_temp<u32>([123]) -> ([123]))
-  statement 435: 1 (store_temp<Pedersen>([115]) -> ([115]))
-  statement 436: 1 (store_temp<RangeCheck>([117]) -> ([117]))
+  statement 426: 1 (store_temp<RangeCheck>([95]) -> ([95]))
+  statement 427: 1 (store_temp<felt252>([116]) -> ([116]))
+  statement 428: 1 (function_call<user@core::starknet::storage_access::storage_base_address_from_felt252>([95], [116]) -> ([117], [118]))
+  statement 434: 1 (store_temp<GasBuiltin>([108]) -> ([108]))
+  statement 435: 1 (store_temp<u32>([123]) -> ([123]))
+  statement 436: 1 (store_temp<Pedersen>([115]) -> ([115]))
   statement 439: 1 (store_temp<GasBuiltin>([124]) -> ([124]))
   statement 444: 1 (store_temp<GasBuiltin>([129]) -> ([129]))
   statement 445: 1 (store_temp<u32>([122]) -> ([122]))
   statement 446: 1 (store_temp<StorageAddress>([132]) -> ([132]))
   statement 449: 1 (store_temp<GasBuiltin>([133]) -> ([133]))
   statement 459: 1 (store_temp<felt252>([146]) -> ([146]))
-  statement 461: 1 (store_temp<felt252>([148]) -> ([148]))
-  statement 472: 1 (store_temp<GasBuiltin>([138]) -> ([138]))
-  statement 473: 1 (store_temp<u32>([159]) -> ([159]))
-  statement 474: 1 (store_temp<Pedersen>([147]) -> ([147]))
-  statement 475: 1 (store_temp<RangeCheck>([149]) -> ([149]))
+  statement 461: 1 (store_temp<RangeCheck>([117]) -> ([117]))
+  statement 462: 1 (store_temp<felt252>([148]) -> ([148]))
+  statement 463: 1 (function_call<user@core::starknet::storage_access::storage_base_address_from_felt252>([117], [148]) -> ([149], [150]))
+  statement 473: 1 (store_temp<GasBuiltin>([138]) -> ([138]))
+  statement 474: 1 (store_temp<u32>([159]) -> ([159]))
+  statement 475: 1 (store_temp<Pedersen>([147]) -> ([147]))
   statement 478: 1 (store_temp<GasBuiltin>([160]) -> ([160]))
   statement 480: 1 (store_temp<felt252>([162]) -> ([162]))
   statement 481: 1 (store_temp<System>([161]) -> ([161]))
@@ -1004,11 +1007,12 @@ Weight by sierra statement:
   statement 532: 1 (jump() { 545() })
   statement 545: 1 (enum_match<core::bool>([203]) { fallthrough([223]) 660([224]) })
   statement 555: 1 (store_temp<felt252>([231]) -> ([231]))
-  statement 557: 1 (store_temp<felt252>([233]) -> ([233]))
-  statement 564: 1 (store_temp<GasBuiltin>([225]) -> ([225]))
-  statement 565: 1 (store_temp<u32>([240]) -> ([240]))
-  statement 566: 1 (store_temp<Pedersen>([232]) -> ([232]))
-  statement 567: 1 (store_temp<RangeCheck>([234]) -> ([234]))
+  statement 557: 1 (store_temp<RangeCheck>([212]) -> ([212]))
+  statement 558: 1 (store_temp<felt252>([233]) -> ([233]))
+  statement 559: 1 (function_call<user@core::starknet::storage_access::storage_base_address_from_felt252>([212], [233]) -> ([234], [235]))
+  statement 565: 1 (store_temp<GasBuiltin>([225]) -> ([225]))
+  statement 566: 1 (store_temp<u32>([240]) -> ([240]))
+  statement 567: 1 (store_temp<Pedersen>([232]) -> ([232]))
   statement 570: 1 (store_temp<GasBuiltin>([241]) -> ([241]))
   statement 575: 1 (store_temp<GasBuiltin>([246]) -> ([246]))
   statement 576: 1 (store_temp<u32>([239]) -> ([239]))
@@ -1024,20 +1028,20 @@ Weight by sierra statement:
   statement 608: 1 (store_temp<Pedersen>([232]) -> ([232]))
   statement 609: 1 (store_temp<System>([271]) -> ([271]))
   statement 611: 1 (return([234], [275], [232], [271], [278]))
-  statement 933: 1 (enum_match<test::erc_20::Event>([0]) { fallthrough([3]) 969([4]) })
-  statement 936: 1 (store_temp<felt252>([5]) -> ([5]))
-  statement 937: 1 (array_append<felt252>([1], [5]) -> ([6]))
-  statement 944: 1 (array_append<felt252>([2], [12]) -> ([13]))
-  statement 951: 1 (array_append<felt252>([13], [19]) -> ([20]))
-  statement 960: 1 (array_append<felt252>([20], [28]) -> ([29]))
-  statement 965: 1 (array_append<felt252>([29], [33]) -> ([34]))
-  statement 968: 1 (return([6], [34]))
+  statement 937: 1 (enum_match<test::erc_20::Event>([0]) { fallthrough([3]) 973([4]) })
+  statement 940: 1 (store_temp<felt252>([5]) -> ([5]))
+  statement 941: 1 (array_append<felt252>([1], [5]) -> ([6]))
+  statement 948: 1 (array_append<felt252>([2], [12]) -> ([13]))
+  statement 955: 1 (array_append<felt252>([13], [19]) -> ([20]))
+  statement 964: 1 (array_append<felt252>([20], [28]) -> ([29]))
+  statement 969: 1 (array_append<felt252>([29], [33]) -> ([34]))
+  statement 972: 1 (return([6], [34]))
 Weight by concrete libfunc:
   libfunc store_temp<GasBuiltin>: 44
   libfunc storage_base_address_from_felt252: 40
   libfunc storage_write_syscall: 32
   libfunc storage_read_syscall: 28
-  libfunc store_temp<RangeCheck>: 20
+  libfunc store_temp<RangeCheck>: 24
   libfunc store_temp<felt252>: 19
   libfunc u128s_from_felt252: 12
   libfunc array_snapshot_pop_front<felt252>: 9
@@ -1058,8 +1062,10 @@ Weight by concrete libfunc:
   libfunc store_temp<test::erc_20::Event>: 5
   libfunc array_new<felt252>: 4
   libfunc branch_align: 4
+  libfunc function_call<user@core::starknet::storage_access::storage_base_address_from_felt252>: 4
   libfunc jump: 4
   libfunc store_temp<StorageAddress>: 4
+  libfunc store_temp<StorageBaseAddress>: 4
   libfunc store_temp<core::array::Span::<core::felt252>>: 4
   libfunc store_temp<core::panics::PanicResult::<((),)>>: 3
   libfunc store_temp<core::panics::PanicResult::<(core::array::Span::<core::felt252>,)>>: 3
@@ -1082,9 +1088,9 @@ Weight by concrete libfunc:
   libfunc store_temp<Box<core::starknet::info::v2::ExecutionInfo>>: 1
   libfunc store_temp<BuiltinCosts>: 1
   libfunc store_temp<Tuple<felt252>>: 1
-  return: 4
+  return: 8
 Weight by generic libfunc:
-  libfunc store_temp: 160
+  libfunc store_temp: 168
   libfunc storage_base_address_from_felt252: 40
   libfunc storage_write_syscall: 32
   libfunc storage_read_syscall: 28
@@ -1094,6 +1100,7 @@ Weight by generic libfunc:
   libfunc array_append: 8
   libfunc pedersen: 8
   libfunc contract_address_try_from_felt252: 7
+  libfunc function_call: 7
   libfunc u128_overflowing_add: 6
   libfunc u128_overflowing_sub: 6
   libfunc withdraw_gas_all: 6
@@ -1102,37 +1109,39 @@ Weight by generic libfunc:
   libfunc array_new: 4
   libfunc branch_align: 4
   libfunc jump: 4
-  libfunc function_call: 3
   libfunc withdraw_gas: 3
   libfunc felt252_is_zero: 2
   libfunc get_builtin_costs: 2
   libfunc cheatcode: 1
   libfunc into_box: 1
-  return: 4
+  return: 8
 Weight by user function (inc. generated):
-  function test::erc_20::StorageImpl::transfer_helper: 248
+  function test::erc_20::StorageImpl::transfer_helper: 212
   function test::erc_20::__wrapper__IERC20Impl__transfer: 81
+  function core::starknet::storage_access::storage_base_address_from_felt252: 52
   function test::erc20_transfer: 28
   function test::erc_20::EventIsEvent::append_keys_and_data: 12
 Weight by original user function (exc. generated):
-  function test::erc_20::StorageImpl::transfer_helper: 248
+  function test::erc_20::StorageImpl::transfer_helper: 212
   function test::erc_20::__wrapper__IERC20Impl__transfer: 81
+  function core::starknet::storage_access::storage_base_address_from_felt252: 52
   function test::erc20_transfer: 28
   function test::erc_20::EventIsEvent::append_keys_and_data: 12
 Weight by Cairo function:
-  function core::starknet::storage::StoragePathImpl::finalize: 44
+  function core::starknet::storage_access::storage_base_address_from_felt252: 52
   function core::integer::u128_try_from_felt252: 32
   function contract::ContractStateEventEmitter::emit: 29
-  function core::starknet::storage_access::StoreFelt252::write: 26
-  function core::starknet::storage_access::StoreFelt252::read: 24
   function core::starknet::storage_access::StoreFelt252::read_at_offset: 24
+  function core::starknet::storage_access::StoreFelt252::write: 24
   function core::starknet::storage_access::StoreFelt252::write_at_offset: 24
   function contract::__wrapper__IERC20Impl__transfer: 22
+  function core::starknet::storage_access::StoreFelt252::read: 22
   function core::integer::u256_overflowing_add: 19
   function core::integer::u256_overflowing_sub: 19
   function core::array::ArrayImpl::append: 17
   function lib.cairo::erc20_transfer: 16
   function core::pedersen::HashStateImpl::update: 12
+  function core::starknet::storage::StoragePathImpl::finalize: 12
   function core::starknet::contract_address::ContractAddressSerde::deserialize: 11
   function lib.cairo::erc_20::IERC20Impl::transfer: 9
   function core::array::SpanImpl::pop_front: 8
@@ -1148,12 +1157,14 @@ Weight by Cairo function:
   function core::integer::u256_checked_sub: 1
   function starknet_derive::EventIsEvent::append_keys_and_data: 1
 Weight by Sierra stack trace:
-  test::erc20_transfer: 369
-  test::erc20_transfer -> test::erc_20::__wrapper__IERC20Impl__transfer: 341
-  test::erc20_transfer -> test::erc_20::__wrapper__IERC20Impl__transfer -> test::erc_20::StorageImpl::transfer_helper: 260
+  test::erc20_transfer: 385
+  test::erc20_transfer -> test::erc_20::__wrapper__IERC20Impl__transfer: 357
+  test::erc20_transfer -> test::erc_20::__wrapper__IERC20Impl__transfer -> test::erc_20::StorageImpl::transfer_helper: 276
+  test::erc20_transfer -> test::erc_20::__wrapper__IERC20Impl__transfer -> test::erc_20::StorageImpl::transfer_helper -> core::starknet::storage_access::storage_base_address_from_felt252: 52
   test::erc20_transfer -> test::erc_20::__wrapper__IERC20Impl__transfer -> test::erc_20::StorageImpl::transfer_helper -> test::erc_20::EventIsEvent::append_keys_and_data: 12
 Weight by Cairo stack trace:
-  test::erc20_transfer: 369
-  test::erc20_transfer -> test::erc_20::__wrapper__IERC20Impl__transfer: 341
-  test::erc20_transfer -> test::erc_20::__wrapper__IERC20Impl__transfer -> test::erc_20::StorageImpl::transfer_helper: 260
+  test::erc20_transfer: 385
+  test::erc20_transfer -> test::erc_20::__wrapper__IERC20Impl__transfer: 357
+  test::erc20_transfer -> test::erc_20::__wrapper__IERC20Impl__transfer -> test::erc_20::StorageImpl::transfer_helper: 276
+  test::erc20_transfer -> test::erc_20::__wrapper__IERC20Impl__transfer -> test::erc_20::StorageImpl::transfer_helper -> core::starknet::storage_access::storage_base_address_from_felt252: 52
   test::erc20_transfer -> test::erc_20::__wrapper__IERC20Impl__transfer -> test::erc_20::StorageImpl::transfer_helper -> test::erc_20::EventIsEvent::append_keys_and_data: 12

crates/cairo-lang-starknet-classes/src/casm_contract_class_test.rs

@@ -100,7 +100,7 @@ fn test_contract_libfuncs_coverage(name: &str) {
 
 /// Tests that compiled_class_hash() returns the correct hash, by comparing it to hard-coded
 /// constant that was computed by other implementations.
-#[test_case("account__account", "66856a0972716664cfeb5014960b9b7cac5fb450272b9e6e2b6d26c9615a9d9")]
+#[test_case("account__account", "30c095e5747d94d32038f621c4576980728c2e6ba90eb9bf3690650e954338f")]
 fn test_compiled_class_hash(name: &str, expected_hash: &str) {
     let compiled_json_path =
         get_example_file_path(format!("{name}.compiled_contract_class.json").as_str());