View | Details | Raw Unified | Return to bug 251425
Collapse All | Expand All

(-)textproc/ripgrep/files/patch-packed_simd (-52 / +45 lines)
Lines 1-15 Link Here
1
From 950903a66950eaff745b0a029f2051d305df1c22 Mon Sep 17 00:00:00 2001
1
--- cargo-crates/packed_simd-0.3.3/src/api/into_bits/arch_specific.rs.orig	2019-02-05 20:18:53 UTC
2
From: Justus K <justus.k@protonmail.com>
2
+++ cargo-crates/packed_simd-0.3.3/src/api/into_bits/arch_specific.rs
3
Date: Tue, 22 Sep 2020 15:36:03 +0200
3
@@ -84,7 +84,6 @@ macro_rules! impl_arch {
4
Subject: [PATCH] Remove `x86_m8x8_sse_impl` macro
4
 // FIXME: 64-bit single element types
5
5
 // FIXME: arm/aarch float16x4_t missing
6
---
6
 impl_arch!(
7
 src/codegen/reductions/mask/x86/sse.rs | 32 --------------------------
7
-    [x86["x86"]: __m64], [x86_64["x86_64"]: __m64],
8
 1 file changed, 32 deletions(-)
8
     [arm["arm"]: int8x8_t, uint8x8_t, poly8x8_t, int16x4_t, uint16x4_t,
9
9
      poly16x4_t, int32x2_t, uint32x2_t, float32x2_t, int64x1_t,
10
diff --git a/src/codegen/reductions/mask/x86/sse.rs b/src/codegen/reductions/mask/x86/sse.rs
10
      uint64x1_t],
11
index 7482f943..eb1ef7fa 100644
11
--- cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86/sse.rs.orig	2019-01-31 15:25:21 UTC
12
--- cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86/sse.rs
13
+++ cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86/sse.rs
12
+++ cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86/sse.rs
14
@@ -34,35 +34,3 @@ macro_rules! x86_m32x4_sse_impl {
13
@@ -34,35 +34,3 @@ macro_rules! x86_m32x4_sse_impl {
15
         }
14
         }
Lines 47-67 Link Here
47
-        }
46
-        }
48
-    };
47
-    };
49
-}
48
-}
50
From 778c0706f356118c7a5dd11c06725fc6c6b84621 Mon Sep 17 00:00:00 2001
49
--- cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86.rs.orig	2019-01-31 15:25:21 UTC
51
From: Justus K <justus.k@protonmail.com>
52
Date: Tue, 22 Sep 2020 15:27:53 +0200
53
Subject: [PATCH] Replace `_mm_movemask_pi8` with the fallback_impl
54
55
This has to be done, because `_mm_movemask_pi8` got removed
56
from stdarch in https://github.com/rust-lang/stdarch/pull/890
57
---
58
 src/codegen/reductions/mask/x86.rs | 8 +-------
59
 src/lib.rs                         | 1 -
60
 2 files changed, 1 insertion(+), 8 deletions(-)
61
62
diff --git a/src/codegen/reductions/mask/x86.rs b/src/codegen/reductions/mask/x86.rs
63
index 2ae4ed81..bcfb1a6e 100644
64
--- cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86.rs
65
+++ cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86.rs
50
+++ cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86.rs
66
@@ -19,13 +19,7 @@ mod avx2;
51
@@ -19,13 +19,7 @@ mod avx2;
67
 /// x86 64-bit m8x8 implementation
52
 /// x86 64-bit m8x8 implementation
Lines 78-86 Link Here
78
     };
63
     };
79
 }
64
 }
80
 
65
 
81
diff --git a/src/lib.rs b/src/lib.rs
66
--- cargo-crates/packed_simd-0.3.3/src/codegen/shuffle1_dyn.rs.orig	2019-02-05 20:18:53 UTC
82
index c3da0d3c..cbd438c0 100644
67
+++ cargo-crates/packed_simd-0.3.3/src/codegen/shuffle1_dyn.rs
83
--- cargo-crates/packed_simd-0.3.3/src/lib.rs
68
@@ -28,28 +28,7 @@ macro_rules! impl_fallback {
69
 macro_rules! impl_shuffle1_dyn {
70
     (u8x8) => {
71
         cfg_if! {
72
-            if #[cfg(all(any(target_arch = "x86", target_arch = "x86_64"),
73
-                         target_feature = "ssse3"))] {
74
-                impl Shuffle1Dyn for u8x8 {
75
-                    type Indices = Self;
76
-                    #[inline]
77
-                    fn shuffle1_dyn(self, indices: Self::Indices) -> Self {
78
-                        #[cfg(target_arch = "x86")]
79
-                        use crate::arch::x86::_mm_shuffle_pi8;
80
-                        #[cfg(target_arch = "x86_64")]
81
-                        use crate::arch::x86_64::_mm_shuffle_pi8;
82
-
83
-                        unsafe {
84
-                            crate::mem::transmute(
85
-                                _mm_shuffle_pi8(
86
-                                    crate::mem::transmute(self.0),
87
-                                    crate::mem::transmute(indices.0)
88
-                                )
89
-                            )
90
-                        }
91
-                    }
92
-                }
93
-            } else if #[cfg(all(
94
+            if #[cfg(all(
95
                 any(
96
                     all(target_aarch = "aarch64", target_feature = "neon"),
97
                     all(target_aarch = "arm", target_feature = "v7",
98
--- cargo-crates/packed_simd-0.3.3/src/lib.rs.orig	2019-02-05 20:18:53 UTC
84
+++ cargo-crates/packed_simd-0.3.3/src/lib.rs
99
+++ cargo-crates/packed_simd-0.3.3/src/lib.rs
85
@@ -210,7 +210,6 @@
100
@@ -210,7 +210,6 @@
86
     core_intrinsics,
101
     core_intrinsics,
Lines 90-114 Link Here
90
     crate_visibility_modifier,
105
     crate_visibility_modifier,
91
     custom_inner_attributes
106
     custom_inner_attributes
92
 )]
107
 )]
93
94
From 57d96e45916066fa9b5cdf2bc695e190207e78af Mon Sep 17 00:00:00 2001
95
From: Jubilee Young <workingjubilee@gmail.com>
96
Date: Wed, 23 Sep 2020 12:23:29 -0700
97
Subject: [PATCH] Remove __m64 type
98
99
---
100
 src/api/into_bits/arch_specific.rs | 1 -
101
 1 file changed, 1 deletion(-)
102
103
diff --git a/src/api/into_bits/arch_specific.rs b/src/api/into_bits/arch_specific.rs
104
index 6cc2fa37..7b560107 100644
105
--- cargo-crates/packed_simd-0.3.3/src/api/into_bits/arch_specific.rs
106
+++ cargo-crates/packed_simd-0.3.3/src/api/into_bits/arch_specific.rs
107
@@ -84,7 +84,6 @@ macro_rules! impl_arch {
108
 // FIXME: 64-bit single element types
109
 // FIXME: arm/aarch float16x4_t missing
110
 impl_arch!(
111
-    [x86["x86"]: __m64], [x86_64["x86_64"]: __m64],
112
     [arm["arm"]: int8x8_t, uint8x8_t, poly8x8_t, int16x4_t, uint16x4_t,
113
      poly16x4_t, int32x2_t, uint32x2_t, float32x2_t, int64x1_t,
114
      uint64x1_t],

Return to bug 251425