Merge pull request swiftlang#31621 from davezarzycki/pr31621

Remove all uses of -force-single-frontend-invocation

Author: CodaFi

benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

@@ -189,7 +189,7 @@ function (add_swift_benchmark_library objfile_out sibfile_out swiftmodule_out)
     DEPENDS ${stdlib_dependencies} ${sources} ${BENCHLIB_DEPENDS}
     COMMAND "${SWIFT_EXEC}"
       ${BENCHLIB_LIBRARY_FLAGS}
-      "-force-single-frontend-invocation"
+      "-whole-module-optimization"
       "-parse-as-library"
       "-module-name" "${module_name}"
       "-emit-module" "-emit-module-path" "${swiftmodule}"
@@ -209,7 +209,7 @@ function (add_swift_benchmark_library objfile_out sibfile_out swiftmodule_out)
       ${stdlib_dependencies} ${sources} ${BENCHLIB_DEPENDS}
       COMMAND "${SWIFT_EXEC}"
         ${BENCHLIB_LIBRARY_FLAGS}
-        "-force-single-frontend-invocation"
+        "-whole-module-optimization"
         "-parse-as-library"
         "-module-name" "${module_name}"
         "-emit-sib"
@@ -574,7 +574,7 @@ function (swift_benchmark_compile_archopts)
         ${SWIFT_BENCH_SIBFILES} "${source}"
       COMMAND "${SWIFT_EXEC}"
       ${common_swift4_options}
-      "-force-single-frontend-invocation"
+      "-whole-module-optimization"
       "-emit-module" "-module-name" "${module_name}"
       "-I" "${objdir}"
       "-o" "${objdir}/${module_name}.o"

docs/CompilerPerformance.md

@@ -100,8 +100,7 @@ running in, and often to perform separate analysis for each mode. The
 significant modes are:
 
   - **Primary-file** vs. **whole-module**: this varies depending on whether the
-    driver is run with the flag `-wmo`, `-whole-module-optimization` or
-    `-force-single-frontend-invocation` (all these options are synonymous).
+    driver is run with the flag `-wmo` (a.k.a. `-whole-module-optimization`).
 
     - **Batch** vs. **single-file** primary-file mode. This distinction refines
     the behaviour of primary-file mode, with the new batch mode added in the

lib/Driver/FrontendUtil.cpp

