Optimizer: add ModuleTest

Author: eeckstein

SwiftCompilerSources/Sources/Optimizer/PassManager/PassRegistration.swift

@@ -23,7 +23,7 @@ public func initializeSwiftModules() {
   registerOptimizerTests()
 }
 
-private func registerPass(
+func registerPass(
       _ pass: ModulePass,
       _ runFn: @escaping (@convention(c) (BridgedContext) -> ())) {
   pass.name._withBridgedStringRef { nameStr in

SwiftCompilerSources/Sources/Optimizer/Utilities/CMakeLists.txt

@@ -11,10 +11,10 @@ swift_compiler_sources(Optimizer
   Devirtualization.swift
   EscapeUtils.swift
   FunctionSignatureTransforms.swift
-  FunctionTest.swift
   GenericSpecialization.swift
   LifetimeDependenceUtils.swift
   LocalVariableUtils.swift
   OptUtils.swift
   OwnershipLiveness.swift
+  Test.swift
 )

SwiftCompilerSources/Sources/Optimizer/Utilities/FunctionTest.swift

@@ -1,4 +1,4 @@
-//===----------- FunctionTest.swift ---------------------------------------===//
+//===----------- Test.swift -----------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -14,15 +14,15 @@
 //
 // For general documentation on how to write tests see `Test.swift` in the
 // SIL module.
-// To add an optimizer test, use `FunctionTest` instead of `Test` and register
-// it in `registerOptimizerTests`.
+// To add an optimizer test, use `FunctionTest` or `ModuleTest` instead of `Test`
+// and register it in `registerOptimizerTests`.
 //
 //===----------------------------------------------------------------------===//
 
 import SIL
 import OptimizerBridging
 
-/// Like `SIL.Test`,  but provides a `FunctionPass` to the invocation closure.
+/// Like `SIL.Test`,  but provides a `FunctionPassContext` to the invocation closure.
 struct FunctionTest {
   let name: String
   let invocation: FunctionTestInvocation
@@ -33,6 +33,17 @@ struct FunctionTest {
   }
 }
 
+/// Like `SIL.Test`,  but provides a `ModulePassContext` to the invocation closure.
+/// This is just a wrapper around a `ModulePass` with the name "test-<testname>".
+/// Therefore, module tests must also be added to `Passes.def`.
+struct ModuleTest {
+  let pass: ModulePass
+
+  public init(_ name: String, invocation: @escaping (ModulePassContext) -> ()) {
+    self.pass = ModulePass(name: "test-" + name, invocation)
+  }
+}
+
 /// The type of the closure passed to a FunctionTest.
 typealias FunctionTestInvocation = @convention(thin) (Function, TestArguments, FunctionPassContext) -> ()
 
@@ -74,6 +85,10 @@ private func registerFunctionTest(_ test: FunctionTest) {
   }
 }
 
+private func registerModuleTest(_ test: ModuleTest, _ runFn: @escaping (@convention(c) (BridgedContext) -> ())) {
+  registerPass(test.pass, runFn)
+}
+
 /// The function called by the swift::test::FunctionTest which invokes the
 /// actual test function.
 ///