Improve raw_ptr::write (1/n)

forc-test/src/execute.rs

@@ -85,9 +85,8 @@ impl TestExecutor {
             .add_unsigned_coin_input(secret_key, utxo_id, amount, asset_id, tx_pointer)
             .maturity(maturity);
 
-        let mut output_index = 1;
         // Insert contract ids into tx input
-        for contract_id in test_setup.contract_ids() {
+        for (output_index, contract_id) in (1..).zip(test_setup.contract_ids()) {
             tx_builder
                 .add_input(tx::Input::contract(
                     tx::UtxoId::new(tx::Bytes32::zeroed(), 0),
@@ -101,7 +100,6 @@ impl TestExecutor {
                     balance_root: fuel_tx::Bytes32::zeroed(),
                     state_root: tx::Bytes32::zeroed(),
                 }));
-            output_index += 1;
         }
 
         let consensus_params = tx_builder.get_params().clone();

forc/tests/cli_integration.rs

@@ -51,10 +51,10 @@ fn test_forc_test_raw_logs() -> Result<(), rexpect::error::Error> {
     // Assert that the output is correct
     process.exp_string("      test test_log_4")?;
     process.exp_string("raw logs:")?;
-    process.exp_string(r#"[{"LogData":{"data":"0000000000000004","digest":"8005f02d43fa06e7d0585fb64c961d57e318b27a145c857bcd3a6bdb413ff7fc","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":11280,"ptr":12456,"ra":0,"rb":1515152261580153489}}]"#)?;
+    process.exp_string(r#"[{"LogData":{"data":"0000000000000004","digest":"8005f02d43fa06e7d0585fb64c961d57e318b27a145c857bcd3a6bdb413ff7fc","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":11288,"ptr":12464,"ra":0,"rb":1515152261580153489}}]"#)?;
     process.exp_string("      test test_log_2")?;
     process.exp_string("raw logs:")?;
-    process.exp_string(r#"[{"LogData":{"data":"0000000000000002","digest":"cd04a4754498e06db5a13c5f371f1f04ff6d2470f24aa9bd886540e5dce77f70","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":11280,"ptr":12456,"ra":0,"rb":1515152261580153489}}]"#)?;
+    process.exp_string(r#"[{"LogData":{"data":"0000000000000002","digest":"cd04a4754498e06db5a13c5f371f1f04ff6d2470f24aa9bd886540e5dce77f70","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":11288,"ptr":12464,"ra":0,"rb":1515152261580153489}}]"#)?;
 
     process.process.exit()?;
     Ok(())
@@ -77,12 +77,12 @@ fn test_forc_test_both_logs() -> Result<(), rexpect::error::Error> {
     process.exp_string("decoded log values:")?;
     process.exp_string("4, log rb: 1515152261580153489")?;
     process.exp_string("raw logs:")?;
-    process.exp_string(r#"[{"LogData":{"data":"0000000000000004","digest":"8005f02d43fa06e7d0585fb64c961d57e318b27a145c857bcd3a6bdb413ff7fc","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":11280,"ptr":12456,"ra":0,"rb":1515152261580153489}}]"#)?;
+    process.exp_string(r#"[{"LogData":{"data":"0000000000000004","digest":"8005f02d43fa06e7d0585fb64c961d57e318b27a145c857bcd3a6bdb413ff7fc","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":11288,"ptr":12464,"ra":0,"rb":1515152261580153489}}]"#)?;
     process.exp_string("      test test_log_2")?;
     process.exp_string("decoded log values:")?;
     process.exp_string("2, log rb: 1515152261580153489")?;
     process.exp_string("raw logs:")?;
-    process.exp_string(r#"[{"LogData":{"data":"0000000000000002","digest":"cd04a4754498e06db5a13c5f371f1f04ff6d2470f24aa9bd886540e5dce77f70","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":11280,"ptr":12456,"ra":0,"rb":1515152261580153489}}]"#)?;
+    process.exp_string(r#"[{"LogData":{"data":"0000000000000002","digest":"cd04a4754498e06db5a13c5f371f1f04ff6d2470f24aa9bd886540e5dce77f70","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":11288,"ptr":12464,"ra":0,"rb":1515152261580153489}}]"#)?;
     process.process.exit()?;
     Ok(())
 }

justfile

@@ -40,6 +40,27 @@ benchmark-tests:
 # The `performance` group contains recipes related to benchmarking the performance of compiled code:
 # gas usages and bytecode sizes.
 
+CURRENT_BRANCH := `git branch --show-current`
+
+pe2e-against-master:
+    echo "Performance: {{CURRENT_BRANCH}} vs master"
+    git clean -xfd test/perf_out
+    git checkout master
+    cargo r -p test --release -- XX # update reduced std-libs
+    just pa
+    git checkout {{CURRENT_BRANCH}}
+    cargo r -p test --release -- XX # update reduced std-libs
+    just pa
+    just pdl
+    echo "performance reports at ./test/perf_out"
+
+pe2e-o2-against-master:
+    echo "Performance: {{CURRENT_BRANCH}} vs master"
+    git checkout master
+    cd ../sway-program-collection && git clean -xfd && just a
+    git checkout {{CURRENT_BRANCH}}
+    cd ../sway-program-collection && just a && just opd
+
 alias pe2e := perf-e2e
 # collect gas usages and bytecode sizes from E2E tests
 [group('performance')]
@@ -96,7 +117,7 @@ perf-diff-latest format='md':
 # format:         output format, either `csv` or `html` (default: `csv`)
 # open:           for `html` output, `-o` opens the report in the default browser
 
-alias psh := perf-snapshot-historical
+#alias psh := perf-snapshot-historical
 # collect historic gas usages from a snapshot test that has a `forc test` output
 [linux]
 [macos]

scripts/perf/perf-diff-latest.sh

@@ -12,6 +12,14 @@ perf_diff_stats_script="./scripts/perf/perf-diff-stats.sh"
 
 categories=("e2e-gas-usages" "e2e-bytecode-sizes" "in-language-gas-usages" "in-language-bytecode-sizes")
 
+
+# macOS compatibility: gfind from `brew install findutils`
+if [ -x "$(command -v gfind)" ]; then
+    find="gfind"
+else
+    find="find"
+fi
+
 err() {
     echo "ERROR: $*" >&2
     exit 1
@@ -28,8 +36,11 @@ process_category() {
     local category="$1"
 
     # Collect candidates: "*-<category>-*.csv", but skip "-<category>-historical-*.csv".
-    mapfile -t candidates < <(
-        find "$perf_out_dir" -maxdepth 1 -type f -name "*-${category}-*.csv" -printf "%p\n" 2>/dev/null |
+    candidates=()
+    while IFS= read -r line; do
+        candidates+=("$line")
+    done < <(
+        $find "$perf_out_dir" -maxdepth 1 -type f -name "*-${category}-*.csv" -printf "%p\n" 2>/dev/null |
             while IFS= read -r f; do
                 base="$(basename -- "$f")"
 
@@ -50,7 +61,10 @@ process_category() {
     fi
 
     # Sort by timestamp (asc) and take last two paths.
-    mapfile -t sorted_paths < <(
+    sorted_paths=()
+    while IFS= read -r line; do
+        sorted_paths+=("$line")
+    done < <(
         printf "%s\n" "${candidates[@]}" |
             sort -n -k1,1 |
             awk -F'\t' '{print $2}' |

sway-core/src/asm_generation/fuel/fuel_asm_builder.rs

@@ -2330,7 +2330,7 @@ impl<'ir, 'eng> FuelAsmBuilder<'ir, 'eng> {
         // XXX not required after we have FuelVM specific verifier.
         if !val
             .get_type(self.context)
-            .and_then(|val_ty| key.get_type(self.context).map(|key_ty| (val_ty, key_ty)))
+            .zip(key.get_type(self.context))
             .is_some_and(|(val_ty, key_ty)| {
                 val_ty.is_ptr(self.context) && key_ty.is_ptr(self.context)
             })

sway-core/src/ir_generation/convert.rs

@@ -176,7 +176,7 @@ pub(super) fn convert_resolved_type_info(
                 elem_type.type_id,
                 span,
             )?;
-            Type::new_array(context, elem_type, len as u64)
+            Type::new_array(context, elem_type, len)
         }
 
         TypeInfo::Tuple(fields) => {

sway-ir/Cargo.toml

@@ -26,6 +26,7 @@ sway-types.workspace = true
 sway-utils.workspace = true
 
 [dev-dependencies]
+expect-test.workspace = true
 insta.workspace = true
 vte.workspace = true
 

sway-ir/src/analysis.rs

@@ -4,3 +4,5 @@ pub mod dominator;
 pub use dominator::*;
 pub mod memory_utils;
 pub use memory_utils::*;
+pub mod loop_analysis;
+pub use loop_analysis::*;