Cache flags and escaping vars for predicates#73180

matthewjasper · 2020-06-09T20:56:17Z

With predicates becoming interned (rust-lang/compiler-team#285) this is now possible and could be a perf win. It would become an even larger win once we have recursive predicates.

cc @lcnr @nikomatsakis

r? @ghost

matthewjasper · 2020-06-09T21:46:14Z

ICE is correct behavior, the test is broken (cf #72788).
@bors try @rust-timer queue

rust-timer · 2020-06-09T21:46:15Z

Awaiting bors try build completion

bors · 2020-06-09T21:46:26Z

⌛ Trying commit af84f544b621c419cf408f263980dadcd0db06df with merge 59fc3d2fa5f30845fe5dde070032e229d807d4f6...

rust-highfive · 2020-06-09T22:03:27Z

The job x86_64-gnu-llvm-8 of your PR failed (pretty log, 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.

##[section]Starting: Linux x86_64-gnu-llvm-8
##[section]Starting: Initialize job
Agent name: 'Azure Pipelines 8'
Agent machine name: 'fv-az578'
Current agent version: '2.170.1'
##[group]Operating System
16.04.6
LTS
LTS
##[endgroup]
##[group]Virtual Environment
Environment: ubuntu-16.04
Version: 20200517.1
Included Software: https://github.com/actions/virtual-environments/blob/ubuntu16/20200517.1/images/linux/Ubuntu1604-README.md
##[endgroup]
Agent running as: 'vsts'
Prepare build directory.
Set build variables.
Download all required tasks.
Download all required tasks.
Downloading task: Bash (3.163.3)
Checking job knob settings.
   Knob: AgentToolsDirectory = /opt/hostedtoolcache Source: ${AGENT_TOOLSDIRECTORY} 
   Knob: AgentPerflog = /home/vsts/perflog Source: ${VSTS_AGENT_PERFLOG} 
Start tracking orphan processes.
##[section]Finishing: Initialize job
##[section]Starting: Configure Job Name
==============================================================================
---
========================== Starting Command Output ===========================
[command]/bin/bash --noprofile --norc /home/vsts/work/_temp/86e6e917-30d4-4637-8eec-88bb9a9eb408.sh

##[section]Finishing: Disable git automatic line ending conversion
##[section]Starting: Checkout rust-lang/rust@refs/pull/73180/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
---
##[command]git remote add origin https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
##[command]git config --get-all http.proxy
##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/73180/merge:refs/remotes/pull/73180/merge
---
 ---> cb2676f08729
Step 5/8 : ENV RUST_CONFIGURE_ARGS       --build=x86_64-unknown-linux-gnu       --llvm-root=/usr/lib/llvm-8       --enable-llvm-link-shared       --set rust.thin-lto-import-instr-limit=10
 ---> Using cache
 ---> df25ce111862
Step 6/8 : ENV SCRIPT python2.7 ../x.py test --exclude src/tools/tidy &&            python2.7 ../x.py test src/test/mir-opt --pass=build                                   --target=armv5te-unknown-linux-gnueabi &&            python2.7 ../x.py test src/tools/tidy
 ---> 599b9ac96b27
Step 7/8 : ENV NO_DEBUG_ASSERTIONS=1
 ---> Using cache
 ---> 091087e35a36
---
   Compiling rustc_parse_format v0.0.0 (/checkout/src/librustc_parse_format)
   Compiling chalk-rust-ir v0.10.0
   Compiling rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
   Compiling rustc_hir v0.0.0 (/checkout/src/librustc_hir)
   Compiling rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
   Compiling chalk-solve v0.10.0
   Compiling rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
   Compiling rustc_parse v0.0.0 (/checkout/src/librustc_parse)
   Compiling rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
---
   Compiling rustc_parse_format v0.0.0 (/checkout/src/librustc_parse_format)
   Compiling chalk-rust-ir v0.10.0
   Compiling rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
   Compiling rustc_hir v0.0.0 (/checkout/src/librustc_hir)
   Compiling rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
   Compiling chalk-solve v0.10.0
   Compiling rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
   Compiling rustc_parse v0.0.0 (/checkout/src/librustc_parse)
   Compiling rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
---
..............................i...............i..................................................... 5200/10292
.................................................................................................... 5300/10292
..............................................................................i..................... 5400/10292
........................................................................i........................... 5500/10292
.........................................................................................ii.ii...... 5600/10292
..i...i............................................................................................. 5700/10292
........................................i........................................................... 5900/10292
..............................................................................................ii.... 6000/10292
.................................i.................................................................. 6100/10292
.................................................................................................... 6200/10292
.................................................................................................... 6200/10292
.................................................................................................... 6300/10292
........................................................ii...i..ii...........i...................... 6400/10292
.................................................................................................... 6600/10292
.................................................................................................... 6700/10292
.................................................................................................... 6700/10292
.........................................................................................i..ii...... 6800/10292
.................................................................................................... 7000/10292
.................................................................................................... 7100/10292
...........................................i........................................................ 7200/10292
.................................................................................................... 7300/10292
---
.................................................................................................... 8200/10292
.................................................................................................... 8300/10292
...................................................................................i................ 8400/10292
.................................................................................................... 8500/10292
.....................................iiiiii.iiiiii.i................................................ 8600/10292
.................................................................................................... 8800/10292
.................................................................................................... 8900/10292
.................................................................................................... 9000/10292
.................................................................................................... 9100/10292
---
---- [ui] ui/issues/issue-38091.rs stdout ----

error: test compilation failed although it shouldn't!
status: exit code: 101
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/issues/issue-38091.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-38091/a" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-38091/auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
error: internal compiler error: src/librustc_trait_selection/traits/codegen/mod.rs:108: Encountered errors `[FulfillmentError(Obligation(predicate=Binder(TraitPredicate(<() as Valid>)), depth=2),Unimplemented)]` resolving bounds after type-checking
thread 'rustc' panicked at 'Box<Any>', src/librustc_errors/lib.rs:907:9
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

note: the compiler unexpectedly panicked. this is a bug.
note: the compiler unexpectedly panicked. this is a bug.

note: we would appreciate a bug report: ***/blob/master/CONTRIBUTING.md#bug-reports
note: rustc 1.46.0-nightly (4e54c9c06 2020-06-09) running on x86_64-unknown-linux-gnu


note: compiler flags: -Z threads=1 -Z ui-testing -Z deduplicate-diagnostics=no -Z unstable-options -C prefer-dynamic -C rpath -C debuginfo=0
error: aborting due to previous error


------------------------------------------
---
thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:348:22
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace


command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-8/bin/FileCheck" "--nodejs" "/usr/bin/node" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "8.0.0" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"


failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --exclude src/tools/tidy
Build completed unsuccessfully in 1:01:31
Build completed unsuccessfully in 1:01:31
== clock drift check ==
  local time: Tue Jun  9 22:03:04 UTC 2020
  network time: Tue, 09 Jun 2020 22:03:04 GMT
== end clock drift check ==

##[error]Bash exited with code '1'.
##[section]Finishing: Run build
##[section]Starting: Checkout rust-lang/rust@refs/pull/73180/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
Author       : Microsoft
Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
==============================================================================
Cleaning any cached credential from repository: rust-lang/rust (GitHub)
##[section]Finishing: Checkout rust-lang/rust@refs/pull/73180/merge to s
Cleaning up task key
Start cleaning up orphan processes.
Terminate orphan process: pid (3653) (python)
##[section]Finishing: Finalize Job

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 @rust-lang/infra. (Feature Requests)

bors · 2020-06-10T00:22:42Z

☀️ Try build successful - checks-azure
Build commit: 59fc3d2fa5f30845fe5dde070032e229d807d4f6 (59fc3d2fa5f30845fe5dde070032e229d807d4f6)

rust-timer · 2020-06-10T00:22:44Z

Queued 59fc3d2fa5f30845fe5dde070032e229d807d4f6 with parent feb3536, future comparison URL.

rust-timer · 2020-06-10T05:41:44Z

Finished benchmarking try commit (59fc3d2fa5f30845fe5dde070032e229d807d4f6): comparison url.

matthewjasper · 2020-06-10T10:04:02Z

The perf improvements seem a little too good to just be the type flag changes. I guess that a lot of them are the change to hash predicates by address. I've moved the change that breaks the test into #72788.

r? @nikomatsakis or @oli-obk

nikomatsakis · 2020-06-10T10:13:15Z

@bors r+ rollup=never

Perf sensitive

bors · 2020-06-10T10:13:16Z

📌 Commit 8bff498b28f41d4c9fc737430519b593064d9f9e has been approved by nikomatsakis

bors · 2020-06-15T15:43:05Z

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

matthewjasper · 2020-06-15T18:36:13Z

@bors r=nikomatsakis

bors · 2020-06-15T18:36:14Z

📌 Commit 2e17245 has been approved by nikomatsakis

@lcnr

…komatsakis Cache flags and escaping vars for predicates With predicates becoming interned (rust-lang/compiler-team#285) this is now possible and could be a perf win. It would become an even larger win once we have recursive predicates. cc @lcnr @nikomatsakis r? @ghost

bors · 2020-06-21T02:24:12Z

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

Also hash predicates by address

matthewjasper · 2020-06-21T10:34:06Z

@bors r=nikomatsakis

bors · 2020-06-21T10:34:07Z

📌 Commit 6e12272 has been approved by nikomatsakis

RalfJung · 2020-06-21T12:21:37Z

@bors p=1
let's work through some rollup=never PRs

bors · 2020-06-21T21:06:02Z

⌛ Testing commit 6e12272 with merge 1a4e2b6...

bors · 2020-06-22T00:35:54Z

☀️ Test successful - checks-azure
Approved by: nikomatsakis
Pushing 1a4e2b6 to master...

nnethercote · 2020-06-22T23:48:41Z

Perf results from landing were a big win, as expected. Great job!

matthewjasper force-pushed the predicate-cache branch from af84f54 to f561593 Compare June 10, 2020 08:38

This comment has been minimized.

Sign in to view

matthewjasper force-pushed the predicate-cache branch from f561593 to 8bff498 Compare June 10, 2020 08:53

rust-highfive assigned nikomatsakis Jun 10, 2020

nikomatsakis approved these changes Jun 10, 2020

View reviewed changes

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 10, 2020

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 15, 2020

matthewjasper force-pushed the predicate-cache branch from 8bff498 to 2e17245 Compare June 15, 2020 17:33

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 15, 2020

Manishearth mentioned this pull request Jun 19, 2020

Rollup of 10 pull requests #73499

Closed

lcnr mentioned this pull request Jun 19, 2020

convert higher ranked Predicates to PredicateKind::ForAll #73503

Merged

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 21, 2020

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 21, 2020

matthewjasper added 3 commits June 21, 2020 10:18

Cache decoded predicate shorthands

8ea55f1

Cache flags and escaping vars for predicates

f802ee1

Also hash predicates by address

Replace is_global call on data with call on predicate

6e12272

matthewjasper force-pushed the predicate-cache branch from 2e17245 to 6e12272 Compare June 21, 2020 09:22

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 21, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 22, 2020

bors merged commit 1a4e2b6 into rust-lang:master Jun 22, 2020

bors mentioned this pull request Jun 22, 2020

Add TyCtxtAt::{ty_error, ty_error_with_message} #73176

Merged

jonas-schievink added relnotes-perf Performance improvements that should be mentioned in the release notes. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 22, 2020

jonas-schievink added this to the 1.46 milestone Jun 22, 2020

matthewjasper deleted the predicate-cache branch June 22, 2020 03:23

Uh oh!

Conversation

matthewjasper commented Jun 9, 2020

Uh oh!

matthewjasper commented Jun 9, 2020

Uh oh!

rust-timer commented Jun 9, 2020

Uh oh!

bors commented Jun 9, 2020

Uh oh!

rust-highfive commented Jun 9, 2020

Uh oh!

bors commented Jun 10, 2020

Uh oh!

rust-timer commented Jun 10, 2020

Uh oh!

rust-timer commented Jun 10, 2020

Uh oh!

This comment has been minimized.

matthewjasper commented Jun 10, 2020

Uh oh!

nikomatsakis commented Jun 10, 2020

Uh oh!

bors commented Jun 10, 2020

Uh oh!

bors commented Jun 15, 2020

Uh oh!

matthewjasper commented Jun 15, 2020

Uh oh!

bors commented Jun 15, 2020

Uh oh!

bors commented Jun 21, 2020

Uh oh!

matthewjasper commented Jun 21, 2020

Uh oh!

bors commented Jun 21, 2020

Uh oh!

RalfJung commented Jun 21, 2020

Uh oh!

bors commented Jun 21, 2020

Uh oh!

bors commented Jun 22, 2020

Uh oh!

nnethercote commented Jun 22, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants