diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-08-22 15:15:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-22 15:15:38 +0200 |
| commit | 30fd79cb6c8d68df10392595231a55e83f217f61 (patch) | |
| tree | 0be4c696060da9d09bfa9809144d3b4d802e66a8 | |
| parent | 07843959123b5d3598d3795891548513acd568bd (diff) | |
| parent | f5b16f6212d2d72d505d4d6b1dedc2c9c61dd014 (diff) | |
| download | rust-30fd79cb6c8d68df10392595231a55e83f217f61.tar.gz rust-30fd79cb6c8d68df10392595231a55e83f217f61.zip | |
Rollup merge of #63767 - lzutao:integer-ord-suboptimal, r=nagisa
Use more optimal Ord implementation for integers Closes #63758 r? @nagisa ### Compare results ([godbolt link](https://godbolt.org/z/dsbczy)) Old assembly: ```asm example::cmp1: mov eax, dword ptr [rdi] mov ecx, dword ptr [rsi] cmp eax, ecx setae dl add dl, dl add dl, -1 xor esi, esi cmp eax, ecx movzx eax, dl cmove eax, esi ret ``` New assembly: ```asm example::cmp2: mov eax, dword ptr [rdi] xor ecx, ecx cmp eax, dword ptr [rsi] seta cl mov eax, 255 cmovae eax, ecx ret ``` Old llvm-mca statistics: ``` Iterations: 100 Instructions: 1100 Total Cycles: 243 Total uOps: 1300 Dispatch Width: 6 uOps Per Cycle: 5.35 IPC: 4.53 Block RThroughput: 2.2 ``` New llvm-mca statistics: ``` Iterations: 100 Instructions: 700 Total Cycles: 217 Total uOps: 1100 Dispatch Width: 6 uOps Per Cycle: 5.07 IPC: 3.23 Block RThroughput: 1.8 ```
| -rw-r--r-- | src/libcore/cmp.rs | 8 | ||||
| -rw-r--r-- | src/test/codegen/integer-cmp.rs | 28 |
2 files changed, 33 insertions, 3 deletions
diff --git a/src/libcore/cmp.rs b/src/libcore/cmp.rs index cb9feb074dd..167a9dd1c36 100644 --- a/src/libcore/cmp.rs +++ b/src/libcore/cmp.rs @@ -1012,9 +1012,11 @@ mod impls { impl Ord for $t { #[inline] fn cmp(&self, other: &$t) -> Ordering { - if *self == *other { Equal } - else if *self < *other { Less } - else { Greater } + // The order here is important to generate more optimal assembly. + // See <https://github.com/rust-lang/rust/issues/63758> for more info. + if *self < *other { Less } + else if *self > *other { Greater } + else { Equal } } } )*) diff --git a/src/test/codegen/integer-cmp.rs b/src/test/codegen/integer-cmp.rs new file mode 100644 index 00000000000..1373b12e372 --- /dev/null +++ b/src/test/codegen/integer-cmp.rs @@ -0,0 +1,28 @@ +// This is test for more optimal Ord implementation for integers. +// See <https://github.com/rust-lang/rust/issues/63758> for more info. + +// compile-flags: -C opt-level=3 + +#![crate_type = "lib"] + +use std::cmp::Ordering; + +// CHECK-LABEL: @cmp_signed +#[no_mangle] +pub fn cmp_signed(a: i64, b: i64) -> Ordering { +// CHECK: icmp slt +// CHECK: icmp sgt +// CHECK: zext i1 +// CHECK: select i1 + a.cmp(&b) +} + +// CHECK-LABEL: @cmp_unsigned +#[no_mangle] +pub fn cmp_unsigned(a: u32, b: u32) -> Ordering { +// CHECK: icmp ult +// CHECK: icmp ugt +// CHECK: zext i1 +// CHECK: select i1 + a.cmp(&b) +} |
