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.

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

Clean up query cache code #59722

Merged
merged 2 commits into from Jun 30, 2019

Conversation

Projects
None yet
7 participants
@Zoxc
Copy link
Contributor

commented Apr 5, 2019

There are a couple of queries for which we do not promote saved results, which have been removed from caching here. This was likely the cause of the regression in #57293 (comment).

r? @michaelwoerister

@Zoxc

This comment has been minimized.

Copy link
Contributor Author

commented Apr 5, 2019

@bors try

@bors

This comment has been minimized.

Copy link
Contributor

commented Apr 5, 2019

⌛️ Trying commit a3493a2 with merge db126a1...

bors added a commit that referenced this pull request Apr 5, 2019

Auto merge of #59722 - Zoxc:query-cache, r=<try>
[WIP] Clean up query cache code

There are a couple of queries for which we do not promote saved results, which have been removed from caching here. This was likely the cause of the regression in #57293 (comment).

r? @michaelwoerister
@bors

This comment has been minimized.

Copy link
Contributor

commented Apr 5, 2019

☀️ Try build successful - checks-travis
Build commit: db126a1

@Zoxc

This comment has been minimized.

Copy link
Contributor Author

commented Apr 5, 2019

@rust-build timer db126a1

@Zoxc

This comment has been minimized.

Copy link
Contributor Author

commented Apr 7, 2019

@rust-timer

This comment has been minimized.

Copy link

commented Apr 7, 2019

Success: Queued db126a1 with parent acd8dd6, comparison URL.

@rust-timer

This comment has been minimized.

Copy link

commented Apr 7, 2019

Finished benchmarking try commit db126a1

@Zoxc Zoxc force-pushed the Zoxc:query-cache branch 3 times, most recently from e3cdfff to a31b2af Apr 14, 2019

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Apr 14, 2019

The job x86_64-gnu-llvm-6.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:005ccbb4:start=1555261047624443916,finish=1555261048358277880,duration=733833964
$ 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
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---

[00:04:03] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:04] tidy error: /checkout/src/librustc/query/mod.rs:225: line longer than 100 chars
[00:04:05] some tidy checks failed
[00:04:05] 
[00:04:05] 
[00:04:05] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:04:05] 
[00:04:05] 
[00:04:05] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:05] Build completed unsuccessfully in 0:00:47
[00:04:05] Build completed unsuccessfully in 0:00:47
[00:04:05] make: *** [tidy] Error 1
[00:04:05] Makefile:67: recipe for target 'tidy' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:116c22c6
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sun Apr 14 17:01:44 UTC 2019
---
travis_time:end:23dc4d9a:start=1555261305653397594,finish=1555261305658518868,duration=5121274
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:01d02cbc
$ 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:0822c09c
travis_time:start:0822c09c
$ 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:02770044
$ 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)

@Zoxc Zoxc force-pushed the Zoxc:query-cache branch from a31b2af to 475186d Apr 14, 2019

@Zoxc Zoxc changed the title [WIP] Clean up query cache code Clean up query cache code Apr 15, 2019

@Zoxc

This comment has been minimized.

Copy link
Contributor Author

commented Apr 15, 2019

@bors try

@bors

This comment has been minimized.

Copy link
Contributor

commented Apr 15, 2019

⌛️ Trying commit 475186d with merge 59c0f07...

bors added a commit that referenced this pull request Apr 15, 2019

Auto merge of #59722 - Zoxc:query-cache, r=<try>
Clean up query cache code

There are a couple of queries for which we do not promote saved results, which have been removed from caching here. This was likely the cause of the regression in #57293 (comment).

r? @michaelwoerister
@bors

This comment has been minimized.

Copy link
Contributor

commented Apr 15, 2019

☀️ Try build successful - checks-travis
Build commit: 59c0f07

@Zoxc

This comment has been minimized.

Copy link
Contributor Author

commented Apr 15, 2019

@rust-timer

This comment has been minimized.

Copy link

commented Apr 15, 2019

