Rollup of 10 pull requests #74719

Dylan-DPC-zz · 2020-07-24T15:27:43Z

Successful merges:

revise RwLock for HermitCore #72954 (revise RwLock for HermitCore)
Rearrange the pipeline of pow to gain efficiency #74367 (Rearrange the pipeline of pow to gain efficiency)
Optimize away BitAnd and BitOr when possible #74491 (Optimize away BitAnd and BitOr when possible)
add visit_operand to const prop #74507 (add visit_operand to const prop)
Downgrade glibc to 2.11.1 for ppc, ppc64 and s390x #74639 (Downgrade glibc to 2.11.1 for ppc, ppc64 and s390x)
Refactor region_name: add RegionNameHighlight #74661 (Refactor region_name: add RegionNameHighlight)
Miri: use extern fn to expose interpreter operations to program; fix leak checker on Windows #74681 ( Miri: use extern fn to expose interpreter operations to program; fix leak checker on Windows)
delay_span_bug instead of silent ignore #74692 (delay_span_bug instead of silent ignore)
fixed error reporting for mismatched traits #74698 (fixed error reporting for mismatched traits)
Ensure stack when type checking and building MIR for large if expressions #74708 (Ensure stack when type checking and building MIR for large if expressions)

Failed merges:

- increasing the readability of `Condvar` - simplify the interface to the libos HermitCore

out of highlight_if_we_can_match_hir_ty_from_argument, which is then renamed

The check of the `exp` parameter seems useless if we execute the while-loop more than once. The original implementation of `pow` function using one more comparison if the `exp==0` and may break the pipeline of the cpu, which may generate a slower code. The performance gap between the old and the new implementation may be small, but IMO, at least the newer one looks more beautiful. --- bench prog: ``` extern crate test; ($a:expr)=>{let time=std::time::Instant::now();{$a;}print!("{:?} ",time.elapsed())}; ($a:expr,$b:literal)=>{let time=std::time::Instant::now();let mut a=0;for _ in 0..$b{a^=$a;}print!("{:?} {} ",time.elapsed(),a)} } pub fn pow_rust(x:i64, mut exp: u32) -> i64 { let mut base = x; let mut acc = 1; while exp > 1 { if (exp & 1) == 1 { acc = acc * base; } exp /= 2; base = base * base; } if exp == 1 { acc = acc * base; } acc } pub fn pow_new(x:i64, mut exp: u32) -> i64 { if exp==0{ 1 }else{ let mut base = x; let mut acc = 1; while exp > 1 { if (exp & 1) == 1 { acc = acc * base; } exp >>= 1; base = base * base; } acc * base } } fn main(){ let a=2i64; let b=1_u32; println!(); timing!(test::black_box(a).pow(test::black_box(b)),100000000); timing!(pow_new(test::black_box(a),test::black_box(b)),100000000); timing!(pow_rust(test::black_box(a),test::black_box(b)),100000000); println!(); timing!(test::black_box(a).pow(test::black_box(b)),100000000); timing!(pow_new(test::black_box(a),test::black_box(b)),100000000); timing!(pow_rust(test::black_box(a),test::black_box(b)),100000000); println!(); timing!(test::black_box(a).pow(test::black_box(b)),100000000); timing!(pow_new(test::black_box(a),test::black_box(b)),100000000); timing!(pow_rust(test::black_box(a),test::black_box(b)),100000000); println!(); timing!(test::black_box(a).pow(test::black_box(b)),100000000); timing!(pow_new(test::black_box(a),test::black_box(b)),100000000); timing!(pow_rust(test::black_box(a),test::black_box(b)),100000000); println!(); timing!(test::black_box(a).pow(test::black_box(b)),100000000); timing!(pow_new(test::black_box(a),test::black_box(b)),100000000); timing!(pow_rust(test::black_box(a),test::black_box(b)),100000000); println!(); timing!(test::black_box(a).pow(test::black_box(b)),100000000); timing!(pow_new(test::black_box(a),test::black_box(b)),100000000); timing!(pow_rust(test::black_box(a),test::black_box(b)),100000000); println!(); timing!(test::black_box(a).pow(test::black_box(b)),100000000); timing!(pow_new(test::black_box(a),test::black_box(b)),100000000); timing!(pow_rust(test::black_box(a),test::black_box(b)),100000000); println!(); timing!(test::black_box(a).pow(test::black_box(b)),100000000); timing!(pow_new(test::black_box(a),test::black_box(b)),100000000); timing!(pow_rust(test::black_box(a),test::black_box(b)),100000000); println!(); } ``` bench in my laptop: ``` neutron@Neutron:/me/rust$ rc commit.rs rustc commit.rs && ./commit 3.978419716s 0 4.079765171s 0 3.964630622s 0 3.997127013s 0 4.260304804s 0 3.997638211s 0 3.963195544s 0 4.11657718s 0 4.176054164s 0 3.830128579s 0 3.980396122s 0 3.937258567s 0 3.986055948s 0 4.127804162s 0 4.018943411s 0 4.185568857s 0 4.217512517s 0 3.98313603s 0 3.863018225s 0 4.030447988s 0 3.694878237s 0 4.206987927s 0 4.137608047s 0 4.115564664s 0 neutron@Neutron:/me/rust$ rc commit.rs -O rustc commit.rs -O && ./commit 162.111993ms 0 165.107125ms 0 166.26924ms 0 175.20479ms 0 205.062565ms 0 176.278791ms 0 174.408975ms 0 166.526899ms 0 201.857604ms 0 146.190062ms 0 168.592821ms 0 154.61411ms 0 199.678912ms 0 168.411598ms 0 162.129996ms 0 147.420765ms 0 209.759326ms 0 154.807907ms 0 165.507134ms 0 188.476239ms 0 157.351524ms 0 121.320123ms 0 126.401229ms 0 114.86428ms 0 ``` delete an unnecessary semicolon... Sorry for the typo. delete trailing whitespace Sorry, too.. Sorry for the missing... I checked all the implementations, and finally found that there is one function that does not check whether `exp == 0` add extra tests add extra tests. finished adding the extra tests to prevent further typo add pow(2) to negative exp add whitespace. add whitespace add whitespace delete extra line

