[WIP] Tweak query code for performance #56509

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

travis_time:end:1a3f10b0:start=1544161593915828770,finish=1544161664792372575,duration=70876543805
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#Pull-Requests-and-Security-Restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-5.0
---
[00:29:15]    Compiling arena v0.0.0 (/checkout/src/libarena)
[00:29:15]    Compiling syntax_pos v0.0.0 (/checkout/src/libsyntax_pos)
[00:29:21]    Compiling rustc_errors v0.0.0 (/checkout/src/librustc_errors)
[00:30:51]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:31:03] thread 'main' panicked at 'type must lift when substs do', src/libcore/option.rs:1008:5
[00:31:04] 
[00:31:04] error: internal compiler error: unexpected panic
[00:31:04] 
[00:31:04] note: the compiler unexpectedly panicked. this is a bug.
[00:31:04] note: the compiler unexpectedly panicked. this is a bug.
[00:31:04] 
[00:31:04] note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
[00:31:04] 
[00:31:04] note: rustc 1.32.0-dev running on x86_64-unknown-linux-gnu
[00:31:04] 
[00:31:04] note: compiler flags: -Z force-unstable-if-unmarked -C prefer-dynamic -C opt-level=2 -C prefer-dynamic -C debug-assertions=y -C link-args=-Wl,-rpath,$ORIGIN/../lib --crate-type dylib
[00:31:04] note: some of the compiler flags provided by cargo are hidden
[00:31:04] 
[00:31:04] error: Could not compile `rustc`.
[00:31:04] warning: build failed, waiting for other jobs to finish...
---
travis_time:end:196f9801:start=1544163555915219709,finish=1544163555920186128,duration=4966419
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:06c35ab6
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0fac

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2018-12-07T08:55:56Z

💔 Test failed - status-travis

Zoxc · 2018-12-07T13:16:54Z

@bors try

bors · 2018-12-07T13:17:06Z

⌛ Trying commit f0c9eec with merge 264b63a...

@michaelwoerister

[WIP] Tweak query code for performance r? @michaelwoerister

rust-highfive · 2018-12-07T14:46:23Z

The job mingw-check of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

travis_time:end:1d47cbf6:start=1544187673569784372,finish=1544187675898480269,duration=2328695897
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#Pull-Requests-and-Security-Restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=mingw-check
---
[00:04:28]     Checking arena v0.0.0 (/checkout/src/libarena)
[00:04:29]     Checking syntax_pos v0.0.0 (/checkout/src/libsyntax_pos)
[00:04:30]     Checking rustc_errors v0.0.0 (/checkout/src/librustc_errors)
[00:04:45]     Checking syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:04:47] error[E0432]: unresolved import `ty::query::job::QueryResult`
[00:04:47]    --> src/librustc/ty/query/plumbing.rs:816:13
[00:04:47]     |
[00:04:47] 816 |           use ty::query::job::QueryResult;
[00:04:47]     |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `QueryResult` in `ty::query::job`
[00:04:47]     | 
[00:04:47]    ::: src/librustc/ty/query/mod.rs:106:1
[00:04:47]     |
[00:04:47] 106 | / define_queries! { <'tcx>
[00:04:47] 107 | |     Other {
[00:04:47] 108 | |         /// Records the type of every item.
[00:04:47] 109 | |         [] fn type_of: TypeOfItem(DefId) -> Ty<'tcx>,
[00:04:47] 698 | |     },
[00:04:47] 699 | | }
[00:04:47]     | |_- in this macro invocation
[00:04:47] 
[00:04:47] 
[00:05:11] error: aborting due to previous error
[00:05:11] 
[00:05:11] For more information about this error, try `rustc --explain E0432`.
[00:05:11] error: Could not compile `rustc`.
[00:05:11] 
[00:05:11] To learn more, run the command again with --verbose.
[00:05:11] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--color" "always" "--features" "" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json"
[00:05:11] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check
[00:05:11] Build completed unsuccessfully in 0:03:07
travis_time:end:02fb5403:start=1544187684949644919,finish=1544187996855895432,duration=311906250513
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 1.
---
travis_time:end:1177f928:start=1544187997318949468,finish=1544187997326050627,duration=7101159
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:021450ed
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:00f7f57e
travis_time:start:00f7f57e
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:00eef080
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2018-12-07T15:44:28Z

☀️ Test successful - status-travis
State: approved= try=True

Zoxc · 2018-12-07T15:47:45Z

@rust-timer build 264b63a

rust-timer · 2018-12-07T15:47:47Z

Success: Queued 264b63a with parent fc84f5f, comparison URL.

rust-timer · 2018-12-07T18:29:56Z

Finished benchmarking try commit 264b63a

michaelwoerister · 2018-12-07T19:40:02Z

This looks very promising :) Ping me when it's not work-in-progress anymore.

cc @rust-lang/wg-compiler-performance

nnethercote · 2018-12-07T19:47:03Z

Indeed, looks good! @Zoxc, can you edit this PR's description with some brief details of what the 30 commits do? Thanks.

Zoxc · 2018-12-07T19:50:26Z

I'll probably split this out in smaller PRs when I clean things up

michaelwoerister · 2018-12-07T22:20:48Z

I'll probably split this out in smaller PRs when I clean things up

Yes, that's a good idea!

bors · 2018-12-07T22:26:37Z

