[PowerPC][NFC] Add missing P10 code enablement asm/disasm tests

Fix/add missing p10 enablement asm/dis-asm tests and remove
obsolete test files now that all p10 instruction enablement patches
have been committed.

diff --git a/llvm/test/MC/Disassembler/PowerPC/p10insts.txt b/llvm/test/MC/Disassembler/PowerPC/p10insts.txt
deleted file mode 100644 (file)
index e2bfee6..0000000
--- a/llvm/test/MC/Disassembler/PowerPC/p10insts.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# RUN: llvm-mc --disassemble %s -triple powerpc64-unknown-linux-gnu -mcpu=pwr10
-##############################################################################
-# CONTENT MOVED TO ppc64-encoding-ISA31.txt, please do NOT add to this file
-##############################################################################

diff --git a/llvm/test/MC/Disassembler/PowerPC/ppc64-encoding-ISA31.txt b/llvm/test/MC/Disassembler/PowerPC/ppc64-encoding-ISA31.txt
index 1bbc612..6ca48e0 100644 (file)
--- a/llvm/test/MC/Disassembler/PowerPC/ppc64-encoding-ISA31.txt
+++ b/llvm/test/MC/Disassembler/PowerPC/ppc64-encoding-ISA31.txt
@@ -7,6 +7,12 @@
 # CHECK: paddi 1, 0, -8589934592, 1
 0x06 0x12 0x00 0x00 0x38 0x20 0x00 0x00
 
+# CHECK: pli 1, -8589934592
+0x06 0x02 0x00 0x00 0x38 0x20 0x00 0x00
+
+# CHECK: pli 1, 8589934591
+0x06 0x01 0xff 0xff 0x38 0x20 0xff 0xff
+
 # Largest positive displacement.
 # CHECK: plxv 31, 8589934591(3), 0
 0x04 0x01 0xff 0xff 0xcb 0xe3 0xff 0xff
@@ -379,16 +385,16 @@
 # CHECK: cnttzdm 1, 3, 2
 0x7c 0x61 0x14 0x76
 
-# CHECK xxgenpcvbm 0, 1, 2
+# CHECK: xxgenpcvbm 0, 1, 2
 0xf0 0x02 0x0f 0x28
 
-# CHECK xxgenpcvhm 0, 1, 2
+# CHECK: xxgenpcvhm 0, 1, 2
 0xf0 0x02 0x0f 0x2a
 
-# CHECK xxgenpcvwm 0, 1, 2
+# CHECK: xxgenpcvwm 0, 1, 2
 0xf0 0x02 0x0f 0x68
 
-# CHECK xxgenpcvdm 0, 1, 2
+# CHECK: xxgenpcvdm 0, 1, 2
 0xf0 0x02 0x0f 0x6a
 
 # CHECK: vclrlb 1, 4, 3
@@ -465,6 +471,9 @@
 # CHECK: vmulld 1, 2, 3
 0x10 0x22 0x19 0xc9
 
+# CHECK: vmodsq 3, 4, 5
+0x10 0x64 0x2f 0x0b
+
 # CHECK: vmodsw 21, 11, 10
 0x12 0xab 0x57 0x8b
 
@@ -714,6 +723,12 @@
 # CHECK: vcmpgtuq. 4, 5, 6
 0x10 0x85 0x36 0x87
 
+# CHECK: vcmpsq 7, 1, 2
+0x13 0x81 0x11 0x41
+
+# CHECK: vcmpuq 7, 1, 2
+0x13 0x81 0x11 0x01
+
 # CHECK: vmoduq 3, 4, 5
 0x10 0x64 0x2e 0x0b
 
@@ -795,6 +810,9 @@
 # CHECK: xvcvbf16spn 33, 34
 0xf0 0x30 0x17 0x6f
 
+# CHECK: xvtlsbb 1, 7
+0xf0 0x82 0x3f 0x6c
+
 # CHECK: hashst 5, -8(1)
 0x7f 0xe1 0x2d 0xa5
 

diff --git a/llvm/test/MC/PowerPC/p10.s b/llvm/test/MC/PowerPC/p10.s
deleted file mode 100644 (file)
index b99d28e..0000000
--- a/llvm/test/MC/PowerPC/p10.s
+++ /dev/null
@@ -1,4 +0,0 @@
-# RUN: llvm-mc -triple powerpc64-unknown-linux-gnu --show-encoding %s
-##############################################################################
-# CONTENT MOVED TO ppc64-encoding-ISA31.s, please do NOT add to this file
-##############################################################################

