Make `i*::signum` a `const fn`. #61635

ecstatic-morse · 2019-06-07T21:22:38Z

Ticks a box in #53718.

This uses a well-known branchless implementation of signum: (n > 0) as i32 - (n < 0) as i32.

Here's a playground comparing the two techniques. On x86 in release mode, the branchless implementation is able to replace a mov and cmov with a sar and add, so this should be a bit faster as well.

~~This is marked as a draft since I think I'll need to add #[rustc_const_unstable] somewhere. Perhaps the reviewer can point me in the right direction.~~

rust-highfive · 2019-06-07T21:22:42Z

r? @bluss

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

oli-obk

r? @oli-obk

src/libcore/num/mod.rs

This uses a well-known branchless implementation of `signum`. Its `const`-ness is unstable and requires `#![feature(const_int_sign)]`.

oli-obk · 2019-06-07T22:52:06Z

can you also add some tests using this inside a constant and comparing the result with expected values?

There should already be tests for other const fns for integer types, you can add the new test to them.

src/test/run-pass/const-int-sign.rs

src/test/ui/consts/const-int-sign.rs

src/test/run-pass/const-int-sign.rs

rust-highfive · 2019-06-08T00:44:02Z

The job x86_64-gnu-llvm-6.0 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.

travis_time:end:17e9407e:start=1559951213612132101,finish=1559951215669921732,duration=2057789631
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[00:53:41] .................................................................................................... 500/5656
[00:53:44] ........................i........................................................................... 600/5656
[00:53:48] .................................................................................................... 700/5656
[00:53:53] .................................................................................................... 800/5656
[00:53:57] ..........................F......................................................................... 900/5656
[00:54:04] ...................................................iiiii............................................ 1100/5656
[00:54:08] .................................................................................................... 1200/5656
[00:54:10] .................................................................................................... 1300/5656
[00:54:13] .................................................................................................... 1400/5656
---
[00:56:51] 
[00:56:51] 23 error[E0716]: temporary value dropped while borrowed
[00:56:51] 24   --> $DIR/const-int-sign.rs:7:30
[00:56:51] 25    |
[00:56:51] - LL |     let sgn: &'static bool = &(5_i32.signum());
[00:56:51] -    |              -------------    ^^^^^^^^^^^^^^^^ creates a temporary which is freed while still in use
[00:56:51] + LL |     let sgn: &'static i32 = &(5_i32.signum());
[00:56:51] +    |              ------------    ^^^^^^^^^^^^^^^^ creates a temporary which is freed while still in use
[00:56:51] 29    |              type annotation requires that borrow lasts for `'static`
[00:56:51] 30 LL |
[00:56:51] 
[00:56:51] 
[00:56:51] 
[00:56:51] The actual stderr differed from the expected stderr.
[00:56:51] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/const-int-sign/const-int-sign.stderr
[00:56:51] To update references, rerun the tests and pass the `--bless` flag
[00:56:51] To only update this specific test, also pass `--test-args consts/const-int-sign.rs`
[00:56:51] error: 1 errors occurred comparing output.
[00:56:51] status: exit code: 1
[00:56:51] status: exit code: 1
[00:56:51] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/consts/const-int-sign.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/const-int-sign" "-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/consts/const-int-sign/auxiliary" "-A" "unused"
[00:56:51] ------------------------------------------
[00:56:51] 
[00:56:51] ------------------------------------------
[00:56:51] stderr:
[00:56:51] stderr:
[00:56:51] ------------------------------------------
[00:56:51] error[E0716]: temporary value dropped while borrowed
[00:56:51]   --> /checkout/src/test/ui/consts/const-int-sign.rs:2:29
[00:56:51]    |
[00:56:51] LL |     let x: &'static bool = &(5_i32.is_negative());
[00:56:51]    |            -------------    ^^^^^^^^^^^^^^^^^^^^^ creates a temporary which is freed while still in use
[00:56:51]    |            type annotation requires that borrow lasts for `'static`
[00:56:51] ...
[00:56:51] LL | }
[00:56:51]    | - temporary value is freed at the end of this statement
[00:56:51]    | - temporary value is freed at the end of this statement
[00:56:51] 
[00:56:51] error[E0716]: temporary value dropped while borrowed
[00:56:51]   --> /checkout/src/test/ui/consts/const-int-sign.rs:4:29
[00:56:51]    |
[00:56:51] LL |     let y: &'static bool = &(5_i32.is_positive());
[00:56:51]    |            -------------    ^^^^^^^^^^^^^^^^^^^^^ creates a temporary which is freed while still in use
[00:56:51]    |            type annotation requires that borrow lasts for `'static`
[00:56:51] ...
[00:56:51] LL | }
[00:56:51]    | - temporary value is freed at the end of this statement
[00:56:51]    | - temporary value is freed at the end of this statement
[00:56:51] 
[00:56:51] error[E0716]: temporary value dropped while borrowed
[00:56:51]   --> /checkout/src/test/ui/consts/const-int-sign.rs:7:30
[00:56:51]    |
[00:56:51] LL |     let sgn: &'static i32 = &(5_i32.signum());
[00:56:51]    |              ------------    ^^^^^^^^^^^^^^^^ creates a temporary which is freed while still in use
[00:56:51]    |              type annotation requires that borrow lasts for `'static`
[00:56:51] LL |     //~^ ERROR temporary value dropped while borrowed
[00:56:51] LL | }
[00:56:51]    | - temporary value is freed at the end of this statement
---
[00:56:51] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:521:22
[00:56:51] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[00:56:51] 
[00:56:51] 
[00:56:51] 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-6.0/bin/FileCheck" "--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" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[00:56:51] 
[00:56:51] 
[00:56:51] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[00:56:51] Build completed unsuccessfully in 0:52:44

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)