☔ The latest upstream changes (presumably #56502) made this pull request unmergeable. Please resolve the merge conflicts.

@michaelwoerister

Tweak query code for performance Split from #56509 r? @michaelwoerister

@michaelwoerister

Replace LockCell with atomic types Split from #56509 r? @michaelwoerister

@michaelwoerister

Tweak query code for performance Split from #56509 r? @michaelwoerister

@michaelwoerister

Replace LockCell with atomic types Split from #56509 r? @michaelwoerister

XAMPPRocky · 2019-01-11T13:20:08Z

Triage; @Zoxc Hello, have you been able to get back to this PR?

rust-highfive assigned michaelwoerister Dec 4, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 4, 2018

Zoxc force-pushed the query-perf branch 2 times, most recently from 37f7864 to 4d35ddf Compare December 4, 2018 15:43

bors added a commit that referenced this pull request Dec 4, 2018

Auto merge of #56509 - Zoxc:query-perf, r=<try>

da5ac1d

[WIP] Tweak query code for performance r? @michaelwoerister

Zoxc force-pushed the query-perf branch from 4d35ddf to 3b29d34 Compare December 4, 2018 18:22

Zoxc force-pushed the query-perf branch from 3b29d34 to de6a468 Compare December 4, 2018 21:21

This comment has been minimized.

# to view

Zoxc force-pushed the query-perf branch 2 times, most recently from f762447 to 475cafe Compare December 5, 2018 03:48

This comment has been minimized.

# to view

Zoxc force-pushed the query-perf branch from 07edbec to 73456f6 Compare December 7, 2018 02:04

This comment has been minimized.

# to view

Zoxc force-pushed the query-perf branch from 622616d to 6c3305e Compare December 7, 2018 03:36

This comment has been minimized.

# to view

bors added a commit that referenced this pull request Dec 7, 2018

Auto merge of #56509 - Zoxc:query-perf, r=<try>

fb2bcaf

[WIP] Tweak query code for performance r? @michaelwoerister

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 7, 2018

Zoxc added 4 commits December 7, 2018 13:06

fixes

cc9b91a

Remove QueryResult

14d0f37

Move diagnostics out from QueryJob

fed1612

fix

f0c9eec

Zoxc force-pushed the query-perf branch from 9107948 to f0c9eec Compare December 7, 2018 13:00

bors added a commit that referenced this pull request Dec 7, 2018

Auto merge of #56509 - Zoxc:query-perf, r=<try>

264b63a

[WIP] Tweak query code for performance r? @michaelwoerister

QueryResult fix

282239e

This was referenced Dec 7, 2018

Tweak query code for performance #56613

Merged

Replace LockCell with atomic types #56614

Merged

bors added a commit that referenced this pull request Dec 10, 2018

Auto merge of #56613 - Zoxc:query-perf1, r=<try>

c89a860

Tweak query code for performance Split from #56509 r? @michaelwoerister

bors added a commit that referenced this pull request Dec 10, 2018

Auto merge of #56614 - Zoxc:query-perf2, r=<try>

bcc6e63

Replace LockCell with atomic types Split from #56509 r? @michaelwoerister

Zoxc mentioned this pull request Dec 11, 2018

Refactor task system for efficiency #56717

Closed

bors added a commit that referenced this pull request Dec 19, 2018

Auto merge of #56613 - Zoxc:query-perf1, r=michaelwoerister

790f4c5

Tweak query code for performance Split from #56509 r? @michaelwoerister

bors added a commit that referenced this pull request Jan 9, 2019

Auto merge of #56614 - Zoxc:query-perf2, r=michaelwoerister

664c779

Replace LockCell with atomic types Split from #56509 r? @michaelwoerister

Zoxc closed this Jan 21, 2019

[WIP] Tweak query code for performance #56509

[WIP] Tweak query code for performance #56509

Uh oh!

Conversation

Zoxc commented Dec 4, 2018

Uh oh!

Zoxc commented Dec 4, 2018

Uh oh!

bors commented Dec 4, 2018

Uh oh!

Zoxc commented Dec 4, 2018

Uh oh!

bors commented Dec 4, 2018

Uh oh!

Zoxc commented Dec 4, 2018

Uh oh!

rust-timer commented Dec 4, 2018

Uh oh!

rust-timer commented Dec 5, 2018

Uh oh!

This comment has been minimized.

This comment has been minimized.

bors commented Dec 6, 2018

Uh oh!

This comment has been minimized.

This comment has been minimized.

Zoxc commented Dec 7, 2018

Uh oh!

bors commented Dec 7, 2018

Uh oh!

rust-highfive commented Dec 7, 2018

Uh oh!

bors commented Dec 7, 2018

Uh oh!

Zoxc commented Dec 7, 2018

Uh oh!

bors commented Dec 7, 2018

Uh oh!

rust-highfive commented Dec 7, 2018

Uh oh!

bors commented Dec 7, 2018

Uh oh!

Zoxc commented Dec 7, 2018

Uh oh!

rust-timer commented Dec 7, 2018

Uh oh!

rust-timer commented Dec 7, 2018

Uh oh!

michaelwoerister commented Dec 7, 2018

Uh oh!

nnethercote commented Dec 7, 2018

Uh oh!

Zoxc commented Dec 7, 2018

Uh oh!

michaelwoerister commented Dec 7, 2018

Uh oh!

bors commented Dec 7, 2018

Uh oh!

XAMPPRocky commented Jan 11, 2019

Uh oh!

Uh oh!