some more cleanup

Author: vchuravy

src/compiler/optimize.jl

@@ -99,26 +99,6 @@ function loop_optimizations_tm!(pm::LLVM.ModulePassManager, tm::LLVM.TargetMachi
     end
 end
 
-function more_loop_optimizations_newPM!(fpm::LLVM.NewPMPassManager)
-    add!(fpm, NewPMLoopPassManager()) do lpm
-        add!(lpm, LoopRotatePass())
-        # moving IndVarSimplify here prevented removing the loop in perf_sumcartesian(10:-1:1)
-        # add!(lpm, LoopIdiomPass()) TODO(NewPM): This seems to have gotten removed
-
-        # LoopRotate strips metadata from terminator, so run LowerSIMD afterwards
-        add!(lpm, LowerSIMDLoopPass()) # Annotate loop marked with "loopinfo" as LLVM parallel loop
-        add!(lpm, LICMPass())
-        add!(lpm, JuliaLICMPass())
-    end
-    add!(fpm, InstCombinePass())
-    add!(fpm, JLInstSimplifyPass())
-    add!(fpm, NewPMLoopPassManager()) do lpm
-        add!(lpm, IndVarSimplifyPass())
-        add!(lpm, LoopDeletionPass())
-    end
-    add!(fpm, LoopUnrollPass(opt_level=2))
-end
-
 @static if VERSION < v"1.11-"
     function cpu_features_tm!(pm::LLVM.ModulePassManager, tm::LLVM.TargetMachine)
         @static if isdefined(LLVM.Interop, :cpu_features!)
@@ -315,7 +295,6 @@ function addOptimizationPasses!(mpm::LLVM.NewPMPassManager)
         # merging the `alloca` for the unboxed data and the `alloca` created by the `alloc_opt`
         # pass.
 
-
         add!(fpm, AllocOptPass())
         # consider AggressiveInstCombinePass at optlevel > 2
 
@@ -335,7 +314,23 @@ function addOptimizationPasses!(mpm::LLVM.NewPMPassManager)
         # remove those before optimizing loops.
         add!(fpm, AllocOptPass())
 
-        more_loop_optimizations_newPM!(fpm)
+        add!(fpm, NewPMLoopPassManager(use_memory_ssa=true)) do lpm
+            add!(lpm, LoopRotatePass())
+            # moving IndVarSimplify here prevented removing the loop in perf_sumcartesian(10:-1:1)
+            add!(lpm, LoopIdiomRecognizePass())
+
+            # LoopRotate strips metadata from terminator, so run LowerSIMD afterwards
+            add!(lpm, LowerSIMDLoopPass()) # Annotate loop marked with "loopinfo" as LLVM parallel loop
+            add!(lpm, LICMPass())
+            add!(lpm, JuliaLICMPass())
+        end
+        add!(fpm, InstCombinePass())
+        add!(fpm, JLInstSimplifyPass())
+        add!(fpm, NewPMLoopPassManager()) do lpm
+            add!(lpm, IndVarSimplifyPass())
+            add!(lpm, LoopDeletionPass())
+        end
+        add!(fpm, LoopUnrollPass(opt_level=2))
 
         # Run our own SROA on heap objects before LLVM's
         add!(fpm, AllocOptPass())