ecstatic-morse · 2019-06-08T03:06:38Z

@oli-obk I think this is ready to go now.

oli-obk · 2019-06-08T07:20:51Z

@bors r+

bors · 2019-06-08T07:20:52Z

📌 Commit f6611db has been approved by oli-obk

bors · 2019-06-08T07:21:03Z

⌛ Testing commit f6611db with merge 7f90abe...

Make `i*::signum` a `const fn`. Ticks a box in #53718. This uses a well-known branchless implementation of `signum`: `(n > 0) as i32 - (n < 0) as i32`. Here's a [playground](https://play.rust-lang.org/?version=nightly&mode=release&edition=2018&gist=747cf191c4974bf66c9d75e509ae6e6e) comparing the two techniques. On x86 in release mode, the branchless implementation is able to replace a `mov` and `cmov` with a `sar` and `add`, so this should be a bit faster as well. ~~This is marked as a draft since I think I'll need to add `#[rustc_const_unstable]` somewhere. Perhaps the reviewer can point me in the right direction.~~

bors · 2019-06-08T10:15:25Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing 7f90abe to master...

rust-highfive · 2019-06-08T10:16:44Z

📣 Toolstate changed by #61635!

Tested on commit 7f90abe.
Direct link to PR: #61635

🎉 rls on windows: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).

@Xanewok

Tested on commit rust-lang/rust@7f90abe. Direct link to PR: <rust-lang/rust#61635> 🎉 rls on windows: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).

bjacob · 2019-06-17T19:13:39Z

