Added sub-strategy.

commit-id:34b56463

Author: orizi

crates/cairo-lang-executable/src/compile_test_data/basic

@@ -262,7 +262,7 @@ ret;
 [ap + 0] = [fp + -7] + 5, ap++;
 jmp rel 4;
 [ap + 0] = [fp + -7] + 2, ap++;
-call rel 89;
+call rel 87;
 [ap + 0] = [ap + -9], ap++;
 [ap + 0] = 1, ap++;
 [ap + 0] = [ap + -4], ap++;
@@ -271,7 +271,7 @@ ret;
 [ap + 0] = [fp + -7] + 4, ap++;
 jmp rel 4;
 [ap + 0] = [fp + -7] + 1, ap++;
-call rel 80;
+call rel 78;
 [ap + 0] = [ap + -9], ap++;
 [ap + 0] = 1, ap++;
 [ap + 0] = [ap + -4], ap++;
@@ -280,14 +280,14 @@ ret;
 [ap + 0] = [fp + -7] + 3, ap++;
 jmp rel 3;
 [ap + 0] = [fp + -7], ap++;
-call rel 72;
+call rel 70;
 [ap + 0] = [ap + -9], ap++;
 [ap + 0] = 1, ap++;
 [ap + 0] = [ap + -4], ap++;
 [ap + 0] = [ap + -4], ap++;
 ret;
 [ap + 0] = 117999715903629884655797335944760714204113152088920212735095598, ap++;
-call rel 67;
+call rel 65;
 ret;
 jmp rel 9 if [fp + -3] != 0;
 [ap + 0] = [fp + -6], ap++;
@@ -300,24 +300,22 @@ ret;
 jmp rel 7 if [ap + -1] != 0, ap++;
 [ap + -1] = [ap + 0] + 340282366920938463463374607431768211456, ap++;
 [ap + -1] = [[fp + -6] + 0];
-jmp rel 25;
+jmp rel 23;
 [ap + -1] = [[fp + -6] + 0];
-[ap + 0] = [fp + -3], ap++;
-call rel 52;
-jmp rel 10 if [ap + -2] != 0;
-[ap + 0] = [fp + -6] + 1, ap++;
-[ap + 0] = [fp + -4], ap++;
-[ap + 0] = [ap + -8], ap++;
-[ap + 0] = [ap + -4], ap++;
-call rel -28;
-ret;
-call rel 52;
+jmp rel 11 if [fp + -3] != 0;
+call rel 49;
 [ap + 0] = [fp + -6] + 1, ap++;
 [ap + 0] = 1, ap++;
 [ap + 0] = [ap + -4], ap++;
 [ap + 0] = [ap + -4], ap++;
 ret;
-call rel 48;
+[ap + 0] = [fp + -6] + 1, ap++;
+[ap + 0] = [fp + -4], ap++;
+[ap + 0] = [ap + -3], ap++;
+[fp + -3] = [ap + 0] + 1, ap++;
+call rel -35;
+ret;
+call rel 36;
 [ap + 0] = [fp + -6] + 1, ap++;
 [ap + 0] = 1, ap++;
 [ap + 0] = [ap + -4], ap++;
@@ -338,18 +336,11 @@ ap += 1;
 [ap + 0] = [ap + -1], ap++;
 [ap + 0] = [ap + -2] + 1, ap++;
 ret;
-jmp rel 7 if [fp + -3] != 0;
-[ap + 0] = 1, ap++;
-[ap + 0] = 340282366920938463463374607431768211455, ap++;
-ret;
-[ap + 0] = 0, ap++;
-[fp + -3] = [ap + 0] + 1, ap++;
-ret;
 [ap + 0] = 39878429859763533771555484554338820190071, ap++;
-call rel -21;
+call rel -9;
 ret;
 [ap + 0] = 39878429859757942499084499860145094553463, ap++;
-call rel -26;
+call rel -14;
 ret;
 // footer
 ret;

crates/cairo-lang-lowering/src/lower/test_data/loop

@@ -801,27 +801,28 @@ Final lowering:
 Parameters: v0: core::RangeCheck, v1: core::gas::GasBuiltin
 blk0 (root):
 Statements:
