SROA: Do not generate GEPs when direct address is available (#7457)

Fixes #7433

Author: vaivaswatha

.github/workflows/ci.yml

@@ -432,7 +432,7 @@ jobs:
         run: |
           fuel-core run --db-type in-memory --debug &
           sleep 5 &&
-          cargo run --locked --release --bin test -- --locked --release
+          cargo run --locked --release --bin test -- --locked --release --verify-ir all
 
   # TODO: Remove this upon merging std tests with the rest of the E2E tests.
   cargo-test-lib-std:

forc-pkg/src/manifest/build_profile.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use sway_core::{Backtrace, OptLevel, PrintAsm, PrintIr};
+use sway_core::{Backtrace, IrCli, OptLevel, PrintAsm};
 
 use crate::DumpOpts;
 
@@ -15,7 +15,9 @@ pub struct BuildProfile {
     pub print_dca_graph_url_format: Option<String>,
     pub dump: DumpOpts,
     #[serde(default)]
-    pub print_ir: PrintIr,
+    pub print_ir: IrCli,
+    #[serde(default)]
+    pub verify_ir: IrCli,
     #[serde(default)]
     pub print_asm: PrintAsm,
     #[serde(default)]
@@ -54,7 +56,8 @@ impl BuildProfile {
             print_ast: false,
             print_dca_graph: None,
             print_dca_graph_url_format: None,
-            print_ir: PrintIr::default(),
+            print_ir: IrCli::default(),
+            verify_ir: IrCli::default(),
             print_asm: PrintAsm::default(),
             print_bytecode: false,
             print_bytecode_spans: false,
@@ -77,7 +80,8 @@ impl BuildProfile {
             print_ast: false,
             print_dca_graph: None,
             print_dca_graph_url_format: None,
-            print_ir: PrintIr::default(),
+            print_ir: IrCli::default(),
+            verify_ir: IrCli::default(),
             print_asm: PrintAsm::default(),
             print_bytecode: false,
             print_bytecode_spans: false,
@@ -107,7 +111,7 @@ impl Default for BuildProfile {
 #[cfg(test)]
 mod tests {
     use crate::{BuildProfile, DumpOpts, PackageManifest};
-    use sway_core::{Backtrace, OptLevel, PrintAsm, PrintIr};
+    use sway_core::{Backtrace, IrCli, OptLevel, PrintAsm};
 
     #[test]
     fn test_build_profiles() {
@@ -132,7 +136,7 @@ mod tests {
         // Profile based on debug profile with adjusted IR printing options.
         let expected = BuildProfile {
             name: "".into(),
-            print_ir: PrintIr {
+            print_ir: IrCli {
                 initial: true,
                 r#final: false,
                 modified_only: true,
@@ -163,7 +167,8 @@ mod tests {
             print_ast: true,
             print_dca_graph: Some("dca_graph".into()),
             print_dca_graph_url_format: Some("print_dca_graph_url_format".into()),
-            print_ir: PrintIr::r#final(),
+            print_ir: IrCli::r#final(),
+            verify_ir: IrCli::none(),
             print_asm: PrintAsm::all(),
             print_bytecode: true,
             print_bytecode_spans: false,

forc-pkg/src/pkg.rs

@@ -47,7 +47,7 @@ use sway_core::{
     write_dwarf, BuildTarget, Engines, FinalizedEntry, LspConfig,
 };
 use sway_core::{namespace::Package, Observer};
-use sway_core::{set_bytecode_configurables_offset, DbgGeneration, PrintAsm, PrintIr};
+use sway_core::{set_bytecode_configurables_offset, DbgGeneration, IrCli, PrintAsm};
 use sway_error::{error::CompileError, handler::Handler, warning::CompileWarning};
 use sway_features::ExperimentalFeatures;
 use sway_types::{Ident, ProgramId, Span, Spanned};
@@ -261,7 +261,7 @@ pub struct PrintOpts {
     /// Print the original source code together with bytecode.
     pub bytecode_spans: bool,
     /// Print the generated Sway IR (Intermediate Representation).
-    pub ir: PrintIr,
+    pub ir: IrCli,
     /// Output build errors and warnings in reverse order.
     pub reverse_order: bool,
 }
@@ -290,6 +290,7 @@ pub struct DumpOpts {
 pub struct BuildOpts {
     pub pkg: PkgOpts,
     pub print: PrintOpts,
+    pub verify_ir: IrCli,
     pub minify: MinifyOpts,
     pub dump: DumpOpts,
     /// If set, generates a JSON file containing the hex-encoded script binary.
@@ -1581,6 +1582,7 @@ pub fn sway_build_config(
         build_profile.print_bytecode_spans,
     )
     .with_print_ir(build_profile.print_ir.clone())
+    .with_verify_ir(build_profile.verify_ir.clone())
     .with_include_tests(build_profile.include_tests)
     .with_time_phases(build_profile.time_phases)
     .with_profile(build_profile.profile)
@@ -2119,6 +2121,7 @@ fn build_profile_from_opts(
     let BuildOpts {
         pkg,
         print,
+        verify_ir,
         time_phases,
         profile: profile_opt,
         build_profile,
@@ -2158,6 +2161,7 @@ fn build_profile_from_opts(
             .clone_from(&print.dca_graph_url_format);
     }
     profile.print_ir |= print.ir.clone();
+    profile.verify_ir |= verify_ir.clone();
     profile.print_asm |= print.asm;
     profile.print_bytecode |= print.bytecode;
     profile.print_bytecode_spans |= print.bytecode_spans;

forc-plugins/forc-client/src/cmd/deploy.rs

@@ -1,5 +1,6 @@
 use crate::NodeTarget;
 use clap::Parser;
+use forc::cli::shared::IrCliOpt;
 pub use forc::cli::shared::{BuildOutput, Minify, Pkg, Print};
 use forc_pkg::BuildProfile;
 pub use forc_tx::{Gas, Maturity};
@@ -23,6 +24,8 @@ pub struct Command {
     pub minify: Minify,
     #[clap(flatten)]
     pub print: Print,
+    #[arg(long, value_parser = clap::builder::PossibleValuesParser::new(IrCliOpt::cli_options()))]
+    pub verify_ir: Option<Vec<String>>,
     #[clap(flatten)]
     pub gas: Gas,
     #[clap(flatten)]

forc-plugins/forc-client/src/cmd/run.rs

@@ -1,5 +1,6 @@
 use crate::NodeTarget;
 use clap::Parser;
+use forc::cli::shared::IrCliOpt;
 use fuel_crypto::SecretKey;
 
 pub use super::submit::Network;
@@ -15,6 +16,8 @@ pub struct Command {
     pub pkg: Pkg,
     #[clap(flatten)]
     pub minify: Minify,
+    #[arg(long, value_parser = clap::builder::PossibleValuesParser::new(IrCliOpt::cli_options()))]
+    pub verify_ir: Option<Vec<String>>,
     #[clap(flatten)]
     pub print: Print,
     #[clap(flatten)]

forc-plugins/forc-client/src/op/deploy.rs

@@ -12,6 +12,7 @@ use crate::{
     },
 };
 use anyhow::{bail, Context, Result};
+use forc::cli::shared::IrCliOpt;
 use forc_pkg::{self as pkg, DumpOpts, PackageManifestFile};
 use forc_pkg::{manifest::GenericManifestFile, MemberFilter};
 use forc_tracing::{println_action_green, println_warning};
@@ -43,7 +44,7 @@ use std::{
     sync::Arc,
     time::Duration,
 };
-use sway_core::{asm_generation::ProgramABI, language::parsed::TreeType, BuildTarget};
+use sway_core::{asm_generation::ProgramABI, language::parsed::TreeType, BuildTarget, IrCli};
 
 /// Default maximum contract size allowed for a single contract. If the target
 /// contract size is bigger than this amount, forc-deploy will automatically
@@ -848,6 +849,10 @@ fn build_opts_from_cmd(cmd: &cmd::Deploy, member_filter: pkg::MemberFilter) -> p
             ir: cmd.print.ir(),
             reverse_order: cmd.print.reverse_order,
         },
+        verify_ir: cmd
+            .verify_ir
+            .as_ref()
+            .map_or(IrCli::default(), |opts| IrCliOpt::from(opts).0),
         dump: DumpOpts::default(),
         time_phases: cmd.print.time_phases,
         profile: cmd.print.profile,

forc-plugins/forc-client/src/op/run/mod.rs

@@ -8,6 +8,7 @@ use crate::{
     },
 };
 use anyhow::{anyhow, bail, Context, Result};
+use forc::cli::shared::IrCliOpt;
 use forc_pkg::{self as pkg, fuel_core_not_running, DumpOpts, PackageManifestFile};
 use forc_tracing::println_warning;
 use forc_util::tx_utils::format_log_receipts;
@@ -25,8 +26,8 @@ use fuels_accounts::{provider::Provider, Account, ViewOnlyAccount};
 use pkg::BuiltPackage;
 use std::time::Duration;
 use std::{path::PathBuf, str::FromStr};
-use sway_core::language::parsed::TreeType;
 use sway_core::BuildTarget;
+use sway_core::{language::parsed::TreeType, IrCli};
 use tokio::time::timeout;
 use tracing::info;
 
@@ -320,6 +321,10 @@ fn build_opts_from_cmd(cmd: &cmd::Run) -> pkg::BuildOpts {
             ir: cmd.print.ir(),
             reverse_order: cmd.print.reverse_order,
         },
+        verify_ir: cmd
+            .verify_ir
+            .as_ref()
+            .map_or(IrCli::default(), |opts| IrCliOpt::from(opts).0),
         minify: pkg::MinifyOpts {
             json_abi: cmd.minify.json_abi,
             json_storage_slots: cmd.minify.json_storage_slots,

forc-test/src/lib.rs

@@ -19,7 +19,7 @@ use pkg::{Built, BuiltPackage};
 use rand::{Rng, SeedableRng};
 use rayon::prelude::*;
 use std::{collections::HashMap, fs, path::PathBuf, sync::Arc};
-use sway_core::BuildTarget;
+use sway_core::{BuildTarget, IrCli};
 use sway_types::Span;
 use tx::consensus_parameters::ConsensusParametersV1;
 use tx::{ConsensusParameters, ContractParameters, ScriptParameters, TxParameters};
@@ -136,6 +136,7 @@ pub enum PackageWithDeploymentToTest {
 pub struct TestOpts {
     pub pkg: pkg::PkgOpts,
     pub print: pkg::PrintOpts,
+    pub verify_ir: IrCli,
     pub minify: pkg::MinifyOpts,
     /// If set, outputs a binary file representing the script bytes.
     pub binary_outfile: Option<String>,
@@ -454,6 +455,7 @@ impl From<TestOpts> for pkg::BuildOpts {
         pkg::BuildOpts {
             pkg: val.pkg,
             print: val.print,
+            verify_ir: val.verify_ir,
             minify: val.minify,
             dump: DumpOpts::default(),
             binary_outfile: val.binary_outfile,
@@ -481,6 +483,7 @@ impl TestOpts {
         pkg::BuildOpts {
             pkg: self.pkg,
             print: self.print,
+            verify_ir: self.verify_ir,
             minify: self.minify,
             dump: DumpOpts::default(),
             binary_outfile: self.binary_outfile,

forc/src/cli/commands/contract_id.rs

@@ -1,5 +1,5 @@
 use crate::{
-    cli::shared::{BuildOutput, BuildProfile, Minify, Pkg, Print},
+    cli::shared::{BuildOutput, BuildProfile, IrCliOpt, Minify, Pkg, Print},
     ops::forc_contract_id,
 };
 use clap::Parser;
@@ -22,6 +22,8 @@ pub struct Command {
     pub minify: Minify,
     #[clap(flatten)]
     pub print: Print,
+    #[arg(long, value_parser = clap::builder::PossibleValuesParser::new(IrCliOpt::cli_options()))]
+    pub verify_ir: Option<Vec<String>>,
     #[clap(flatten)]
     pub build_output: BuildOutput,
     #[clap(flatten)]

forc/src/cli/commands/predicate_root.rs

@@ -2,7 +2,7 @@ use clap::Parser;
 use forc_util::ForcResult;
 
 pub use crate::cli::shared::{BuildOutput, BuildProfile, Minify, Pkg, Print};
-use crate::ops::forc_predicate_root;
+use crate::{cli::shared::IrCliOpt, ops::forc_predicate_root};
 
 forc_util::cli_examples! {
     crate::cli::Opt {
@@ -21,6 +21,8 @@ pub struct Command {
     pub minify: Minify,
     #[clap(flatten)]
     pub print: Print,
+    #[arg(long, value_parser = clap::builder::PossibleValuesParser::new(IrCliOpt::cli_options()))]
+    pub verify_ir: Option<Vec<String>>,
     #[clap(flatten)]
     pub build_output: BuildOutput,
     #[clap(flatten)]