[llvm] 3163269 - [PowerPC][NFC] Rename/organize encoding test files for ISA3.1
Lei Huang via llvm-commits
llvm-commits at lists.llvm.org
Tue Jun 30 09:47:53 PDT 2020
Author: Lei Huang
Date: 2020-06-30T11:42:36-05:00
New Revision: 3163269275dc6c778e5be005454ef1ffc8ed4a20
URL: https://github.com/llvm/llvm-project/commit/3163269275dc6c778e5be005454ef1ffc8ed4a20
DIFF: https://github.com/llvm/llvm-project/commit/3163269275dc6c778e5be005454ef1ffc8ed4a20.diff
LOG: [PowerPC][NFC] Rename/organize encoding test files for ISA3.1
Rename `future*` encoding test files to include ISA3.1 in the file name
and combine with exisitng ISA3.1 instruction encoding tests that were
added into `p10*` test files.
Keeping the `p10*` files for now to ensure we don't add more to it.
Will remove once all ISA3.1 instruction are implemented.
Added:
llvm/test/MC/Disassembler/PowerPC/ppc64-encoding-ISA31-invalid.txt
llvm/test/MC/Disassembler/PowerPC/ppc64-encoding-ISA31.txt
llvm/test/MC/PowerPC/ppc64-encoding-ISA31-errors.s
llvm/test/MC/PowerPC/ppc64-encoding-ISA31-pcrel-reloc.s
llvm/test/MC/PowerPC/ppc64-encoding-ISA31.s
Modified:
llvm/test/MC/Disassembler/PowerPC/p10insts.txt
llvm/test/MC/PowerPC/p10.s
Removed:
llvm/test/MC/Disassembler/PowerPC/future-invalid.txt
llvm/test/MC/Disassembler/PowerPC/futureinsts.txt
llvm/test/MC/PowerPC/future-errors.s
llvm/test/MC/PowerPC/future-reloc.s
llvm/test/MC/PowerPC/future.s
################################################################################
diff --git a/llvm/test/MC/Disassembler/PowerPC/p10insts.txt b/llvm/test/MC/Disassembler/PowerPC/p10insts.txt
index 5e690fe1c69f..e2bfee65eeda 100644
--- a/llvm/test/MC/Disassembler/PowerPC/p10insts.txt
+++ b/llvm/test/MC/Disassembler/PowerPC/p10insts.txt
@@ -1,56 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple powerpc64-unknown-linux-gnu \
-# RUN: -mcpu=pwr10 | FileCheck %s
-
-# CHECK: vpdepd 1, 2, 0
-0x10 0x22 0x05 0xcd
-
-# CHECK: vpextd 1, 2, 0
-0x10 0x22 0x05 0x8d
-
-# CHECK: pdepd 1, 2, 4
-0x7c 0x41 0x21 0x38
-
-# CHECK: pextd 1, 2, 4
-0x7c 0x41 0x21 0x78
-
-# CHECK: vcfuged 1, 2, 4
-0x10 0x22 0x25 0x4d
-
-# CHECK: cfuged 1, 2, 4
-0x7c 0x41 0x21 0xb8
-
-# CHECK: vgnb 1, 2, 2
-0x10 0x22 0x14 0xcc
-
-# CHECK: xxeval 32, 1, 2, 3, 2
-0x05 0x00 0x00 0x02 0x88 0x01 0x10 0xd1
-
-# CHECK: vclzdm 1, 2, 3
-0x10 0x22 0x1f 0x84
-
-# CHECK: vctzdm 1, 2, 3
-0x10 0x22 0x1f 0xc4
-
-# CHECK: cntlzdm 1, 3, 2
-0x7c 0x61 0x10 0x76
-
-# CHECK: cnttzdm 1, 3, 2
-0x7c 0x61 0x14 0x76
-
-# CHECK xxgenpcvbm 0, 1, 2
-0xf0 0x02 0x0f 0x28
-
-# CHECK xxgenpcvhm 0, 1, 2
-0xf0 0x02 0x0f 0x2a
-
-# CHECK xxgenpcvwm 0, 1, 2
-0xf0 0x02 0x0f 0x68
-
-# CHECK xxgenpcvdm 0, 1, 2
-0xf0 0x02 0x0f 0x6a
-
-# CHECK: vclrlb 1, 4, 3
-0x10 0x24 0x19 0x8d
-
-# CHECK: vclrrb 1, 4, 3
-0x10 0x24 0x19 0xcd
+# 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/future-invalid.txt b/llvm/test/MC/Disassembler/PowerPC/ppc64-encoding-ISA31-invalid.txt
similarity index 98%
rename from llvm/test/MC/Disassembler/PowerPC/future-invalid.txt
rename to llvm/test/MC/Disassembler/PowerPC/ppc64-encoding-ISA31-invalid.txt
index af458f8ddfce..3b2e4e2a0161 100644
--- a/llvm/test/MC/Disassembler/PowerPC/future-invalid.txt
+++ b/llvm/test/MC/Disassembler/PowerPC/ppc64-encoding-ISA31-invalid.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -mcpu=future -triple \
+# RUN: llvm-mc --disassemble %s -mcpu=pwr10 -triple \
# RUN: powerpc64-unknown-linux-gnu < %s 2>&1 | FileCheck %s
# paddi 1, 2, 8589934591, 1. However, RA is not zero with R=1
diff --git a/llvm/test/MC/Disassembler/PowerPC/futureinsts.txt b/llvm/test/MC/Disassembler/PowerPC/ppc64-encoding-ISA31.txt
similarity index 79%
rename from llvm/test/MC/Disassembler/PowerPC/futureinsts.txt
rename to llvm/test/MC/Disassembler/PowerPC/ppc64-encoding-ISA31.txt
index 26ca8cc843ac..7be7ea9ac5b4 100644
--- a/llvm/test/MC/Disassembler/PowerPC/futureinsts.txt
+++ b/llvm/test/MC/Disassembler/PowerPC/ppc64-encoding-ISA31.txt
@@ -1,5 +1,5 @@
# RUN: llvm-mc --disassemble %s -triple powerpc64-unknown-linux-gnu \
-# RUN: -mcpu=future | FileCheck %s
+# RUN: -mcpu=pwr10 | FileCheck %s
# CHECK: paddi 1, 2, 8589934591, 0
0x06 0x01 0xff 0xff 0x38 0x22 0xff 0xff
@@ -133,3 +133,56 @@
# CHECK: pld 1, 8589934591(0), 1
0x04 0x11 0xff 0xff 0xe4 0x20 0xff 0xff
+# CHECK: vpdepd 1, 2, 0
+0x10 0x22 0x05 0xcd
+
+# CHECK: vpextd 1, 2, 0
+0x10 0x22 0x05 0x8d
+
+# CHECK: pdepd 1, 2, 4
+0x7c 0x41 0x21 0x38
+
+# CHECK: pextd 1, 2, 4
+0x7c 0x41 0x21 0x78
+
+# CHECK: vcfuged 1, 2, 4
+0x10 0x22 0x25 0x4d
+
+# CHECK: cfuged 1, 2, 4
+0x7c 0x41 0x21 0xb8
+
+# CHECK: vgnb 1, 2, 2
+0x10 0x22 0x14 0xcc
+
+# CHECK: xxeval 32, 1, 2, 3, 2
+0x05 0x00 0x00 0x02 0x88 0x01 0x10 0xd1
+
+# CHECK: vclzdm 1, 2, 3
+0x10 0x22 0x1f 0x84
+
+# CHECK: vctzdm 1, 2, 3
+0x10 0x22 0x1f 0xc4
+
+# CHECK: cntlzdm 1, 3, 2
+0x7c 0x61 0x10 0x76
+
+# CHECK: cnttzdm 1, 3, 2
+0x7c 0x61 0x14 0x76
+
+# CHECK xxgenpcvbm 0, 1, 2
+0xf0 0x02 0x0f 0x28
+
+# CHECK xxgenpcvhm 0, 1, 2
+0xf0 0x02 0x0f 0x2a
+
+# CHECK xxgenpcvwm 0, 1, 2
+0xf0 0x02 0x0f 0x68
+
+# CHECK xxgenpcvdm 0, 1, 2
+0xf0 0x02 0x0f 0x6a
+
+# CHECK: vclrlb 1, 4, 3
+0x10 0x24 0x19 0x8d
+
+# CHECK: vclrrb 1, 4, 3
+0x10 0x24 0x19 0xcd
diff --git a/llvm/test/MC/PowerPC/p10.s b/llvm/test/MC/PowerPC/p10.s
index e0fbf58b91af..b99d28e86158 100644
--- a/llvm/test/MC/PowerPC/p10.s
+++ b/llvm/test/MC/PowerPC/p10.s
@@ -1,61 +1,4 @@
-# RUN: llvm-mc -triple powerpc64-unknown-linux-gnu --show-encoding %s | \
-# RUN: FileCheck -check-prefix=CHECK-BE %s
-# RUN: llvm-mc -triple powerpc64le-unknown-linux-gnu --show-encoding %s | \
-# RUN: FileCheck -check-prefix=CHECK-LE %s
-
-# CHECK-BE: vpdepd 1, 2, 0 # encoding: [0x10,0x22,0x05,0xcd]
-# CHECK-LE: vpdepd 1, 2, 0 # encoding: [0xcd,0x05,0x22,0x10]
- vpdepd 1, 2, 0
-# CHECK-BE: vpextd 1, 2, 0 # encoding: [0x10,0x22,0x05,0x8d]
-# CHECK-LE: vpextd 1, 2, 0 # encoding: [0x8d,0x05,0x22,0x10]
- vpextd 1, 2, 0
-# CHECK-BE: pdepd 1, 2, 4 # encoding: [0x7c,0x41,0x21,0x38]
-# CHECK-LE: pdepd 1, 2, 4 # encoding: [0x38,0x21,0x41,0x7c]
- pdepd 1, 2, 4
-# CHECK-BE: pextd 1, 2, 4 # encoding: [0x7c,0x41,0x21,0x78]
-# CHECK-LE: pextd 1, 2, 4 # encoding: [0x78,0x21,0x41,0x7c]
- pextd 1, 2, 4
-# CHECK-BE: vcfuged 1, 2, 4 # encoding: [0x10,0x22,0x25,0x4d]
-# CHECK-LE: vcfuged 1, 2, 4 # encoding: [0x4d,0x25,0x22,0x10]
- vcfuged 1, 2, 4
-# CHECK-BE: cfuged 1, 2, 4 # encoding: [0x7c,0x41,0x21,0xb8]
-# CHECK-LE: cfuged 1, 2, 4 # encoding: [0xb8,0x21,0x41,0x7c]
- cfuged 1, 2, 4
-# CHECK-BE: vgnb 1, 2, 2 # encoding: [0x10,0x22,0x14,0xcc]
-# CHECK-LE: vgnb 1, 2, 2 # encoding: [0xcc,0x14,0x22,0x10]
- vgnb 1, 2, 2
-# CHECK-BE: xxeval 32, 1, 2, 3, 2 # encoding: [0x05,0x00,0x00,0x02,
-# CHECK-BE-SAME: 0x88,0x01,0x10,0xd1]
-# CHECK-LE: xxeval 32, 1, 2, 3, 2 # encoding: [0x02,0x00,0x00,0x05,
-# CHECK-LE-SAME: 0xd1,0x10,0x01,0x88]
- xxeval 32, 1, 2, 3, 2
-# CHECK-BE: vclzdm 1, 2, 3 # encoding: [0x10,0x22,0x1f,0x84]
-# CHECK-LE: vclzdm 1, 2, 3 # encoding: [0x84,0x1f,0x22,0x10]
- vclzdm 1, 2, 3
-# CHECK-BE: vctzdm 1, 2, 3 # encoding: [0x10,0x22,0x1f,0xc4]
-# CHECK-LE: vctzdm 1, 2, 3 # encoding: [0xc4,0x1f,0x22,0x10]
- vctzdm 1, 2, 3
-# CHECK-BE: cntlzdm 1, 3, 2 # encoding: [0x7c,0x61,0x10,0x76]
-# CHECK-LE: cntlzdm 1, 3, 2 # encoding: [0x76,0x10,0x61,0x7c]
- cntlzdm 1, 3, 2
-# CHECK-BE: cnttzdm 1, 3, 2 # encoding: [0x7c,0x61,0x14,0x76]
-# CHECK-LE: cnttzdm 1, 3, 2 # encoding: [0x76,0x14,0x61,0x7c]
- cnttzdm 1, 3, 2
-# CHECK-BE: xxgenpcvbm 0, 1, 2 # encoding: [0xf0,0x02,0x0f,0x28]
-# CHECK-LE: xxgenpcvbm 0, 1, 2 # encoding: [0x28,0x0f,0x02,0xf0]
- xxgenpcvbm 0, 1, 2
-# CHECK-BE: xxgenpcvhm 0, 1, 2 # encoding: [0xf0,0x02,0x0f,0x2a]
-# CHECK-LE: xxgenpcvhm 0, 1, 2 # encoding: [0x2a,0x0f,0x02,0xf0]
- xxgenpcvhm 0, 1, 2
-# CHECK-BE: xxgenpcvwm 0, 1, 2 # encoding: [0xf0,0x02,0x0f,0x68]
-# CHECK-LE: xxgenpcvwm 0, 1, 2 # encoding: [0x68,0x0f,0x02,0xf0]
- xxgenpcvwm 0, 1, 2
-# CHECK-BE: xxgenpcvdm 0, 1, 2 # encoding: [0xf0,0x02,0x0f,0x6a]
-# CHECK-LE: xxgenpcvdm 0, 1, 2 # encoding: [0x6a,0x0f,0x02,0xf0]
- xxgenpcvdm 0, 1, 2
-# CHECK-BE: vclrlb 1, 4, 3 # encoding: [0x10,0x24,0x19,0x8d]
-# CHECK-LE: vclrlb 1, 4, 3 # encoding: [0x8d,0x19,0x24,0x10]
- vclrlb 1, 4, 3
-# CHECK-BE: vclrrb 1, 4, 3 # encoding: [0x10,0x24,0x19,0xcd]
-# CHECK-LE: vclrrb 1, 4, 3 # encoding: [0xcd,0x19,0x24,0x10]
- vclrrb 1, 4, 3
+# 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/future-errors.s b/llvm/test/MC/PowerPC/ppc64-encoding-ISA31-errors.s
similarity index 100%
rename from llvm/test/MC/PowerPC/future-errors.s
rename to llvm/test/MC/PowerPC/ppc64-encoding-ISA31-errors.s
diff --git a/llvm/test/MC/PowerPC/future-reloc.s b/llvm/test/MC/PowerPC/ppc64-encoding-ISA31-pcrel-reloc.s
similarity index 100%
rename from llvm/test/MC/PowerPC/future-reloc.s
rename to llvm/test/MC/PowerPC/ppc64-encoding-ISA31-pcrel-reloc.s
diff --git a/llvm/test/MC/PowerPC/future.s b/llvm/test/MC/PowerPC/ppc64-encoding-ISA31.s
similarity index 81%
rename from llvm/test/MC/PowerPC/future.s
rename to llvm/test/MC/PowerPC/ppc64-encoding-ISA31.s
index dd5c549e7a4b..13fa0f471377 100644
--- a/llvm/test/MC/PowerPC/future.s
+++ b/llvm/test/MC/PowerPC/ppc64-encoding-ISA31.s
@@ -3,7 +3,6 @@
# RUN: llvm-mc -triple powerpc64le-unknown-linux-gnu --show-encoding %s | \
# RUN: FileCheck -check-prefix=CHECK-LE %s
-
# CHECK-BE: plxv 63, 8589934591(0), 1 # encoding: [0x04,0x11,0xff,0xff
# CHECK-BE-SAME: 0xcf,0xe0,0xff,0xff]
# CHECK-LE: plxv 63, 8589934591(0), 1 # encoding: [0xff,0xff,0x11,0x04
@@ -224,4 +223,59 @@
# CHECK-LE: pld 1, 8589934591(0), 1 # encoding: [0xff,0xff,0x11,0x04,
# CHECK-LE-SAME: 0xff,0xff,0x20,0xe4]
pld 1, 8589934591(0), 1
-
+# CHECK-BE: vpdepd 1, 2, 0 # encoding: [0x10,0x22,0x05,0xcd]
+# CHECK-LE: vpdepd 1, 2, 0 # encoding: [0xcd,0x05,0x22,0x10]
+ vpdepd 1, 2, 0
+# CHECK-BE: vpextd 1, 2, 0 # encoding: [0x10,0x22,0x05,0x8d]
+# CHECK-LE: vpextd 1, 2, 0 # encoding: [0x8d,0x05,0x22,0x10]
+ vpextd 1, 2, 0
+# CHECK-BE: pdepd 1, 2, 4 # encoding: [0x7c,0x41,0x21,0x38]
+# CHECK-LE: pdepd 1, 2, 4 # encoding: [0x38,0x21,0x41,0x7c]
+ pdepd 1, 2, 4
+# CHECK-BE: pextd 1, 2, 4 # encoding: [0x7c,0x41,0x21,0x78]
+# CHECK-LE: pextd 1, 2, 4 # encoding: [0x78,0x21,0x41,0x7c]
+ pextd 1, 2, 4
+# CHECK-BE: vcfuged 1, 2, 4 # encoding: [0x10,0x22,0x25,0x4d]
+# CHECK-LE: vcfuged 1, 2, 4 # encoding: [0x4d,0x25,0x22,0x10]
+ vcfuged 1, 2, 4
+# CHECK-BE: cfuged 1, 2, 4 # encoding: [0x7c,0x41,0x21,0xb8]
+# CHECK-LE: cfuged 1, 2, 4 # encoding: [0xb8,0x21,0x41,0x7c]
+ cfuged 1, 2, 4
+# CHECK-BE: vgnb 1, 2, 2 # encoding: [0x10,0x22,0x14,0xcc]
+# CHECK-LE: vgnb 1, 2, 2 # encoding: [0xcc,0x14,0x22,0x10]
+ vgnb 1, 2, 2
+# CHECK-BE: xxeval 32, 1, 2, 3, 2 # encoding: [0x05,0x00,0x00,0x02,
+# CHECK-BE-SAME: 0x88,0x01,0x10,0xd1]
+# CHECK-LE: xxeval 32, 1, 2, 3, 2 # encoding: [0x02,0x00,0x00,0x05,
+# CHECK-LE-SAME: 0xd1,0x10,0x01,0x88]
+ xxeval 32, 1, 2, 3, 2
+# CHECK-BE: vclzdm 1, 2, 3 # encoding: [0x10,0x22,0x1f,0x84]
+# CHECK-LE: vclzdm 1, 2, 3 # encoding: [0x84,0x1f,0x22,0x10]
+ vclzdm 1, 2, 3
+# CHECK-BE: vctzdm 1, 2, 3 # encoding: [0x10,0x22,0x1f,0xc4]
+# CHECK-LE: vctzdm 1, 2, 3 # encoding: [0xc4,0x1f,0x22,0x10]
+ vctzdm 1, 2, 3
+# CHECK-BE: cntlzdm 1, 3, 2 # encoding: [0x7c,0x61,0x10,0x76]
+# CHECK-LE: cntlzdm 1, 3, 2 # encoding: [0x76,0x10,0x61,0x7c]
+ cntlzdm 1, 3, 2
+# CHECK-BE: cnttzdm 1, 3, 2 # encoding: [0x7c,0x61,0x14,0x76]
+# CHECK-LE: cnttzdm 1, 3, 2 # encoding: [0x76,0x14,0x61,0x7c]
+ cnttzdm 1, 3, 2
+# CHECK-BE: xxgenpcvbm 0, 1, 2 # encoding: [0xf0,0x02,0x0f,0x28]
+# CHECK-LE: xxgenpcvbm 0, 1, 2 # encoding: [0x28,0x0f,0x02,0xf0]
+ xxgenpcvbm 0, 1, 2
+# CHECK-BE: xxgenpcvhm 0, 1, 2 # encoding: [0xf0,0x02,0x0f,0x2a]
+# CHECK-LE: xxgenpcvhm 0, 1, 2 # encoding: [0x2a,0x0f,0x02,0xf0]
+ xxgenpcvhm 0, 1, 2
+# CHECK-BE: xxgenpcvwm 0, 1, 2 # encoding: [0xf0,0x02,0x0f,0x68]
+# CHECK-LE: xxgenpcvwm 0, 1, 2 # encoding: [0x68,0x0f,0x02,0xf0]
+ xxgenpcvwm 0, 1, 2
+# CHECK-BE: xxgenpcvdm 0, 1, 2 # encoding: [0xf0,0x02,0x0f,0x6a]
+# CHECK-LE: xxgenpcvdm 0, 1, 2 # encoding: [0x6a,0x0f,0x02,0xf0]
+ xxgenpcvdm 0, 1, 2
+# CHECK-BE: vclrlb 1, 4, 3 # encoding: [0x10,0x24,0x19,0x8d]
+# CHECK-LE: vclrlb 1, 4, 3 # encoding: [0x8d,0x19,0x24,0x10]
+ vclrlb 1, 4, 3
+# CHECK-BE: vclrrb 1, 4, 3 # encoding: [0x10,0x24,0x19,0xcd]
+# CHECK-LE: vclrrb 1, 4, 3 # encoding: [0xcd,0x19,0x24,0x10]
+ vclrrb 1, 4, 3
More information about the llvm-commits
mailing list