[build][Linux] Create preset to run LLVM's TSan libdispatch tests #24330

yln · 2019-04-27T00:32:09Z

Build a separate compiler-rt instance for running the tests. It is built
and tested against an installed toolchain instead of the llvm-build-dir.

Install everything we need to run tests (CMake modules, FileCheck, etc.)
into the toolchain directory.

Add synthetic target 'all' for llvm-install-components. Also we must set
LLVM_INSTALL_UTILS=ON, so the utilities required by tests (e.g.,
FileCheck) are included in the install target.

rdar://49396529

utils/build-presets.ini

shahmishal · 2019-04-27T00:39:50Z

When you ready to start test use please test with preset

For more info:
https://github.com/apple/swift/blob/master/docs/ContinuousIntegration.md#specific-preset-testing

utils/build_swift/driver_arguments.py

utils/swift_build_support/swift_build_support/products/tsan_libdispatch.py

utils/build-script-impl

utils/build-presets.ini

beccadax · 2019-04-29T18:28:12Z

(I've taken myself off the review list because this is outside my area of expertise, but I'll keep following this PR because I want to see how this works.)

yln · 2019-04-30T01:56:26Z

preset=buildbot_incremental_linux,tsan-libdispatch-test
@swift-ci Please test with preset Linux Platform

compnerd

Seems good to me.

yln · 2019-05-01T01:30:46Z

When invoking the cmake configure step from my python script, I configure the clang to use like so:
-DCMAKE_C_COMPILER=/home/buildnode/jenkins/workspace/swift-PR-Linux-preset/branch-master/buildbot_incremental_tsan_libdispatch_test/tsanlibdispatch-linux-x86_64/../llvm-linux-x86_64/bin/clang

The path is constructed via:

llvm_build_dir = os.path.join(self.build_dir, '../llvm-' + host_target)
cc_path = os.path.join(llvm_build_dir, 'bin/clang')

When I build my preset locally, this folder contains the just-built clang.

@shahmishal @gottesmm Any ideas why/what things could be different when compared to my local Ubuntu VM?

Relevant build output:

cmake -GNinja \
-B/home/buildnode/jenkins/workspace/swift-PR-Linux-preset/branch-master/buildbot_incremental_tsan_libdispatch_test/tsanlibdispatch-linux-x86_64 \
-DCMAKE_PREFIX_PATH=/home/buildnode/jenkins/workspace/swift-PR-Linux-preset/branch-master/buildbot_incremental_tsan_libdispatch_test/tsanlibdispatch-linux-x86_64/../llvm-linux-x86_64 \
-DCMAKE_C_COMPILER=/home/buildnode/jenkins/workspace/swift-PR-Linux-preset/branch-master/buildbot_incremental_tsan_libdispatch_test/tsanlibdispatch-linux-x86_64/../llvm-linux-x86_64/bin/clang \
-DCMAKE_CXX_COMPILER=/home/buildnode/jenkins/workspace/swift-PR-Linux-preset/branch-master/buildbot_incremental_tsan_libdispatch_test/tsanlibdispatch-linux-x86_64/../llvm-linux-x86_64/bin/clang++ \
-DCMAKE_BUILD_TYPE=Release \
-DLLVM_ENABLE_ASSERTIONS=ON \
-DCOMPILER_RT_INCLUDE_TESTS=ON \
-DCOMPILER_RT_INTERCEPT_LIBDISPATCH=ON \
-DCOMPILER_RT_LIBDISPATCH_INSTALL_PATH=/home/buildnode/jenkins/workspace/swift-PR-Linux-preset/branch-master/buildbot_incremental_tsan_libdispatch_test/toolchain-linux-x86_64/usr \
/home/buildnode/jenkins/workspace/swift-PR-Linux-preset/branch-master/tsan-libdispatch-test/../compiler-rt

19:21:12 CMake Error at CMakeLists.txt:10 (project):
19:21:12   The CMAKE_C_COMPILER:
19:21:12 
19:21:12     /home/buildnode/jenkins/workspace/swift-PR-Linux-preset/branch-master/buildbot_incremental_tsan_libdispatch_test/tsanlibdispatch-linux-x86_64/../llvm-linux-x86_64/bin/clang
19:21:12 
19:21:12   is not a full path to an existing compiler tool.