+  (v2: core::integer::u8) <- 3
+  (v3: core::RangeCheck, v4: core::gas::GasBuiltin, v5: core::panics::PanicResult::<(core::integer::u8, ())>) <- test::foo[45-203](v0, v1, v2)
 End:
-  Match(match core::gas::withdraw_gas(v0, v1) {
-    Option::Some(v2, v3) => blk1,
-    Option::None(v4, v5) => blk2,
+  Match(match_enum(v5) {
+    PanicResult::Ok(v6) => blk1,
+    PanicResult::Err(v7) => blk2,
   })
 
 blk1:
 Statements:
-  (v6: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v3)
-  (v7: ()) <- struct_construct()
-  (v8: ((),)) <- struct_construct(v7)
-  (v9: core::panics::PanicResult::<((),)>) <- PanicResult::Ok(v8)
+  (v8: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v4)
+  (v9: ()) <- struct_construct()
+  (v10: ((),)) <- struct_construct(v9)
+  (v11: core::panics::PanicResult::<((),)>) <- PanicResult::Ok(v10)
 End:
-  Return(v2, v6, v9)
+  Return(v3, v8, v11)
 
 blk2:
 Statements:
-  (v10: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
-  (v11: core::panics::PanicResult::<((),)>) <- PanicResult::Err(v10)
+  (v12: core::panics::PanicResult::<((),)>) <- PanicResult::Err(v7)
 End:
-  Return(v4, v5, v11)
+  Return(v3, v4, v12)
 
 
 Generated loop lowering for source location:
@@ -891,40 +892,25 @@ Statements:
 End:
   Match(match core::gas::withdraw_gas(v0, v1) {
     Option::Some(v3, v4) => blk1,
-    Option::None(v5, v6) => blk4,
+    Option::None(v5, v6) => blk2,
   })
 
 blk1:
 Statements:
-  (v7: core::integer::u8) <- 0
+  (v7: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v4)
+  (v8: core::integer::u8) <- 0
+  (v9: ()) <- struct_construct()
+  (v10: (core::integer::u8, ())) <- struct_construct(v8, v9)
+  (v11: core::panics::PanicResult::<(core::integer::u8, ())>) <- PanicResult::Ok(v10)
 End:
-  Match(match core::integer::u8_is_zero(v7) {
-    IsZeroResult::Zero => blk2,
-    IsZeroResult::NonZero(v8) => blk3,
-  })
+  Return(v3, v7, v11)
 
 blk2:
 Statements:
-  (v9: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v4)
-  (v10: ()) <- struct_construct()
-  (v11: (core::integer::u8, ())) <- struct_construct(v7, v10)
-  (v12: core::panics::PanicResult::<(core::integer::u8, ())>) <- PanicResult::Ok(v11)
+  (v12: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
+  (v13: core::panics::PanicResult::<(core::integer::u8, ())>) <- PanicResult::Err(v12)
 End:
-  Return(v3, v9, v12)
-
-blk3:
-Statements:
-  (v13: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v4)
-  (v14: core::RangeCheck, v15: core::gas::GasBuiltin, v16: core::panics::PanicResult::<(core::integer::u8, ())>) <- test::foo[45-203](v3, v13, v7)
-End:
-  Return(v14, v15, v16)
-
-blk4:
-Statements:
-  (v17: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
-  (v18: core::panics::PanicResult::<(core::integer::u8, ())>) <- PanicResult::Err(v17)
-End:
-  Return(v5, v6, v18)
+  Return(v5, v6, v13)
 
 //! > ==========================================================================
 
@@ -1576,58 +1562,28 @@ Final lowering:
 Parameters: v0: core::RangeCheck, v1: core::gas::GasBuiltin
 blk0 (root):
 Statements:
+  (v2: core::integer::u8) <- 0
+  (v3: core::RangeCheck, v4: core::gas::GasBuiltin, v5: core::panics::PanicResult::<(core::integer::u8, ())>) <- test::MyImpl::impl_in_trait[54-175](v0, v1, v2)
 End:
-  Match(match core::gas::withdraw_gas(v0, v1) {
-    Option::Some(v2, v3) => blk1,
-    Option::None(v4, v5) => blk6,
+  Match(match_enum(v5) {
+    PanicResult::Ok(v6) => blk1,
+    PanicResult::Err(v7) => blk2,
   })
 
 blk1:
 Statements:
-  (v6: core::result::Result::<core::integer::u8, core::integer::u8>) <- core::internal::num::u8_inc{0, }()
+  (v8: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v4)
+  (v9: ()) <- struct_construct()
+  (v10: ((),)) <- struct_construct(v9)
+  (v11: core::panics::PanicResult::<((),)>) <- PanicResult::Ok(v10)
 End:
-  Match(match_enum(v6) {
-    Result::Ok(v7) => blk2,
-    Result::Err(v8) => blk5,
-  })
+  Return(v3, v8, v11)
 
 blk2:
 Statements:
-  (v9: core::RangeCheck, v10: core::gas::GasBuiltin, v11: core::panics::PanicResult::<(core::integer::u8, ())>) <- test::MyImpl::impl_in_trait[54-175](v2, v3, v7)
-End:
-  Match(match_enum(v11) {
-    PanicResult::Ok(v12) => blk3,
-    PanicResult::Err(v13) => blk4,
-  })
-
-blk3:
-Statements:
-  (v14: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v10)
-  (v15: ()) <- struct_construct()
-  (v16: ((),)) <- struct_construct(v15)
-  (v17: core::panics::PanicResult::<((),)>) <- PanicResult::Ok(v16)
-End:
-  Return(v9, v14, v17)
-
-blk4:
-Statements:
-  (v18: core::panics::PanicResult::<((),)>) <- PanicResult::Err(v13)
-End:
-  Return(v9, v10, v18)
-
-blk5:
-Statements:
-  (v19: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<608642104203229548495787928534675319>()
-  (v20: core::panics::PanicResult::<((),)>) <- PanicResult::Err(v19)
-End:
-  Return(v2, v3, v20)
-
-blk6:
-Statements:
-  (v21: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
-  (v22: core::panics::PanicResult::<((),)>) <- PanicResult::Err(v21)
+  (v12: core::panics::PanicResult::<((),)>) <- PanicResult::Err(v7)
 End:
-  Return(v4, v5, v22)
+  Return(v3, v4, v12)
 
 //! > lowering_diagnostics
 

crates/cairo-lang-lowering/src/lower/test_data/while

@@ -39,45 +39,28 @@ Final lowering:
 Parameters: v0: core::RangeCheck, v1: core::gas::GasBuiltin, v2: core::felt252
 blk0 (root):
 Statements:
+  (v3: core::felt252) <- 5
+  (v4: core::RangeCheck, v5: core::gas::GasBuiltin, v6: core::panics::PanicResult::<(core::felt252, ())>) <- test::foo[51-95](v0, v1, v3)
 End:
-  Match(match core::gas::withdraw_gas(v0, v1) {
-    Option::Some(v3, v4) => blk1,
-    Option::None(v5, v6) => blk4,
+  Match(match_enum(v6) {
+    PanicResult::Ok(v7) => blk1,
+    PanicResult::Err(v8) => blk2,
   })
 
 blk1:
 Statements:
-  (v7: core::felt252) <- 5
-  (v8: core::felt252) <- 1
-  (v9: core::felt252) <- core::felt252_sub(v7, v8)
-  (v10: core::RangeCheck, v11: core::gas::GasBuiltin, v12: core::panics::PanicResult::<(core::felt252, ())>) <- test::foo[51-95](v3, v4, v9)
+  (v9: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v5)
+  (v10: core::felt252, v11: ()) <- struct_destructure(v7)
+  (v12: (core::felt252,)) <- struct_construct(v10)
+  (v13: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Ok(v12)
 End:
-  Match(match_enum(v12) {
-    PanicResult::Ok(v13) => blk2,
-    PanicResult::Err(v14) => blk3,
-  })
+  Return(v4, v9, v13)
 
 blk2:
 Statements:
-  (v15: core::gas::GasBuiltin) <- core::gas::redeposit_gas(v11)
-  (v16: core::felt252, v17: ()) <- struct_destructure(v13)
-  (v18: (core::felt252,)) <- struct_construct(v16)
-  (v19: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Ok(v18)
-End:
-  Return(v10, v15, v19)
-
-blk3:
-Statements:
-  (v20: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Err(v14)
-End:
-  Return(v10, v11, v20)
-
-blk4:
-Statements:
-  (v21: (core::panics::Panic, core::array::Array::<core::felt252>)) <- core::panic_with_const_felt252::<375233589013918064796019>()
-  (v22: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Err(v21)
+  (v14: core::panics::PanicResult::<(core::felt252,)>) <- PanicResult::Err(v8)
 End:
-  Return(v5, v6, v22)
+  Return(v4, v5, v14)
 
 
 Generated loop lowering for source location:

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

@@ -43,6 +43,14 @@ pub enum OptimizationPhase {
     LowerImplicits,
     /// A validation phase that checks the lowering is valid. Used for debugging purposes.
     Validate,
+    /// A phase that iteratively a set of optimizations to the lowering.
+    /// Stops after a certain number of iterations, or when no more changes are made.
+    SubStrategy {
+        /// The id of the optimization strategy to apply.
+        strategy: OptimizationStrategyId,
+        /// The number of times to apply the strategy.
+        iterations: usize,
+    },
 }
 
 impl OptimizationPhase {
@@ -73,6 +81,16 @@ impl OptimizationPhase {
             OptimizationPhase::GasRedeposit => gas_redeposit(db, function, lowered),
             OptimizationPhase::Validate => validate(lowered)
                 .unwrap_or_else(|err| panic!("Failed validation: {:?}", err.to_message())),
+            OptimizationPhase::SubStrategy { strategy, iterations } => {
+                for _ in 1..iterations {
+                    let before = lowered.clone();
+                    strategy.apply_strategy(db, function, lowered)?;
+                    if *lowered == before {
+                        return Ok(());
+                    }
+                }
+                strategy.apply_strategy(db, function, lowered)?
+            }
         }
         Ok(())
     }
@@ -111,27 +129,29 @@ impl OptimizationStrategyId {
 /// Query implementation of [crate::db::LoweringGroup::baseline_optimization_strategy].
 pub fn baseline_optimization_strategy(db: &dyn LoweringGroup) -> OptimizationStrategyId {
     OptimizationStrategy(vec![
-        // Must be right before const folding.
-        OptimizationPhase::ReorganizeBlocks,
-        // Apply `ConstFolding` before inlining to get better inlining decisions.
-        OptimizationPhase::ConstFolding,
-        OptimizationPhase::ApplyInlining,
-        OptimizationPhase::ReturnOptimization,
-        OptimizationPhase::ReorganizeBlocks,
-        OptimizationPhase::ReorderStatements,
-        OptimizationPhase::BranchInversion,
-        OptimizationPhase::CancelOps,
-        // Must be right before const folding.
-        OptimizationPhase::ReorganizeBlocks,
-        OptimizationPhase::ConstFolding,
-        OptimizationPhase::OptimizeMatches,
-        OptimizationPhase::SplitStructs,
-        OptimizationPhase::ReorganizeBlocks,
-        OptimizationPhase::ReorderStatements,
-        OptimizationPhase::OptimizeMatches,
-        OptimizationPhase::ReorganizeBlocks,
-        OptimizationPhase::CancelOps,
-        OptimizationPhase::ReorganizeBlocks,
+        OptimizationPhase::SubStrategy {
+            strategy: OptimizationStrategy(vec![
+                // Must be right before const folding.
+                OptimizationPhase::ReorganizeBlocks,
+                // Apply `ConstFolding` before inlining to get better inlining decisions.
+                OptimizationPhase::ConstFolding,
+                OptimizationPhase::ApplyInlining,
+                OptimizationPhase::ReturnOptimization,
+                OptimizationPhase::ReorganizeBlocks,
+                OptimizationPhase::ReorderStatements,
+                OptimizationPhase::BranchInversion,
+                OptimizationPhase::CancelOps,
+                OptimizationPhase::SplitStructs,
+                OptimizationPhase::ReorganizeBlocks,
+                OptimizationPhase::ReorderStatements,
+                OptimizationPhase::OptimizeMatches,
+                OptimizationPhase::ReorganizeBlocks,
+                OptimizationPhase::CancelOps,
+                OptimizationPhase::ReorganizeBlocks,
+            ])
+            .intern(db),
+            iterations: 5,
+        },
         OptimizationPhase::DedupBlocks,
         // Re-run ReturnOptimization to eliminate harmful merges introduced by DedupBlocks.
         OptimizationPhase::ReturnOptimization,