Implement [T]::align_to #50319

nagisa · 2018-04-29T19:32:58Z

Note that this PR deviates from what is accepted by RFC slightly by making align_offset to return an offset in elements, rather than bytes. This is necessary to sanely support [T]::align_to and also simply makes more sense™. The caveat is that trying to align a pointer of ZST is now an equivalent to is_aligned check, rather than anything else (as no number of ZST elements will align a misaligned ZST pointer).

It also implements the align_to slightly differently than proposed in the RFC to properly handle cases where size of T and U aren’t co-prime.

Furthermore, a promise is made that the slice containing Us will be as large as possible (contrary to the RFC) – otherwise the function is quite useless.

The implementation uses quite a few underhanded tricks and takes advantage of the fact that alignment is a power-of-two quite heavily to optimise the machine code down to something that results in as few known-expensive instructions as possible. Currently calling ptr.align_offset with an unknown-at-compile-time align results in code that has just a single "expensive" modulo operation; the rest is "cheap" arithmetic and bitwise ops.

cc #44488 @oli-obk

As mentioned in the commit message for align_offset, many thanks go to Chris McDonald.

rust-highfive · 2018-04-29T19:33:11Z

r? @BurntSushi

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

kennytm · 2018-05-02T20:46:46Z

src/librustc_trans/intrinsic.rs

