Skip to content

[5.5 build] ensure benchmark toolchain tests use the just built dylibs #38286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jul 8, 2021
Merged

[5.5 build] ensure benchmark toolchain tests use the just built dylibs #38286

merged 1 commit into from
Jul 8, 2021

Conversation

edymtt
Copy link
Contributor

@edymtt edymtt commented Jul 7, 2021

The binaries would prefer the libraries shipped in the OS to the ones just built -- employ DYLD_LIBRARY_PATH to pick up the latter instead.

The main purpose of this change is to unblock the generation of nightly
toolchains.

Addresses rdar://79788142

Cherry picked from commit 3504310, #38158

@edymtt
[5.5 build] ensure benchmark toolchain tests use the just built dylibs
7e2c23e 
The binaries would prefer the libraries shipped in the OS to the ones just built -- employ `DYLD_LIBRARY_PATH` to pick up the latter instead.

The main purpose of this change is to unblock the generation of nightly
toolchains.

Addresses rdar://79788142

Cherry picked from commit 3504310, swiftlang#38158
@edymtt edymtt requested review from gottesmm and shahmishal July 7, 2021 14:19
@edymtt edymtt requested a review from a team as a code owner July 7, 2021 14:19
@edymtt
Copy link
Contributor Author

edymtt commented Jul 7, 2021

@swift-ci please test

@edymtt
Copy link
Contributor Author

edymtt commented Jul 7, 2021

@swift-ci please build toolchain

@swift-ci
Copy link
Contributor

swift-ci commented Jul 7, 2021

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - 7e2c23e

Install command
tar zxf swift-PR-38286-626-ubuntu16.04.tar.gz
More info

@swift-ci
Copy link
Contributor

swift-ci commented Jul 7, 2021

macOS Toolchain
Download Toolchain
Git Sha - 7e2c23e

Install command
tar -zxf swift-PR-38286-1050-osx.tar.gz --directory ~/

@edymtt
Copy link
Contributor Author

edymtt commented Jul 8, 2021

The toolchain benchmark tests executed without issues

+ env DYLD_LIBRARY_PATH=/Users/buildnode/jenkins/workspace/swift-PR-toolchain-osx/branch-release/5.5/buildbot_osx/intermediate-install/macosx-x86
_64/Library/Developer/Toolchains/swift-PR-38286-1050.xctoolchain/usr/lib/swift/macosx /Users/buildnode/jenkins/workspace/swift-PR-toolchain-osx/b
ranch-release/5.5/buildbot_osx/benchmarks-macosx-x86_64/bin/Benchmark_Onone --num-iters=1 XorLoop
#,TEST,SAMPLES,MIN(μs),MAX(μs),MEAN(μs),SD(μs),MEDIAN(μs)
1015,XorLoop,76,11177,12777,11546,419,11320

Total performance tests executed: 1
+ env DYLD_LIBRARY_PATH=/Users/buildnode/jenkins/workspace/swift-PR-toolchain-osx/branch-release/5.5/buildbot_osx/intermediate-install/macosx-x86
_64/Library/Developer/Toolchains/swift-PR-38286-1050.xctoolchain/usr/lib/swift/macosx /Users/buildnode/jenkins/workspace/swift-PR-toolchain-osx/b
ranch-release/5.5/buildbot_osx/benchmarks-macosx-x86_64/bin/Benchmark_O --num-iters=1 XorLoop
#,TEST,SAMPLES,MIN(μs),MAX(μs),MEAN(μs),SD(μs),MEDIAN(μs)
1015,XorLoop,200,382,912,400,41,399

Total performance tests executed: 1
+ env DYLD_LIBRARY_PATH=/Users/buildnode/jenkins/workspace/swift-PR-toolchain-osx/branch-release/5.5/buildbot_osx/intermediate-install/macosx-x86
_64/Library/Developer/Toolchains/swift-PR-38286-1050.xctoolchain/usr/lib/swift/macosx /Users/buildnode/jenkins/workspace/swift-PR-toolchain-osx/b
ranch-release/5.5/buildbot_osx/benchmarks-macosx-x86_64/bin/Benchmark_Osize --num-iters=1 XorLoop
#,TEST,SAMPLES,MIN(μs),MAX(μs),MEAN(μs),SD(μs),MEDIAN(μs)
1015,XorLoop,200,399,493,403,12,400

Total performance tests executed: 1

@edymtt edymtt merged commit 957611f into swiftlang:release/5.5 Jul 8, 2021
@edymtt edymtt deleted the use_just_build_libraries_for_benchmark_toolchain_tests-5.5 branch July 8, 2021 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DougGregor DougGregor DougGregor approved these changes

@shahmishal shahmishal shahmishal approved these changes

@gottesmm gottesmm Awaiting requested review from gottesmm

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@edymtt @swift-ci @DougGregor @shahmishal