Skip to content

Commit 602240f

Browse files
authored
cmov: use #[inline] instead of #[inline(always)] (#924)
1 parent 9847881 commit 602240f

File tree

4 files changed

+49
-49
lines changed

4 files changed

+49
-49
lines changed

cmov/src/aarch64.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,72 +40,72 @@ macro_rules! csel_eq {
4040
}
4141

4242
impl Cmov for u16 {
43-
#[inline(always)]
43+
#[inline]
4444
fn cmovnz(&mut self, value: &Self, condition: Condition) {
4545
csel!("csel {1:w}, {2:w}, {3:w}, NE", self, value, condition);
4646
}
4747

48-
#[inline(always)]
48+
#[inline]
4949
fn cmovz(&mut self, value: &Self, condition: Condition) {
5050
csel!("csel {1:w}, {2:w}, {3:w}, EQ", self, value, condition);
5151
}
5252
}
5353

5454
impl CmovEq for u16 {
55-
#[inline(always)]
55+
#[inline]
5656
fn cmovne(&self, rhs: &Self, input: Condition, output: &mut Condition) {
5757
csel_eq!("csel {3:w}, {4:w}, {5:w}, NE", self, rhs, input, output);
5858
}
5959

60-
#[inline(always)]
60+
#[inline]
6161
fn cmoveq(&self, rhs: &Self, input: Condition, output: &mut Condition) {
6262
csel_eq!("csel {3:w}, {4:w}, {5:w}, EQ", self, rhs, input, output);
6363
}
6464
}
6565

6666
impl Cmov for u32 {
67-
#[inline(always)]
67+
#[inline]
6868
fn cmovnz(&mut self, value: &Self, condition: Condition) {
6969
csel!("csel {1:w}, {2:w}, {3:w}, NE", self, value, condition);
7070
}
7171

72-
#[inline(always)]
72+
#[inline]
7373
fn cmovz(&mut self, value: &Self, condition: Condition) {
7474
csel!("csel {1:w}, {2:w}, {3:w}, EQ", self, value, condition);
7575
}
7676
}
7777

7878
impl CmovEq for u32 {
79-
#[inline(always)]
79+
#[inline]
8080
fn cmovne(&self, rhs: &Self, input: Condition, output: &mut Condition) {
8181
csel_eq!("csel {3:w}, {4:w}, {5:w}, NE", self, rhs, input, output);
8282
}
8383

84-
#[inline(always)]
84+
#[inline]
8585
fn cmoveq(&self, rhs: &Self, input: Condition, output: &mut Condition) {
8686
csel_eq!("csel {3:w}, {4:w}, {5:w}, EQ", self, rhs, input, output);
8787
}
8888
}
8989

9090
impl Cmov for u64 {
91-
#[inline(always)]
91+
#[inline]
9292
fn cmovnz(&mut self, value: &Self, condition: Condition) {
9393
csel!("csel {1:x}, {2:x}, {3:x}, NE", self, value, condition);
9494
}
9595

96-
#[inline(always)]
96+
#[inline]
9797
fn cmovz(&mut self, value: &Self, condition: Condition) {
9898
csel!("csel {1:x}, {2:x}, {3:x}, EQ", self, value, condition);
9999
}
100100
}
101101

