Port from packed_simd crate to portable_simd feature (aarch64 part)

hsivonen · hsivonen · commit 598edc8602a2 · 2024-04-03T11:17:06.000+03:00
diff --git a/src/simd_funcs.rs b/src/simd_funcs.rs
@@ -148,7 +148,7 @@ cfg_if! {
         pub fn simd_is_ascii(s: u8x16) -> bool {
             unsafe {
                 // Safety: We have cfg()d the correct platform
-                vmaxvq_u8(s.into_bits()) < 0x80
+                vmaxvq_u8(s.into()) < 0x80
             }
         }
     } else {
@@ -177,7 +177,7 @@ cfg_if! {
         pub fn simd_is_str_latin1(s: u8x16) -> bool {
             unsafe {
                 // Safety: We have cfg()d the correct platform
-                vmaxvq_u8(s.into_bits()) < 0xC4
+                vmaxvq_u8(s.into()) < 0xC4
             }
         }
     } else {
@@ -195,15 +195,15 @@ cfg_if! {
         pub fn simd_is_basic_latin(s: u16x8) -> bool {
             unsafe {
                 // Safety: We have cfg()d the correct platform
-                vmaxvq_u16(s.into_bits()) < 0x80
+                vmaxvq_u16(s.into()) < 0x80
             }
         }
 
         #[inline(always)]
         pub fn simd_is_latin1(s: u16x8) -> bool {
             unsafe {
                 // Safety: We have cfg()d the correct platform
-                vmaxvq_u16(s.into_bits()) < 0x100
+                vmaxvq_u16(s.into()) < 0x100
             }
         }
     } else {
@@ -237,7 +237,7 @@ cfg_if! {
             ($s:ident) => ({
                 unsafe {
                     // Safety: We have cfg()d the correct platform
-                    if vmaxvq_u16($s.into_bits()) < 0x0590 {
+                    if vmaxvq_u16($s.into()) < 0x0590 {
                         return false;
                     }
                 }
@@ -328,9 +328,9 @@ cfg_if! {
     } else {
         #[inline(always)]
         pub fn simd_pack(a: u16x8, b: u16x8) -> u8x16 {
-            let first: u8x16 = a.into_bits();
-            let second: u8x16 = b.into_bits();
-            shuffle!(
+            let first: u8x16 = a.to_ne_bytes();
+            let second: u8x16 = b.to_ne_bytes();
+            simd_swizzle!(
                 first,
                 second,
                 [0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30]

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ cfg_if! {`
`148`	`148`	`pub fn simd_is_ascii(s: u8x16) -> bool {`
`149`	`149`	`unsafe {`
`150`	`150`	`// Safety: We have cfg()d the correct platform`
`151`		`- vmaxvq_u8(s.into_bits()) < 0x80`
	`151`	`+ vmaxvq_u8(s.into()) < 0x80`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`	`} else {`
`@@ -177,7 +177,7 @@ cfg_if! {`
`177`	`177`	`pub fn simd_is_str_latin1(s: u8x16) -> bool {`
`178`	`178`	`unsafe {`
`179`	`179`	`// Safety: We have cfg()d the correct platform`
`180`		`- vmaxvq_u8(s.into_bits()) < 0xC4`
	`180`	`+ vmaxvq_u8(s.into()) < 0xC4`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`	`} else {`
`@@ -195,15 +195,15 @@ cfg_if! {`
`195`	`195`	`pub fn simd_is_basic_latin(s: u16x8) -> bool {`
`196`	`196`	`unsafe {`
`197`	`197`	`// Safety: We have cfg()d the correct platform`
`198`		`- vmaxvq_u16(s.into_bits()) < 0x80`
	`198`	`+ vmaxvq_u16(s.into()) < 0x80`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`#[inline(always)]`
`203`	`203`	`pub fn simd_is_latin1(s: u16x8) -> bool {`
`204`	`204`	`unsafe {`
`205`	`205`	`// Safety: We have cfg()d the correct platform`
`206`		`- vmaxvq_u16(s.into_bits()) < 0x100`
	`206`	`+ vmaxvq_u16(s.into()) < 0x100`
`207`	`207`	`}`
`208`	`208`	`}`
`209`	`209`	`} else {`
`@@ -237,7 +237,7 @@ cfg_if! {`
`237`	`237`	`($s:ident) => ({`
`238`	`238`	`unsafe {`
`239`	`239`	`// Safety: We have cfg()d the correct platform`
`240`		`- if vmaxvq_u16($s.into_bits()) < 0x0590 {`
	`240`	`+ if vmaxvq_u16($s.into()) < 0x0590 {`
`241`	`241`	`return false;`
`242`	`242`	`}`
`243`	`243`	`}`
`@@ -328,9 +328,9 @@ cfg_if! {`
`328`	`328`	`} else {`
`329`	`329`	`#[inline(always)]`
`330`	`330`	`pub fn simd_pack(a: u16x8, b: u16x8) -> u8x16 {`
`331`		`- let first: u8x16 = a.into_bits();`
`332`		`- let second: u8x16 = b.into_bits();`
`333`		`- shuffle!(`
	`331`	`+ let first: u8x16 = a.to_ne_bytes();`
	`332`	`+ let second: u8x16 = b.to_ne_bytes();`
	`333`	`+ simd_swizzle!(`
`334`	`334`	`first,`
`335`	`335`	`second,`
`336`	`336`	`[0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30]`