@@ -32,10 +32,10 @@ bool swift::driver::getSingleFrontendInvocationFromDriverArguments(
 
   // When creating a CompilerInvocation, ensure that the driver creates a single
   // frontend command.
-  Args.push_back("-force-single-frontend-invocation");
+  Args.push_back("-whole-module-optimization");
 
   // Explictly disable batch mode to avoid a spurious warning when combining
-  // -enable-batch-mode with -force-single-frontend-invocation.  This is an
+  // -enable-batch-mode with -whole-module-optimization.  This is an
   // implementation detail.
   Args.push_back("-disable-batch-mode");
 

stdlib/cmake/modules/SwiftSource.cmake

@@ -90,7 +90,7 @@ function(handle_swift_sources
 
     # FIXME: We shouldn't /have/ to build things in a single process.
     # <rdar://problem/15972329>
-    list(APPEND swift_compile_flags "-force-single-frontend-invocation")
+    list(APPEND swift_compile_flags "-whole-module-optimization")
 
     _compile_swift_files(
         dependency_target

test/Driver/actions-dsym.swift

@@ -107,7 +107,7 @@
 // LINK-DEBUG-SWIFTMODULES: 7: link, {1, 2, 3, 4, 5, 6}, image
 
 // RUN: touch %t/a.o %t/b.o
-// RUN: %swiftc_driver -driver-print-actions -target x86_64-apple-macosx10.9 -g %S/Inputs/main.swift %S/../Inputs/empty.swift %s -module-name actions -force-single-frontend-invocation 2>&1 | %FileCheck %s -check-prefix=WHOLE-MODULE
+// RUN: %swiftc_driver -driver-print-actions -target x86_64-apple-macosx10.9 -g %S/Inputs/main.swift %S/../Inputs/empty.swift %s -module-name actions -whole-module-optimization 2>&1 | %FileCheck %s -check-prefix=WHOLE-MODULE
 // WHOLE-MODULE: 0: input, "{{.*}}Inputs/main.swift", swift
 // WHOLE-MODULE: 1: input, "{{.*}}Inputs/empty.swift", swift
 // WHOLE-MODULE: 2: input, "{{.*}}actions-dsym.swift", swift

test/Driver/actions.swift

@@ -193,7 +193,7 @@
 // COMPILE-PLUS-OBJECT-MACHO: 3: link, {0, 2}, image
 
 
-// RUN: %swiftc_driver -driver-print-actions %S/Inputs/main.swift %S/../Inputs/empty.swift %s -module-name actions -force-single-frontend-invocation 2>&1 | %FileCheck %s -check-prefix=WHOLE-MODULE -check-prefix WHOLE-MODULE-%target-object-format
+// RUN: %swiftc_driver -driver-print-actions %S/Inputs/main.swift %S/../Inputs/empty.swift %s -module-name actions -whole-module-optimization 2>&1 | %FileCheck %s -check-prefix=WHOLE-MODULE -check-prefix WHOLE-MODULE-%target-object-format
 // WHOLE-MODULE: 0: input, "{{.*}}Inputs/main.swift", swift
 // WHOLE-MODULE: 1: input, "{{.*}}Inputs/empty.swift", swift
 // WHOLE-MODULE: 2: input, "{{.*}}actions.swift", swift

test/Driver/embed-bitcode.swift

@@ -44,15 +44,15 @@
 // CHECK-MODULE-NOT: -fake-llvm-option
 // CHECK-MODULE-NOT: -emit-module-path
 
-// RUN: %target-swiftc_driver -embed-bitcode -force-single-frontend-invocation %s 2>&1 -### | %FileCheck %s -check-prefix=CHECK-SINGLE
+// RUN: %target-swiftc_driver -embed-bitcode -whole-module-optimization %s 2>&1 -### | %FileCheck %s -check-prefix=CHECK-SINGLE
 // CHECK-SINGLE: -frontend
 // CHECK-SINGLE: -emit-bc
 // CHECK-SINGLE: -frontend
 // CHECK-SINGLE: -c
 // CHECK-SINGLE: -embed-bitcode
 // CHECK-SINGLE: -disable-llvm-optzns
 
-// RUN: %target-swiftc_driver -embed-bitcode -force-single-frontend-invocation -O %s 2>&1 -### | %FileCheck %s -check-prefix=CHECK-SINGLE-OPT
+// RUN: %target-swiftc_driver -embed-bitcode -whole-module-optimization -O %s 2>&1 -### | %FileCheck %s -check-prefix=CHECK-SINGLE-OPT
 // CHECK-SINGLE-OPT: -frontend
 // CHECK-SINGLE-OPT-SAME: -emit-bc
 // CHECK-SINGLE-OPT-SAME: -O{{[" ]}}
@@ -62,7 +62,7 @@
 // CHECK-SINGLE-OPT-SAME: -O{{[" ]}}
 // CHECK-SINGLE-OPT-SAME: -disable-llvm-optzns
 
-// RUN: %target-swiftc_driver -embed-bitcode -force-single-frontend-invocation -Osize %s 2>&1 -### | %FileCheck %s -check-prefix=CHECK-SINGLE-OPT-SIZE
+// RUN: %target-swiftc_driver -embed-bitcode -whole-module-optimization -Osize %s 2>&1 -### | %FileCheck %s -check-prefix=CHECK-SINGLE-OPT-SIZE
 // CHECK-SINGLE-OPT-SIZE: -frontend
 // CHECK-SINGLE-OPT-SIZE-SAME: -emit-bc
 // CHECK-SINGLE-OPT-SIZE-SAME: -Osize
@@ -72,7 +72,7 @@
 // CHECK-SINGLE-OPT-SIZE-SAME: -Osize
 // CHECK-SINGLE-OPT-SIZE-SAME: -disable-llvm-optzns
 
-// RUN: %target-swiftc_driver -embed-bitcode -target-cpu abc -force-single-frontend-invocation %s 2>&1 -### | %FileCheck %s -check-prefix=CHECK-SINGLE-MISC
+// RUN: %target-swiftc_driver -embed-bitcode -target-cpu abc -whole-module-optimization %s 2>&1 -### | %FileCheck %s -check-prefix=CHECK-SINGLE-MISC
 // CHECK-SINGLE-MISC: -frontend
 // CHECK-SINGLE-MISC-SAME: -emit-bc
 // CHECK-SINGLE-MISC-SAME: -target-cpu abc
@@ -82,7 +82,7 @@
 // CHECK-SINGLE-MISC-SAME: -target-cpu abc
 // CHECK-SINGLE-MISC-SAME: -disable-llvm-optzns
 
-// RUN: %target-swiftc_driver -embed-bitcode -c -parse-as-library -emit-module -force-single-frontend-invocation %s -parse-stdlib -module-name Swift 2>&1 -### | %FileCheck %s -check-prefix=CHECK-LIB-WMO
+// RUN: %target-swiftc_driver -embed-bitcode -c -parse-as-library -emit-module -whole-module-optimization %s -parse-stdlib -module-name Swift 2>&1 -### | %FileCheck %s -check-prefix=CHECK-LIB-WMO
 // CHECK-LIB-WMO: -frontend
 // CHECK-LIB-WMO: -emit-bc
 // CHECK-LIB-WMO: -parse-stdlib

test/Driver/emit-interface.swift

@@ -6,22 +6,22 @@
 // CHECK-SAME: -emit-module-interface-path {{.+[/\\]}}foo.swiftinterface
 // CHECK: {{(bin/)?}}ld
 
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -emit-module-interface -o %t/foo -force-single-frontend-invocation 2>&1 | %FileCheck -check-prefix=CHECK-WHOLE-MODULE %s
+// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -emit-module-interface -o %t/foo -whole-module-optimization 2>&1 | %FileCheck -check-prefix=CHECK-WHOLE-MODULE %s
 
 // CHECK-WHOLE-MODULE: swift{{c?(\.exe)?"?}} -frontend
 // CHECK-WHOLE-MODULE-SAME: emit-interface.swift
 // CHECK-WHOLE-MODULE-SAME: -emit-module-interface-path {{.+[/\\]}}foo.swiftinterface
 // CHECK-WHOLE-MODULE-NOT: -merge-modules
 // CHECK-WHOLE-MODULE: {{(bin/)?}}ld
 
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -emit-module-interface-path %t/unrelated.swiftinterface -o %t/foo -force-single-frontend-invocation 2>&1 | %FileCheck -check-prefix=CHECK-EXPLICIT-PATH %s
+// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -emit-module-interface-path %t/unrelated.swiftinterface -o %t/foo -whole-module-optimization 2>&1 | %FileCheck -check-prefix=CHECK-EXPLICIT-PATH %s
 
 // CHECK-EXPLICIT-PATH: swift{{c?(\.exe)?"?}} -frontend
 // CHECK-EXPLICIT-PATH-SAME: emit-interface.swift
 // CHECK-EXPLICIT-PATH-SAME: -emit-module-interface-path {{.+[/\\]}}unrelated.swiftinterface
 
 // Ensure that we emit arguments when we force filelists as well
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -emit-module-interface -o %t/foo -module-name foo -force-single-frontend-invocation -driver-filelist-threshold=0 2>&1 | %FileCheck -check-prefix=CHECK-FILELIST %s
+// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -emit-module-interface -o %t/foo -module-name foo -whole-module-optimization -driver-filelist-threshold=0 2>&1 | %FileCheck -check-prefix=CHECK-FILELIST %s
 
 // CHECK-FILELIST: swift{{c?(\.exe)?"?}} -frontend
 // CHECK-FILELIST-SAME: -supplementary-output-file-map

test/Driver/emit-objc-header-single-vs-multi-file.swift

@@ -5,7 +5,7 @@
 // FIXME: END -enable-source-import hackaround
 
 // RUN: %target-swiftc_driver %clang-importer-sdk-nosource -emit-module -o %t.1.swiftmodule -emit-objc-header -emit-objc-header-path %t.1.h -module-name ThisModule %s %S/Inputs/main.swift %S/Inputs/lib.swift -I %t
-// RUN: %target-swiftc_driver %clang-importer-sdk-nosource -emit-module -o %t.2.swiftmodule -emit-objc-header -emit-objc-header-path %t.2.h -module-name ThisModule %s %S/Inputs/main.swift %S/Inputs/lib.swift -force-single-frontend-invocation -I %t
+// RUN: %target-swiftc_driver %clang-importer-sdk-nosource -emit-module -o %t.2.swiftmodule -emit-objc-header -emit-objc-header-path %t.2.h -module-name ThisModule %s %S/Inputs/main.swift %S/Inputs/lib.swift -whole-module-optimization -I %t
 // RUN: diff %t.1.h %t.2.h
 
 // REQUIRES: objc_interop

test/Driver/emit-objc-header.swift

@@ -6,7 +6,7 @@
 // CHECK-SAME: -emit-objc-header-path {{.+}}/foo.h
 // CHECK: {{(bin/)?}}ld
 
-// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -emit-objc-header-path %t/foo.h -force-single-frontend-invocation 2>&1 | %FileCheck -check-prefix=CHECK-WHOLE-MODULE %s
+// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s -emit-objc-header-path %t/foo.h -whole-module-optimization 2>&1 | %FileCheck -check-prefix=CHECK-WHOLE-MODULE %s
 
 // CHECK-WHOLE-MODULE: swift{{c?(\.exe)?"?}} -frontend
 // CHECK-WHOLE-MODULE-SAME: emit-objc-header.swift