feat: Initial multivalue WASM proposal support

.github/workflows/build.yml

@@ -123,6 +123,10 @@ jobs:
         run: |
           # fast benchmark tests before long run
           cargo test -p "pallet-*" --features runtime-benchmarks,runtime-benchmarks-checkers --locked ${{ matrix.profiles.flags }} bench
+          # check `multivalue` proposal works
+          RUSTFLAGS="--cfg force_wasmer_cranelift_i_know_what_i_do" \
+            cargo test -p pallet-gear --features runtime-benchmarks,runtime-benchmarks-checkers --locked ${{ matrix.profiles.flags }} \
+            benchmarking::bench_instr_call_indirect_per_result -- --exact
 
       - name: "Test: Benchmarks in WASM"
         # unoptimized benchmarks take a few hours to run

Cargo.toml

@@ -7,6 +7,9 @@ homepage = "https://gear-tech.io"
 repository = "https://github.com/gear-tech/gear"
 rust-version = "1.81"
 
+[workspace.lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(loom)', 'cfg(fuzz)', 'cfg(force_wasmer_cranelift_i_know_what_i_do)'] }
+
 [workspace]
 resolver = "2"
 
@@ -554,9 +557,6 @@ fs4 = "0.11.1"                                               # utils/gear-wasmer
 bytes = "1.8.0"                                              # utils/gear-wasmer-cache
 loom = "0.7.2"                                               # utils/gear-wasmer-cache
 
-[workspace.lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(loom)', 'cfg(fuzz)'] }
-
 [profile.dev.package.corosensei]
 opt-level = 3
 
@@ -592,9 +592,10 @@ debug = true
 [patch.crates-io]
 # sp-io = { version = "38.0.0", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409" }
 # sp-application-crypto = { version = "38.0.0", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-polkadot-stable2409" }
+
+# these patched dependecies force their `sign_ext` feature to be used by Substrate dependencies
 parity-wasm = { version = "0.45.0", git = "https://github.com/gear-tech/parity-wasm", branch = "v0.45.0-sign-ext" }
 wasmi-validation = { version = "0.5.0", git = "https://github.com/gear-tech/wasmi", branch = "v0.13.2-sign-ext" }
-# wasm-instrument = { version = "0.3.0", git = "https://github.com/gear-tech/wasm-instrument", branch = "v0.3.0-sign-ext" }
 wasm-instrument = { version = "0.4.0", git = "https://github.com/gear-tech/wasm-instrument", branch = "v0.4.0-sign-ext" }
 
 # TODO: remove after https://github.com/BLAKE3-team/BLAKE3/pull/230

core/src/gas_metering/rules.rs

@@ -183,21 +183,21 @@ impl Rules for CustomConstantCostRules {
 /// This type provides real gas cost of instructions on pallet-gear.
 pub struct ScheduleRules<'a> {
     schedule: &'a Schedule,
-    params: Vec<u32>,
+    funcs: Vec<(u32, u32)>,
 }
 
 impl Schedule {
     /// Returns real gas rules that are used by pallet gear.
     pub fn rules(&self, module: &Module) -> impl Rules + '_ {
         ScheduleRules {
             schedule: self,
-            params: module
+            funcs: module
                 .type_section()
                 .iter()
                 .flat_map(|section| section.types())
                 .map(|func| {
                     let Type::Function(func) = func;
-                    func.params().len() as u32
+                    (func.params().len() as u32, func.results().len() as u32)
                 })
                 .collect(),
         }
@@ -211,6 +211,7 @@ impl<'a> Rules for ScheduleRules<'a> {
 
         let w = &self.schedule.instruction_weights;
         let max_params = self.schedule.limits.parameters;
+        let max_results = self.schedule.limits.results;
 
         let weight = match *instruction {
             End | Unreachable | Return | Else | Block(_) | Loop(_) | Nop | Drop => 0,
@@ -240,7 +241,16 @@ impl<'a> Rules for ScheduleRules<'a> {
             GetGlobal(_) => w.global_get,
             SetGlobal(_) => w.global_set,
             CurrentMemory(_) => w.memory_current,
-            CallIndirect(idx, _) => *self.params.get(idx as usize).unwrap_or(&max_params),
+            CallIndirect(idx, _) => {
+                let (params, results) = self
+                    .funcs
+                    .get(idx as usize)
+                    .copied()
+                    .unwrap_or((max_params, max_results));
+                w.call_indirect
+                    .saturating_add(w.call_indirect_per_param.saturating_mul(params))
+                    .saturating_add(w.call_indirect_per_result.saturating_mul(results))
+            }
             BrTable(ref data) => w
                 .br_table
                 .saturating_add(w.br_table_per_entry.saturating_mul(data.table.len() as u32)),