utils/swift_build_support/swift_build_support/products/tsan_libdispatch.py

utils/build-script

gottesmm

Much better! = ).

Only comment is shouldn't you be using the toolchain as your CMAKE_PREFIX_PATH? You shouldn't have access to the original llvm build directory.

gottesmm · 2019-05-01T03:52:25Z

@yln #24330 (comment)

Maybe try making the path absolute? os.path.abspath(...)? I vaguely remember hitting that before.

yln · 2019-05-02T01:05:57Z

preset=buildbot_incremental_linux,tsan-libdispatch-test
@swift-ci Please test with preset Linux Platform

yln · 2019-05-02T16:28:09Z

Using absolute paths got me one step further. Thanks for the tip! Next issue:

cmake -GNinja -B/home/buildnode/jenkins/workspace/swift-PR-Linux-preset/branch-master/buildbot_incremental_tsan_libdispatch_test/tsanlibdispatch-linux-x86_64 ...

However:
Build files have been written to: /home/buildnode/jenkins/workspace/swift-PR-Linux-preset/branch-master

Leading to:
cmake --build /home/buildnode/jenkins/workspace/swift-PR-Linux-preset/branch-master/buildbot_incremental_tsan_libdispatch_test/tsanlibdispatch-linux-x86_64 --target tsan
Error: /home/buildnode/jenkins/workspace/swift-PR-Linux-preset/branch-master/buildbot_incremental_tsan_libdispatch_test/tsanlibdispatch-linux-x86_64 is not a directory

Looks like cmake -B/path/to/build/dir has no effect. Is that a recent cmake feature? Which version are we using on our bots? @shahmishal @gottesmm Can you test which version of cmake we use and if it understands the -B option? Like so:

➤ cmake --version
cmake version 3.14.3
➤ cmake --help | grep -e "-B"
  cmake [options] -S <path-to-source> -B <path-to-build>
  -B <path-to-build>           = Explicitly specify a build directory.

gottesmm · 2019-05-02T17:36:12Z

@yln I would perform the invocation of cmake in that specific directory. We assume I think 3.4.3. We should update at some point soon once compnerd's changes in cmake itself land to enable swift as a language.

yln · 2019-05-02T19:35:32Z

preset=buildbot_incremental_linux,tsan-libdispatch-test
@swift-ci Please test with preset Linux Platform

yln · 2019-05-03T00:05:55Z

preset=buildbot_incremental_linux,tsan-libdispatch-test
@swift-ci Please test with preset Linux Platform

yln · 2019-05-10T18:16:28Z

@swift-ci Please clean test

yln · 2019-05-10T20:52:01Z

preset=buildbot_incremental_linux,tsan-libdispatch-test
@swift-ci Please test with preset Linux Platform

yln · 2019-05-14T22:21:25Z

I think I have finally found the problem for undefined references during the configure step for 'libcxx_tsan_x86_64'.

The 'stable' branch is used for CI, but the following (required) change hasn't made it there yet:
https://reviews.llvm.org/D58013

I could cherry-pick it into stable, however, since the purpose of the libdispatch tests is guarding against upstream changes, they should actually build run against "The Upstream Branches". master-next/upstream-with-swift for Swift and LLVM respectively.

@shahmishal @gottesmm
How can I configure this?

yln · 2019-05-15T00:01:54Z

apple/swift-compiler-rt#39
preset=buildbot_incremental_linux,tsan-libdispatch-test
@swift-ci Please test with preset Linux Platform

yln · 2019-05-15T15:25:43Z

@swift-ci Please test

Required change to make "Swift CI preset for LLVM libdispatch tests" [1] work. This goes the opposite direction of [2], ensuring that the link step succeeds for the prodcued dynamic library (*.so). In the future versions of compiler-rt this will not be necessary since we will create a static archive instead. [1] swiftlang/swift#24330 [2] https://reviews.llvm.org/D58013

yln · 2019-05-15T18:04:57Z

apple/swift-compiler-rt#40
preset=buildbot_incremental_linux,tsan-libdispatch-test
@swift-ci Please test with preset Linux Platform

Required change to make "Swift CI preset for LLVM libdispatch tests" [1] work. This goes the opposite direction of [2], ensuring that the link step succeeds for the prodcued dynamic library (*.so). In the future versions of compiler-rt this will not be necessary since we will create a static archive instead. [1] swiftlang/swift#24330 [2] https://reviews.llvm.org/D58013

