diff --git a/llvm/test/MC/ARM/directive-arch_extension-fp.s b/llvm/test/MC/ARM/directive-arch_extension-fp.s
--- a/llvm/test/MC/ARM/directive-arch_extension-fp.s
+++ b/llvm/test/MC/ARM/directive-arch_extension-fp.s
@@ -1,11 +1,11 @@
 @ RUN: not llvm-mc -triple armv7-eabi -filetype asm -o /dev/null 2>&1 %s \
 @ RUN:   | FileCheck %s -check-prefix CHECK-V7 -check-prefix CHECK
 @ RUN: not llvm-mc -triple armv8-eabi -filetype asm -o /dev/null 2>&1 %s \
-@ RUN:   | FileCheck %s -check-prefix CHECK-V8 -check-prefix CHECK
+@ RUN:   | FileCheck %s -check-prefix CHECK
 @ RUN: not llvm-mc -triple thumbv7-eabi -filetype asm -o /dev/null 2>&1 %s \
 @ RUN:   | FileCheck %s -check-prefix CHECK-V7 -check-prefix CHECK
 @ RUN: not llvm-mc -triple thumbv8-eabi -filetype asm -o /dev/null 2>&1 %s \
-@ RUN:   | FileCheck %s -check-prefix CHECK-V8 -check-prefix CHECK
+@ RUN:   | FileCheck %s -check-prefix CHECK
 
 	.syntax unified
 
diff --git a/llvm/test/MC/ARM/directive-arch_extension-idiv.s b/llvm/test/MC/ARM/directive-arch_extension-idiv.s
--- a/llvm/test/MC/ARM/directive-arch_extension-idiv.s
+++ b/llvm/test/MC/ARM/directive-arch_extension-idiv.s
@@ -1,15 +1,15 @@
 @ RUN: not llvm-mc -triple armv6-eabi -filetype asm -o /dev/null 2>&1 %s \
 @ RUN:   | FileCheck %s -check-prefix CHECK-ARMv6 -check-prefix CHECK-V6
 @ RUN: not llvm-mc -triple armv7-eabi -filetype asm -o /dev/null 2>&1 %s \
-@ RUN:   | FileCheck %s -check-prefix CHECK-ARMv7 -check-prefix CHECK-V7
+@ RUN:   | FileCheck %s -check-prefix CHECK-ARMv7
 @ RUN: not llvm-mc -triple armv7m-eabi -filetype asm -o /dev/null 2>&1 %s \
-@ RUN:   | FileCheck %s -check-prefix CHECK-ARMv7M -check-prefix CHECK-V7M
+@ RUN:   | FileCheck %s -check-prefix CHECK-V7M
 @ RUN: not llvm-mc -triple thumbv6-eabi -filetype asm -o /dev/null 2>&1 %s \
 @ RUN:   | FileCheck %s -check-prefix CHECK-THUMBv6 -check-prefix CHECK-V6
 @ RUN: not llvm-mc -triple thumbv7-eabi -filetype asm -o /dev/null 2>&1 %s \
-@ RUN:   | FileCheck %s -check-prefix CHECK-THUMBv7 -check-prefix CHECK-V7
+@ RUN:   | FileCheck %s -check-prefix CHECK-THUMBv7
 @ RUN: not llvm-mc -triple thumbv7m-eabi -filetype asm -o /dev/null 2>&1 %s \
-@ RUN:   | FileCheck %s -check-prefix CHECK-THUMBv7M -check-prefix CHECK-V7M
+@ RUN:   | FileCheck %s -check-prefix CHECK-V7M
 
 	.syntax unified
 
diff --git a/llvm/test/MC/ARM/directive-arch_extension-mp.s b/llvm/test/MC/ARM/directive-arch_extension-mp.s
--- a/llvm/test/MC/ARM/directive-arch_extension-mp.s
+++ b/llvm/test/MC/ARM/directive-arch_extension-mp.s
@@ -1,15 +1,15 @@
 @ RUN: not llvm-mc -triple armv6-eabi -filetype asm -o /dev/null 2>&1 %s \
-@ RUN:   | FileCheck %s -check-prefix CHECK-ARMv6 -check-prefix CHECK-V6
+@ RUN:   | FileCheck %s -check-prefix CHECK-V6
 @ RUN: not llvm-mc -triple armv7-eabi -filetype asm -o /dev/null 2>&1 %s \
-@ RUN:   | FileCheck %s -check-prefix CHECK-ARMv7 -check-prefix CHECK-V7
+@ RUN:   | FileCheck %s -check-prefix CHECK-V7
 @ RUN: not llvm-mc -triple armv7m-eabi -filetype asm -o /dev/null 2>&1 %s \
-@ RUN:   | FileCheck %s -check-prefix CHECK-ARMv7M -check-prefix CHECK-V7M
+@ RUN:   | FileCheck %s -check-prefix CHECK-V7M
 @ RUN: not llvm-mc -triple thumbv6-eabi -filetype asm -o /dev/null 2>&1 %s \
-@ RUN:   | FileCheck %s -check-prefix CHECK-THUMBv6 -check-prefix CHECK-V6
+@ RUN:   | FileCheck %s -check-prefix CHECK-V6
 @ RUN: not llvm-mc -triple thumbv7-eabi -filetype asm -o /dev/null 2>&1 %s \
-@ RUN:   | FileCheck %s -check-prefix CHECK-THUMBv7 -check-prefix CHECK-V7
+@ RUN:   | FileCheck %s -check-prefix CHECK-V7
 @ RUN: not llvm-mc -triple thumbv7m-eabi -filetype asm -o /dev/null 2>&1 %s \
-@ RUN:   | FileCheck %s -check-prefix CHECK-THUMBv7M -check-prefix CHECK-V7M
+@ RUN:   | FileCheck %s -check-prefix CHECK-V7M
 
 	.syntax unified
 
diff --git a/llvm/test/MC/ARM/directive-arch_extension-simd.s b/llvm/test/MC/ARM/directive-arch_extension-simd.s
--- a/llvm/test/MC/ARM/directive-arch_extension-simd.s
+++ b/llvm/test/MC/ARM/directive-arch_extension-simd.s
@@ -1,11 +1,11 @@
 @ RUN: not llvm-mc -triple armv7-eabi -filetype asm -o /dev/null 2>&1 %s \
 @ RUN:   | FileCheck %s -check-prefix CHECK-V7 -check-prefix CHECK
 @ RUN: not llvm-mc -triple armv8-eabi -filetype asm -o /dev/null 2>&1 %s \
-@ RUN:   | FileCheck %s -check-prefix CHECK-V8 -check-prefix CHECK
+@ RUN:   | FileCheck %s -check-prefix CHECK
 @ RUN: not llvm-mc -triple thumbv7-eabi -filetype asm -o /dev/null 2>&1 %s \
 @ RUN:   | FileCheck %s -check-prefix CHECK-V7 -check-prefix CHECK
 @ RUN: not llvm-mc -triple thumbv8-eabi -filetype asm -o /dev/null 2>&1 %s \
-@ RUN:   | FileCheck %s -check-prefix CHECK-V8 -check-prefix CHECK
+@ RUN:   | FileCheck %s -check-prefix CHECK
 
 	.syntax unified