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

move considering_regions to the infcx #99501

Merged
merged 2 commits into from
Jul 21, 2022
Merged

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Jul 20, 2022

it seems weird to prove some obligations which constrain inference vars while ignoring regions in a context which considers regions. This is especially weird because even for a fulfillment context with ignored regions, we still added region outlives bounds when directly relating regions.

tbh our handling of regions is still very weird, but at least this is a step in the right direction imo.

r? rust-lang/types

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 20, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 20, 2022
@lcnr
Copy link
Contributor Author

lcnr commented Jul 20, 2022

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 20, 2022
@bors
Copy link
Contributor

bors commented Jul 20, 2022

⌛ Trying commit 021d922c81dc22e07a430b98f8673cbc004e56d1 with merge da971220f376e3ce460c76dbd7febd3c9890dfda...

@rustbot
Copy link
Collaborator

rustbot commented Jul 20, 2022

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

@lcnr
Copy link
Contributor Author

lcnr commented Jul 20, 2022

@bors try

@bors
Copy link
Contributor

bors commented Jul 20, 2022

⌛ Trying commit 5390cbb23bc12626d369d1ac0a01580fe363a9d4 with merge 23f3bd4a887f76dfd3000c00074dd2eed34613df...

@bors
Copy link
Contributor

bors commented Jul 20, 2022

☀️ Try build successful - checks-actions
Build commit: 23f3bd4a887f76dfd3000c00074dd2eed34613df (23f3bd4a887f76dfd3000c00074dd2eed34613df)

@rust-timer
Copy link
Collaborator

Queued 23f3bd4a887f76dfd3000c00074dd2eed34613df with parent 03d488b, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (23f3bd4a887f76dfd3000c00074dd2eed34613df): comparison url.

Instruction count

  • Primary benchmarks: 🎉 relevant improvement found
  • Secondary benchmarks: 😿 relevant regressions found
mean1 max count2
Regressions 😿
(primary)
N/A N/A 0
Regressions 😿
(secondary)
0.4% 0.5% 5
Improvements 🎉
(primary)
-0.3% -0.3% 1
Improvements 🎉
(secondary)
N/A N/A 0
All 😿🎉 (primary) -0.3% -0.3% 1

Max RSS (memory usage)

Results
  • Primary benchmarks: 😿 relevant regression found
  • Secondary benchmarks: mixed results
mean1 max count2
Regressions 😿
(primary)
2.8% 2.8% 1
Regressions 😿
(secondary)
3.8% 6.0% 4
Improvements 🎉
(primary)
N/A N/A 0
Improvements 🎉
(secondary)
-8.9% -9.0% 2
All 😿🎉 (primary) 2.8% 2.8% 1

Cycles

Results
  • Primary benchmarks: mixed results
  • Secondary benchmarks: no relevant changes found
mean1 max count2
Regressions 😿
(primary)
2.6% 2.8% 2
Regressions 😿
(secondary)
N/A N/A 0
Improvements 🎉
(primary)
-2.6% -3.1% 2
Improvements 🎉
(secondary)
N/A N/A 0
All 😿🎉 (primary) -0.0% -3.1% 4

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

Footnotes

  1. the arithmetic mean of the percent change 2 3

  2. number of relevant changes 2 3

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 20, 2022
@oli-obk
Copy link
Contributor

oli-obk commented Jul 21, 2022

Hmm... can't get the details of this perf regression:

collector error: did not manage to obtain toolchain 03d488b

@lqd
Copy link
Member

lqd commented Jul 21, 2022

Maybe some temporary network/server issue ? rustup-toolchain-master successfully downloads 03d488b here.

@oli-obk
Copy link
Contributor

oli-obk commented Jul 21, 2022

aha! rustup changed its exit code from 101 to something else, and the collector doesn't know about this yet

rust-lang/rustc-perf#1363

@oli-obk
Copy link
Contributor

oli-obk commented Jul 21, 2022

 6,261,975  ???:rustc_query_system::query::plumbing::get_query::<rustc_query_impl::queries::hir_attrs, rustc_query_impl::plumbing::QueryCtxt>
 6,241,533  /build/glibc-sMfBJT/glibc-2.31/string/../sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S:__memcpy_sse2_unaligned_erms