102102
impl CmovEq for u64 {
103-
#[inline(always)]
103+
#[inline]
104104
fn cmovne(&self, rhs: &Self, input: Condition, output: &mut Condition) {
105105
csel_eq!("csel {3:w}, {4:w}, {5:w}, NE", self, rhs, input, output);
106106
}
107107

108-
#[inline(always)]
108+
#[inline]
109109
fn cmoveq(&self, rhs: &Self, input: Condition, output: &mut Condition) {
110110
csel_eq!("csel {3:w}, {4:w}, {5:w}, EQ", self, rhs, input, output);
111111
}

cmov/src/lib.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ pub trait CmovEq {
6060
}
6161

6262
impl Cmov for u8 {
63-
#[inline(always)]
63+
#[inline]
6464
fn cmovnz(&mut self, value: &Self, condition: Condition) {
6565
let mut tmp = *self as u16;
6666
tmp.cmovnz(&(*value as u16), condition);
6767
*self = tmp as u8;
6868
}
6969

70-
#[inline(always)]
70+
#[inline]
7171
fn cmovz(&mut self, value: &Self, condition: Condition) {
7272
let mut tmp = *self as u16;
7373
tmp.cmovz(&(*value as u16), condition);
@@ -76,19 +76,19 @@ impl Cmov for u8 {
7676
}
7777

7878
impl CmovEq for u8 {
79-
#[inline(always)]
79+
#[inline]
8080
fn cmoveq(&self, rhs: &Self, input: Condition, output: &mut Condition) {
8181
(*self as u16).cmoveq(&(*rhs as u16), input, output);
8282
}
8383

84-
#[inline(always)]
84+
#[inline]
8585
fn cmovne(&self, rhs: &Self, input: Condition, output: &mut Condition) {
8686
(*self as u16).cmovne(&(*rhs as u16), input, output);
8787
}
8888
}
8989

9090
impl Cmov for u128 {
91-
#[inline(always)]
91+
#[inline]
9292
fn cmovnz(&mut self, value: &Self, condition: Condition) {
9393
let mut lo = (*self & u64::MAX as u128) as u64;
9494
let mut hi = (*self >> 64) as u64;
@@ -99,7 +99,7 @@ impl Cmov for u128 {
9999
*self = (lo as u128) | (hi as u128) << 64;
100100
}
101101

102-
#[inline(always)]
102+
#[inline]
103103
fn cmovz(&mut self, value: &Self, condition: Condition) {
104104
let mut lo = (*self & u64::MAX as u128) as u64;
105105
let mut hi = (*self >> 64) as u64;
@@ -112,7 +112,7 @@ impl Cmov for u128 {
112112
}
113113

114114
impl CmovEq for u128 {
115-
#[inline(always)]
115+
#[inline]
116116
fn cmovne(&self, rhs: &Self, input: Condition, output: &mut Condition) {
117117
let lo = (*self & u64::MAX as u128) as u64;
118118
let hi = (*self >> 64) as u64;
@@ -123,7 +123,7 @@ impl CmovEq for u128 {
123123
tmp.cmoveq(&0, input, output);
124124
}
125125

126-
#[inline(always)]
126+
#[inline]
127127
fn cmoveq(&self, rhs: &Self, input: Condition, output: &mut Condition) {
128128
let lo = (*self & u64::MAX as u128) as u64;
129129
let hi = (*self >> 64) as u64;

cmov/src/portable.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
use crate::{Cmov, CmovEq, Condition};
1010

1111
impl Cmov for u16 {
12-
#[inline(always)]
12+
#[inline]
1313
fn cmovnz(&mut self, value: &Self, condition: Condition) {
1414
let mut tmp = *self as u64;
1515
tmp.cmovnz(&(*value as u64), condition);
1616
*self = tmp as u16;
1717
}
1818

19-
#[inline(always)]
19+
#[inline]
2020
fn cmovz(&mut self, value: &Self, condition: Condition) {
2121
let mut tmp = *self as u64;
2222
tmp.cmovz(&(*value as u64), condition);
@@ -25,26 +25,26 @@ impl Cmov for u16 {
2525
}
2626

2727
impl CmovEq for u16 {
28-
#[inline(always)]
28+
#[inline]
2929
fn cmovne(&self, rhs: &Self, input: Condition, output: &mut Condition) {
3030
(*self as u64).cmovne(&(*rhs as u64), input, output);
3131
}
3232

33-
#[inline(always)]
33+
#[inline]
3434
fn cmoveq(&self, rhs: &Self, input: Condition, output: &mut Condition) {
3535
(*self as u64).cmoveq(&(*rhs as u64), input, output);
3636
}
3737
}
3838

3939
impl Cmov for u32 {
40-
#[inline(always)]
40+
#[inline]
4141
fn cmovnz(&mut self, value: &Self, condition: Condition) {
4242
let mut tmp = *self as u64;
4343
tmp.cmovnz(&(*value as u64), condition);
4444
*self = tmp as u32;
4545
}
4646

47-
#[inline(always)]
47+
#[inline]
4848
fn cmovz(&mut self, value: &Self, condition: Condition) {
4949
let mut tmp = *self as u64;
5050
tmp.cmovz(&(*value as u64), condition);
@@ -53,38 +53,38 @@ impl Cmov for u32 {
5353
}
5454

5555
impl CmovEq for u32 {
56-
#[inline(always)]
56+
#[inline]
5757
fn cmovne(&self, rhs: &Self, input: Condition, output: &mut Condition) {
5858
(*self as u64).cmovne(&(*rhs as u64), input, output);
5959
}
6060

61-
#[inline(always)]
61+
#[inline]
6262
fn cmoveq(&self, rhs: &Self, input: Condition, output: &mut Condition) {
6363
(*self as u64).cmoveq(&(*rhs as u64), input, output);
6464
}
6565
}
6666

6767
impl Cmov for u64 {
68-
#[inline(always)]
68+
#[inline]
6969
fn cmovnz(&mut self, value: &Self, condition: Condition) {
7070
let mask = is_non_zero(condition).wrapping_sub(1);
7171
*self = (*self & mask) | (*value & !mask);
7272
}
7373

74-
#[inline(always)]
74+
#[inline]
7575
fn cmovz(&mut self, value: &Self, condition: Condition) {
7676
let mask = (1 ^ is_non_zero(condition)).wrapping_sub(1);
7777
*self = (*self & mask) | (*value & !mask);
7878
}
7979
}
8080

8181
impl CmovEq for u64 {
82-
#[inline(always)]
82+
#[inline]
8383
fn cmovne(&self, rhs: &Self, input: Condition, output: &mut Condition) {
8484
output.cmovnz(&input, (self ^ rhs) as u8);
8585
}
8686

87-
#[inline(always)]
87+
#[inline]
8888
fn cmoveq(&self, rhs: &Self, input: Condition, output: &mut Condition) {
8989
output.cmovz(&input, (self ^ rhs) as u8);
9090
}
@@ -95,7 +95,7 @@ impl CmovEq for u64 {
9595
/// # Returns
9696
/// - `condition` is zero: `0`
9797
/// - `condition` is non-zero: `1`
98-
#[inline(always)]
98+
#[inline]
9999
fn is_non_zero(condition: Condition) -> u64 {
100100
const SHIFT_BITS: usize = core::mem::size_of::<u64>() - 1;
101101
let condition = condition as u64;

cmov/src/x86.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,56 +26,56 @@ macro_rules! cmov {
2626
}
2727

2828
impl Cmov for u16 {
29-
#[inline(always)]
29+
#[inline]
3030
fn cmovnz(&mut self, value: &Self, condition: Condition) {
3131
cmov!("cmovnz {1:e}, {2:e}", self, value, condition);
3232
}
3333

34-
#[inline(always)]
34+
#[inline]
3535
fn cmovz(&mut self, value: &Self, condition: Condition) {
3636
cmov!("cmovz {1:e}, {2:e}", self, value, condition);
3737
}
3838
}
3939

4040
impl CmovEq for u16 {
41-
#[inline(always)]
41+
#[inline]
4242
fn cmoveq(&self, rhs: &Self, input: Condition, output: &mut Condition) {
4343
output.cmovz(&input, (self ^ rhs) as u8);
4444
}
4545

46-
#[inline(always)]
46+
#[inline]
4747
fn cmovne(&self, rhs: &Self, input: Condition, output: &mut Condition) {
4848
output.cmovnz(&input, (self ^ rhs) as u8);
4949
}
5050
}
5151

5252
impl Cmov for u32 {
53-
#[inline(always)]
53+
#[inline]
5454
fn cmovnz(&mut self, value: &Self, condition: Condition) {
5555
cmov!("cmovnz {1:e}, {2:e}", self, value, condition);
5656
}
5757

58-
#[inline(always)]
58+
#[inline]
5959
fn cmovz(&mut self, value: &Self, condition: Condition) {
6060
cmov!("cmovz {1:e}, {2:e}", self, value, condition);
6161
}
6262
}
6363

6464
impl CmovEq for u32 {
65-
#[inline(always)]
65+
#[inline]
6666
fn cmoveq(&self, rhs: &Self, input: Condition, output: &mut Condition) {
6767
output.cmovz(&input, (self ^ rhs) as u8);
6868
}
6969

70-
#[inline(always)]
70+
#[inline]
7171
fn cmovne(&self, rhs: &Self, input: Condition, output: &mut Condition) {
7272
output.cmovnz(&input, (self ^ rhs) as u8);
7373
}
7474
}
7575

7676
#[cfg(target_arch = "x86")]
7777
impl Cmov for u64 {
78-
#[inline(always)]
78+
#[inline]
7979
fn cmovnz(&mut self, value: &Self, condition: Condition) {
8080
let mut lo = (*self & u32::MAX as u64) as u32;
8181
let mut hi = (*self >> 32) as u32;
@@ -86,7 +86,7 @@ impl Cmov for u64 {
8686
*self = (lo as u64) | (hi as u64) << 32;
8787
}
8888

89-
#[inline(always)]
89+
#[inline]
9090
fn cmovz(&mut self, value: &Self, condition: Condition) {
9191
let mut lo = (*self & u32::MAX as u64) as u32;
9292
let mut hi = (*self >> 32) as u32;
@@ -100,7 +100,7 @@ impl Cmov for u64 {
100100

101101
#[cfg(target_arch = "x86")]
102102
impl CmovEq for u64 {
103-
#[inline(always)]
103+
#[inline]
104104
fn cmovne(&self, rhs: &Self, input: Condition, output: &mut Condition) {
105105
let lo = (*self & u32::MAX as u64) as u32;
106106
let hi = (*self >> 32) as u32;
@@ -111,7 +111,7 @@ impl CmovEq for u64 {
111111
tmp.cmoveq(&0, input, output);
112112
}
113113

114-
#[inline(always)]
114+
#[inline]
115115
fn cmoveq(&self, rhs: &Self, input: Condition, output: &mut Condition) {
116116
let lo = (*self & u32::MAX as u64) as u32;
117117
let hi = (*self >> 32) as u32;
@@ -125,25 +125,25 @@ impl CmovEq for u64 {
125125

126126
#[cfg(target_arch = "x86_64")]
127127
impl Cmov for u64 {
128-
#[inline(always)]
128+
#[inline]
129129
fn cmovnz(&mut self, value: &Self, condition: Condition) {
130130
cmov!("cmovnz {1:r}, {2:r}", self, value, condition);
131131
}
132132

133-
#[inline(always)]
133+
#[inline]
134134
fn cmovz(&mut self, value: &Self, condition: Condition) {
135135
cmov!("cmovz {1:r}, {2:r}", self, value, condition);
136136
}
137137
}
138138

139139
#[cfg(target_arch = "x86_64")]
140140
impl CmovEq for u64 {
141-
#[inline(always)]
141+
#[inline]
142142
fn cmoveq(&self, rhs: &Self, input: Condition, output: &mut Condition) {
143143
output.cmovz(&input, (self ^ rhs) as u8);
144144
}
145145

146-
#[inline(always)]
146+
#[inline]
147147
fn cmovne(&self, rhs: &Self, input: Condition, output: &mut Condition) {
148148
output.cmovnz(&input, (self ^ rhs) as u8);
149149
}

0 commit comments

Comments
 (0)