---

yaml
---
r: 284539
b: refs/heads/preset-for-llvm-tsan-libdispatch-tests
c: 8ead7bf
h: refs/heads/master
i:
  284537: d4823c8
  284535: f78fa6d

Author: yln

[refs]

@@ -1309,4 +1309,4 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-04-06-a: c07bed7748ebc34c450425b544770
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-04-07-a: f810da9432a0970cc3f82d5b1e9b3b20b6e43db9
 refs/heads/compnerd-windows-is-fetch: d80736e9a0b724569829ccb5b32a8be9fb968e4f
 refs/heads/natecook1000-patch-2: 1632fbdf63c06b3e90015cb20c1d629e35aed65d
-refs/heads/preset-for-llvm-tsan-libdispatch-tests: 81ce653bc3229b18744396fa364bf6133f952785
+refs/heads/preset-for-llvm-tsan-libdispatch-tests: 8ead7bfd3dfbc86691622c0465fe13decbf879e0

branches/preset-for-llvm-tsan-libdispatch-tests/utils/build-presets.ini

@@ -1024,6 +1024,23 @@ skip-build-swift
 skip-build-cmark
 llvm-include-tests
 
+
+[preset: buildbot_incremental_linux,tsan-libdispatch-test]
+mixin-preset=buildbot_incremental_linux,llvm-only
+build-subdir=buildbot_incremental_tsan_libdispatch_test
+
+llvm-cmake-options=-DLLVM_ENABLE_PROJECTS=clang;libcxx;compiler-rt  \
+  -DCOMPILER_RT_INTERCEPT_LIBDISPATCH=ON  \
+  -DCOMPILER_RT_LIBDISPATCH_INSTALL_PATH=/home/yln/work/swift-source/build/buildbot_incremental_tsan_libdispatch_test/toolchain-linux-x86_64/usr
+llvm-install-components=clang
+
+libdispatch-cmake-options=-DENABLE_SWIFT=OFF
+libdispatch
+install-libdispatch
+
+tsan-libdispatch-test
+
+
 [preset: buildbot_incremental_linux,asan]
 mixin-preset=buildbot_incremental_linux
 build-subdir=buildbot_incremental_asan

branches/preset-for-llvm-tsan-libdispatch-tests/utils/build-script

@@ -342,6 +342,7 @@ class BuildScriptInvocation(object):
             'build_indexstoredb',
             'build_sourcekitlsp',
             'build_toolchainbenchmarks',
+            'tsan_libdispatch_test',
         ]
         has_target_needing_toolchain = \
             bool(sum(getattr(args, x) for x in targets_needing_toolchain))
@@ -896,6 +897,8 @@ class BuildScriptInvocation(object):
             product_classes.append(products.SourceKitLSP)
         if self.args.build_toolchainbenchmarks:
             product_classes.append(products.Benchmarks)
+        if self.args.tsan_libdispatch_test:
+            product_classes.append(products.TSanLibDispatch)
         return product_classes
 
     def execute(self):

branches/preset-for-llvm-tsan-libdispatch-tests/utils/build-script-impl

@@ -2750,6 +2750,7 @@ for host in "${ALL_HOSTS[@]}"; do
                   call rm -rf "${LIBDISPATCH_BUILD_DIR}"
 
                   cmake_options=(
+                    -DENABLE_SWIFT=YES
                     ${cmake_options[@]}
                     -DCMAKE_BUILD_TYPE:STRING="${LIBDISPATCH_BUILD_TYPE}"
                     -DCMAKE_C_COMPILER:PATH="${LLVM_BIN}/clang"
@@ -2758,7 +2759,7 @@ for host in "${ALL_HOSTS[@]}"; do
                     -DCMAKE_INSTALL_PREFIX:PATH="$(get_host_install_prefix ${host})"
                     -DCMAKE_INSTALL_LIBDIR:PATH="lib"
 
-                    -DENABLE_SWIFT=YES
+                     # -DENABLE_SWIFT=YES  # Moved above ${cmake_options[@]}, so we can override it.
                     -DSwift_DIR="${SWIFT_BUILD_PATH}/lib/cmake/swift"
 
                     -DENABLE_TESTING=YES

branches/preset-for-llvm-tsan-libdispatch-tests/utils/build_swift/driver_arguments.py

@@ -788,6 +788,9 @@ def create_argument_parser():
            help='if the Swift Benchmark Suite is run after building, run N '
                 'iterations with -Onone')
 
+    option('--tsan-libdispatch-test', toggle_true,
+           help='run TSan (compiler-rt) libdispatch tests')
+
     option('--skip-test-osx', toggle_false('test_osx'),
            help='skip testing Swift stdlibs for Mac OS X')
     option('--skip-test-linux', toggle_false('test_linux'),

branches/preset-for-llvm-tsan-libdispatch-tests/utils/build_swift/tests/expected_options.py

@@ -158,6 +158,7 @@
     'llvm_max_parallel_lto_link_jobs':
         host.max_lto_link_job_counts()['llvm'],
     'llvm_targets_to_build': 'X86;ARM;AArch64;PowerPC;SystemZ;Mips',
+    'tsan_libdispatch_test': False,
     'long_test': False,
     'lto_type': None,
     'show_sdks': False,
@@ -450,6 +451,7 @@ class IgnoreOption(_BaseOption):
     EnableOption('--indexstore-db', dest='build_indexstoredb'),
     EnableOption('--sourcekit-lsp', dest='build_sourcekitlsp'),
     EnableOption('--toolchain-benchmarks', dest='build_toolchainbenchmarks'),
+    EnableOption('--tsan-libdispatch-test'),
     EnableOption('--long-test'),
     EnableOption('--show-sdks'),
     EnableOption('--stress-test'),

branches/preset-for-llvm-tsan-libdispatch-tests/utils/swift_build_support/swift_build_support/products/__init__.py

@@ -27,6 +27,7 @@
 from .swiftevolve import SwiftEvolve
 from .swiftpm import SwiftPM
 from .swiftsyntax import SwiftSyntax
+from .tsan_libdispatch import TSanLibDispatch
 from .xctest import XCTest
 
 __all__ = [
@@ -49,4 +50,5 @@
     'IndexStoreDB',
     'SourceKitLSP',
     'Benchmarks',
+    'TSanLibDispatch',
 ]

branches/preset-for-llvm-tsan-libdispatch-tests/utils/swift_build_support/swift_build_support/products/tsan_libdispatch.py

@@ -0,0 +1,39 @@
+# swift_build_support/products/tsan_libdispatch.py --------------*- python -*-
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See https://swift.org/LICENSE.txt for license information
+# See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+#
+# ----------------------------------------------------------------------------
+
+import os
+
+from . import product
+from .. import shell
+
+
+class TSanLibDispatch(product.Product):
+    @classmethod
+    def product_source_name(cls):
+        return "tsan-libdispatch-test"
+
+    @classmethod
+    def is_build_script_impl_product(cls):
+        return False
+
+    def build(self, host_target):
+        """We reuse the llvm build directory."""
+        # Clang is already built. TSan runtime will be built by 'check-tsan' in
+        # test step.
+        pass
+
+    def test(self, host_target):
+        """Run check-tsan target with a LIT filter for libdispatch."""
+        llvm_build_dir = os.path.join(self.build_dir, '..', 'llvm-'+host_target)
+        cmd = ['cmake', '--build', llvm_build_dir, '--target', 'check-tsan']
+        env = {'LIT_FILTER': 'libdispatch'}
+        shell.call(cmd, env=env)