yln · 2019-05-15T18:41:35Z

apple/swift-compiler-rt#40
preset=buildbot_incremental_linux,tsan-libdispatch-test
@swift-ci Please test with preset Linux Platform

Required change to make "Swift CI preset for LLVM libdispatch tests" [1] work. This goes the opposite direction of [2, 3], ensuring that the link step succeeds for the prodcued dynamic library (*.so). In the future versions of compiler-rt this will not be necessary since we will create a static archive instead. [1] swiftlang/swift#24330 [2] https://reviews.llvm.org/D58013 [3] https://reviews.llvm.org/rG0a9cb239a6c91a709a98c96bbf60b6c006d5a07b

yln · 2019-05-15T19:58:42Z

apple/swift-compiler-rt#40
preset=buildbot_incremental_linux,tsan-libdispatch-test
@swift-ci Please test with preset Linux Platform

Required change to make "Swift CI preset for LLVM libdispatch tests" [1] work. This goes the opposite direction of [2, 3], ensuring that the link step succeeds for the produced dynamic library (*.so). In the future versions of compiler-rt this will not be necessary since we will create a static archive instead. [1] swiftlang/swift#24330 [2] https://reviews.llvm.org/D58013 [3] https://reviews.llvm.org/rG0a9cb239a6c91a709a98c96bbf60b6c006d5a07b rdar://problem/50828689

yln · 2019-05-15T22:23:23Z

apple/swift-compiler-rt#40
preset=buildbot_incremental_linux,tsan-libdispatch-test
@swift-ci Please test with preset Linux Platform

Required change to make "Swift CI preset for LLVM libdispatch tests" [1] work. This goes the opposite direction of [2, 3], ensuring that the link step succeeds for the produced dynamic library (*.so). In the future versions of compiler-rt this will not be necessary since we will create a static archive instead. [1] swiftlang/swift#24330 [2] https://reviews.llvm.org/D58013 [3] https://reviews.llvm.org/rG0a9cb239a6c91a709a98c96bbf60b6c006d5a07b rdar://problem/50828689

yln · 2019-05-15T22:50:02Z

apple/swift-compiler-rt#40
preset=buildbot_incremental_linux,tsan-libdispatch-test
@swift-ci Please test with preset Linux Platform

yln · 2019-05-16T18:00:45Z

It seems to work now. I just clicked merge on the PR for the required changes in swift-compiler-rt [swift-5.1-branch]. I will wait until those have propagated to [stable], and run the preset one more time to verify it works.

@gottesmm @jrose-apple
Does one of you want to sign off on the changes in this PR? Thanks!

gottesmm · 2019-05-16T19:44:36Z

@swift-ci python lint

gottesmm · 2019-05-16T19:44:50Z

Lets make sure this passes the python linter. If we pass, I am good with this.

gottesmm · 2019-05-16T20:04:27Z

@yln can you fix the python lint issues?

Build a separate compiler-rt instance for running the tests. It is built and tested against an installed toolchain instead of the llvm-build-dir. Install everything we need to run tests (CMake modules, FileCheck, etc.) into the toolchain directory. Add synthetic target 'all' for llvm-install-components. Also we must set LLVM_INSTALL_UTILS=ON, so the utilities required by tests (e.g., FileCheck) are included in the install target.

yln · 2019-05-16T20:21:30Z

@swift-ci python lint

yln · 2019-05-16T20:34:04Z

@swift-ci Please test

gottesmm

LGTM

yln · 2019-05-17T17:09:48Z

preset=buildbot_incremental_linux,tsan-libdispatch-test
@swift-ci Please test with preset Linux Platform

gottesmm · 2019-05-17T18:30:36Z

@yln congrats!

PR #25085 [1] enabled building and installing the static variant of the libdispatch library in build-script-impl. This broke the `tsan-libdispatch-test` preset [2]. Let's make sure we pass along the options specified in `libdispatch-cmake-options` when building the static variant. [1] #25085 [2] #24330 rdar://problem/49177823

yln requested review from compnerd, gottesmm, beccadax, devincoughlin, benlangmuir and jrose-apple April 27, 2019 00:32