diff --git a/llvm/test/MC/PowerPC/ppc64-encoding-ISA31.s b/llvm/test/MC/PowerPC/ppc64-encoding-ISA31.s
index efd9354..d2d0d44 100644 (file)
--- a/llvm/test/MC/PowerPC/ppc64-encoding-ISA31.s
+++ b/llvm/test/MC/PowerPC/ppc64-encoding-ISA31.s
@@ -675,6 +675,9 @@
 # CHECK-BE: vmulhud 1, 2, 3                       # encoding: [0x10,0x22,0x1a,0xc9]
 # CHECK-LE: vmulhud 1, 2, 3                       # encoding: [0xc9,0x1a,0x22,0x10]
             vmulhud 1, 2, 3
+# CHECK-BE: vmodsq 3, 4, 5                        # encoding: [0x10,0x64,0x2f,0x0b]
+# CHECK-LE: vmodsq 3, 4, 5                        # encoding: [0x0b,0x2f,0x64,0x10]
+            vmodsq 3, 4, 5
 # CHECK-BE: vmodsw 21, 11, 10                     # encoding: [0x12,0xab,0x57,0x8b]
 # CHECK-LE: vmodsw 21, 11, 10                     # encoding: [0x8b,0x57,0xab,0x12]
             vmodsw 21, 11, 10
@@ -912,6 +915,15 @@
 # CHECK-BE: vcmpgtuq. 4, 5, 6                     # encoding: [0x10,0x85,0x36,0x87]
 # CHECK-LE: vcmpgtuq. 4, 5, 6                     # encoding: [0x87,0x36,0x85,0x10]
             vcmpgtuq. 4, 5, 6
+# CHECK-BE: vcmpsq 7, 1, 2                        # encoding: [0x13,0x81,0x11,0x41]
+# CHECK-LE: vcmpsq 7, 1, 2                        # encoding: [0x41,0x11,0x81,0x13]
+            vcmpsq 7, 1, 2
+# CHECK-BE: vcmpuq 7, 1, 2                        # encoding: [0x13,0x81,0x11,0x01]
+# CHECK-LE: vcmpuq 7, 1, 2                        # encoding: [0x01,0x11,0x81,0x13]
+            vcmpuq 7, 1, 2
+# CHECK-BE: vmodsq 3, 4, 5                        # encoding: [0x10,0x64,0x2f,0x0b]
+# CHECK-LE: vmodsq 3, 4, 5                        # encoding: [0x0b,0x2f,0x64,0x10]
+            vmodsq 3, 4, 5
 # CHECK-BE: vmoduq 3, 4, 5                        # encoding: [0x10,0x64,0x2e,0x0b]
 # CHECK-LE: vmoduq 3, 4, 5                        # encoding: [0x0b,0x2e,0x64,0x10]
             vmoduq 3, 4, 5
@@ -981,6 +993,9 @@
 # CHECK-BE: vstrihr. 2, 2                         # encoding: [0x10,0x43,0x14,0x0d]
 # CHECK-LE: vstrihr. 2, 2                         # encoding: [0x0d,0x14,0x43,0x10]
             vstrihr. 2, 2
+# CHECK-BE: vstrihl 2, 4                          # encoding: [0x10,0x42,0x20,0x0d]
+# CHECK-LE: vstrihl 2, 4                          # encoding: [0x0d,0x20,0x42,0x10]
+            vstrihl 2, 4
 # CHECK-BE: vstrihl. 2, 2                         # encoding: [0x10,0x42,0x14,0x0d]
 # CHECK-LE: vstrihl. 2, 2                         # encoding: [0x0d,0x14,0x42,0x10]
             vstrihl. 2, 2
@@ -990,6 +1005,9 @@
 # CHECK-BE: xvcvbf16spn 33, 34                    # encoding: [0xf0,0x30,0x17,0x6f]
 # CHECK-LE: xvcvbf16spn 33, 34                    # encoding: [0x6f,0x17,0x30,0xf0]
             xvcvbf16spn 33, 34
+# CHECK-BE: xvtlsbb 1, 7                          # encoding: [0xf0,0x82,0x3f,0x6c]
+# CHECK-LE: xvtlsbb 1, 7                          # encoding: [0x6c,0x3f,0x82,0xf0]
+            xvtlsbb 1, 7
 # CHECK-BE: hashst 5, -8(1)                       # encoding: [0x7f,0xe1,0x2d,0xa5]
 # CHECK-LE: hashst 5, -8(1)                       # encoding: [0xa5,0x2d,0xe1,0x7f]
             hashst 5, -8(1)