[ARM] Split out ARMv8-A semaphores and atomics and ARMv7 clrex as separate features

llvm-svn: 257877

3 files changed, 30 insertions, 30 deletions

diff --git a/llvm/test/MC/ARM/arm11-hint-instr.s b/llvm/test/MC/ARM/arm11-hint-instr.s
index 2c0fef4adf7..4193a686870 100644
--- a/llvm/test/MC/ARM/arm11-hint-instr.s
+++ b/llvm/test/MC/ARM/arm11-hint-instr.s
@@ -65,7 +65,7 @@
 @ CHECK-THUMB: wfe                             @ encoding: [0x20,0xbf]
 @ CHECK-THUMB: wfi                             @ encoding: [0x30,0xbf]
 @ CHECK-THUMB: sev                             @ encoding: [0x40,0xbf]
-@ CHECK-ERROR-THUMB: error: instruction requires: armv7
+@ CHECK-ERROR-THUMB: error: instruction requires: v7 clrex
 @ CHECK-ERROR-THUMB: clrex
 @ CHECK-ERROR-THUMB: ^
 
@@ -77,6 +77,6 @@
 @ CHECK-V6M: wfe                             @ encoding: [0x20,0xbf]
 @ CHECK-V6M: wfi                             @ encoding: [0x30,0xbf]
 @ CHECK-V6M: sev                             @ encoding: [0x40,0xbf]
-@ CHECK-ERROR-V6M: error: instruction requires: armv7
+@ CHECK-ERROR-V6M: error: instruction requires: v7 clrex
 @ CHECK-ERROR-V6M: clrex
 @ CHECK-ERROR-V6M: ^
diff --git a/llvm/test/MC/ARM/load-store-acquire-release-v8-thumb.s b/llvm/test/MC/ARM/load-store-acquire-release-v8-thumb.s
index e34a2638735..be8d3c324e6 100644
--- a/llvm/test/MC/ARM/load-store-acquire-release-v8-thumb.s
+++ b/llvm/test/MC/ARM/load-store-acquire-release-v8-thumb.s
@@ -9,10 +9,10 @@
 @ CHECK:  ldaexh	r2, [r5]                @ encoding: [0xd5,0xe8,0xdf,0x2f]
 @ CHECK:  ldaex	r1, [r7]                @ encoding: [0xd7,0xe8,0xef,0x1f]
 @ CHECK:  ldaexd	r6, r7, [r8]            @ encoding: [0xd8,0xe8,0xff,0x67]
-@ CHECK-V7: error: instruction requires: armv8
-@ CHECK-V7: error: instruction requires: armv8
-@ CHECK-V7: error: instruction requires: armv8
-@ CHECK-V7: error: instruction requires: armv8
+@ CHECK-V7: error: instruction requires: acquire/release
+@ CHECK-V7: error: instruction requires: acquire/release
+@ CHECK-V7: error: instruction requires: acquire/release
+@ CHECK-V7: error: instruction requires: acquire/release
 
         stlexb  r1, r3, [r4]
         stlexh  r4, r2, [r5]
@@ -22,10 +22,10 @@
 @ CHECK: stlexh r4, r2, [r5]            @ encoding: [0xc5,0xe8,0xd4,0x2f]
 @ CHECK: stlex r2, r1, [r7]            @ encoding: [0xc7,0xe8,0xe2,0x1f]
 @ CHECK: stlexd r6, r2, r3, [r8]        @ encoding: [0xc8,0xe8,0xf6,0x23]
-@ CHECK-V7: error: instruction requires: armv8
-@ CHECK-V7: error: instruction requires: armv8
-@ CHECK-V7: error: instruction requires: armv8
-@ CHECK-V7: error: instruction requires: armv8
+@ CHECK-V7: error: instruction requires: acquire/release
+@ CHECK-V7: error: instruction requires: acquire/release
+@ CHECK-V7: error: instruction requires: acquire/release
+@ CHECK-V7: error: instruction requires: acquire/release
 
          lda r5, [r6]
          ldab r5, [r6]
@@ -33,9 +33,9 @@
 @ CHECK: lda r5, [r6]                   @ encoding: [0xd6,0xe8,0xaf,0x5f]
 @ CHECK: ldab r5, [r6]                  @ encoding: [0xd6,0xe8,0x8f,0x5f]
 @ CHECK: ldah r12, [r9]                 @ encoding: [0xd9,0xe8,0x9f,0xcf]
-@ CHECK-V7: error: instruction requires: armv8
-@ CHECK-V7: error: instruction requires: armv8
-@ CHECK-V7: error: instruction requires: armv8
+@ CHECK-V7: error: instruction requires: acquire/release
+@ CHECK-V7: error: instruction requires: acquire/release
+@ CHECK-V7: error: instruction requires: acquire/release
 
          stl r3, [r0]
          stlb r2, [r1]
