Skip to content
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

llvm6: 6.0.0 -> 6.0.1 (18.03 edition) #42825

Merged
merged 2 commits into from Jul 3, 2018
Merged

llvm6: 6.0.0 -> 6.0.1 (18.03 edition) #42825

merged 2 commits into from Jul 3, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jun 30, 2018

Triggers rebuild on Linux, so suggesting sent to staging-18.03
(and using PR instead of just picking onto the branch directly).

Like other point releases for LLVM lots of bug-fixes of varying importance.

No official summary of changes (other than looking at SVN/git for commits merged) AFAIK.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@dtzWill
llvm6: 6.0.0 -> 6.0.1
2817cf2 
(cherry picked from commit 4a8104a)

Pick wasn't entirely clean, required touchup because on master
compiler-rt is split into separate expression (and file),
which just meant the hash to update was in default.nix instead :).
@dtzWill
llvm_6: refresh sanitizers-non-gnu patch
73ef59e 
(cherry picked from commit 8cd268a)
@LnL7
Copy link
Member

LnL7 commented Jun 30, 2018

Is the jobset for staging-18.03 still active? The release staging branches are only used when stabilising the release AFAIK. There's generally not much activity on a stable release to require a staging workflow (unlike master 😄 ).

@dtzWill
Copy link
Member Author

dtzWill commented Jun 30, 2018

Oh, I'm not sure. I should probably read that RFC again -- I mostly wanted a +1 for this change on 18.03 and to avoid blocking things there unnecessarily since AFAIK this isn't a priority but should make it there eventually :).

@dtzWill
Copy link
Member Author

dtzWill commented Jun 30, 2018

Oh, haha there's no mesa dep on 18.03 so it's not a mass-rebuild anyway!
Well alright then this seems like an easy win. Okay to pick these onto release-18.03 directly?

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: llvm_6

Partial log (click to expand)

/nix/store/wkdgwflxv1adazbs6fwrsimjxirlxpj0-llvm-6.0.1-python/share/opt-viewer/opt-stats.py: interpreter directive changed from "/usr/bin/env python2.7" to "/nix/store/ff7mnr83nr700g6wp2svbaf5fkisb0f9-python-2.7.15/bin/python2.7"
/nix/store/wkdgwflxv1adazbs6fwrsimjxirlxpj0-llvm-6.0.1-python/share/opt-viewer/opt-diff.py: interpreter directive changed from "/usr/bin/env python2.7" to "/nix/store/ff7mnr83nr700g6wp2svbaf5fkisb0f9-python-2.7.15/bin/python2.7"
checking for references to /build in /nix/store/wkdgwflxv1adazbs6fwrsimjxirlxpj0-llvm-6.0.1-python...
shrinking RPATHs of ELF executables and libraries in /nix/store/n7p8qrdfr52lxvkiz9rndl2q485mqa3y-llvm-6.0.1-lib
shrinking /nix/store/n7p8qrdfr52lxvkiz9rndl2q485mqa3y-llvm-6.0.1-lib/lib/libLLVM-6.0.so
strip is /nix/store/ppn001bfygzlqx4h50n9zgxc3kqv2d6k-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/n7p8qrdfr52lxvkiz9rndl2q485mqa3y-llvm-6.0.1-lib/lib
patching script interpreter paths in /nix/store/n7p8qrdfr52lxvkiz9rndl2q485mqa3y-llvm-6.0.1-lib
checking for references to /build in /nix/store/n7p8qrdfr52lxvkiz9rndl2q485mqa3y-llvm-6.0.1-lib...
/nix/store/4byxvl1apxk6p6xgxlk50pd58v6n6k08-llvm-6.0.1

@vcunat vcunat changed the base branch from staging-18.03 to release-18.03 June 30, 2018 18:24
@vcunat
Copy link
Member

vcunat commented Jun 30, 2018

I still use staging-18.03 occasionally, but this case rebuilds almost nothing...

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: llvm_6

Partial log (click to expand)

/nix/store/0y7i19y84imkcp98b4dxlcmvri72j5pb-llvm-6.0.1-python/share/opt-viewer/opt-stats.py: interpreter directive changed from "/usr/bin/env python2.7" to "/nix/store/2k0ap4hvl25rxlwhhva9ydhcsx8z3p0k-python-2.7.15/bin/python2.7"
/nix/store/0y7i19y84imkcp98b4dxlcmvri72j5pb-llvm-6.0.1-python/share/opt-viewer/opt-viewer.py: interpreter directive changed from "/usr/bin/env python2.7" to "/nix/store/2k0ap4hvl25rxlwhhva9ydhcsx8z3p0k-python-2.7.15/bin/python2.7"
/nix/store/0y7i19y84imkcp98b4dxlcmvri72j5pb-llvm-6.0.1-python/share/opt-viewer/optrecord.py: interpreter directive changed from "/usr/bin/env python2.7" to "/nix/store/2k0ap4hvl25rxlwhhva9ydhcsx8z3p0k-python-2.7.15/bin/python2.7"
checking for references to /build in /nix/store/0y7i19y84imkcp98b4dxlcmvri72j5pb-llvm-6.0.1-python...
shrinking RPATHs of ELF executables and libraries in /nix/store/949cwdicqnhhdwcyqwg2iw2k8fljcxwz-llvm-6.0.1-lib
shrinking /nix/store/949cwdicqnhhdwcyqwg2iw2k8fljcxwz-llvm-6.0.1-lib/lib/libLLVM-6.0.so
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/949cwdicqnhhdwcyqwg2iw2k8fljcxwz-llvm-6.0.1-lib/lib
patching script interpreter paths in /nix/store/949cwdicqnhhdwcyqwg2iw2k8fljcxwz-llvm-6.0.1-lib
checking for references to /build in /nix/store/949cwdicqnhhdwcyqwg2iw2k8fljcxwz-llvm-6.0.1-lib...

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: llvm_6

