From 8b3208fa35bd8e3c2f2d902e2b7e0d5e16957e3f Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sat, 17 Feb 2024 08:51:37 +0100
Subject: [PATCH] import LLVM SIMD intrinsics from core rather than declaring
 them locally

---
 crates/core_arch/src/simd_llvm.rs | 67 +------------------------------
 1 file changed, 2 insertions(+), 65 deletions(-)

diff --git a/crates/core_arch/src/simd_llvm.rs b/crates/core_arch/src/simd_llvm.rs
index 5b6cd0b93b..9a0820eb7e 100644
--- a/crates/core_arch/src/simd_llvm.rs
+++ b/crates/core_arch/src/simd_llvm.rs
@@ -1,76 +1,13 @@
 //! LLVM's SIMD platform intrinsics
 
-extern "platform-intrinsic" {
-    //pub fn simd_select_bitmask
-    pub fn simd_eq<T, U>(x: T, y: T) -> U;
-    pub fn simd_ne<T, U>(x: T, y: T) -> U;
-    pub fn simd_lt<T, U>(x: T, y: T) -> U;
-    pub fn simd_le<T, U>(x: T, y: T) -> U;
-    pub fn simd_gt<T, U>(x: T, y: T) -> U;
-    pub fn simd_ge<T, U>(x: T, y: T) -> U;
-
-    pub fn simd_shuffle<T, U, V>(x: T, y: T, idx: U) -> V;
+pub use crate::intrinsics::simd::*;
 
+extern "platform-intrinsic" {
     #[rustc_const_unstable(feature = "const_simd_insert", issue = "none")]
     pub fn simd_insert<T, U>(x: T, idx: u32, val: U) -> T;
     #[rustc_const_unstable(feature = "const_simd_extract", issue = "none")]
     pub fn simd_extract<T, U>(x: T, idx: u32) -> U;
-    //pub fn simd_select
-    pub fn simd_bitmask<T, U>(x: T) -> U;
-
-    pub fn simd_cast<T, U>(x: T) -> U;
-
-    pub fn simd_add<T>(x: T, y: T) -> T;
-    pub fn simd_sub<T>(x: T, y: T) -> T;
-    pub fn simd_mul<T>(x: T, y: T) -> T;
-    pub fn simd_div<T>(x: T, y: T) -> T;
-    pub fn simd_rem<T>(x: T, y: T) -> T;
-    pub fn simd_shl<T>(x: T, y: T) -> T;
-    pub fn simd_shr<T>(x: T, y: T) -> T;
-    pub fn simd_and<T>(x: T, y: T) -> T;
-    pub fn simd_or<T>(x: T, y: T) -> T;
-    pub fn simd_xor<T>(x: T, y: T) -> T;
-
-    pub fn simd_neg<T>(x: T) -> T;
-
-    pub fn simd_saturating_add<T>(x: T, y: T) -> T;
-    pub fn simd_saturating_sub<T>(x: T, y: T) -> T;
-
-    pub fn simd_gather<T, U, V>(values: T, pointers: U, mask: V) -> T;
-    pub fn simd_scatter<T, U, V>(values: T, pointers: U, mask: V);
 
     pub fn simd_reduce_add_unordered<T, U>(x: T) -> U;
     pub fn simd_reduce_mul_unordered<T, U>(x: T) -> U;
-    pub fn simd_reduce_add_ordered<T, U>(x: T, acc: U) -> U;
-    pub fn simd_reduce_mul_ordered<T, U>(x: T, acc: U) -> U;
-    pub fn simd_reduce_min<T, U>(x: T) -> U;
-    pub fn simd_reduce_max<T, U>(x: T) -> U;
-    pub fn simd_reduce_min_nanless<T, U>(x: T) -> U;
-    pub fn simd_reduce_max_nanless<T, U>(x: T) -> U;
-    pub fn simd_reduce_and<T, U>(x: T) -> U;
-    pub fn simd_reduce_or<T, U>(x: T) -> U;
-    pub fn simd_reduce_xor<T, U>(x: T) -> U;
-    pub fn simd_reduce_all<T>(x: T) -> bool;
-    pub fn simd_reduce_any<T>(x: T) -> bool;
-
-    pub fn simd_select<M, T>(m: M, a: T, b: T) -> T;
-    pub fn simd_select_bitmask<M, T>(m: M, a: T, b: T) -> T;
-
-    pub fn simd_fmin<T>(a: T, b: T) -> T;
-    pub fn simd_fmax<T>(a: T, b: T) -> T;
-
-    pub fn simd_fsqrt<T>(a: T) -> T;
-    pub fn simd_fsin<T>(a: T) -> T;
-    pub fn simd_fcos<T>(a: T) -> T;
-    pub fn simd_fabs<T>(a: T) -> T;
-    pub fn simd_floor<T>(a: T) -> T;
-    pub fn simd_ceil<T>(a: T) -> T;
-    pub fn simd_fexp<T>(a: T) -> T;
-    pub fn simd_fexp2<T>(a: T) -> T;
-    pub fn simd_flog10<T>(a: T) -> T;
-    pub fn simd_flog2<T>(a: T) -> T;
-    pub fn simd_flog<T>(a: T) -> T;
-    //pub fn simd_fpowi
-    //pub fn simd_fpow
-    pub fn simd_fma<T>(a: T, b: T, c: T) -> T;
 }