mismatched traits were previously referred to as types

…ions

revise RwLock for HermitCore - current version is derived from the wasm implementation - increasing the readability of `Condvar` - simplify the interface to the libos

Rearrange the pipeline of `pow` to gain efficiency The check of the `exp` parameter seems useless if we execute the while-loop more than once. The original implementation of `pow` function using one more comparison if the `exp==0` and may break the pipeline of the cpu, which may generate a slower code. The performance gap between the old and the new implementation may be small, but IMO, at least the newer one looks more beautiful. --- bench prog: ``` #![feature(test)] extern crate test; #[macro_export]macro_rules! timing{ ($a:expr)=>{let time=std::time::Instant::now();{$a;}print!("{:?} ",time.elapsed())}; ($a:expr,$b:literal)=>{let time=std::time::Instant::now();let mut a=0;for _ in 0..$b{a^=$a;}print!("{:?} {} ",time.elapsed(),a)} } #[inline] pub fn pow_rust(x:i64, mut exp: u32) -> i64 { let mut base = x; let mut acc = 1; while exp > 1 { if (exp & 1) == 1 { acc = acc * base; } exp /= 2; base = base * base; } if exp == 1 { acc = acc * base; } acc } #[inline] pub fn pow_new(x:i64, mut exp: u32) -> i64 { if exp==0{ 1 }else{ let mut base = x; let mut acc = 1; while exp > 1 { if (exp & 1) == 1 { acc = acc * base; } exp >>= 1; base = base * base; } acc * base } } fn main(){ let a=2i64; let b=1_u32; println!(); timing!(test::black_box(a).pow(test::black_box(b)),100000000); timing!(pow_new(test::black_box(a),test::black_box(b)),100000000); timing!(pow_rust(test::black_box(a),test::black_box(b)),100000000); println!(); timing!(test::black_box(a).pow(test::black_box(b)),100000000); timing!(pow_new(test::black_box(a),test::black_box(b)),100000000); timing!(pow_rust(test::black_box(a),test::black_box(b)),100000000); println!(); timing!(test::black_box(a).pow(test::black_box(b)),100000000); timing!(pow_new(test::black_box(a),test::black_box(b)),100000000); timing!(pow_rust(test::black_box(a),test::black_box(b)),100000000); println!(); timing!(test::black_box(a).pow(test::black_box(b)),100000000); timing!(pow_new(test::black_box(a),test::black_box(b)),100000000); timing!(pow_rust(test::black_box(a),test::black_box(b)),100000000); println!(); timing!(test::black_box(a).pow(test::black_box(b)),100000000); timing!(pow_new(test::black_box(a),test::black_box(b)),100000000); timing!(pow_rust(test::black_box(a),test::black_box(b)),100000000); println!(); timing!(test::black_box(a).pow(test::black_box(b)),100000000); timing!(pow_new(test::black_box(a),test::black_box(b)),100000000); timing!(pow_rust(test::black_box(a),test::black_box(b)),100000000); println!(); timing!(test::black_box(a).pow(test::black_box(b)),100000000); timing!(pow_new(test::black_box(a),test::black_box(b)),100000000); timing!(pow_rust(test::black_box(a),test::black_box(b)),100000000); println!(); timing!(test::black_box(a).pow(test::black_box(b)),100000000); timing!(pow_new(test::black_box(a),test::black_box(b)),100000000); timing!(pow_rust(test::black_box(a),test::black_box(b)),100000000); println!(); } ``` bench in my laptop: ``` neutron@Neutron:/me/rust$ rc commit.rs rustc commit.rs && ./commit 3.978419716s 0 4.079765171s 0 3.964630622s 0 3.997127013s 0 4.260304804s 0 3.997638211s 0 3.963195544s 0 4.11657718s 0 4.176054164s 0 3.830128579s 0 3.980396122s 0 3.937258567s 0 3.986055948s 0 4.127804162s 0 4.018943411s 0 4.185568857s 0 4.217512517s 0 3.98313603s 0 3.863018225s 0 4.030447988s 0 3.694878237s 0 4.206987927s 0 4.137608047s 0 4.115564664s 0 neutron@Neutron:/me/rust$ rc commit.rs -O rustc commit.rs -O && ./commit 162.111993ms 0 165.107125ms 0 166.26924ms 0 175.20479ms 0 205.062565ms 0 176.278791ms 0 174.408975ms 0 166.526899ms 0 201.857604ms 0 146.190062ms 0 168.592821ms 0 154.61411ms 0 199.678912ms 0 168.411598ms 0 162.129996ms 0 147.420765ms 0 209.759326ms 0 154.807907ms 0 165.507134ms 0 188.476239ms 0 157.351524ms 0 121.320123ms 0 126.401229ms 0 114.86428ms 0 ```