Partial log (click to expand)

[ 18%] Building CXX object lib/Analysis/CMakeFiles/LLVMAnalysis.dir/AssumptionCache.cpp.o
[ 18%] Building CXX object lib/Analysis/CMakeFiles/LLVMAnalysis.dir/BasicAliasAnalysis.cpp.o
[ 18%] Building CXX object lib/Analysis/CMakeFiles/LLVMAnalysis.dir/BlockFrequencyInfo.cpp.o
[ 18%] Building CXX object lib/Analysis/CMakeFiles/LLVMAnalysis.dir/BlockFrequencyInfoImpl.cpp.o
[ 18%] Building CXX object lib/Analysis/CMakeFiles/LLVMAnalysis.dir/BranchProbabilityInfo.cpp.o
[ 18%] Building CXX object lib/Analysis/CMakeFiles/LLVMAnalysis.dir/CFG.cpp.o
[ 18%] Building CXX object lib/Analysis/CMakeFiles/LLVMAnalysis.dir/CFGPrinter.cpp.o
[ 18%] Building CXX object lib/Analysis/CMakeFiles/LLVMAnalysis.dir/CFLAndersAliasAnalysis.cpp.o
building of '/nix/store/ijc040mda1q19i8jqskjzgfa5cg426fx-llvm-6.0.1.drv' timed out after 1800 seconds
�[31;1merror:�[0m build of '/nix/store/ijc040mda1q19i8jqskjzgfa5cg426fx-llvm-6.0.1.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: llvm_6

Partial log (click to expand)

/nix/store/4byxvl1apxk6p6xgxlk50pd58v6n6k08-llvm-6.0.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: llvm_6

Partial log (click to expand)

/nix/store/33ql1qj7pmv255f48nw7jiy685nkpcv9-llvm-6.0.1

@LnL7
Copy link
Member

LnL7 commented Jun 30, 2018

Has the hydra eval finished building stuff with 6.0.1 yet. Maybe take a quick look at that to make sure everything looks sane, but I don't see a problem with backporting this.

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: llvm_6

Partial log (click to expand)

[ 18%] Building CXX object lib/Analysis/CMakeFiles/LLVMAnalysis.dir/AliasAnalysisSummary.cpp.o
[ 18%] Building CXX object lib/Analysis/CMakeFiles/LLVMAnalysis.dir/AliasSetTracker.cpp.o
[ 18%] Building CXX object lib/Analysis/CMakeFiles/LLVMAnalysis.dir/Analysis.cpp.o
[ 18%] Building CXX object lib/Analysis/CMakeFiles/LLVMAnalysis.dir/AssumptionCache.cpp.o
[ 18%] Building CXX object lib/Analysis/CMakeFiles/LLVMAnalysis.dir/BasicAliasAnalysis.cpp.o
[ 18%] Building CXX object lib/Analysis/CMakeFiles/LLVMAnalysis.dir/BlockFrequencyInfo.cpp.o
[ 18%] Building CXX object lib/Analysis/CMakeFiles/LLVMAnalysis.dir/BlockFrequencyInfoImpl.cpp.o
[ 18%] Building CXX object lib/Analysis/CMakeFiles/LLVMAnalysis.dir/BranchProbabilityInfo.cpp.o
building of '/nix/store/ijc040mda1q19i8jqskjzgfa5cg426fx-llvm-6.0.1.drv' timed out after 1800 seconds
�[31;1merror:�[0m build of '/nix/store/ijc040mda1q19i8jqskjzgfa5cg426fx-llvm-6.0.1.drv' failed

@dtzWill
Copy link
Member Author

dtzWill commented Jun 30, 2018

Has the hydra eval finished building stuff with 6.0.1 yet. Maybe take a quick look at that to make sure everything looks sane, but I don't see a problem with backporting this.

Not sure which job this would be--with cancels and such. I think this one, assuming things aren't aborted?

https://hydra.nixos.org/eval/1466589

If so, it looks very much still underway. If that's correct, then perhaps we should give this a day or two to sit first?

@LnL7
Copy link
Member

LnL7 commented Jun 30, 2018

Up to you, I'm guessing it's probably fine if you don't want to wait.

@dtzWill
Copy link
Member Author

dtzWill commented Jul 3, 2018

Welp LGTM but not sure what to make of that evaluation. But as you say it's unlikely to be especially problematic, but regardless please ping me if anything breaks that I've missed!

@dtzWill dtzWill merged commit 330ba50 into NixOS:release-18.03 Jul 3, 2018
@dtzWill dtzWill deleted the update/llvm-6.0.1-staging-18.03 branch July 3, 2018 19:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dtzWill @LnL7 @GrahamcOfBorg @vcunat