Swift Optimizer: move function passes which are only used for unit testing to their own TestPasses directory.

Author: eeckstein

SwiftCompilerSources/Sources/Optimizer/CMakeLists.txt

@@ -16,4 +16,5 @@ add_subdirectory(DataStructures)
 add_subdirectory(InstructionPasses)
 add_subdirectory(PassManager)
 add_subdirectory(FunctionPasses)
+add_subdirectory(TestPasses)
 add_subdirectory(Utilities)

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/CMakeLists.txt

@@ -8,14 +8,9 @@
 
 swift_compiler_sources(Optimizer
   AssumeSingleThreaded.swift
-  AccessDumper.swift
   ComputeEffects.swift
-  EscapeInfoDumper.swift
   ObjCBridgingOptimization.swift
-  SILPrinter.swift
   MergeCondFails.swift
-  RangeDumper.swift
   ReleaseDevirtualizer.swift
-  RunUnitTests.swift
   StackPromotion.swift
 )

SwiftCompilerSources/Sources/Optimizer/PassManager/PassRegistration.swift

@@ -38,20 +38,25 @@ private func registerPass<InstType: Instruction>(
 }
 
 private func registerSwiftPasses() {
-  registerPass(silPrinterPass, { silPrinterPass.run($0) })
+  // Function passes
   registerPass(mergeCondFailsPass, { mergeCondFailsPass.run($0) })
-  registerPass(escapeInfoDumper, { escapeInfoDumper.run($0) })
-  registerPass(addressEscapeInfoDumper, { addressEscapeInfoDumper.run($0) })
-  registerPass(accessDumper, { accessDumper.run($0) })
   registerPass(computeEffects, { computeEffects.run($0) })
   registerPass(objCBridgingOptimization, { objCBridgingOptimization.run($0) })
   registerPass(stackPromotion, { stackPromotion.run($0) })
+  registerPass(assumeSingleThreadedPass, { assumeSingleThreadedPass.run($0) })
+  registerPass(releaseDevirtualizerPass, { releaseDevirtualizerPass.run($0) })
+
+  // Instruction passes
   registerPass(simplifyBeginCOWMutationPass, { simplifyBeginCOWMutationPass.run($0) })
   registerPass(simplifyGlobalValuePass, { simplifyGlobalValuePass.run($0) })
   registerPass(simplifyStrongRetainPass, { simplifyStrongRetainPass.run($0) })
   registerPass(simplifyStrongReleasePass, { simplifyStrongReleasePass.run($0) })
-  registerPass(assumeSingleThreadedPass, { assumeSingleThreadedPass.run($0) })
+
+  // Test passes
+  registerPass(silPrinterPass, { silPrinterPass.run($0) })
+  registerPass(escapeInfoDumper, { escapeInfoDumper.run($0) })
+  registerPass(addressEscapeInfoDumper, { addressEscapeInfoDumper.run($0) })
+  registerPass(accessDumper, { accessDumper.run($0) })
   registerPass(rangeDumper, { rangeDumper.run($0) })
   registerPass(runUnitTests, { runUnitTests.run($0) })
-  registerPass(releaseDevirtualizerPass, { releaseDevirtualizerPass.run($0) })
 }

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/AccessDumper.swift renamed to SwiftCompilerSources/Sources/Optimizer/TestPasses/AccessDumper.swift

@@ -0,0 +1,15 @@
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2022 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+swift_compiler_sources(Optimizer
+  AccessDumper.swift
+  EscapeInfoDumper.swift
+  SILPrinter.swift
+  RangeDumper.swift
+  RunUnitTests.swift
+)