shahmishal reviewed Apr 27, 2019

View reviewed changes

utils/build-presets.ini Outdated Show resolved Hide resolved

gottesmm reviewed Apr 29, 2019

View reviewed changes

utils/build_swift/driver_arguments.py Outdated Show resolved Hide resolved

gottesmm reviewed Apr 29, 2019

View reviewed changes

utils/swift_build_support/swift_build_support/products/tsan_libdispatch.py Outdated Show resolved Hide resolved

utils/build-script-impl Outdated Show resolved Hide resolved

utils/build-presets.ini Outdated Show resolved Hide resolved

beccadax removed their request for review April 29, 2019 18:27

compnerd approved these changes Apr 30, 2019

View reviewed changes

gottesmm reviewed May 1, 2019

View reviewed changes

utils/swift_build_support/swift_build_support/products/tsan_libdispatch.py Outdated Show resolved Hide resolved

gottesmm reviewed May 1, 2019

View reviewed changes

utils/build-script Show resolved Hide resolved

gottesmm reviewed May 1, 2019

View reviewed changes

yln force-pushed the preset-for-llvm-tsan-libdispatch-tests branch from 0f82d0c to 2d77de9 Compare May 3, 2019 00:05

yln force-pushed the preset-for-llvm-tsan-libdispatch-tests branch from 2d77de9 to d3170c2 Compare May 10, 2019 18:14

yln mentioned this pull request May 15, 2019

[TSan] Ensure libc++ can be built for TSan tests on Linux apple/swift-compiler-rt#40

Merged

yln force-pushed the preset-for-llvm-tsan-libdispatch-tests branch from d3170c2 to 9631700 Compare May 16, 2019 20:18

gottesmm approved these changes May 16, 2019

View reviewed changes

yln merged commit 4dcb49d into master May 17, 2019

yln deleted the preset-for-llvm-tsan-libdispatch-tests branch May 17, 2019 17:32

This was referenced May 17, 2019

[build-script] Extract most parts related to build-script-impl #23982

Closed

[build-script] Rename is_build_script_impl_product to needs_toolchain. #23918

Closed

[build-script] Transform IndexStoreDB and SorcekitLSP to use ProductBuilder #24854

Closed

yln mentioned this pull request Aug 12, 2019

[build-script] Propagate libdispatch-cmake-options #26620

Merged

[build][Linux] Create preset to run LLVM's TSan libdispatch tests #24330

[build][Linux] Create preset to run LLVM's TSan libdispatch tests #24330

Uh oh!

Conversation

yln commented Apr 27, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

shahmishal commented Apr 27, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

beccadax commented Apr 29, 2019

Uh oh!

yln commented Apr 30, 2019

Uh oh!

compnerd left a comment

Choose a reason for hiding this comment

Uh oh!

yln commented May 1, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gottesmm left a comment

Choose a reason for hiding this comment

Uh oh!

gottesmm commented May 1, 2019

Uh oh!

yln commented May 2, 2019

Uh oh!

yln commented May 2, 2019

Uh oh!

gottesmm commented May 2, 2019

Uh oh!

yln commented May 2, 2019

Uh oh!

yln commented May 3, 2019

Uh oh!

yln commented May 10, 2019

Uh oh!

yln commented May 10, 2019

Uh oh!

yln commented May 14, 2019

Uh oh!

yln commented May 15, 2019

Uh oh!

yln commented May 15, 2019

Uh oh!

yln commented May 15, 2019

Uh oh!

yln commented May 15, 2019

Uh oh!

yln commented May 15, 2019

Uh oh!

yln commented May 15, 2019

Uh oh!

yln commented May 15, 2019

Uh oh!

yln commented May 16, 2019

Uh oh!

gottesmm commented May 16, 2019

Uh oh!

gottesmm commented May 16, 2019

Uh oh!

gottesmm commented May 16, 2019

Uh oh!

yln commented May 16, 2019

Uh oh!

yln commented May 16, 2019

Uh oh!

gottesmm left a comment

Choose a reason for hiding this comment

Uh oh!

yln commented May 17, 2019

Uh oh!

gottesmm commented May 17, 2019

Uh oh!

yln commented Apr 27, 2019 •

edited

Loading

yln commented May 1, 2019 •

edited

Loading