-5,701,890  ???:rustc_query_system::query::plumbing::try_execute_query::<rustc_query_impl::plumbing::QueryCtxt, rustc_query_system::query::caches::DefaultCache<rustc_span::def_id::LocalDefId, &rustc_hir::hir::AttributeMap>>
  -920,230  ???:<rustc_query_impl::Queries as rustc_middle::ty::query::QueryEngine>::hir_attrs
   320,080  ???:<rustc_infer::infer::InferCtxtBuilder>::ignoring_regions
   240,060  /build/glibc-sMfBJT/glibc-2.31/string/../sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S:memcpy@GLIBC_2.2.5
   160,032  ???:<rustc_infer::infer::InferCtxtBuilder>::enter::<core::result::Result<alloc::vec::Vec<rustc_middle::ty::Predicate>, rustc_errors::ErrorGuaranteed>, rustc_trait_selection::traits::do_normalize_predicates::{closure
   140,028  ???:rustc_trait_selection::traits::normalize_param_env_or_error
  -114,593  ???:core::slice::sort::choose_pivot::<(rustc_span::def_id::DefPathHash, &rustc_hir::hir::OwnerInfo), <[(rustc_span::def_id::DefPathHash, &rustc_hir::hir::OwnerInfo)]>::sort_unstable_by_key<rustc_span::def_id::DefPathHash, rustc_ast_lowering::compute_hir_hash::{closure
    99,845  ???:core::slice::sort::recurse::<(rustc_span::def_id::DefPathHash, &rustc_hir::hir::OwnerInfo), <[(rustc_span::def_id::DefPathHash, &rustc_hir::hir::OwnerInfo)]>::sort_unstable_by_key<rustc_span::def_id::DefPathHash, rustc_ast_lowering::compute_hir_hash::{closure
    40,020  ???:<rustc_middle::ty::context::TyCtxt as rustc_infer::infer::TyCtxtInferExt>::infer_ctxt
    33,862  /build/glibc-sMfBJT/glibc-2.31/string/../sysdeps/x86_64/strcmp.S:strcmp
   -20,004  ???:<rustc_middle::ty::context::TyCtxt>::lint_level_at_node
    19,968  ???:<rustc_middle::lint::LintLevelSets>::get_lint_level

@oli-obk
Copy link
Contributor

oli-obk commented Jul 21, 2022

let's try rebasing and running perf again, this diff looks really weird

@lcnr lcnr force-pushed the check-regions-infcx branch from 5390cbb to 43ccacf Compare July 21, 2022 11:09
@lcnr
Copy link
Contributor Author

lcnr commented Jul 21, 2022

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 21, 2022
@bors
Copy link
Contributor

bors commented Jul 21, 2022

⌛ Trying commit 43ccacf with merge 019e66e07b3107d621817372a70d171d66dfb9ba...

@bors
Copy link
Contributor

bors commented Jul 21, 2022

☀️ Try build successful - checks-actions
Build commit: 019e66e07b3107d621817372a70d171d66dfb9ba (019e66e07b3107d621817372a70d171d66dfb9ba)

@rust-timer
Copy link
Collaborator

Queued 019e66e07b3107d621817372a70d171d66dfb9ba with parent ceeb5ad, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (019e66e07b3107d621817372a70d171d66dfb9ba): comparison url.

Instruction count

  • Primary benchmarks: 🎉 relevant improvement found
  • Secondary benchmarks: 😿 relevant regressions found
mean1 max count2
Regressions 😿
(primary)
N/A N/A 0
Regressions 😿
(secondary)
0.4% 0.5% 4
Improvements 🎉
(primary)
-0.2% -0.2% 1
Improvements 🎉
(secondary)
N/A N/A 0
All 😿🎉 (primary) -0.2% -0.2% 1

Max RSS (memory usage)

Results
  • Primary benchmarks: 🎉 relevant improvement found
  • Secondary benchmarks: 🎉 relevant improvement found
mean1 max count2
Regressions 😿
(primary)
N/A N/A 0
Regressions 😿
(secondary)
N/A N/A 0
Improvements 🎉
(primary)
-2.8% -2.8% 1
Improvements 🎉
(secondary)
-2.1% -2.1% 1
All 😿🎉 (primary) -2.8% -2.8% 1

Cycles

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 😿 relevant regression found
mean1 max count2
Regressions 😿
(primary)
N/A N/A 0
Regressions 😿
(secondary)
2.6% 2.6% 1
Improvements 🎉
(primary)
N/A N/A 0
Improvements 🎉
(secondary)
N/A N/A 0
All 😿🎉 (primary) N/A N/A 0

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

Footnotes

  1. the arithmetic mean of the percent change 2 3

  2. number of relevant changes 2 3

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 21, 2022
@oli-obk
Copy link
Contributor

oli-obk commented Jul 21, 2022

@bors r+

the perf part seems like just some changes in how LLVM optimizes some memcpy

@bors
Copy link
Contributor

bors commented Jul 21, 2022

📌 Commit 43ccacf has been approved by oli-obk

It is now in the queue for this repository.

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 21, 2022
@bors
Copy link
Contributor

bors commented Jul 21, 2022

⌛ Testing commit 43ccacf with merge 62b272d...

@bors
Copy link
Contributor

bors commented Jul 21, 2022

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 62b272d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 21, 2022
@bors bors merged commit 62b272d into rust-lang:master Jul 21, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 21, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (62b272d): comparison url.

Instruction count

  • Primary benchmarks: 😿 relevant regressions found
  • Secondary benchmarks: 😿 relevant regressions found
mean1 max count2
Regressions 😿
(primary)
0.4% 0.4% 2
Regressions 😿
(secondary)
0.4% 0.5% 5
Improvements 🎉
(primary)
N/A N/A 0
Improvements 🎉
(secondary)
N/A N/A 0
All 😿🎉 (primary) 0.4% 0.4% 2

Max RSS (memory usage)

Results
  • Primary benchmarks: 😿 relevant regression found
  • Secondary benchmarks: 😿 relevant regression found
mean1 max count2
Regressions 😿
(primary)
3.2% 3.2% 1
Regressions 😿
(secondary)
3.2% 3.2% 1
Improvements 🎉
(primary)
N/A N/A 0
Improvements 🎉
(secondary)
N/A N/A 0
All 😿🎉 (primary) 3.2% 3.2% 1

Cycles

This benchmark run did not return any relevant results for this metric.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression

Footnotes

  1. the arithmetic mean of the percent change 2

  2. number of relevant changes 2

@rustbot rustbot added the perf-regression Performance regression. label Jul 21, 2022
@pnkfelix
Copy link
Member

  • The secondary regressions were already anticipated by the PR reviewer. The primary regressions are both diesel and they look like blips in the data to me from the graph over time.
  • Marking as triaged.

@rustbot label: +perf-regression-triaged.

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Jul 27, 2022
@lcnr lcnr deleted the check-regions-infcx branch July 27, 2022 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants