Hook compiler-rt up to the swift build system

Author: vedantk

test/SILGen/coverage_smoke.swift

@@ -0,0 +1,18 @@
+// RUN: rm -rf %t && mkdir %t
+// RUN: %target-build-swift %s -profile-generate -profile-coverage-mapping -o %t/main
+// RUN: env LLVM_PROFILE_FILE=%t/default.profraw %target-run %t/main
+// RUN: %llvm-profdata merge %t/default.profraw -o %t/default.profdata
+// RUN: %llvm-profdata show %t/default.profdata -function=main | FileCheck %s --check-prefix=CHECK-PROF
+// RUN: %llvm-cov show %t/main -instr-profile=%t/default.profdata | FileCheck %s --check-prefix=CHECK-COV
+// RUN: rm -rf %t
+// REQUIRES: profile_runtime
+// REQUIRES: OS=macosx
+
+func main() {
+// CHECK-PROF: Counters: 2
+// CHECK-PROF: Function count: 1
+// CHECK-COV: 1|{{.*}}[[@LINE+1]]|{{.*}}if (true)
+  if (true) {}
+}
+
+main()

test/lit.cfg

@@ -275,6 +275,8 @@ config.swift_reflection_test = inferSwiftBinary('swift-reflection-test')
 config.clang = inferSwiftBinary('clang')
 config.llvm_link = inferSwiftBinary('llvm-link')
 config.swift_llvm_opt = inferSwiftBinary('swift-llvm-opt')
+config.llvm_profdata = inferSwiftBinary('llvm-profdata')
+config.llvm_cov = inferSwiftBinary('llvm-cov')
 
 config.gyb = os.path.join(config.swift_src_root, 'utils', 'gyb')
 config.rth = os.path.join(config.swift_src_root, 'utils', 'rth') # Resilience test helper
@@ -725,6 +727,39 @@ else:
 
 config.substitutions.append(("%target-sdk-name", config.target_sdk_name))
 
+config.compiler_rt_libs = []
+config.compiler_rt_platform = {
+    'iphoneos': 'ios',
+    'appletvos': 'tvos',
+    'watchos': 'watchos',
+    'iphonesimulator': 'iossim',
+    'watchsimulator': 'watchossim',
+    'appletvsimulator': 'tvossim',
+    'macosx': 'osx'
+}.get(config.target_sdk_name, run_cpu)
+
+def source_compiler_rt_libs(path):
+    if os.path.exists(path):
+        config.compiler_rt_libs.extend([lib for lib in
+                                        os.listdir(path)
+                                        if lib.startswith('libclang_rt.')
+                                        and config.compiler_rt_platform in lib])
+
+source_compiler_rt_libs(os.path.join(test_resource_dir, 'clang', 'lib',
+                        platform.system().lower()))
+
+def check_runtime_feature(name):
+    for lib in config.compiler_rt_libs:
+        if lib.startswith('libclang_rt.' + name + '_'):
+            config.available_features.add(name + '_runtime')
+            return
+
+check_runtime_feature('profile')
+check_runtime_feature('asan')
+check_runtime_feature('ubsan')
+check_runtime_feature('tsan')
+check_runtime_feature('safestack')
+
 if not getattr(config, 'target_run_simple_swift', None):
     config.target_run_simple_swift = (
         'rm -rf %%t && mkdir -p %%t && '
@@ -833,3 +868,6 @@ config.substitutions.append(('%target-object-format', config.target_object_forma
 
 config.substitutions.append(('%target-resilience-test-wmo', config.target_resilience_test_wmo))
 config.substitutions.append(('%target-resilience-test', config.target_resilience_test))
+
+config.substitutions.append(('%llvm-profdata', config.llvm_profdata))
+config.substitutions.append(('%llvm-cov', config.llvm_cov))

utils/build-script

@@ -170,6 +170,7 @@ SWIFT_SOURCE_ROOT: a directory containing the source for LLVM, Clang, Swift.
                      /lldb                       (optional)
                      /llbuild                    (optional)
                      /swiftpm                    (optional, requires llbuild)
+                     /compiler-rt                (optional)
                      /swift-corelibs-xctest      (optional)
                      /swift-corelibs-foundation  (optional)
                      /swift-corelibs-libdispatch (optional)

utils/build-script-impl

@@ -488,6 +488,9 @@ function set_deployment_target_based_options() {
                 -DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
                 -DLLVM_HOST_TRIPLE:STRING="${llvm_host_triple}"
                 -DLLVM_ENABLE_LIBCXX:BOOL=TRUE
+                -DCOMPILER_RT_ENABLE_IOS:BOOL=$(false_true ${SKIP_IOS})
+                -DCOMPILER_RT_ENABLE_WATCHOS:BOOL=FALSE
+                -DCOMPILER_RT_ENABLE_TVOS:BOOL=FALSE
             )
 	    if [[ $(true_false "${LLVM_ENABLE_LTO}") = "TRUE" ]]; then
                 if [[ $(cmake_needs_to_specify_standard_computed_defaults) = "TRUE" ]]; then
@@ -805,6 +808,10 @@ function true_false() {
     esac
 }
 
+function false_true() {
+    true_false $(not "$1")
+}
+
 function cmake_version() {
     echo $("${CMAKE}" --version | grep "cmake version" | cut -f 3 -d " ")
 }
@@ -975,6 +982,14 @@ if [ ! -d "${CLANG_SOURCE_DIR}" ] ; then
     ln -sf "${WORKSPACE}/clang" "${CLANG_SOURCE_DIR}"
 fi
 
+# Symlink compiler-rt into the llvm tree, if it exists.
+COMPILER_RT_SOURCE_DIR="${LLVM_SOURCE_DIR}/projects/compiler-rt"
+if [ -e "${WORKSPACE}/compiler-rt" ] ; then
+    if [ ! -d "${COMPILER_RT_SOURCE_DIR}" ] ; then
+        ln -sf "${WORKSPACE}/compiler-rt" "${COMPILER_RT_SOURCE_DIR}"
+    fi
+fi
+
 PRODUCTS=(cmark llvm swift)
 if [[ ! "${SKIP_BUILD_LLDB}" ]] ; then
      PRODUCTS=("${PRODUCTS[@]}" lldb)

utils/update-checkout

@@ -32,6 +32,7 @@ REPOSITORIES = {
     'cmark': 'apple/swift-cmark',
     'llbuild': 'apple/swift-llbuild',
     'swiftpm': 'apple/swift-package-manager',
+    'compiler-rt': 'apple/swift-compiler-rt',
     'swift-corelibs-xctest': 'apple/swift-corelibs-xctest',
     'swift-corelibs-foundation': 'apple/swift-corelibs-foundation',
     'swift-corelibs-libdispatch': 'apple/swift-corelibs-libdispatch',