@oli-obk

Optimize away BitAnd and BitOr when possible This PR lets `const_prop` optimize away `a | true == true` , `a & false == false` and `a * 0 = 0`. While I was writing this I've realized that constant propagation misses a lot of opportunities. For example: https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=2a4b45e772f214210a36749b27223bb0 Constant propagation doesn't seem to... propagate constants, additionally the way constant propagation is currently setup makes it tricky to add cases like `a | false == a`. I tried to organize `eval_rvalue_with_identities` to make the pattern of the optimizations easier to see but it still obscurs what should be a simple peephole optmization. cc @oli-obk

@oli-obk

add `visit_operand` to const prop r? @oli-obk

Downgrade glibc to 2.11.1 for ppc, ppc64 and s390x As discussed in rust-lang#73782 I've tested these changes on rust 1.43.0 for all the specified archs and used the resulting binaries to bootstrap building rust 1.43.1. I've also shortly tested these changes on master on ppc64.

…r=estebank Refactor `region_name`: add `RegionNameHighlight` This PR does not change any diagnostics itself, rather it enables further code changes, but I would like to get approval for the refactoring first before making use of it. In `rustc_mir::borrow_check::diagnostics::region_name`, there is code that allows for, when giving a synthesized name like `'1` to an anonymous lifetime, pointing at e.g. the exact '`&`' that introduces the lifetime. This PR decouples that code from the specific case of arguments, adding a new enum `RegionNameHighlight`, enabling future changes to use it in other places. This allows: * We could change the other `AnonRegionFrom*` variants to use `RegionNameHighlight` to precisely point at where lifetimes are introduced in other locations when they have type annotations, e.g. a closure return `|...| -> &i32`. * Because of how async functions are lowered this affects async functions as well, see rust-lang#74072 * for rust-lang#74597, we could add a second, optional `RegionNameHighlight` to the `AnonRegionFromArgument` variant that highlights a lifetime in the return type of a function when, due to elision, this is the same as the argument lifetime. * in rust-lang#74497 (comment) I noticed that a diagnostic was trying to introduce a lifetime `'2` in the opaque type `impl std::future::Future`. The code for the case of arguments has [code to handle cases like this](https://github.com/rust-lang/rust/blob/bbebe7351fcd29af1eb9a35e315369b15887ea09/src/librustc_mir/borrow_check/diagnostics/region_name.rs#L365) but not the others. This refactoring would allow the same code path to handle this. * It might be appropriate to add another variant of `RegionNameHighlight` to say something like `lifetime '1 appears in the opaque type impl std::future::Future`. These are quite a few changes so I thought I would make sure the refactoring is OK before I start making changes that rely on it. :)

@oli-obk

Miri: use extern fn to expose interpreter operations to program; fix leak checker on Windows This PR realizes an idea that @oli-obk has been suggesting for a while: to use Miri-specific `extern` functions to provide some extra capabilities to the program. Initially, we have two of these methods, which libstd itself needs: * `miri_start_panic`, which replaces the intrinsic of the same name (mostly for consistency, to avoid having multiple mechanisms for Miri-specific functionality). * `miri_static_root`, which adds an allocation to a list of static "roots" that Miri considers as not having leaked (including all memory reachable through them). This is needed for rust-lang/miri#1302. We use `extern` functions instead of intrinsics for this so that user code can more easily call these Miri hoolks -- e.g. `miri_static_root` should be useful for rust-lang/miri#1318. The Miri side of this is at rust-lang/miri#1485. r? @oli-obk