@@ -85,12 +86,12 @@ fn get_simple_intrinsic(cx: &CodegenCx, name: &str) -> Option<ValueRef> {
 /// Remember to add all intrinsics here, in librustc_typeck/check/mod.rs,
 /// and in libcore/intrinsics.rs; if you need access to any llvm intrinsics,
 /// add them to librustc_trans/trans/context.rs
-pub fn trans_intrinsic_call<'a, 'tcx>(bx: &Builder<'a, 'tcx>,
+pub fn trans_intrinsic_call<'a, 'tcx>(bx: Builder<'a, 'tcx>,


Why is the signature of this function changed? From the diff it doesn't look like you really need the ownership.

Generating a call to the language item will terminate the block being passed in, so using that block further makes no sense. Passing ownership models this pretty well.

Is this just a refactoring or necessary for the new align_offset? If it's just refactoring I prefer this being separated into its own commit.

~~Without the new align_offset this change is not necessary.~~ This change is necessary for implementation of align_offset itself.

nagisa · 2018-05-03T10:12:54Z

I’ll probably redo the PR slightly to not use an intrinsic at all – miri will still be able to detect calls to this by looking at langitem defid of the function.

oli-obk · 2018-05-03T11:09:06Z

I think we already do that for some u128 lowerings

nagisa · 2018-05-04T09:58:10Z

So, adapting the code was pretty easy, however it seems to have a hard hit on code quality in debug builds.

Most notably, constant propagation is not active, so the dead code is not removed, making what should essentially be p - (p % a) for sizeof::<T>() == 1 a significantly larger function (and includes all the dead code for the other cases). Optimised code is as good as one could hope, though.

I’m still going to go with this, because all the issues can be fixed with some const evaluation at a later date.

scottmcm · 2018-05-05T05:55:38Z

miri will still be able to detect calls to this by looking at langitem defid of the function.

I recall that this approach caused some problems with the i128 stuff, since it could get inlined and disappear. (It'd be nice, now that MIRI is merged, so go back and redo the lowering functions as const fn so they wouldn't need to be special at eval time, though last I tried intrinsics couldn't be marked const...)

nagisa · 2018-05-05T07:52:10Z

const functions can’t do conditional code yet due to #49146.

bors · 2018-05-06T08:50:18Z

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

pietroalbini · 2018-05-10T12:48:01Z

Ping from triage @BurntSushi! This PR needs your review.

nagisa · 2018-05-10T15:41:46Z

Perhaps somebody else from the @rust-lang/libs wants to volunteer to review this?

pietroalbini · 2018-05-14T10:30:30Z

Ping from triage! This PR needs a review, can @BurntSushi or someone else from @rust-lang/libs review this?

alexcrichton · 2018-05-16T14:45:52Z

This seems like it's a lot of unstable internal details that are unlikely to be stabilized soon so I'm not necessarily reviewing too too closely. @oli-obk does this overall change look ok to you? I think you were one of the original proponents for the intrinsic, right?

oli-obk · 2018-05-16T14:52:41Z

@oli-obk does this overall change look ok to you?

Yes, I already talked with @nagisa every now and then about it and have reviewed the current state last week. This is fine with me, though I can't grok the math, the tests look like it works out.

I think you were one of the original proponents for the intrinsic, right?

I created the rfc and initial impl. We still need this for miri to continue working.

alexcrichton · 2018-05-16T20:20:42Z

@bors: r+

bors · 2018-05-16T20:20:43Z

📌 Commit cdc5f33 has been approved by alexcrichton

bors · 2018-05-17T07:18:21Z

⌛ Testing commit cdc5f334616211a3620a2a50239ec11c7b56afa1 with merge 5c5dc122a7cc2ed813958e12c595f67c4ea5c8cd...

bors · 2018-05-17T08:29:07Z

💔 Test failed - status-appveyor

Keep only the language item. This removes some indirection and makes codegen worse for debug builds, but simplifies code significantly, which is a good tradeoff to make, in my opinion. Besides, the codegen can be improved even further with some constant evaluation improvements that we expect to happen in the future.

nagisa · 2018-05-17T20:24:53Z

@bors r=alexcrichton

bors · 2018-05-17T20:24:54Z

📌 Commit 59bb0fe has been approved by alexcrichton

bors · 2018-05-18T13:13:49Z

⌛ Testing commit 59bb0fe with merge ccd0949aa5b6b143c3f16f7324c19868de26ad2b...

bors · 2018-05-18T14:52:07Z

💔 Test failed - status-travis

rust-highfive · 2018-05-18T14:52:18Z

The job i686-gnu-nopt 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.

[00:03:02]    Compiling build_helper v0.1.0 (file:///checkout/src/build_helper)
[00:03:06]    Compiling std v0.0.0 (file:///checkout/src/libstd)
[00:03:11]    Compiling compiler_builtins v0.0.0 (file:///checkout/src/rustc/compiler_builtins_shim)
[00:03:11]    Compiling alloc_jemalloc v0.0.0 (file:///checkout/src/liballoc_jemalloc)
[00:03:23] warning: method is never used: `align_to_offsets`
[00:03:23]     --> libcore/slice/mod.rs:1701:5
[00:03:23]      |
[00:03:23] 1701 |     fn align_to_offsets<U>(&self) -> (usize, usize) {
[00:03:23]      |
[00:03:23]      = note: #[warn(dead_code)] on by default
[00:03:23] 
[00:03:23] 
[00:03:23] warning: function is never used: `gcd`
[00:03:23]     --> libcore/slice/mod.rs:1721:9
[00:03:23]      |
[00:03:23] 1721 |         fn gcd(a: usize, b: usize) -> usize {
[00:03:23] 
[00:03:31] [RUSTC-TIMING] core test:false 28.587
[00:03:33] [RUSTC-TIMING] compiler_builtins test:false 2.209
[00:03:33]    Compiling libc v0.0.0 (file:///checkout/src/rustc/libc_shim)

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)

rust-highfive · 2018-05-18T14:53:13Z

The job i686-gnu-nopt 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.

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)

nagisa · 2018-05-18T19:36:01Z

I don’t get this failure. The log just… stops… as if somebody flicked the power switch in Travis’ data centre.

kennytm · 2018-05-18T19:39:33Z

@bors retry

bors · 2018-05-18T21:49:45Z

⌛ Testing commit 59bb0fe with merge 37a4091...

@oli-obk

Implement [T]::align_to Note that this PR deviates from what is accepted by RFC slightly by making `align_offset` to return an offset in elements, rather than bytes. This is necessary to sanely support `[T]::align_to` and also simply makes more sense™. The caveat is that trying to align a pointer of ZST is now an equivalent to `is_aligned` check, rather than anything else (as no number of ZST elements will align a misaligned ZST pointer). It also implements the `align_to` slightly differently than proposed in the RFC to properly handle cases where size of T and U aren’t co-prime. Furthermore, a promise is made that the slice containing `U`s will be as large as possible (contrary to the RFC) – otherwise the function is quite useless. The implementation uses quite a few underhanded tricks and takes advantage of the fact that alignment is a power-of-two quite heavily to optimise the machine code down to something that results in as few known-expensive instructions as possible. Currently calling `ptr.align_offset` with an unknown-at-compile-time `align` results in code that has just a single "expensive" modulo operation; the rest is "cheap" arithmetic and bitwise ops. cc #44488 @oli-obk As mentioned in the commit message for align_offset, many thanks go to Chris McDonald.

bors · 2018-05-19T00:27:35Z

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 37a4091 to master...

nagisa · 2018-05-19T09:33:19Z

rust-highfive assigned BurntSushi Apr 29, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 29, 2018

nagisa mentioned this pull request Apr 30, 2018

Tracking issue for RFC 2043: Add align_offset intrinsic (formerly: and [T]::align_to function) #44488

Closed

4 tasks

kennytm reviewed May 2, 2018

View reviewed changes

nagisa force-pushed the align_to branch 3 times, most recently from f27ddd1 to 9b7a579 Compare May 3, 2018 22:20

nagisa force-pushed the align_to branch from 9b7a579 to cdc5f33 Compare May 6, 2018 09:06

pietroalbini added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label May 14, 2018

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 May 16, 2018

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 May 17, 2018

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

nagisa added 3 commits May 17, 2018 23:13

Implement [T]::align_to

680031b

Fix align_offset_stride1 & align_to_simple tests

59bb0fe

nagisa force-pushed the align_to branch from 611db90 to 59bb0fe Compare May 17, 2018 20: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 May 17, 2018

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 May 18, 2018

kennytm 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 May 18, 2018

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 May 18, 2018

bors merged commit 59bb0fe into rust-lang:master May 19, 2018

bors mentioned this pull request May 19, 2018

libcore: Add VaList and variadic arg handling intrinsics #49878

Merged

SimonSapin mentioned this pull request Sep 25, 2018

Simplify implementation of align_offset slightly #54534

Merged

phil-opp mentioned this pull request Jan 27, 2020

Comments for "https://os.phil-opp.com/allocator-designs/" phil-opp/blog_os#720

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement [T]::align_to #50319

Implement [T]::align_to #50319

nagisa commented Apr 29, 2018 •

edited

Loading

rust-highfive commented Apr 29, 2018

kennytm May 2, 2018

nagisa May 2, 2018

kennytm May 2, 2018

nagisa May 2, 2018 •

edited

Loading

nagisa commented May 3, 2018

oli-obk commented May 3, 2018

nagisa commented May 4, 2018 •

edited

Loading

scottmcm commented May 5, 2018

nagisa commented May 5, 2018

bors commented May 6, 2018

pietroalbini commented May 10, 2018

nagisa commented May 10, 2018

pietroalbini commented May 14, 2018

alexcrichton commented May 16, 2018

oli-obk commented May 16, 2018

alexcrichton commented May 16, 2018

bors commented May 16, 2018

bors commented May 17, 2018

bors commented May 17, 2018

nagisa commented May 17, 2018

bors commented May 17, 2018

bors commented May 18, 2018

bors commented May 18, 2018

rust-highfive commented May 18, 2018

rust-highfive commented May 18, 2018

nagisa commented May 18, 2018

kennytm commented May 18, 2018

bors commented May 18, 2018

bors commented May 19, 2018

nagisa commented May 19, 2018

Implement [T]::align_to #50319

Implement [T]::align_to #50319

Conversation

nagisa commented Apr 29, 2018 • edited Loading

rust-highfive commented Apr 29, 2018

kennytm May 2, 2018

Choose a reason for hiding this comment

nagisa May 2, 2018

Choose a reason for hiding this comment

kennytm May 2, 2018

Choose a reason for hiding this comment

nagisa May 2, 2018 • edited Loading

Choose a reason for hiding this comment

nagisa commented May 3, 2018

oli-obk commented May 3, 2018

nagisa commented May 4, 2018 • edited Loading

scottmcm commented May 5, 2018

nagisa commented May 5, 2018

bors commented May 6, 2018

pietroalbini commented May 10, 2018

nagisa commented May 10, 2018

pietroalbini commented May 14, 2018

alexcrichton commented May 16, 2018

oli-obk commented May 16, 2018

alexcrichton commented May 16, 2018

bors commented May 16, 2018

bors commented May 17, 2018

bors commented May 17, 2018

nagisa commented May 17, 2018

bors commented May 17, 2018

bors commented May 18, 2018

bors commented May 18, 2018

rust-highfive commented May 18, 2018

rust-highfive commented May 18, 2018

nagisa commented May 18, 2018

kennytm commented May 18, 2018

bors commented May 18, 2018

bors commented May 19, 2018

nagisa commented May 19, 2018

nagisa commented Apr 29, 2018 •

edited

Loading

nagisa May 2, 2018 •

edited

Loading

nagisa commented May 4, 2018 •

edited

Loading