From e9f387e0cb4d4a812f9849fbec7d9e8b81d021b6 Mon Sep 17 00:00:00 2001 From: YunQiang Su Date: Tue, 9 Apr 2019 11:20:35 +0800 Subject: [PATCH 1/2] Support MIPS r6 triples MIPS r6 uses some new triples: mipsisa{64,32}r6{,el}-linux-gnu{,abi64} This patch has been in rust main project. --- crates/simd-test-macro/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/simd-test-macro/src/lib.rs b/crates/simd-test-macro/src/lib.rs index 4b0abc6e23..272da43f2d 100644 --- a/crates/simd-test-macro/src/lib.rs +++ b/crates/simd-test-macro/src/lib.rs @@ -67,7 +67,7 @@ pub fn simd_test( "aarch64" => "is_aarch64_feature_detected", "powerpc" | "powerpcle" => "is_powerpc_feature_detected", "powerpc64" | "powerpc64le" => "is_powerpc64_feature_detected", - "mips" | "mipsel" => { + "mips" | "mipsel" | "mipsisa32r6" | "mipsisa32r6el" => { // FIXME: // On MIPS CI run-time feature detection always returns false due // to this qemu bug: https://bugs.launchpad.net/qemu/+bug/1754372 @@ -77,7 +77,7 @@ pub fn simd_test( force_test = true; "is_mips_feature_detected" } - "mips64" | "mips64el" => { + "mips64" | "mips64el" | "mipsisa64r6" | "mipsisa64r6el" => { // FIXME: see above force_test = true; "is_mips64_feature_detected" From 5876503844120fd5e7d868f922a4cdf5f362349b Mon Sep 17 00:00:00 2001 From: YunQiang Su Date: Tue, 9 Apr 2019 11:23:32 +0800 Subject: [PATCH 2/2] Remove workaround for MIPS CI: qemu bug fixed The qemu bug: Set MIPS MSA in ELF Auxiliary Vectors https://bugs.launchpad.net/qemu/+bug/1754372 has been fixed, so we remove the workaround. --- crates/simd-test-macro/src/lib.rs | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/crates/simd-test-macro/src/lib.rs b/crates/simd-test-macro/src/lib.rs index 272da43f2d..a67ee2009c 100644 --- a/crates/simd-test-macro/src/lib.rs +++ b/crates/simd-test-macro/src/lib.rs @@ -67,21 +67,8 @@ pub fn simd_test( "aarch64" => "is_aarch64_feature_detected", "powerpc" | "powerpcle" => "is_powerpc_feature_detected", "powerpc64" | "powerpc64le" => "is_powerpc64_feature_detected", - "mips" | "mipsel" | "mipsisa32r6" | "mipsisa32r6el" => { - // FIXME: - // On MIPS CI run-time feature detection always returns false due - // to this qemu bug: https://bugs.launchpad.net/qemu/+bug/1754372 - // - // This is a workaround to force the MIPS tests to always run on - // CI. - force_test = true; - "is_mips_feature_detected" - } - "mips64" | "mips64el" | "mipsisa64r6" | "mipsisa64r6el" => { - // FIXME: see above - force_test = true; - "is_mips64_feature_detected" - } + "mips" | "mipsel" | "mipsisa32r6" | "mipsisa32r6el" => "is_mips_feature_detected", + "mips64" | "mips64el" | "mipsisa64r6" | "mipsisa64r6el" => "is_mips64_feature_detected", t => panic!("unknown target: {}", t), }; let macro_test = Ident::new(macro_test, Span::call_site());