@pnkfelix

delay_span_bug instead of silent ignore This is a follow-up to rust-lang#74557. r? @pnkfelix

…=estebank fixed error reporting for mismatched traits mismatched traits were previously referred to as types closes rust-lang#72217

Ensure stack when type checking and building MIR for large if expressions Fixes rust-lang#74564

Dylan-DPC-zz · 2020-07-24T15:33:01Z

@bors r+ p=5 rollup=never

bors · 2020-07-24T15:33:02Z

📌 Commit bc36d69 has been approved by Dylan-DPC

bors · 2020-07-24T16:00:12Z

⌛ Testing commit bc36d69 with merge f55934e4e38f14a1e7808c8fc114917436b7ccc4...

bors · 2020-07-24T16:27:11Z

💔 Test failed - checks-actions

JohnTitor · 2020-07-24T18:24:06Z

Failed by #74708, closing.

stlankes and others added 30 commits June 26, 2020 00:02

revise RwLock, which is derived from the wasm implementation

6813c1c

- increasing the readability of `Condvar` - simplify the interface to the libos HermitCore

minor changes to pass the format check

3acc3ef

reorder crates to pass the format check

beb1b1f

remove some compiler warnings

f9c6091

use latest version of hermit-abi

6925ebd

const prop into operands

c74c648

Optimize away BitAnd and BitOr when possible

711a680

note LLVM in fixme

d257bac

add RegionName::span

c276334

extract RegionNameHighlight

51af5af

change returns to RegionNameHighlight

601518e

rename functions

723ea90

clean up give_name_if_anonymous_region_appears_in_arguments

b56f5b9

decouple highlight_if_we_cannot_match_hir_ty

a7450b7

move highlight_if_we_can_match_hir_ty call

ebb4aba

out of highlight_if_we_can_match_hir_ty_from_argument, which is then renamed

rename arguments to highlight_if_we_can_match_hir_ty

8a776ee

Downgrade glibc to 2.11.1 for ppc, ppc64 and s390x

e46219c

replace miri_start_panic intrinsic by 'extern fn'

1b446cd

on Windows, use miri_static_root for TLS dtors

c8229cd

avoid implicitly returning ()

67b4f3b

slightly adapt const prop

61a9ab8

delay_span_bug instead of silent ignore

5a5846f

fixed error reporting for mismatched traits

bae1e03

mismatched traits were previously referred to as types

added a test case for reporting mismatched traits

b75ed4f

Ensure stack when type checking and building MIR for large if express…

f64e58c

…ions

Rollup merge of rust-lang#72954 - hermitcore:rwlock, r=dtolnay

363e4f5

revise RwLock for HermitCore - current version is derived from the wasm implementation - increasing the readability of `Condvar` - simplify the interface to the libos

Rollup merge of rust-lang#74507 - lcnr:const-prop-into-op, r=oli-obk

1279137

add `visit_operand` to const prop r? @oli-obk

Dylan-DPC added 6 commits July 24, 2020 17:27

Rollup merge of rust-lang#74692 - Mark-Simulacrum:delay-bug, r=pnkfelix

7d545ed

delay_span_bug instead of silent ignore This is a follow-up to rust-lang#74557. r? @pnkfelix

Rollup merge of rust-lang#74698 - ayrtonm:handle-traitref-mismatch, r…

a64b544

…=estebank fixed error reporting for mismatched traits mismatched traits were previously referred to as types closes rust-lang#72217

Rollup merge of rust-lang#74708 - kanru:issue-74564, r=davidtwco

bc36d69

Ensure stack when type checking and building MIR for large if expressions Fixes rust-lang#74564

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

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 24, 2020

JohnTitor mentioned this pull request Jul 24, 2020

Ensure stack when type checking and building MIR for large if expressions #74708

Merged

JohnTitor closed this Jul 24, 2020

JohnTitor added the rollup A PR which is a rollup label Jul 24, 2020

Dylan-DPC-zz deleted the rollup-j7w6cvr branch August 10, 2020 23:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 10 pull requests #74719

Rollup of 10 pull requests #74719

Dylan-DPC-zz commented Jul 24, 2020

Dylan-DPC-zz commented Jul 24, 2020

bors commented Jul 24, 2020

bors commented Jul 24, 2020

bors commented Jul 24, 2020

JohnTitor commented Jul 24, 2020

Rollup of 10 pull requests #74719

Rollup of 10 pull requests #74719

Conversation

Dylan-DPC-zz commented Jul 24, 2020

Dylan-DPC-zz commented Jul 24, 2020

bors commented Jul 24, 2020

bors commented Jul 24, 2020

bors commented Jul 24, 2020

JohnTitor commented Jul 24, 2020