Success: Queued 59c0f07 with parent fcf850f, comparison URL.

@rust-timer

This comment has been minimized.

Copy link

commented Apr 16, 2019

Finished benchmarking try commit 59c0f07

@michaelwoerister

This comment has been minimized.

Copy link
Contributor

commented Apr 26, 2019

Any idea why performance is affected so badly?

@Zoxc

This comment has been minimized.

Copy link
Contributor Author

commented Apr 26, 2019

@michaelwoerister No, but I must have messed something up.

@Mark-Simulacrum

This comment has been minimized.

Copy link
Member

commented May 18, 2019

Visiting from triage; marking as waiting on author rather than review; I suspect this is unlikely to make progress until @Zoxc has a chance to investigate the slowdown and fix it.

@Zoxc Zoxc force-pushed the Zoxc:query-cache branch from 475186d to 26ff212 Jun 15, 2019

@Zoxc

This comment has been minimized.

Copy link
Contributor Author

commented Jun 26, 2019

@rust-timer

This comment has been minimized.

Copy link

commented Jun 26, 2019

Success: Queued 61796f2 with parent d3e2cec, comparison URL.

None
}
let data = self.data.as_ref().unwrap();
data.colors.values.indices().for_each(|prev_index| {

This comment has been minimized.

Copy link
@eddyb

eddyb Jun 26, 2019

Member

Why not use a for loop?

This comment has been minimized.

Copy link
@Zoxc

Zoxc Jun 26, 2019

Author Contributor

Idk, to not make for_each seem useless? =P

@eddyb

eddyb approved these changes Jun 26, 2019

Copy link
Member

left a comment

r=me if perf is good

@Zoxc Zoxc force-pushed the Zoxc:query-cache branch from 02f751b to fbfee70 Jun 26, 2019

@rust-timer

This comment has been minimized.

Copy link

commented Jun 26, 2019

Finished benchmarking try commit 61796f2, comparison URL.

@Zoxc

This comment has been minimized.

Copy link
Contributor Author

commented Jun 26, 2019

@bors r=eddyb

bors added a commit that referenced this pull request Jun 27, 2019

Auto merge of #62166 - Zoxc:const_eval_raw, r=<try>
 Store const_eval_raw results to disk

Based on #59722.

r? @oli-obk

@Zoxc Zoxc closed this Jun 30, 2019

@Zoxc Zoxc reopened this Jun 30, 2019

@Zoxc Zoxc force-pushed the Zoxc:query-cache branch from fbfee70 to ede41ab Jun 30, 2019

@Zoxc

This comment has been minimized.

Copy link
Contributor Author

commented Jun 30, 2019

@bors r=eddyb

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 30, 2019

📌 Commit ede41ab has been approved by eddyb

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 30, 2019

⌛️ Testing commit ede41ab with merge 0af8e87...

bors added a commit that referenced this pull request Jun 30, 2019

Auto merge of #59722 - Zoxc:query-cache, r=eddyb
Clean up query cache code

There are a couple of queries for which we do not promote saved results, which have been removed from caching here. This was likely the cause of the regression in #57293 (comment).

r? @michaelwoerister
@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 30, 2019

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: eddyb
Pushing 0af8e87 to master...

@bors bors added the merged-by-bors label Jun 30, 2019

@bors bors merged commit ede41ab into rust-lang:master Jun 30, 2019

2 checks passed

homu Test successful
Details
pr Build #20190630.8 succeeded
Details

@Zoxc Zoxc deleted the Zoxc:query-cache branch Jun 30, 2019

bors added a commit that referenced this pull request Jul 1, 2019

Auto merge of #62166 - Zoxc:const_eval_raw, r=<try>
 Store const_eval_raw results to disk

Based on #59722.

r? @oli-obk

bors added a commit that referenced this pull request Jul 1, 2019

Auto merge of #62166 - Zoxc:const_eval_raw, r=<try>
 Store const_eval_raw results to disk

Based on #59722.

r? @oli-obk
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.