Reorganize SILOptimizer directories for better discoverability.

(libraries now)

It has been generally agreed that we need to do this reorg, and now
seems like the perfect time. Some major pass reorganization is in the
works.

This does not have to be the final word on the matter. The consensus
among those working on the code is that it's much better than what we
had and a better starting point for future bike shedding.

Note that the previous organization was designed to allow separate
analysis and optimization libraries. It turns out this is an
artificial distinction and not an important goal.

CODE_OWNERS.TXT

@@ -46,7 +46,7 @@ D: ClangImporter, Serialization, (Objective-)C printer, Driver
 
 N: Nadav Rotem
 E: [email protected]
-D: SILAnalysis, SILPasses
+D: SILOptimizer
 
 N: Anna Zaks
 E: [email protected]

include/swift/SIL/SILCloner.h

@@ -400,7 +400,7 @@ SILCloner<ImplClass>::cleanUp(SILFunction *F) {
   // NOTE: It is unfortunate that it essentially duplicates
   // the code from sil-combine, but doing so allows for
   // avoiding any cross-layer invocations between SIL and
-  // SILPasses layers.
+  // SILOptimizer layers.
 
   for (auto *BB : BlocksWithUnreachables) {
     for (auto &I : *BB) {

include/swift/SILOptimizer/Analysis/SimplifyInstruction.h

@@ -12,7 +12,7 @@
 //
 // An analysis that provides utilities for folding instructions. Since it is an
 // analysis it does not modify the IR in anyway. This is left to actual
-// SILPasses.
+// SIL Transforms.
 //
 //===----------------------------------------------------------------------===//
 

lib/CMakeLists.txt

@@ -18,7 +18,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   add_subdirectory(SwiftDemangle)
 endif()
 add_subdirectory(SIL)
-add_subdirectory(SILAnalysis)
 add_subdirectory(SILGen)
-add_subdirectory(SILPasses)
+add_subdirectory(SILOptimizer)
 

lib/Immediate/CMakeLists.txt

@@ -5,7 +5,7 @@ add_swift_library(swiftImmediate
     swiftIDE
     swiftFrontend
     swiftSILGen
-    swiftSILPasses
+    swiftSILOptimizer
     swiftIRGen
   COMPONENT_DEPENDS
     linker mcjit)

lib/SILOptimizer/Analysis/CMakeLists.txt

@@ -0,0 +1,22 @@
+set(ANALYSIS_SOURCES
+  Analysis/ARCAnalysis.cpp
+  Analysis/AliasAnalysis.cpp
+  Analysis/Analysis.cpp
+  Analysis/ArraySemantic.cpp
+  Analysis/BasicCalleeAnalysis.cpp
+  Analysis/CFG.cpp
+  Analysis/ClassHierarchyAnalysis.cpp
+  Analysis/ColdBlockInfo.cpp
+  Analysis/DestructorAnalysis.cpp
+  Analysis/EscapeAnalysis.cpp
+  Analysis/FunctionOrder.cpp
+  Analysis/IVAnalysis.cpp
+  Analysis/LoopAnalysis.cpp
+  Analysis/LoopRegionAnalysis.cpp
+  Analysis/MemoryBehavior.cpp
+  Analysis/RCIdentityAnalysis.cpp
+  Analysis/SideEffectAnalysis.cpp
+  Analysis/SimplifyInstruction.cpp
+  Analysis/TypeExpansionAnalysis.cpp
+  Analysis/ValueTracking.cpp
+  PARENT_SCOPE)

lib/SILOptimizer/CMakeLists.txt

@@ -0,0 +1,22 @@
+add_subdirectory(ARC)
+add_subdirectory(Analysis)
+add_subdirectory(IPO)
+add_subdirectory(LoopTransforms)
+add_subdirectory(Mandatory)
+add_subdirectory(PassManager)
+add_subdirectory(SILCombiner)
+add_subdirectory(Transforms)
+add_subdirectory(UtilityPasses)
+add_subdirectory(Utils)
+add_swift_library(swiftSILOptimizer
+  ${ARC_SOURCES}
+  ${ANALYSIS_SOURCES}
+  ${SILCOMBINER_SOURCES}
+  ${UTILITYPASSES_SOURCES}
+  ${UTILS_SOURCES}
+  ${PASSMANAGER_SOURCES}
+  ${LOOPTRANSFORMS_SOURCES}
+  ${MANDATORY_SOURCES}
+  ${TRANSFORMS_SOURCES}
+  ${IPO_SOURCES}
+  LINK_LIBRARIES swiftSIL)

lib/SILOptimizer/IPO/CMakeLists.txt

@@ -0,0 +1,13 @@
+set(IPO_SOURCES
+  IPO/CapturePromotion.cpp
+  IPO/DeadFunctionElimination.cpp
+  IPO/GlobalOpt.cpp
+  IPO/PerformanceInliner.cpp
+  IPO/CapturePropagation.cpp
+  IPO/ExternalDefsToDecls.cpp
+  IPO/GlobalPropertyOpt.cpp
+  IPO/UsePrespecialized.cpp
+  IPO/ClosureSpecializer.cpp
+  IPO/FunctionSignatureOpts.cpp
+  IPO/LetPropertiesOpts.cpp
+  PARENT_SCOPE)

lib/SILOptimizer/LoopTransforms/CMakeLists.txt

@@ -0,0 +1,6 @@
+set(LOOPTRANSFORMS_SOURCES
+  LoopTransforms/ArrayBoundsCheckOpts.cpp
+  LoopTransforms/COWArrayOpt.cpp
+  LoopTransforms/LoopRotate.cpp
+  LoopTransforms/LICM.cpp
+  PARENT_SCOPE)

lib/SILOptimizer/Mandatory/CMakeLists.txt

@@ -0,0 +1,10 @@
+set(MANDATORY_SOURCES
+  Mandatory/DefiniteInitialization.cpp
+  Mandatory/MandatoryInlining.cpp
+  Mandatory/DIMemoryUseCollector.cpp
+  Mandatory/DataflowDiagnostics.cpp
+  Mandatory/DiagnoseUnreachable.cpp
+  Mandatory/PredictableMemOpt.cpp
+  Mandatory/ConstantPropagation.cpp
+  Mandatory/InOutDeshadowing.cpp
+  PARENT_SCOPE)

lib/SILPasses/PassManager/CMakeLists.txt → lib/SILOptimizer/PassManager/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(PM_SOURCES
+set(PASSMANAGER_SOURCES
   PassManager/PassManager.cpp
   PassManager/Passes.cpp
   PassManager/PrettyStackTrace.cpp

lib/SILOptimizer/Transforms/CMakeLists.txt

@@ -0,0 +1,23 @@
+set(TRANSFORMS_SOURCES
+  Transforms/AllocBoxToStack.cpp
+  Transforms/ArrayCountPropagation.cpp
+  Transforms/MergeCondFail.cpp
+  Transforms/SILSROA.cpp
+  Transforms/CSE.cpp
+  Transforms/RedundantOverflowCheckRemoval.cpp
+  Transforms/SimplifyCFG.cpp
+  Transforms/CopyForwarding.cpp
+  Transforms/RemovePin.cpp
+  Transforms/Sink.cpp
+  Transforms/DeadCodeElimination.cpp
+  Transforms/SILCleanup.cpp
+  Transforms/SpeculativeDevirtualizer.cpp
+  Transforms/ReleaseDevirtualizer.cpp
+  Transforms/DeadObjectElimination.cpp
+  Transforms/SILCodeMotion.cpp
+  Transforms/StackPromotion.cpp
+  Transforms/DeadStoreElimination.cpp
+  Transforms/SILLowerAggregateInstrs.cpp
+  Transforms/RedundantLoadElimination.cpp
+  Transforms/SILMem2Reg.cpp
+  PARENT_SCOPE)

lib/SILOptimizer/Utils/CMakeLists.txt

@@ -0,0 +1,13 @@
+set(UTILS_SOURCES
+  Utils/CFG.cpp
+  Utils/Local.cpp
+  Utils/SILInliner.cpp
+  Utils/SILSSAUpdater.cpp
+  Utils/ConstantFolding.cpp
+  Utils/GenericCloner.cpp
+  Utils/Generics.cpp
+  Utils/Devirtualize.cpp
+  Utils/CheckedCastBrJumpThreading.cpp
+  Utils/LoopUtils.cpp
+  PARENT_SCOPE)
+

tools/SourceKit/lib/SwiftLang/CMakeLists.txt

@@ -9,9 +9,9 @@ add_sourcekit_library(SourceKitSwiftLang
   SwiftLangSupport.cpp
   SwiftSourceDocInfo.cpp
   DEPENDS SourceKitCore swiftDriver swiftFrontend swiftClangImporter swiftIDE
-          swiftAST swiftMarkup swiftParse swiftSIL swiftSILGen swiftSILPasses
-          swiftSILPassesUtils swiftSema swiftBasic swiftSerialization
-          swiftSILAnalysis swiftOption cmark
+          swiftAST swiftMarkup swiftParse swiftSIL swiftSILGen swiftSILOptimizer
+          swiftSema swiftBasic swiftSerialization
+          swiftOption cmark
     # Clang dependencies.
       clangFormat
       clangToolingCore

tools/driver/CMakeLists.txt

@@ -5,7 +5,7 @@ add_swift_executable(swift
   modulewrap_main.cpp
   LINK_LIBRARIES
     swiftIDE
-    swiftDriver swiftIRGen swiftSIL swiftSILGen swiftSILPasses
+    swiftDriver swiftIRGen swiftSIL swiftSILGen swiftSILOptimizer
     swiftImmediate
     swiftSerialization
     swiftPrintAsObjC

tools/sil-extract/CMakeLists.txt

@@ -3,7 +3,7 @@ add_swift_executable(sil-extract
   LINK_LIBRARIES
     swiftFrontend
     swiftSILGen
-    swiftSILPasses
+    swiftSILOptimizer
     swiftSerialization
     swiftClangImporter
 )

tools/sil-opt/CMakeLists.txt

@@ -4,7 +4,7 @@ add_swift_executable(sil-opt
     swiftFrontend
     swiftIRGen
     swiftSILGen
-    swiftSILPasses
+    swiftSILOptimizer
 )
 
 swift_install_in_component(tools