Merge pull request #78078 from kavon/samplepgo-driver-support

swift-frontend: Driver support for SamplePGO

Author: kavon

include/swift/Option/Options.td

@@ -1490,7 +1490,7 @@ def profile_generate : Flag<["-"], "profile-generate">,
   HelpText<"Generate instrumented code to collect execution counts">;
 
 def debug_info_for_profiling : Flag<["-"], "debug-info-for-profiling">,
-  Flags<[FrontendOption, NoInteractiveOption]>,
+  Flags<[FrontendOption, NoInteractiveOption, NewDriverOnlyOption]>,
   HelpText<"Emit extra debug info (DWARF discriminators) to make sampling-based profiling more accurate">;
 
 def profile_use : CommaJoined<["-"], "profile-use=">,
@@ -1502,8 +1502,8 @@ def profile_coverage_mapping : Flag<["-"], "profile-coverage-mapping">,
   Flags<[FrontendOption, NoInteractiveOption]>,
   HelpText<"Generate coverage data for use with profiled execution counts">;
 
-def profile_sample_use : CommaJoined<["-"], "profile-sample-use=">,
-  Flags<[FrontendOption, NoInteractiveOption, ArgumentIsPath]>,
+def profile_sample_use : Joined<["-"], "profile-sample-use=">,
+  Flags<[FrontendOption, NoInteractiveOption, ArgumentIsPath, NewDriverOnlyOption]>,
   MetaVarName<"<profile data>">,
   HelpText<"Supply sampling-based profiling data from llvm-profdata to enable profile-guided optimization">;
 

test/Profiler/samplepgo.swift

@@ -5,10 +5,14 @@
 // Test the -profile-sample-use= flag using bogus data, to ensure it's actually
 // reaching LLVM in the expected way.
 
-// RUN: %target-swift-frontend %t/program.swift -module-name test -emit-ir \
-// RUN:                  -O -profile-sample-use=%t/profile.txt -o %t/has-data.ll
+// RUN: %target-swiftc_driver -v %t/program.swift -module-name test -emit-ir \
+// RUN:                -O -profile-sample-use=%t/profile.txt -o %t/has-data.ll \
+// RUN:                > %t/flags.txt
+
+// RUN: %FileCheck %s --check-prefix CHECK-STDERR --input-file %t/flags.txt
+// CHECK-STDERR: -Xllvm -sample-profile-use-profi
 
-// RUN: %FileCheck %s < %t/has-data.ll
+// RUN: %FileCheck %s --input-file %t/has-data.ll
 
 // CHECK: define{{.*}} @"$s4test8anythingyyF"() #[[ATTRID:[0-9]+]]
 // CHECK: attributes #[[ATTRID]] = {{.*}} "use-sample-profile"
@@ -33,6 +37,11 @@
 // CHECK-NODATA-LABEL: !llvm.module.flags
 // CHECK-NODATA-NOT: Profile
 
+// FIXME: It appears that Windows does not use the new swift-driver.
+// This test in particular includes end-to-end testing coverage via
+// that driver to ensure the flag works.
+// REQUIRES: OS=macosx || OS=linux-gnu
+
 
 //--- program.swift
 public func anything() {}