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

ispc: llvm_4 -> llvm_6, fix luxcorerender #42977

Merged
merged 4 commits into from Jul 5, 2018
Merged

ispc: llvm_4 -> llvm_6, fix luxcorerender #42977

merged 4 commits into from Jul 5, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jul 4, 2018

Also build llvm_6 with *::dump() methods enabled,
(mostly Value::dump I think?) since they're needed
by ispc but are generally useful as well.

Presumably the resulting ISPC still works,
since expressions using it build properly...
but sanity-check from someone would be appreciated :).

  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@dtzWill
Copy link
Member Author

dtzWill commented Jul 4, 2018

cc @guibou

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: llvm_6

The following builds were skipped because they don't evaluate on aarch64-linux: ispc, luxcorerender

Partial log (click to expand)

/nix/store/cdni9lk5qdl129d61956l82q4hgi1217-llvm-6.0.0-python/share/opt-viewer/opt-stats.py: interpreter directive changed from "/usr/bin/env python2.7" to "/nix/store/fh8z4sniyv18b4jf32f3gnn862bvwc3f-python-2.7.15/bin/python2.7"
/nix/store/cdni9lk5qdl129d61956l82q4hgi1217-llvm-6.0.0-python/share/opt-viewer/opt-diff.py: interpreter directive changed from "/usr/bin/env python2.7" to "/nix/store/fh8z4sniyv18b4jf32f3gnn862bvwc3f-python-2.7.15/bin/python2.7"
checking for references to /build in /nix/store/cdni9lk5qdl129d61956l82q4hgi1217-llvm-6.0.0-python...
shrinking RPATHs of ELF executables and libraries in /nix/store/jyv8hdzj7s3mpax7calfvx1h55iznhs4-llvm-6.0.0-lib
shrinking /nix/store/jyv8hdzj7s3mpax7calfvx1h55iznhs4-llvm-6.0.0-lib/lib/libLLVM-6.0.so
strip is /nix/store/0pjsgkxz0rp5baycq5sp2s72lrr5q9sg-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/jyv8hdzj7s3mpax7calfvx1h55iznhs4-llvm-6.0.0-lib/lib
patching script interpreter paths in /nix/store/jyv8hdzj7s3mpax7calfvx1h55iznhs4-llvm-6.0.0-lib
checking for references to /build in /nix/store/jyv8hdzj7s3mpax7calfvx1h55iznhs4-llvm-6.0.0-lib...
/nix/store/iisdj6rfsqh6afs2mp9j7nhxjmpb24zv-llvm-6.0.0

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: llvm_6

The following builds were skipped because they don't evaluate on x86_64-darwin: ispc, luxcorerender

Partial log (click to expand)