For what it's worth, regarding 'branchless' in the commit message, this code was/is branchless and more or less as efficient before and after this commit. Example on ARM64:
https://godbolt.org/z/9w4BPr
The old form compiled to 2 mask-and-select instructions (0 branches).
The new form compiles to 1 mask-and-select and 1 subtract-with-shifted-operand (it shifts by 31 bits to get the sign bit, that's how it evals (x < 0)).
So it's just 2 arithmetic instructions before and after.

Note though that the old form also informed the compiler that the result was either -1, 0 or +1. The new form looks to the compiler like the result might be any integer value. That might have side effects on optimization opportunities in inlined contexts.

ecstatic-morse · 2019-06-17T20:25:21Z

@bjacob, I compared the generated assembly (albeit only on x86) in the PR message, so I'm aware that the optimized version of the old implementation is branchless. I've reproduced the full output below for you.

playground::signum: # @playground::signum
# %bb.0:
	xorl	%eax, %eax
	testl	%edi, %edi
	setg	%al
	sarl	$31, %edi
	addl	%edi, %eax
	retq
                                        # -- End function

playground::signum_branch: # @playground::signum_branch
# %bb.0:
	xorl	%ecx, %ecx
	testl	%edi, %edi
	setne	%cl
	movl	$-1, %eax
	cmovnsl	%ecx, %eax
	retq
                                        # -- End function

The main benefit of this PR is that signum is now callable in a const context (since the implementation has no branches). A side benefit is that the code is now faster (caveats: on x86, using clang instead of rustc, in a contrived microbenchmark, on whatever machine quick-bench.com uses). cmov is slower than your typical, constant-time arithmetic instruction on x86 (although the gap is closing with each new microarchitecture), and the new version uses one less register (on both ARM and x86).

Your last point is an interesting one, although I'm not aware of a set of optimizations that would make use this information. Perhaps you have an idea?

bjacob · 2019-06-17T20:49:09Z

right, sorry I had not followed the link in the commit message.
about the latter point, I was thinking about this: https://godbolt.org/z/kfha8c
See how switch_foo (old form) is simpler than switch_bar(new form) just because the logic is transparent to the compiler so it's able to merge the inline code at the logical level and not even evaluate the actual 'signum' value.

bjacob · 2019-06-17T20:50:37Z

On the other hand, I'm impressed that even in the new form, the compiler was able to deduce that the result could only be -1, 0 or 1 so it still elided the default: case.

ecstatic-morse · 2019-06-17T21:47:05Z

Ah, I didn't consider branching on the result of signum. The original implementation will indeed be faster in that case since the compiler can unify the control flow (although I am also surprised that it it knows the range of outputs for the branchless version).

I don't know how common code like this is, since

match n {
    n if n > 0 => {}
    0 => {}
    _ => {}
}

is much more straightforward (I only use signum for multiplication), but it's good to know that this PR isn't an unconditional performance win.

ecstatic-morse · 2019-09-17T00:59:14Z

@Centril This should get const-hack, although there may be a slight performance win from the convoluted version.

@oli-obk

Clean up const-hack PRs now that const if / match exist. Closes rust-lang#67627. Cleans up these merged PRs tagged with `const-hack`: - rust-lang#63810 - rust-lang#63786 - rust-lang#61635 - rust-lang#58044 reverting their contents to have the match or if expressions they originally contained. r? @oli-obk There's one more PR in those tagged with `const-hack` that originally wasn't merged (rust-lang#65107). Reading the thread, it looks like it was originally closed because the `const-hack` for the checked arithmetic non-negligibly hurt performance, and because there was no way to manipulate the returned Option at compile time anyway (with neither const if nor const match). Would you like me to add these changes to the changes from this PR here too, now that we have the necessary features?

rust-highfive assigned bluss Jun 7, 2019

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

oli-obk requested changes Jun 7, 2019

View reviewed changes

src/libcore/num/mod.rs Outdated Show resolved Hide resolved

oli-obk assigned oli-obk and unassigned bluss Jun 7, 2019

oli-obk 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 Jun 7, 2019

Make i*::signum a const fn.

bd899d0

This uses a well-known branchless implementation of `signum`. Its `const`-ness is unstable and requires `#![feature(const_int_sign)]`.

ecstatic-morse force-pushed the const-signum branch from e080fac to bd899d0 Compare June 7, 2019 22:38

ecstatic-morse marked this pull request as ready for review June 7, 2019 22:38

ecstatic-morse force-pushed the const-signum branch from d79e75d to 1bf37ae Compare June 7, 2019 23:25

oli-obk reviewed Jun 7, 2019

View reviewed changes

src/test/run-pass/const-int-sign.rs Outdated Show resolved Hide resolved

ecstatic-morse commented Jun 7, 2019

View reviewed changes

src/test/ui/consts/const-int-sign.rs Outdated Show resolved Hide resolved

ecstatic-morse commented Jun 7, 2019

View reviewed changes

src/test/run-pass/const-int-sign.rs Outdated Show resolved Hide resolved

ecstatic-morse force-pushed the const-signum branch from 1bf37ae to 7ec54f9 Compare June 7, 2019 23:43

ecstatic-morse force-pushed the const-signum branch from 7ec54f9 to c2d8841 Compare June 8, 2019 00:52

Add const-ness tests for i32::signum

f6611db

ecstatic-morse force-pushed the const-signum branch from c2d8841 to f6611db Compare June 8, 2019 00:55

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 8, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 8, 2019

bors merged commit f6611db into rust-lang:master Jun 8, 2019

ecstatic-morse deleted the const-signum branch June 8, 2019 17:41

ecstatic-morse mentioned this pull request Jun 8, 2019

Tracking Issue for more const int functions #53718

Closed

59 tasks

scottmcm mentioned this pull request Sep 2, 2019

Even more optimal Ord implementation for integers #64082

Closed

Centril added the const-hack label Sep 17, 2019

Centril mentioned this pull request Nov 20, 2019

Announce if and match in constants on nightly rust-lang/blog.rust-lang.org#461

Merged

jumbatm mentioned this pull request Dec 27, 2019

Clean up const-hack PRs now that const if / match exist. #67657

Merged

jumbatm added a commit to jumbatm/rust that referenced this pull request Dec 27, 2019

Clean up const-hack from rust-lang#61635

282635f

RalfJung removed the const-hack label Aug 7, 2020

Make i*::signum a const fn. #61635

Make i*::signum a const fn. #61635

Uh oh!

Conversation

ecstatic-morse commented Jun 7, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Jun 7, 2019

Uh oh!

oli-obk left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

oli-obk commented Jun 7, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rust-highfive commented Jun 8, 2019

Uh oh!

ecstatic-morse commented Jun 8, 2019

Uh oh!

oli-obk commented Jun 8, 2019

Uh oh!

bors commented Jun 8, 2019

Uh oh!

bors commented Jun 8, 2019

Uh oh!

bors commented Jun 8, 2019

Uh oh!

rust-highfive commented Jun 8, 2019

Uh oh!

bjacob commented Jun 17, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ecstatic-morse commented Jun 17, 2019

Uh oh!

bjacob commented Jun 17, 2019

Uh oh!

bjacob commented Jun 17, 2019

Uh oh!

ecstatic-morse commented Jun 17, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ecstatic-morse commented Sep 17, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Make `i*::signum` a `const fn`. #61635

Make `i*::signum` a `const fn`. #61635

ecstatic-morse commented Jun 7, 2019 •

edited

Loading

bjacob commented Jun 17, 2019 •

edited

Loading

ecstatic-morse commented Jun 17, 2019 •

edited

Loading