Improve `ptr_rotate` performance, tests, and benches #61937

AaronKutch · 2019-06-18T19:05:13Z

The corresponding issue is #61784. I am not actually sure if miri can handle the test, but I can change the commit if necessary.

rust-highfive · 2019-06-18T19:05:17Z

r? @rkruppe

(rust_highfive has picked a reviewer for you, use r? to override)

hanna-kruppe · 2019-06-27T12:53:11Z

Sorry, it seems like I can't get around to reviewing this quickly. Maybe @scottmcm can take a look?

Mark-Simulacrum · 2019-07-09T21:21:43Z

Re-assigning to @scottmcm but I suspect they might also be unavailable.

cc @rust-lang/libs

bors · 2019-07-25T22:41:38Z

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

AaronKutch · 2019-07-26T01:21:29Z

Is this the right way to resolve a merge conflict? All I did was click the in browser resolve button and fix the problem. The in browser commits look fine, but my local rust branch is freaking out and git pull --force makes my branch two commits ahead of origin, but

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   src/doc/book (new commits)
        modified:   src/doc/edition-guide (new commits)
...
        modified:   src/tools/rustfmt (new commits)

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        src/stdsimd/

What is going on here? I want to squash the conflict fix into the original commit, without needing to redownload a rust clone.

tesuji · 2019-07-26T01:25:16Z

I think rust prefer rebasing feature branches on top of master in case of merge conflict.

rust-highfive · 2019-07-26T01:28:45Z

