[SystemZ] Add missing (dis-)assembly tests. #88498
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This adds assembly tests for lcdfr, lncfr, and lpdfr This also adds disassembly tests for cgit, cgrt, cit, clfit, clgit, clgrt, clgt, clrt, clt, crt, lcdfr, lndfr, and lpdfr
|
@uweigand FYI |
|
@llvm/pr-subscribers-mc @llvm/pr-subscribers-backend-systemz Author: Dominik Steenken (dominik-steenken) ChangesAssembly TestsThis adds assembly tests for Disassembly TestsThis also adds a number of disassembly tests for the following menmonics: For Full diff: https://github.com/llvm/llvm-project/pull/88498.diff 4 Files Affected:
diff --git a/llvm/test/MC/Disassembler/SystemZ/insns-z14.txt b/llvm/test/MC/Disassembler/SystemZ/insns-z14.txt
index c73b50c1c2fbdc..f27388fb16a8cf 100644
--- a/llvm/test/MC/Disassembler/SystemZ/insns-z14.txt
+++ b/llvm/test/MC/Disassembler/SystemZ/insns-z14.txt
@@ -407,6 +407,12 @@
# CHECK: msgrkc %r7, %r8, %r9
0xb9 0xed 0x90 0x78
+# CHECK: ppno %r0, %r2
+0xb9 0x3c 0x00 0x02
+
+# CHECK: ppno %r12, %r14
+0xb9 0x3c 0x00 0xce
+
# CHECK: sgh %r0, -524288
0xe3 0x00 0x00 0x00 0x80 0x39
@@ -989,6 +995,9 @@
# CHECK: vflcsb %v14, %v17
0xe7 0xe1 0x00 0x00 0x24 0xcc
+# CHECK: vflls %v0, %v1
+0xe7 0x01 0x00 0x00 0x20 0xc4
+
# CHECK: vflnsb %v0, %v0
0xe7 0x00 0x00 0x10 0x20 0xcc
diff --git a/llvm/test/MC/Disassembler/SystemZ/insns.txt b/llvm/test/MC/Disassembler/SystemZ/insns.txt
index f2f942ed5d36eb..2cf3fb512333ac 100644
--- a/llvm/test/MC/Disassembler/SystemZ/insns.txt
+++ b/llvm/test/MC/Disassembler/SystemZ/insns.txt
@@ -2956,6 +2956,12 @@
# CHECK: cgib %r0, 0, 15, 0
0xec 0x0f 0x00 0x00 0x00 0xfc
+# CHECK: cgit %r0, 0, 0
+0xec 0x00 0x00 0x00 0x00 0x70
+
+# CHECK: cgit %r0, 0, 15
+0xec 0x00 0x00 0x00 0xf0 0x70
+
# CHECK: cgith %r0, 0
0xec 0x00 0x00 0x00 0x20 0x70
@@ -3052,6 +3058,12 @@
# CHECK: cgrb %r0, %r0, 15, 0
0xec 0x00 0x00 0x00 0xf0 0xe4
+# CHECK: cgrt %r0, %r1, 0
+0xb9 0x60 0x00 0x01
+
+# CHECK: cgrt %r0, %r1, 15
+0xb9 0x60 0xf0 0x01
+
# CHECK: cgrth %r0, %r1
0xb9 0x60 0x20 0x01
@@ -3430,6 +3442,12 @@
# CHECK: cih %r15, 0
0xcc 0xfd 0x00 0x00 0x00 0x00
+# CHECK: cit %r0, 0, 0
+0xec 0x00 0x00 0x00 0x00 0x72
+
+# CHECK: cit %r0, 0, 15
+0xec 0x00 0x00 0x00 0xf0 0x72
+
# CHECK: cith %r0, 0
0xec 0x00 0x00 0x00 0x20 0x72
@@ -3862,6 +3880,12 @@
# CHECK: clfi %r15, 0
0xc2 0xff 0x00 0x00 0x00 0x00
+# CHECK: clfit %r0, 0, 0
+0xec 0x00 0x00 0x00 0x00 0x73
+
+# CHECK: clfit %r0, 0, 15
+0xec 0x00 0x00 0x00 0xf0 0x73
+
# CHECK: clfith %r0, 0
0xec 0x00 0x00 0x00 0x20 0x73
@@ -3910,6 +3934,12 @@
# CHECK: clg %r15, 0
0xe3 0xf0 0x00 0x00 0x00 0x21
+# CHECK: clgit %r0, 0, 0
+0xec 0x00 0x00 0x00 0x00 0x71
+
+# CHECK: clgit %r0, 0, 15
+0xec 0x00 0x00 0x00 0xf0 0x71
+
# CHECK: clgith %r0, 0
0xec 0x00 0x00 0x00 0x20 0x71
@@ -4447,6 +4477,12 @@
# CHECK: clrb %r0, %r0, 15, 0
0xec 0x00 0x00 0x00 0xf0 0xf7
+# CHECK: clgrt %r0, %r1, 0
+0xb9 0x61 0x00 0x01
+
+# CHECK: clgrt %r0, %r1, 15
+0xb9 0x61 0xf0 0x01
+
# CHECK: clgrth %r0, %r1
0xb9 0x61 0x20 0x01
@@ -4465,6 +4501,12 @@
# CHECK: clgrtle %r0, %r1
0xb9 0x61 0xc0 0x01
+# CHECK: clrt %r0, %r1, 0
+0xb9 0x73 0x00 0x01
+
+# CHECK: clrt %r0, %r1, 15
+0xb9 0x73 0xf0 0x01
+
# CHECK: clrth %r0, %r1
0xb9 0x73 0x20 0x01
@@ -4483,6 +4525,12 @@
# CHECK: clrtle %r0, %r1
0xb9 0x73 0xc0 0x01
+# CHECK: clt %r0, 0, -524288
+0xeb 0x00 0x00 0x00 0x80 0x23
+
+# CHECK: clt %r0, 15, 32768
+0xeb 0x0f 0x00 0x00 0x08 0x23
+
# CHECK: clth %r0, -524288
0xeb 0x02 0x00 0x00 0x80 0x23
@@ -4525,6 +4573,12 @@
# CHECK: cltle %r1, 0
0xeb 0x1c 0x00 0x00 0x00 0x23
+# CHECK: clgt %r0, 0, -524288
+0xeb 0x00 0x00 0x00 0x80 0x2b
+
+# CHECK: clgt %r0, 15, 32768
+0xeb 0x0f 0x00 0x00 0x08 0x2b
+
# CHECK: clgth %r0, -524288
0xeb 0x02 0x00 0x00 0x80 0x2b
@@ -4792,6 +4846,12 @@
# CHECK: crdte %r4, %r5, %r6, 7
0xb9 0x8f 0x57 0x46
+# CHECK: crt %r0, %r1, 0
+0xb9 0x72 0x00 0x01
+
+# CHECK: crt %r0, %r1, 15
+0xb9 0x72 0xf0 0x01
+
# CHECK: crth %r0, %r1
0xb9 0x72 0x20 0x01
@@ -7972,6 +8032,18 @@
# CHECK: lcdbr %f15, %f9
0xb3 0x13 0x00 0xf9
+# CHECK: lcdfr %f0, %f9
+0xb3 0x73 0x00 0x09
+
+# CHECK: lcdfr %f0, %f15
+0xb3 0x73 0x00 0x0f
+
+# CHECK: lcdfr %f15, %f0
+0xb3 0x73 0x00 0xf0
+
+# CHECK: lcdfr %f15, %f9
+0xb3 0x73 0x00 0xf9
+
# CHECK: lcdr %f0, %f9
0x23 0x09
@@ -9570,6 +9642,18 @@
# CHECK: lndbr %f15, %f9
0xb3 0x11 0x00 0xf9
+# CHECK: lndfr %f0, %f9
+0xb3 0x71 0x00 0x09
+
+# CHECK: lndfr %f0, %f15
+0xb3 0x71 0x00 0x0f
+
+# CHECK: lndfr %f15, %f0
+0xb3 0x71 0x00 0xf0
+
+# CHECK: lndfr %f15, %f9
+0xb3 0x71 0x00 0xf9
+
# CHECK: lndr %f0, %f9
0x21 0x09
@@ -9909,6 +9993,18 @@
# CHECK: lpdbr %f15, %f9
0xb3 0x10 0x00 0xf9
+# CHECK: lpdfr %f0, %f9
+0xb3 0x70 0x00 0x09
+
+# CHECK: lpdfr %f0, %f15
+0xb3 0x70 0x00 0x0f
+
+# CHECK: lpdfr %f15, %f0
+0xb3 0x70 0x00 0xf0
+
+# CHECK: lpdfr %f15, %f9
+0xb3 0x70 0x00 0xf9
+
# CHECK: lpdg %r0, 0, 0
0xc8 0x05 0x00 0x00 0x00 0x00
@@ -10656,18 +10752,6 @@
# CHECK: lxdbr %f13, %f15
0xb3 0x05 0x00 0xdf
-# CHECK: lxdr %f0, %f8
-0xb3 0x25 0x00 0x08
-
-# CHECK: lxdr %f0, %f13
-0xb3 0x25 0x00 0x0d
-
-# CHECK: lxdr %f13, %f0
-0xb3 0x25 0x00 0xd0
-
-# CHECK: lxdr %f13, %f15
-0xb3 0x25 0x00 0xdf
-
# CHECK: lxdtr %f0, %f0, 15
0xb3 0xdc 0x0f 0x00
diff --git a/llvm/test/MC/Disassembler/SystemZ/invalid-regs.txt b/llvm/test/MC/Disassembler/SystemZ/invalid-regs.txt
index 12440677ba34a1..0ce960d5ddcc37 100644
--- a/llvm/test/MC/Disassembler/SystemZ/invalid-regs.txt
+++ b/llvm/test/MC/Disassembler/SystemZ/invalid-regs.txt
@@ -20,3 +20,10 @@
# CHECK-NEXT: 0xb9 0x97 0x00 0x18
# CHECK-NEXT: ^
0xb9 0x97 0x00 0x18
+
+# This would be "cutfu %r1, %r2", but %r1 is invalid.
+#
+# CHECK-NEXT: warning: invalid instruction encoding
+# CHECK-NEXT: 0xb2 0xa7 0x00 0x12
+# CHECK-NEXT: ^
+0xb2 0xa7 0x00 0x12
diff --git a/llvm/test/MC/SystemZ/insn-good.s b/llvm/test/MC/SystemZ/insn-good.s
index 91120f7f97aa9d..f5dd672f9dd8cf 100644
--- a/llvm/test/MC/SystemZ/insn-good.s
+++ b/llvm/test/MC/SystemZ/insn-good.s
@@ -9038,6 +9038,36 @@
lcdbr %f15,%f0
lcdbr %f15,%f9
+#CHECK: lcdfr %f0, %f9 # encoding: [0xb3,0x73,0x00,0x09]
+#CHECK: lcdfr %f0, %f15 # encoding: [0xb3,0x73,0x00,0x0f]
+#CHECK: lcdfr %f15, %f0 # encoding: [0xb3,0x73,0x00,0xf0]
+#CHECK: lcdfr %f15, %f9 # encoding: [0xb3,0x73,0x00,0xf9]
+
+ lcdfr %f0,%f9
+ lcdfr %f0,%f15
+ lcdfr %f15,%f0
+ lcdfr %f15,%f9
+
+#CHECK: lndfr %f0, %f9 # encoding: [0xb3,0x71,0x00,0x09]
+#CHECK: lndfr %f0, %f15 # encoding: [0xb3,0x71,0x00,0x0f]
+#CHECK: lndfr %f15, %f0 # encoding: [0xb3,0x71,0x00,0xf0]
+#CHECK: lndfr %f15, %f9 # encoding: [0xb3,0x71,0x00,0xf9]
+
+ lndfr %f0,%f9
+ lndfr %f0,%f15
+ lndfr %f15,%f0
+ lndfr %f15,%f9
+
+#CHECK: lpdfr %f0, %f9 # encoding: [0xb3,0x70,0x00,0x09]
+#CHECK: lpdfr %f0, %f15 # encoding: [0xb3,0x70,0x00,0x0f]
+#CHECK: lpdfr %f15, %f0 # encoding: [0xb3,0x70,0x00,0xf0]
+#CHECK: lpdfr %f15, %f9 # encoding: [0xb3,0x70,0x00,0xf9]
+
+ lpdfr %f0,%f9
+ lpdfr %f0,%f15
+ lpdfr %f15,%f0
+ lpdfr %f15,%f9
+
#CHECK: lcdr %f0, %f9 # encoding: [0x23,0x09]
#CHECK: lcdr %f0, %f15 # encoding: [0x23,0x0f]
#CHECK: lcdr %f15, %f0 # encoding: [0x23,0xf0]
|
uweigand
reviewed
Apr 12, 2024
| @@ -407,6 +407,12 @@ | |||
| # CHECK: msgrkc %r7, %r8, %r9 | |||
| 0xb9 0xed 0x90 0x78 | |||
|
|
|||
| # CHECK: ppno %r0, %r2 | |||
There was a problem hiding this comment.
This is already tested in insns-z13.txt, why add it again in insns-z14?
There was a problem hiding this comment.
I overlooked that they were already there, will remove these.
| @@ -989,6 +995,9 @@ | |||
| # CHECK: vflcsb %v14, %v17 | |||
| 0xe7 0xe1 0x00 0x00 0x24 0xcc | |||
|
|
|||
| # CHECK: vflls %v0, %v1 | |||
There was a problem hiding this comment.
Should be mentioned in the commit message as well.
There was a problem hiding this comment.
Also, shouldn't we then also test the wffls variant?
There was a problem hiding this comment.
Actually, this is covered by vldeb and should be deleted.
| @@ -10656,18 +10752,6 @@ | |||
| # CHECK: lxdbr %f13, %f15 | |||
| 0xb3 0x05 0x00 0xdf | |||
|
|
|||
| # CHECK: lxdr %f0, %f8 | |||
There was a problem hiding this comment.
Why are you removing these? That isn't mentioned in the commit message at all ...
There was a problem hiding this comment.
my apologies, it seems i messed up the commits i aggregated into this PR. I believe i have now fixed the issues mentioned.
bazuzi
pushed a commit
to bazuzi/llvm-project
that referenced
this pull request
Apr 15, 2024
### Assembly Tests This adds assembly tests for ``` lcdfr, lndfr, lpdfr ``` ### Disassembly Tests This also adds a number of disassembly tests for the following menmonics: ``` cgit, cgrt, cit, clfit, clgit, clgrt, clgt, clrt, clt, crt, lcdfr, lndfr, lpdfr ``` For `cutfu` / `cu12`, it also adds a check for bad register choice.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Assembly Tests
This adds assembly tests for
Disassembly Tests
This also adds a number of disassembly tests for the following menmonics:
For
cutfu/cu12, it also adds a check for bad register choice.