From d51db4275b5271b0349b3d6f21e5eea2d0ee62fc Mon Sep 17 00:00:00 2001 From: Jamie Cunliffe Date: Wed, 25 Jan 2023 16:05:24 +0000 Subject: [PATCH] Make v8a match optional in the test feature list. --- tests/codegen/tied-features-strength.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/codegen/tied-features-strength.rs b/tests/codegen/tied-features-strength.rs index 36fd717e914..5dc9ae47e79 100644 --- a/tests/codegen/tied-features-strength.rs +++ b/tests/codegen/tied-features-strength.rs @@ -3,17 +3,21 @@ // compile-flags: --crate-type=rlib --target=aarch64-unknown-linux-gnu // needs-llvm-components: aarch64 +// The "+v8a" feature is matched as optional as it isn't added when we +// are targeting older LLVM versions. Once the min supported version +// is LLVM-14 we can remove the regex matching for this feature. + // [ENABLE_SVE] compile-flags: -C target-feature=+sve -// ENABLE_SVE: attributes #0 = { {{.*}} "target-features"="+outline-atomics,+sve,+neon,+v8a" } +// ENABLE_SVE: attributes #0 = { {{.*}} "target-features"="+outline-atomics,+sve,+neon{{(,\+v8a)?}}" } // [DISABLE_SVE] compile-flags: -C target-feature=-sve -// DISABLE_SVE: attributes #0 = { {{.*}} "target-features"="+outline-atomics,-sve,+v8a" } +// DISABLE_SVE: attributes #0 = { {{.*}} "target-features"="+outline-atomics,-sve{{(,\+v8a)?}}" } // [DISABLE_NEON] compile-flags: -C target-feature=-neon -// DISABLE_NEON: attributes #0 = { {{.*}} "target-features"="+outline-atomics,-neon,-fp-armv8,+v8a" } +// DISABLE_NEON: attributes #0 = { {{.*}} "target-features"="+outline-atomics,-neon,-fp-armv8{{(,\+v8a)?}}" } // [ENABLE_NEON] compile-flags: -C target-feature=+neon -// ENABLE_NEON: attributes #0 = { {{.*}} "target-features"="+outline-atomics,+neon,+fp-armv8,+v8a" } +// ENABLE_NEON: attributes #0 = { {{.*}} "target-features"="+outline-atomics,+neon,+fp-armv8{{(,\+v8a)?}}" } #![feature(no_core, lang_items)]