Move acle/dsp to arm; fix tests by skipping dsp arm functions

Author: Byron

crates/core_arch/src/acle/mod.rs

@@ -65,31 +65,6 @@ mod ex;
 
 pub use self::ex::*;
 
-// Supported arches: 5TE, 7E-M. See Section 10.1 of ACLE (e.g. QADD)
-// We also include the A profile even though DSP is deprecated on that profile as of ACLE 2.0 (see
-// section 5.4.7)
-// Here we workaround the difference between LLVM's +dsp and ACLE's __ARM_FEATURE_DSP by gating on
-// '+v5te' rather than on '+dsp'
-#[cfg(all(
-    not(target_arch = "aarch64"),
-    any(
-        // >= v5TE but excludes v7-M
-        all(target_feature = "v5te", not(target_feature = "mclass")),
-        // v7E-M
-        all(target_feature = "mclass", target_feature = "dsp"),
-    )
-))]
-mod dsp;
-
-#[cfg(all(
-    not(target_arch = "aarch64"),
-    any(
-        all(target_feature = "v5te", not(target_feature = "mclass")),
-        all(target_feature = "mclass", target_feature = "dsp"),
-    )
-))]
-pub use self::dsp::*;
-
 // Deprecated in ACLE 2.0 for the A profile but fully supported on the M and R profiles, says
 // Section 5.4.9 of ACLE. We'll expose these for the A profile even if deprecated
 #[cfg(all(

crates/core_arch/src/acle/dsp.rs renamed to crates/core_arch/src/arm/dsp.rs

@@ -21,6 +21,31 @@ mod sat;
 #[cfg(any(all(not(target_arch = "aarch64"), target_feature = "v6",), doc))]
 pub use self::sat::*;
 
+// Supported arches: 5TE, 7E-M. See Section 10.1 of ACLE (e.g. QADD)
+// We also include the A profile even though DSP is deprecated on that profile as of ACLE 2.0 (see
+// section 5.4.7)
+// Here we workaround the difference between LLVM's +dsp and ACLE's __ARM_FEATURE_DSP by gating on
+// '+v5te' rather than on '+dsp'
+#[cfg(all(
+    not(target_arch = "aarch64"),
+    any(
+        // >= v5TE but excludes v7-M
+        all(target_feature = "v5te", not(target_feature = "mclass")),
+        // v7E-M
+        all(target_feature = "mclass", target_feature = "dsp"),
+    )
+))]
+mod dsp;
+
+#[cfg(all(
+    not(target_arch = "aarch64"),
+    any(
+        all(target_feature = "v5te", not(target_feature = "mclass")),
+        all(target_feature = "mclass", target_feature = "dsp"),
+    )
+))]
+pub use self::dsp::*;
+
 #[cfg(any(target_arch = "aarch64", target_feature = "v7"))]
 mod v7;
 #[cfg(any(target_arch = "aarch64", target_feature = "v7"))]

crates/core_arch/src/arm/mod.rs

@@ -371,6 +371,21 @@ fn verify_all_signatures() {
                 "vsriq_n_p8",
                 "vsri_n_p16",
                 "vsriq_n_p16",
+                "__smulbb",
+                "__smultb",
+                "__smulbt",
+                "__smultt",
+                "__smulwb",
+                "__smulwt",
+                "__qadd",
+                "__qsub",
+                "__qdbl",
+                "__smlabb",
+                "__smlabt",
+                "__smlatb",
+                "__smlatt",
+                "__smlawb",
+                "__smlawt",
             ];
             if !skip.contains(&rust.name) {
                 println!(
@@ -396,7 +411,13 @@ fn verify_all_signatures() {
         }
         // Skip some intrinsics that are present in GCC and Clang but
         // are missing from the official documentation.
-        let skip_intrinsic_verify = ["vmov_n_p64", "vmovq_n_p64", "vreinterpret_p64_s64", "vreinterpret_f32_p64", "vreinterpretq_f32_p64"];
+        let skip_intrinsic_verify = [
+            "vmov_n_p64",
+            "vmovq_n_p64",
+            "vreinterpret_p64_s64",
+            "vreinterpret_f32_p64",
+            "vreinterpretq_f32_p64",
+        ];
         let arm = match map.get(rust.name) {
             Some(i) => i,
             None => {