@@ -43,6 +43,6 @@
 @ CHECK: stl r3, [r0]                   @ encoding: [0xc0,0xe8,0xaf,0x3f]
 @ CHECK: stlb r2, [r1]                  @ encoding: [0xc1,0xe8,0x8f,0x2f]
 @ CHECK: stlh r2, [r3]                  @ encoding: [0xc3,0xe8,0x9f,0x2f]
-@ CHECK-V7: error: instruction requires: armv8
-@ CHECK-V7: error: instruction requires: armv8
-@ CHECK-V7: error: instruction requires: armv8
+@ CHECK-V7: error: instruction requires: acquire/release
+@ CHECK-V7: error: instruction requires: acquire/release
+@ CHECK-V7: error: instruction requires: acquire/release
diff --git a/llvm/test/MC/ARM/load-store-acquire-release-v8.s b/llvm/test/MC/ARM/load-store-acquire-release-v8.s
index bc55364e684..273519e050b 100644
--- a/llvm/test/MC/ARM/load-store-acquire-release-v8.s
+++ b/llvm/test/MC/ARM/load-store-acquire-release-v8.s
@@ -9,10 +9,10 @@
 @ CHECK: ldaexh r2, [r5]                @ encoding: [0x9f,0x2e,0xf5,0xe1]
 @ CHECK: ldaex r1, [r7]                @ encoding: [0x9f,0x1e,0x97,0xe1]
 @ CHECK: ldaexd r6, r7, [r8]            @ encoding: [0x9f,0x6e,0xb8,0xe1]
-@ CHECK-V7: instruction requires: armv8
-@ CHECK-V7: instruction requires: armv8
-@ CHECK-V7: instruction requires: armv8
-@ CHECK-V7: instruction requires: armv8
+@ CHECK-V7: instruction requires: acquire/release
+@ CHECK-V7: instruction requires: acquire/release
+@ CHECK-V7: instruction requires: acquire/release
+@ CHECK-V7: instruction requires: acquire/release
 
         stlexb  r1, r3, [r4]
         stlexh  r4, r2, [r5]
@@ -22,10 +22,10 @@
 @ CHECK: stlexh r4, r2, [r5]            @ encoding: [0x92,0x4e,0xe5,0xe1]
 @ CHECK: stlex r2, r1, [r7]            @ encoding: [0x91,0x2e,0x87,0xe1]
 @ CHECK: stlexd r6, r2, r3, [r8]        @ encoding: [0x92,0x6e,0xa8,0xe1]
-@ CHECK-V7: instruction requires: armv8
-@ CHECK-V7: instruction requires: armv8
-@ CHECK-V7: instruction requires: armv8
-@ CHECK-V7: instruction requires: armv8
+@ CHECK-V7: instruction requires: acquire/release
+@ CHECK-V7: instruction requires: acquire/release
+@ CHECK-V7: instruction requires: acquire/release
+@ CHECK-V7: instruction requires: acquire/release
 
          lda r5, [r6]
          ldab r5, [r6]
@@ -33,9 +33,9 @@
 @ CHECK: lda r5, [r6]                   @ encoding: [0x9f,0x5c,0x96,0xe1]
 @ CHECK: ldab r5, [r6]                  @ encoding: [0x9f,0x5c,0xd6,0xe1]
 @ CHECK: ldah r12, [r9]                 @ encoding: [0x9f,0xcc,0xf9,0xe1]
-@ CHECK-V7: instruction requires: armv8
-@ CHECK-V7: instruction requires: armv8
-@ CHECK-V7: instruction requires: armv8
+@ CHECK-V7: instruction requires: acquire/release
+@ CHECK-V7: instruction requires: acquire/release
+@ CHECK-V7: instruction requires: acquire/release
 
          stl r3, [r0]
          stlb r2, [r1]
@@ -43,6 +43,6 @@
 @ CHECK: stl r3, [r0]                   @ encoding: [0x93,0xfc,0x80,0xe1]
 @ CHECK: stlb r2, [r1]                  @ encoding: [0x92,0xfc,0xc1,0xe1]
 @ CHECK: stlh r2, [r3]                  @ encoding: [0x92,0xfc,0xe3,0xe1]
-@ CHECK-V7: instruction requires: armv8
-@ CHECK-V7: instruction requires: armv8
-@ CHECK-V7: instruction requires: armv8
+@ CHECK-V7: instruction requires: acquire/release
+@ CHECK-V7: instruction requires: acquire/release
+@ CHECK-V7: instruction requires: acquire/release