Merge pull request #61046 from hamishknight/cant-pass-this-up

Author: hamishknight

lib/IRGen/IRGen.cpp

@@ -245,6 +245,20 @@ performOptimizationsUsingLegacyPassManger(const IRGenOptions &Opts,
   // Set up a pipeline.
   PassManagerBuilderWrapper PMBuilder(Opts);
 
+  // If we're generating a profile, add the lowering pass now.
+  if (Opts.GenerateProfile) {
+    // TODO: Surface the option to emit atomic profile counter increments at
+    // the driver level.
+    // Configure the module passes.
+    legacy::PassManager ModulePasses;
+    ModulePasses.add(createTargetTransformInfoWrapperPass(
+        TargetMachine->getTargetIRAnalysis()));
+    InstrProfOptions Options;
+    Options.Atomic = bool(Opts.Sanitizers & SanitizerKind::Thread);
+    ModulePasses.add(createInstrProfilingLegacyPass(Options));
+    ModulePasses.run(*Module);
+  }
+
   if (Opts.shouldOptimize() && !Opts.DisableLLVMOptzns) {
     PMBuilder.OptLevel = 2; // -Os
     PMBuilder.SizeLevel = 1; // -Os
@@ -355,15 +369,6 @@ performOptimizationsUsingLegacyPassManger(const IRGenOptions &Opts,
   ModulePasses.add(createTargetTransformInfoWrapperPass(
       TargetMachine->getTargetIRAnalysis()));
 
-  // If we're generating a profile, add the lowering pass now.
-  if (Opts.GenerateProfile) {
-    // TODO: Surface the option to emit atomic profile counter increments at
-    // the driver level.
-    InstrProfOptions Options;
-    Options.Atomic = bool(Opts.Sanitizers & SanitizerKind::Thread);
-    ModulePasses.add(createInstrProfilingLegacyPass(Options));
-  }
-
   PMBuilder.populateModulePassManager(ModulePasses);
 
   // The PMBuilder only knows about LLVM AA passes.  We should explicitly add

test/Profiler/rdar77217762.sil

@@ -0,0 +1,47 @@
+
+// rdar://77217762 – The increment_profiler_counter in $foo gets optimized out by
+// LLVM function optimization, but make sure we still emit the name data which
+// is required by the coverage record.
+
+// Make sure both the legacy and new pass manager work.
+// We need to disable SIL optimizations to ensure LLVM optimizes out the
+// profiler increment.
+// RUN: %target-swift-frontend -emit-ir -profile-generate -profile-coverage-mapping -O -disable-sil-perf-optzns -disable-new-llvm-pass-manager %s | %FileCheck %s
+// RUN: %target-swift-frontend -emit-ir -profile-generate -profile-coverage-mapping -O -disable-sil-perf-optzns -enable-new-llvm-pass-manager %s | %FileCheck %s
+
+sil_stage canonical
+
+import Swift
+import Builtin
+
+// CHECK-DAG: @__covrec
+// CHECK-DAG: @__llvm_coverage_mapping
+// CHECK-DAG: @__llvm_prf_nm
+
+sil [ossa] @main : $@convention(c) (Int32, UnsafeMutablePointer<Optional<UnsafeMutablePointer<Int8>>>) -> Int32 {
+bb0(%0 : $Int32, %1 : $UnsafeMutablePointer<Optional<UnsafeMutablePointer<Int8>>>):
+  %2 = integer_literal $Builtin.Int32, 0
+  %3 = struct $Int32 (%2 : $Builtin.Int32)
+  return %3 : $Int32
+}
+
+sil [ossa] @$foo : $@convention(thin) () -> () {
+bb0:
+  %1 = integer_literal $Builtin.Int1, 0
+  cond_br %1, bb1, bb2
+
+bb1:
+  increment_profiler_counter 0, "$foo", num_counters 1, hash 0
+  br bb3
+
+bb2:
+  br bb3
+
+bb3:
+  %10 = tuple ()
+  return %10 : $()
+}
+
+sil_coverage_map "main.swift" "$foo" "$foo" 0 {
+  10:6 -> 10:11 : 0
+}

test/Profiler/rdar77217762_coverage.sil

@@ -0,0 +1,64 @@
+// RUN: %empty-directory(%t)
+
+// rdar://77217762 – The increment_profiler_counter in $foo gets optimized out by
+// LLVM function optimization, but make sure we still emit the name data which
+// is required by the coverage record.
+
+// Make sure both the legacy and new pass manager work.
+// We need to disable SIL optimizations to ensure LLVM optimizes out the
+// profiler increment.
+// RUN: %target-build-swift %s -profile-generate -profile-coverage-mapping -O -Xfrontend -disable-sil-perf-optzns -Xfrontend -disable-new-llvm-pass-manager -o %t/main1
+// RUN: %target-build-swift %s -profile-generate -profile-coverage-mapping -O -Xfrontend -disable-sil-perf-optzns -Xfrontend -enable-new-llvm-pass-manager -o %t/main2
+
+// This unusual use of 'sh' allows the path of the profraw file to be
+// substituted by %target-run.
+// RUN: %target-codesign %t/main1
+// RUN: %target-codesign %t/main2
+// RUN: %target-run sh -c 'env LLVM_PROFILE_FILE=$1 $2' -- %t/default1.profraw %t/main1
+// RUN: %target-run sh -c 'env LLVM_PROFILE_FILE=$1 $2' -- %t/default2.profraw %t/main2
+
+// RUN: %llvm-profdata merge %t/default1.profraw -o %t/default1.profdata
+// RUN: %llvm-profdata merge %t/default2.profraw -o %t/default2.profdata
+
+// RUN: %llvm-cov report %t/main1 -instr-profile=%t/default1.profdata
+// RUN: %llvm-cov report %t/main2 -instr-profile=%t/default2.profdata
+
+// REQUIRES: profile_runtime
+// REQUIRES: executable_test
+// REQUIRES: OS=macosx
+
+sil_stage canonical
+
+import Swift
+import Builtin
+
+sil [ossa] @main : $@convention(c) (Int32, UnsafeMutablePointer<Optional<UnsafeMutablePointer<Int8>>>) -> Int32 {
+bb0(%0 : $Int32, %1 : $UnsafeMutablePointer<Optional<UnsafeMutablePointer<Int8>>>):
+  increment_profiler_counter 0, "__tlcd_line:12:1", num_counters 1, hash 0
+  %3 = function_ref @$foo : $@convention(thin) () -> ()
+  %4 = apply %3() : $@convention(thin) () -> ()
+  %5 = integer_literal $Builtin.Int32, 0
+  %6 = struct $Int32 (%5 : $Builtin.Int32)
+  return %6 : $Int32
+}
+
+sil [ossa] @$foo : $@convention(thin) () -> () {
+bb0:
+  %1 = integer_literal $Builtin.Int1, 0
+  cond_br %1, bb1, bb2
+
+bb1:
+  increment_profiler_counter 0, "$foo", num_counters 1, hash 0
+  br bb3
+
+bb2:
+  br bb3
+
+bb3:
+  %10 = tuple ()
+  return %10 : $()
+}
+
+sil_coverage_map "main.swift" "$foo" "$foo" 0 {
+  10:6 -> 10:11 : 0
+}