Skip to content

Commit 377be01

Browse files
satiscugcatAmanieu
satiscugcat
authored and
Amanieu
committed
Changed implementation of bsrli in avx512.rs to match that of bslli, fixing a bug in the process.
1 parent 353a478 commit 377be01

File tree

1 file changed

+78
-195
lines changed

1 file changed

+78
-195
lines changed

‎crates/core_arch/src/x86/avx512bw.rs‎

Lines changed: 78 additions & 195 deletions
Original file line numberDiff line numberDiff line change
@@ -11208,203 +11208,86 @@ pub fn _mm512_bslli_epi128<const IMM8: i32>(a: __m512i) -> __m512i {
1120811208
pub fn _mm512_bsrli_epi128<const IMM8: i32>(a: __m512i) -> __m512i {
1120911209
unsafe {
1121011210
static_assert_uimm_bits!(IMM8, 8);
11211+
const fn mask(shift: i32, i: u32) -> u32 {
11212+
let shift = shift as u32 & 0xff;
11213+
if shift > 15 || (15 - (i % 16)) < shift {
11214+
0
11215+
} else {
11216+
64 + (i + shift)
11217+
}
11218+
}
1121111219
let a = a.as_i8x64();
1121211220
let zero = i8x64::ZERO;
11213-
let r: i8x64 = match IMM8 % 16 {
11214-
0 => {
11215-
simd_shuffle!(
11216-
a,
11217-
zero,
11218-
[
11219-
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
11220-
21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
11221-
40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
11222-
59, 60, 61, 62, 63,
11223-
],
11224-
)
11225-
}
11226-
1 => {
11227-
simd_shuffle!(
11228-
a,
11229-
zero,
11230-
[
11231-
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 64, 17, 18, 19, 20, 21,
11232-
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 80, 33, 34, 35, 36, 37, 38, 39, 40,
11233-
41, 42, 43, 44, 45, 46, 47, 96, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
11234-
60, 61, 62, 63, 112,
11235-
],
11236-
)
11237-
}
11238-
2 => {
11239-
simd_shuffle!(
11240-
a,
11241-
zero,
11242-
[
11243-
2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 64, 65, 18, 19, 20, 21, 22,
11244-
23, 24, 25, 26, 27, 28, 29, 30, 31, 80, 81, 34, 35, 36, 37, 38, 39, 40, 41,
11245-
42, 43, 44, 45, 46, 47, 96, 97, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
11246-
61, 62, 63, 112, 113,
11247-
],
11248-
)
11249-
}
11250-
3 => {
11251-
simd_shuffle!(
11252-
a,
11253-
zero,
11254-
[
11255-
3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 64, 65, 66, 19, 20, 21, 22,
11256-
23, 24, 25, 26, 27, 28, 29, 30, 31, 80, 81, 82, 35, 36, 37, 38, 39, 40, 41,
11257-
42, 43, 44, 45, 46, 47, 96, 97, 98, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
11258-
61, 62, 63, 112, 113, 114,
11259-
],
11260-
)
11261-
}
11262-
4 => {
11263-
simd_shuffle!(
11264-
a,
11265-
zero,
11266-
[
11267-
4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 64, 65, 66, 67, 20, 21, 22, 23,
11268-
24, 25, 26, 27, 28, 29, 30, 31, 80, 81, 82, 83, 36, 37, 38, 39, 40, 41, 42,
11269-
43, 44, 45, 46, 47, 96, 97, 98, 99, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
11270-
62, 63, 112, 113, 114, 115,
11271-
],
11272-
)
11273-
}
11274-
5 => {
11275-
simd_shuffle!(
11276-
a,
11277-
zero,
11278-
[
11279-
5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 64, 65, 66, 67, 68, 21, 22, 23, 24,
11280-
25, 26, 27, 28, 29, 30, 31, 80, 81, 82, 83, 84, 37, 38, 39, 40, 41, 42, 43,
11281-
44, 45, 46, 47, 96, 97, 98, 99, 100, 53, 54, 55, 56, 57, 58, 59, 60, 61,
11282-
62, 63, 112, 113, 114, 115, 116,
11283-
],
11284-
)
11285-
}
11286-
6 => {
11287-
simd_shuffle!(
11288-
a,
11289-
zero,
11290-
[
11291-
6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 64, 65, 66, 67, 68, 69, 22, 23, 24, 25,
11292-
26, 27, 28, 29, 30, 31, 80, 81, 82, 83, 84, 85, 38, 39, 40, 41, 42, 43, 44,
11293-
45, 46, 47, 96, 97, 98, 99, 100, 101, 54, 55, 56, 57, 58, 59, 60, 61, 62,
11294-
63, 112, 113, 114, 115, 116, 117,
11295-
],
11296-
)
11297-
}
11298-
7 => {
11299-
simd_shuffle!(
11300-
a,
11301-
zero,
11302-
[
11303-
7, 8, 9, 10, 11, 12, 13, 14, 15, 64, 65, 66, 67, 68, 69, 70, 23, 24, 25,
11304-
26, 27, 28, 29, 30, 31, 80, 81, 82, 83, 84, 85, 86, 39, 40, 41, 42, 43, 44,
11305-
45, 46, 47, 96, 97, 98, 99, 100, 101, 102, 55, 56, 57, 58, 59, 60, 61, 62,
11306-
63, 112, 113, 114, 115, 116, 117, 118,
11307-
],
11308-
)
11309-
}
11310-
8 => {
11311-
simd_shuffle!(
11312-
a,
11313-
zero,
11314-
[
11315-
8, 9, 10, 11, 12, 13, 14, 15, 64, 65, 66, 67, 68, 69, 70, 71, 24, 25, 26,
11316-
27, 28, 29, 30, 31, 80, 81, 82, 83, 84, 85, 86, 87, 40, 41, 42, 43, 44, 45,
11317-
46, 47, 96, 97, 98, 99, 100, 101, 102, 103, 56, 57, 58, 59, 60, 61, 62, 63,
11318-
112, 113, 114, 115, 116, 117, 118, 119,
11319-
],
11320-
)
11321-
}
11322-
9 => {
11323-
simd_shuffle!(
11324-
a,
11325-
zero,
11326-
[
11327-
9, 10, 11, 12, 13, 14, 15, 64, 65, 66, 67, 68, 69, 70, 71, 72, 25, 26, 27,
11328-
28, 29, 30, 31, 80, 81, 82, 83, 84, 85, 86, 87, 88, 41, 42, 43, 44, 45, 46,
11329-
47, 96, 97, 98, 99, 100, 101, 102, 103, 104, 57, 58, 59, 60, 61, 62, 63,
11330-
112, 113, 114, 115, 116, 117, 118, 119, 120,
11331-
],
11332-
)
11333-
}
11334-
10 => {
11335-
simd_shuffle!(
11336-
a,
11337-
zero,
11338-
[
11339-
10, 11, 12, 13, 14, 15, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 26, 27, 28,
11340-
29, 30, 31, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 42, 43, 44, 45, 46, 47,
11341-
96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 58, 59, 60, 61, 62, 63, 112,
11342-
113, 114, 115, 116, 117, 118, 119, 120, 121,
11343-
],
11344-
)
11345-
}
11346-
11 => {
11347-
simd_shuffle!(
11348-
a,
11349-
zero,
11350-
[
11351-
11, 12, 13, 14, 15, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 27, 28, 29,
11352-
30, 31, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 43, 44, 45, 46, 47, 96,
11353-
97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 59, 60, 61, 62, 63, 112,
11354-
113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
11355-
],
11356-
)
11357-
}
11358-
12 => {
11359-
simd_shuffle!(
11360-
a,
11361-
zero,
11362-
[
11363-
12, 13, 14, 15, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 28, 29, 30,
11364-
31, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 44, 45, 46, 47, 96, 97,
11365-
98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 60, 61, 62, 63, 112, 113,
11366-
114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
11367-
],
11368-
)
11369-
}
11370-
13 => {
11371-
simd_shuffle!(
11372-
a,
11373-
zero,
11374-
[
11375-
13, 14, 15, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 29, 30, 31,
11376-
80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 45, 46, 47, 96, 97, 98,
11377-
99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 61, 62, 63, 112, 113, 114,
11378-
115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
11379-
],
11380-
)
11381-
}
11382-
14 => {
11383-
simd_shuffle!(
11384-
a,
11385-
zero,
11386-
[
11387-
14, 15, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 30, 31, 80,
11388-
81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 46, 47, 96, 97, 98, 99,
11389-
100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 62, 63, 112, 113, 114,
11390-
115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
11391-
],
11392-
)
11393-
}
11394-
15 => {
11395-
simd_shuffle!(
11396-
a,
11397-
zero,
11398-
[
11399-
15, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 31, 80, 81,
11400-
82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 47, 96, 97, 98, 99,
11401-
100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 63, 112, 113, 114,
11402-
115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
11403-
],
11404-
)
11405-
}
11406-
_ => zero,
11407-
};
11221+
let r: i8x64 = simd_shuffle!(
11222+
zero,
11223+
a,
11224+
[
11225+
mask(IMM8, 0),
11226+
mask(IMM8, 1),
11227+
mask(IMM8, 2),
11228+
mask(IMM8, 3),
11229+
mask(IMM8, 4),
11230+
mask(IMM8, 5),
11231+
mask(IMM8, 6),
11232+
mask(IMM8, 7),
11233+
mask(IMM8, 8),
11234+
mask(IMM8, 9),
11235+
mask(IMM8, 10),
11236+
mask(IMM8, 11),
11237+
mask(IMM8, 12),
11238+
mask(IMM8, 13),
11239+
mask(IMM8, 14),
11240+
mask(IMM8, 15),
11241+
mask(IMM8, 16),
11242+
mask(IMM8, 17),
11243+
mask(IMM8, 18),
11244+
mask(IMM8, 19),
11245+
mask(IMM8, 20),
11246+
mask(IMM8, 21),
11247+
mask(IMM8, 22),
11248+
mask(IMM8, 23),
11249+
mask(IMM8, 24),
11250+
mask(IMM8, 25),
11251+
mask(IMM8, 26),
11252+
mask(IMM8, 27),
11253+
mask(IMM8, 28),
11254+
mask(IMM8, 29),
11255+
mask(IMM8, 30),
11256+
mask(IMM8, 31),
11257+
mask(IMM8, 32),
11258+
mask(IMM8, 33),
11259+
mask(IMM8, 34),
11260+
mask(IMM8, 35),
11261+
mask(IMM8, 36),
11262+
mask(IMM8, 37),
11263+
mask(IMM8, 38),
11264+
mask(IMM8, 39),
11265+
mask(IMM8, 40),
11266+
mask(IMM8, 41),
11267+
mask(IMM8, 42),
11268+
mask(IMM8, 43),
11269+
mask(IMM8, 44),
11270+
mask(IMM8, 45),
11271+
mask(IMM8, 46),
11272+
mask(IMM8, 47),
11273+
mask(IMM8, 48),
11274+
mask(IMM8, 49),
11275+
mask(IMM8, 50),
11276+
mask(IMM8, 51),
11277+
mask(IMM8, 52),
11278+
mask(IMM8, 53),
11279+
mask(IMM8, 54),
11280+
mask(IMM8, 55),
11281+
mask(IMM8, 56),
11282+
mask(IMM8, 57),
11283+
mask(IMM8, 58),
11284+
mask(IMM8, 59),
11285+
mask(IMM8, 60),
11286+
mask(IMM8, 61),
11287+
mask(IMM8, 62),
11288+
mask(IMM8, 63),
11289+
],
11290+
);
1140811291
transmute(r)
1140911292
}
1141011293
}

0 commit comments

Comments
 (0)