The job x86_64-gnu-llvm-6.0 of your PR failed (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.

2019-07-26T01:08:31.3810554Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-07-26T01:08:31.4008157Z ##[command]git config gc.auto 0
2019-07-26T01:08:31.4095818Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-07-26T01:08:31.4146211Z ##[command]git config --get-all http.proxy
2019-07-26T01:08:31.4292868Z ##[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/61937/merge:refs/remotes/pull/61937/merge
---
2019-07-26T01:09:06.2582004Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-26T01:09:06.2582048Z 
2019-07-26T01:09:06.2582309Z   git checkout -b <new-branch-name>
2019-07-26T01:09:06.2582348Z 
2019-07-26T01:09:06.2582429Z HEAD is now at 080f4b6ff Merge ec5523b0028dc93eb10b914f08368779655902d9 into 890881f8f4c77e8670d4b32104c0325fcfefc90f
2019-07-26T01:09:06.2738074Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-07-26T01:09:06.2741338Z ==============================================================================
2019-07-26T01:09:06.2741403Z Task         : Bash
2019-07-26T01:09:06.2741472Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-07-26T01:15:17.0878392Z    Compiling serde_json v1.0.40
2019-07-26T01:15:21.3105105Z    Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
2019-07-26T01:15:29.8907431Z     Finished release [optimized] target(s) in 1m 28s
2019-07-26T01:15:29.8993340Z tidy check
2019-07-26T01:15:30.0998107Z tidy error: /checkout/src/libcore/slice/rotate.rs: missing trailing newline
2019-07-26T01:15:31.6972789Z some tidy checks failed
2019-07-26T01:15:31.6977019Z 
2019-07-26T01:15:31.6977019Z 
2019-07-26T01:15:31.6978817Z 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"
2019-07-26T01:15:31.6982446Z 
2019-07-26T01:15:31.6982719Z 
2019-07-26T01:15:31.6983124Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-07-26T01:15:31.6983428Z Build completed unsuccessfully in 0:01:31
2019-07-26T01:15:31.6983428Z Build completed unsuccessfully in 0:01:31
2019-07-26T01:15:33.0503816Z ##[error]Bash exited with code '1'.
2019-07-26T01:15:33.0544224Z ##[section]Starting: Checkout
2019-07-26T01:15:33.0546258Z ==============================================================================
2019-07-26T01:15:33.0546312Z Task         : Get sources
2019-07-26T01:15:33.0546379Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

AaronKutch · 2019-07-26T02:52:33Z

I downloaded a fresh depth 1 rust master and used that for this PR. It looks like everything is going well, except that my Github website rust master page is "1 commit ahead, 59 commits behind" for some reason.

scottmcm

Sorry for the delay here. This approach seems good, though I couldn't repro any material perf difference on my old SandyBridge.

Please respond to the comments I left (with code changes or with prose) and I'll take another look.

src/libcore/slice/rotate.rs

AaronKutch · 2019-07-29T03:41:34Z

Note that some of the benchmarks are behaving weirdly. I figured out that if I run the x1024s32 benches by themselves, then they consistently get 181 ns plus or minus 2. If I run with all the benchmarks ahead of them, then my algorithm usually gets a 239 ns, while the old one stays at 181 ns. This continues even if I reorder them. The rgb and u8 benches are also weird. Most of the other benches are consistent.

edmilsonefs · 2019-08-06T04:39:00Z

Hey! This is a ping from triage, we would like to know if you @scottmcm could give us a few minutes to share your thoughts on last response sent by @AaronKutch .

Thanks.

@rustbot modify labels to -S-waiting-on-author, +S-waiting-on-review

AaronKutch · 2019-08-06T15:45:13Z

I made some changes to the commit.

scottmcm · 2019-08-09T03:08:21Z

Thanks, looks like it should be good now!

@bors r+

bors · 2019-08-09T03:08:23Z

📌 Commit ad7fdb6 has been approved by scottmcm

Improve `ptr_rotate` performance, tests, and benches The corresponding issue is rust-lang#61784. I am not actually sure if miri can handle the test, but I can change the commit if necessary.

bors · 2019-08-09T03:27:39Z

⌛ Testing commit ad7fdb6 with merge 186011a0de31be69649a1fe9f66fed93125b3ca4...

Centril · 2019-08-09T03:28:52Z

@bors retry rolled up.

@ghost

Rollup of 4 pull requests Successful merges: - #61937 (Improve `ptr_rotate` performance, tests, and benches) - #63302 (Update LLVM submodule) - #63337 (Tweak mismatched types error) - #63397 (Add tests for some ICEs) Failed merges: r? @ghost

bors · 2019-08-09T04:41:28Z

⌛ Testing commit ad7fdb6 with merge d8f8be4...

Improve `ptr_rotate` performance, tests, and benches The corresponding issue is #61784. I am not actually sure if miri can handle the test, but I can change the commit if necessary.

bors · 2019-08-09T08:24:38Z

☀️ Test successful - checks-azure
Approved by: scottmcm
Pushing d8f8be4 to master...

RalfJung · 2019-08-09T11:53:41Z

src/libcore/tests/slice.rs

+#[test]
+fn brute_force_rotate_test_1() {
+    // `ptr_rotate` covers so many kinds of pointer usage, that this is just a good test for
+    // pointers in general. This uses a `[usize; 4]` to hit all algorithms without overwhelming miri


Thanks you so much for keeping Miri in mind here. <3

RalfJung · 2019-08-09T11:54:08Z

src/libcore/tests/slice.rs

@@ -1130,6 +1130,44 @@ fn test_rotate_right() {
    }
 }

+#[test]
+#[cfg(not(miri))]


These should come with a comment explaining why. I will add a Miri is too slow in one of the Miri-adjustment PRs I have in flight anyway.

rust-highfive assigned hanna-kruppe Jun 18, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 18, 2019

AaronKutch mentioned this pull request Jun 20, 2019

Crate reorganization and upgrade to Rust 2018 Robbepop/apint#36

Closed

Mark-Simulacrum assigned scottmcm and unassigned hanna-kruppe Jul 9, 2019

AaronKutch force-pushed the master branch from ec5523b to 8c0f7c4 Compare July 26, 2019 02:26

scottmcm requested changes Jul 28, 2019

View reviewed changes

src/libcore/slice/rotate.rs Outdated Show resolved Hide resolved

src/libcore/slice/rotate.rs Show resolved Hide resolved

src/libcore/slice/rotate.rs Show resolved Hide resolved

scottmcm 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 28, 2019

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 6, 2019

scottmcm 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 6, 2019

Improve ptr_rotate performance, tests, and benchmarks

ad7fdb6

AaronKutch force-pushed the master branch from 8c0f7c4 to ad7fdb6 Compare August 6, 2019 15:43

scottmcm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 9, 2019

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 Aug 9, 2019

Centril mentioned this pull request Aug 9, 2019

Rollup of 4 pull requests #63401

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 9, 2019

bors merged commit ad7fdb6 into rust-lang:master Aug 9, 2019

bors mentioned this pull request Aug 9, 2019

Change untagged_unions to not allow union fields with drop #62330

Merged

RalfJung reviewed Aug 9, 2019

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve `ptr_rotate` performance, tests, and benches #61937

Improve `ptr_rotate` performance, tests, and benches #61937

AaronKutch commented Jun 18, 2019

rust-highfive commented Jun 18, 2019

hanna-kruppe commented Jun 27, 2019

Mark-Simulacrum commented Jul 9, 2019

bors commented Jul 25, 2019

AaronKutch commented Jul 26, 2019

tesuji commented Jul 26, 2019

rust-highfive commented Jul 26, 2019

AaronKutch commented Jul 26, 2019

scottmcm left a comment •

edited

Loading

AaronKutch commented Jul 29, 2019

edmilsonefs commented Aug 6, 2019

AaronKutch commented Aug 6, 2019

scottmcm commented Aug 9, 2019

bors commented Aug 9, 2019

bors commented Aug 9, 2019

Centril commented Aug 9, 2019

bors commented Aug 9, 2019

bors commented Aug 9, 2019

RalfJung Aug 9, 2019

RalfJung Aug 9, 2019

Improve ptr_rotate performance, tests, and benches #61937

Improve ptr_rotate performance, tests, and benches #61937

Conversation

AaronKutch commented Jun 18, 2019

rust-highfive commented Jun 18, 2019

hanna-kruppe commented Jun 27, 2019

Mark-Simulacrum commented Jul 9, 2019

bors commented Jul 25, 2019

AaronKutch commented Jul 26, 2019

tesuji commented Jul 26, 2019

rust-highfive commented Jul 26, 2019

AaronKutch commented Jul 26, 2019

scottmcm left a comment • edited Loading

Choose a reason for hiding this comment

AaronKutch commented Jul 29, 2019

edmilsonefs commented Aug 6, 2019

AaronKutch commented Aug 6, 2019

scottmcm commented Aug 9, 2019

bors commented Aug 9, 2019

bors commented Aug 9, 2019

Centril commented Aug 9, 2019

bors commented Aug 9, 2019

bors commented Aug 9, 2019

RalfJung Aug 9, 2019

Choose a reason for hiding this comment

RalfJung Aug 9, 2019

Choose a reason for hiding this comment

Improve `ptr_rotate` performance, tests, and benches #61937

Improve `ptr_rotate` performance, tests, and benches #61937

scottmcm left a comment •

edited

Loading