[ 18%] Building CXX object lib/Transforms/Utils/CMakeFiles/LLVMTransformUtils.dir/BasicBlockUtils.cpp.o
[ 18%] Building CXX object lib/Transforms/Utils/CMakeFiles/LLVMTransformUtils.dir/BreakCriticalEdges.cpp.o
[ 18%] Building CXX object lib/Transforms/Utils/CMakeFiles/LLVMTransformUtils.dir/BuildLibCalls.cpp.o
[ 18%] Building CXX object lib/Transforms/Utils/CMakeFiles/LLVMTransformUtils.dir/BypassSlowDivision.cpp.o
[ 18%] Building CXX object lib/Transforms/Utils/CMakeFiles/LLVMTransformUtils.dir/CallPromotionUtils.cpp.o
[ 18%] Building CXX object lib/Transforms/Utils/CMakeFiles/LLVMTransformUtils.dir/CloneFunction.cpp.o
[ 18%] Building CXX object lib/Transforms/Utils/CMakeFiles/LLVMTransformUtils.dir/CloneModule.cpp.o
[ 18%] Building CXX object lib/Transforms/Utils/CMakeFiles/LLVMTransformUtils.dir/CodeExtractor.cpp.o
building of '/nix/store/a18w74mmgsh9ak34a09xd0x4sr91jd2g-llvm-6.0.0.drv' timed out after 1800 seconds
�[31;1merror:�[0m build of '/nix/store/a18w74mmgsh9ak34a09xd0x4sr91jd2g-llvm-6.0.0.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: ispc, llvm_6, luxcorerender

Partial log (click to expand)

[ 22%] Building CXX object Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/runtime/JSCallee.cpp.o
[14789/16857] CXX obj/third_party/WebKit/Source/platform/platform/platform_jumbo_14.o
[ 22%] Building CXX object Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/runtime/JSCell.cpp.o
[14790/16857] CXX obj/third_party/WebKit/Source/platform/platform/platform_jumbo_52.o
[14791/16857] CXX obj/third_party/WebKit/Source/platform/platform/platform_jumbo_39.o
building of '/nix/store/ha19qzqrszy8z4gkms4j594d2ynpwwyq-qtwebengine-5.11.0.drv' timed out after 4000 seconds
building of '/nix/store/wips8wfn1j9wj03683rhqqkl3jwjmccq-qtwebkit-5.212-alpha-01-26-2018.drv' timed out after 4000 seconds
cannot build derivation '/nix/store/qvyyph74p35h2nmk5alm8qkpn35bvg92-qt-full-5.11.0.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/ji5yw578b2f4i5wd1lha8fk8lv6n899l-luxcorerender-2.0.drv': 1 dependencies couldn't be built
error: build of '/nix/store/ji5yw578b2f4i5wd1lha8fk8lv6n899l-luxcorerender-2.0.drv' failed

@dtzWill dtzWill requested a review from Ericson2314 July 4, 2018 16:38
@dtzWill
Copy link
Member Author

dtzWill commented Jul 4, 2018

(github suggested, wasn't sure who to ask to review :))

Ericson2314
Ericson2314 approved these changes Jul 5, 2018
View reviewed changes
Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know little about this, but the diff seems fine. LGTM.

@dtzWill
Copy link
Member Author

dtzWill commented Jul 5, 2018

Will be sending to staging instead, due to Linux rebuilds...

@dtzWill dtzWill changed the base branch from master to staging July 5, 2018 13:51
@dtzWill
Copy link
Member Author

dtzWill commented Jul 5, 2018

For posterity: looks like enabling the ::dump methods bumps the output from 169M to 172M, which relatively tiny and IMO very much worth it (not just for ispc, but any user of LLVM, especially anyone debugging something using LLVM).

@dtzWill dtzWill merged commit eecbb63 into NixOS:staging Jul 5, 2018
@dtzWill dtzWill deleted the feature/ispc-llvm-6 branch July 5, 2018 14:22
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: llvm_6

The following builds were skipped because they don't evaluate on aarch64-linux: ispc, luxcorerender

Partial log (click to expand)

/nix/store/zn8yh3x3vg6ns8kcd3vx4i8zzsd0ykyr-llvm-6.0.1-python/share/opt-viewer/opt-stats.py: interpreter directive changed from "/usr/bin/env python2.7" to "/nix/store/0bxsz2pw8n2f11lwwxwwbb8cdzaw2l9j-python-2.7.15/bin/python2.7"
/nix/store/zn8yh3x3vg6ns8kcd3vx4i8zzsd0ykyr-llvm-6.0.1-python/share/opt-viewer/opt-diff.py: interpreter directive changed from "/usr/bin/env python2.7" to "/nix/store/0bxsz2pw8n2f11lwwxwwbb8cdzaw2l9j-python-2.7.15/bin/python2.7"
checking for references to /build in /nix/store/zn8yh3x3vg6ns8kcd3vx4i8zzsd0ykyr-llvm-6.0.1-python...
shrinking RPATHs of ELF executables and libraries in /nix/store/gvwpk9fy96l9zb8hkwqibp8d9hsqmr7w-llvm-6.0.1-lib
shrinking /nix/store/gvwpk9fy96l9zb8hkwqibp8d9hsqmr7w-llvm-6.0.1-lib/lib/libLLVM-6.0.so
strip is /nix/store/7iyn7gn33i7xxjgmwf25k20246y6nd9d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/gvwpk9fy96l9zb8hkwqibp8d9hsqmr7w-llvm-6.0.1-lib/lib
patching script interpreter paths in /nix/store/gvwpk9fy96l9zb8hkwqibp8d9hsqmr7w-llvm-6.0.1-lib
checking for references to /build in /nix/store/gvwpk9fy96l9zb8hkwqibp8d9hsqmr7w-llvm-6.0.1-lib...
/nix/store/13hv0r9ik22sxsnh2538xdyq1bwga9dk-llvm-6.0.1

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: llvm_6

The following builds were skipped because they don't evaluate on x86_64-darwin: ispc, luxcorerender

Partial log (click to expand)

cannot build derivation '/nix/store/hl1pskknnxrja1wpqxadkg8485qg6mgx-apple-framework-SystemConfiguration.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/7s8k9pfbvaq0bd2836avwcw9hfkc0c3n-apple-framework-CoreGraphics.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/cmj0wq6b57han77l3zf10j901b5bgqlf-apple-framework-CoreServices.drv': 12 dependencies couldn't be built
cannot build derivation '/nix/store/vdxzlig1i1pfk6vkyrlffc555qfizx4s-apple-framework-CoreText.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/mywysyckjnlw0phhh42jfpmhg2s33vwp-apple-framework-ImageIO.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/m4yljly9vzg02q55hwwr97bz3a4i4g2i-apple-framework-ApplicationServices.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/8idh3gqf55h75w10kv8dibgzdw7v6pfp-libuv-1.21.0.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/58r456xdddl4whgc0mjsr7gddkai667f-cmake-3.11.2.drv': 14 dependencies couldn't be built
cannot build derivation '/nix/store/yawga9rmj416cds01dywywi30qvn0k2n-llvm-6.0.1.drv': 8 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/yawga9rmj416cds01dywywi30qvn0k2n-llvm-6.0.1.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: ispc, llvm_6, luxcorerender

Partial log (click to expand)

cannot build derivation '/nix/store/sb9v4hg0xhixp69cppzykm9j7p7qyzr9-qtvirtualkeyboard-5.11.0.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/1vmgmcd52m08my81lg7lijrlmmv6gx9c-qtwebchannel-5.11.0.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/rsa0fza2ig1bbzkv9iy3gzpi71j6lv7p-qtwebsockets-5.11.0.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/q0jid2kv815wijincdfv82hnpkfkmk9j-qtlocation-5.11.0.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/nxij1q9q2nvbbpdqdf53hisyhpppmfnb-qtwayland-5.11.0.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/acpahwyayj8v8xaj80z7f0n98zg138f9-qtwebengine-5.11.0.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/dsr2lkcr6pg8mybsxwzy83g8s3g51xzj-qtwebkit-5.212-alpha-01-26-2018.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/wlgyhypbb2zw6cm664j0qah1c12zy262-qt-full-5.11.0.drv': 25 dependencies couldn't be built
cannot build derivation '/nix/store/dvrj4xxjh0705h4zrlymy25pg6g50xiw-luxcorerender-2.0.drv': 9 dependencies couldn't be built
error: build of '/nix/store/458cr8am3apnh7vjj5055760vyvx8amk-ispc-1.9.2.drv', '/nix/store/8pwijfxa7zdb0ak4206h4gr171m7a99c-llvm-6.0.1.drv', '/nix/store/dvrj4xxjh0705h4zrlymy25pg6g50xiw-luxcorerender-2.0.drv' failed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314 Ericson2314 approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dtzWill @GrahamcOfBorg @Ericson2314