Skip to content

Commit 6167ca0

Browse files
committed
[NFC][X86] Reorg MC tests for APX promoted instrs
1 parent 9e1ad3c commit 6167ca0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1221
-584
lines changed

llvm/lib/Target/X86/X86InstrMisc.td

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,11 +1371,11 @@ multiclass bmi_pdep_pext<string mnemonic, RegisterClass RC,
13711371
def rr#Suffix : I<0xF5, MRMSrcReg, (outs RC:$dst), (ins RC:$src1, RC:$src2),
13721372
!strconcat(mnemonic, "\t{$src2, $src1, $dst|$dst, $src1, $src2}"),
13731373
[(set RC:$dst, (OpNode RC:$src1, RC:$src2))]>,
1374-
VEX, VVVV, Sched<[WriteALU]>;
1374+
VEX, NoCD8, VVVV, Sched<[WriteALU]>;
13751375
def rm#Suffix : I<0xF5, MRMSrcMem, (outs RC:$dst), (ins RC:$src1, x86memop:$src2),
13761376
!strconcat(mnemonic, "\t{$src2, $src1, $dst|$dst, $src1, $src2}"),
13771377
[(set RC:$dst, (OpNode RC:$src1, (ld_frag addr:$src2)))]>,
1378-
VEX, VVVV, Sched<[WriteALU.Folded, WriteALU.ReadAfterFold]>;
1378+
VEX, NoCD8, VVVV, Sched<[WriteALU.Folded, WriteALU.ReadAfterFold]>;
13791379
}
13801380

13811381
let Predicates = [HasBMI2, NoEGPR] in {

llvm/lib/Target/X86/X86InstrShiftRotate.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ let Predicates = [HasBMI2, NoEGPR] in {
868868
defm SHLX64 : bmi_shift<"shlx{q}", GR64, i64mem>, T8, PD, REX_W;
869869
}
870870

871-
let Predicates = [HasBMI2, HasEGPR] in {
871+
let Predicates = [HasBMI2, HasEGPR, In64BitMode] in {
872872
defm RORX32 : bmi_rotate<"rorx{l}", GR32, i32mem, "_EVEX">, EVEX;
873873
defm RORX64 : bmi_rotate<"rorx{q}", GR64, i64mem, "_EVEX">, REX_W, EVEX;
874874
defm SARX32 : bmi_shift<"sarx{l}", GR32, i32mem, "_EVEX">, T8, XS, EVEX;
Lines changed: 226 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,226 @@
1+
# RUN: llvm-mc --disassemble %s -triple=x86_64 | FileCheck %s --check-prefixes=ATT
2+
# RUN: llvm-mc --disassemble %s -triple=x86_64 -x86-asm-syntax=intel --output-asm-variant=1 | FileCheck %s --check-prefixes=INTEL
3+
4+
# ATT: mulxl %ecx, %edx, %r10d
5+
# INTEL: mulx r10d, edx, ecx
6+
0x62,0x72,0x6f,0x08,0xf6,0xd1
7+
8+
# ATT: mulxq %r9, %r15, %r11
9+
# INTEL: mulx r11, r15, r9
10+
0x62,0x52,0x87,0x08,0xf6,0xd9
11+
12+
# ATT: mulxl 123(%rax,%rbx,4), %ecx, %edx
13+
# INTEL: mulx edx, ecx, dword ptr [rax + 4*rbx + 123]
14+
0x62,0xf2,0x77,0x08,0xf6,0x94,0x98,0x7b,0x00,0x00,0x00
15+
16+
# ATT: mulxq 123(%rax,%rbx,4), %r9, %r15
17+
# INTEL: mulx r15, r9, qword ptr [rax + 4*rbx + 123]
18+
0x62,0x72,0xb7,0x08,0xf6,0xbc,0x98,0x7b,0x00,0x00,0x00
19+
20+
# ATT: mulxl %r18d, %r22d, %r26d
21+
# INTEL: mulx r26d, r22d, r18d
22+
0x62,0x6a,0x4f,0x00,0xf6,0xd2
23+
24+
# ATT: mulxq %r19, %r23, %r27
25+
# INTEL: mulx r27, r23, r19
26+
0x62,0x6a,0xc7,0x00,0xf6,0xdb
27+
28+
# ATT: mulxl 291(%r28,%r29,4), %r18d, %r22d
29+
# INTEL: mulx r22d, r18d, dword ptr [r28 + 4*r29 + 291]
30+
0x62,0x8a,0x6b,0x00,0xf6,0xb4,0xac,0x23,0x01,0x00,0x00
31+
32+
# ATT: mulxq 291(%r28,%r29,4), %r19, %r23
33+
# INTEL: mulx r23, r19, qword ptr [r28 + 4*r29 + 291]
34+
0x62,0x8a,0xe3,0x00,0xf6,0xbc,0xac,0x23,0x01,0x00,0x00
35+
36+
# ATT: pdepl %ecx, %edx, %r10d
37+
# INTEL: pdep r10d, edx, ecx
38+
0x62,0x72,0x6f,0x08,0xf5,0xd1
39+
40+
# ATT: pdepq %r9, %r15, %r11
41+
# INTEL: pdep r11, r15, r9
42+
0x62,0x52,0x87,0x08,0xf5,0xd9
43+
44+
# ATT: pdepl 123(%rax,%rbx,4), %ecx, %edx
45+
# INTEL: pdep edx, ecx, dword ptr [rax + 4*rbx + 123]
46+
0x62,0xf2,0x77,0x08,0xf5,0x54,0x98,0x7b
47+
48+
# ATT: pdepq 123(%rax,%rbx,4), %r9, %r15
49+
# INTEL: pdep r15, r9, qword ptr [rax + 4*rbx + 123]
50+
0x62,0x72,0xb7,0x08,0xf5,0x7c,0x98,0x7b
51+
52+
# ATT: pdepl %r18d, %r22d, %r26d
53+
# INTEL: pdep r26d, r22d, r18d
54+
0x62,0x6a,0x4f,0x00,0xf5,0xd2
55+
56+
# ATT: pdepq %r19, %r23, %r27
57+
# INTEL: pdep r27, r23, r19
58+
0x62,0x6a,0xc7,0x00,0xf5,0xdb
59+
60+
# ATT: pdepl 291(%r28,%r29,4), %r18d, %r22d
61+
# INTEL: pdep r22d, r18d, dword ptr [r28 + 4*r29 + 291]
62+
0x62,0x8a,0x6b,0x00,0xf5,0xb4,0xac,0x23,0x01,0x00,0x00
63+
64+
# ATT: pdepq 291(%r28,%r29,4), %r19, %r23
65+
# INTEL: pdep r23, r19, qword ptr [r28 + 4*r29 + 291]
66+
0x62,0x8a,0xe3,0x00,0xf5,0xbc,0xac,0x23,0x01,0x00,0x00
67+
68+
# ATT: pextl %ecx, %edx, %r10d
69+
# INTEL: pext r10d, edx, ecx
70+
0x62,0x72,0x6e,0x08,0xf5,0xd1
71+
72+
# ATT: pextq %r9, %r15, %r11
73+
# INTEL: pext r11, r15, r9
74+
0x62,0x52,0x86,0x08,0xf5,0xd9
75+
76+
# ATT: pextl 123(%rax,%rbx,4), %ecx, %edx
77+
# INTEL: pext edx, ecx, dword ptr [rax + 4*rbx + 123]
78+
0x62,0xf2,0x76,0x08,0xf5,0x54,0x98,0x7b
79+
80+
# ATT: pextq 123(%rax,%rbx,4), %r9, %r15
81+
# INTEL: pext r15, r9, qword ptr [rax + 4*rbx + 123]
82+
0x62,0x72,0xb6,0x08,0xf5,0x7c,0x98,0x7b
83+
84+
# ATT: pextl %r18d, %r22d, %r26d
85+
# INTEL: pext r26d, r22d, r18d
86+
0x62,0x6a,0x4e,0x00,0xf5,0xd2
87+
88+
# ATT: pextq %r19, %r23, %r27
89+
# INTEL: pext r27, r23, r19
90+
0x62,0x6a,0xc6,0x00,0xf5,0xdb
91+
92+
# ATT: pextl 291(%r28,%r29,4), %r18d, %r22d
93+
# INTEL: pext r22d, r18d, dword ptr [r28 + 4*r29 + 291]
94+
0x62,0x8a,0x6a,0x00,0xf5,0xb4,0xac,0x23,0x01,0x00,0x00
95+
96+
# ATT: pextq 291(%r28,%r29,4), %r19, %r23
97+
# INTEL: pext r23, r19, qword ptr [r28 + 4*r29 + 291]
98+
0x62,0x8a,0xe2,0x00,0xf5,0xbc,0xac,0x23,0x01,0x00,0x00
99+
100+
# ATT: rorxl $123, %ecx, %edx
101+
# INTEL: rorx edx, ecx, 123
102+
0x62,0xf3,0x7f,0x08,0xf0,0xd1,0x7b
103+
104+
# ATT: rorxq $123, %r9, %r15
105+
# INTEL: rorx r15, r9, 123
106+
0x62,0x53,0xff,0x08,0xf0,0xf9,0x7b
107+
108+
# ATT: rorxl $123, 123(%rax,%rbx,4), %ecx
109+
# INTEL: rorx ecx, dword ptr [rax + 4*rbx + 123], 123
110+
0x62,0xf3,0x7f,0x08,0xf0,0x8c,0x98,0x7b,0x00,0x00,0x00,0x7b
111+
112+
# ATT: rorxq $123, 123(%rax,%rbx,4), %r9
113+
# INTEL: rorx r9, qword ptr [rax + 4*rbx + 123], 123
114+
0x62,0x73,0xff,0x08,0xf0,0x8c,0x98,0x7b,0x00,0x00,0x00,0x7b
115+
116+
# ATT: rorxl $123, %r18d, %r22d
117+
# INTEL: rorx r22d, r18d, 123
118+
0x62,0xeb,0x7f,0x08,0xf0,0xf2,0x7b
119+
120+
# ATT: rorxq $123, %r19, %r23
121+
# INTEL: rorx r23, r19, 123
122+
0x62,0xeb,0xff,0x08,0xf0,0xfb,0x7b
123+
124+
# ATT: rorxl $123, 291(%r28,%r29,4), %r18d
125+
# INTEL: rorx r18d, dword ptr [r28 + 4*r29 + 291], 123
126+
0x62,0x8b,0x7b,0x08,0xf0,0x94,0xac,0x23,0x01,0x00,0x00,0x7b
127+
128+
# ATT: rorxq $123, 291(%r28,%r29,4), %r19
129+
# INTEL: rorx r19, qword ptr [r28 + 4*r29 + 291], 123
130+
0x62,0x8b,0xfb,0x08,0xf0,0x9c,0xac,0x23,0x01,0x00,0x00,0x7b
131+
132+
# ATT: sarxl %ecx, %edx, %r10d
133+
# INTEL: sarx r10d, edx, ecx
134+
0x62,0x72,0x76,0x08,0xf7,0xd2
135+
136+
# ATT: sarxl %ecx, 123(%rax,%rbx,4), %edx
137+
# INTEL: sarx edx, dword ptr [rax + 4*rbx + 123], ecx
138+
0x62,0xf2,0x76,0x08,0xf7,0x94,0x98,0x7b,0x00,0x00,0x00
139+
140+
# ATT: sarxq %r9, %r15, %r11
141+
# INTEL: sarx r11, r15, r9
142+
0x62,0x52,0xb6,0x08,0xf7,0xdf
143+
144+
# ATT: sarxq %r9, 123(%rax,%rbx,4), %r15
145+
# INTEL: sarx r15, qword ptr [rax + 4*rbx + 123], r9
146+
0x62,0x72,0xb6,0x08,0xf7,0xbc,0x98,0x7b,0x00,0x00,0x00
147+
148+
# ATT: sarxl %r18d, %r22d, %r26d
149+
# INTEL: sarx r26d, r22d, r18d
150+
0x62,0x6a,0x6e,0x00,0xf7,0xd6
151+
152+
# ATT: sarxl %r18d, 291(%r28,%r29,4), %r22d
153+
# INTEL: sarx r22d, dword ptr [r28 + 4*r29 + 291], r18d
154+
0x62,0x8a,0x6a,0x00,0xf7,0xb4,0xac,0x23,0x01,0x00,0x00
155+
156+
# ATT: sarxq %r19, %r23, %r27
157+
# INTEL: sarx r27, r23, r19
158+
0x62,0x6a,0xe6,0x00,0xf7,0xdf
159+
160+
# ATT: sarxq %r19, 291(%r28,%r29,4), %r23
161+
# INTEL: sarx r23, qword ptr [r28 + 4*r29 + 291], r19
162+
0x62,0x8a,0xe2,0x00,0xf7,0xbc,0xac,0x23,0x01,0x00,0x00
163+
164+
# ATT: shlxl %ecx, %edx, %r10d
165+
# INTEL: shlx r10d, edx, ecx
166+
0x62,0x72,0x75,0x08,0xf7,0xd2
167+
168+
# ATT: shlxl %ecx, 123(%rax,%rbx,4), %edx
169+
# INTEL: shlx edx, dword ptr [rax + 4*rbx + 123], ecx
170+
0x62,0xf2,0x75,0x08,0xf7,0x94,0x98,0x7b,0x00,0x00,0x00
171+
172+
# ATT: shlxq %r9, %r15, %r11
173+
# INTEL: shlx r11, r15, r9
174+
0x62,0x52,0xb5,0x08,0xf7,0xdf
175+
176+
# ATT: shlxq %r9, 123(%rax,%rbx,4), %r15
177+
# INTEL: shlx r15, qword ptr [rax + 4*rbx + 123], r9
178+
0x62,0x72,0xb5,0x08,0xf7,0xbc,0x98,0x7b,0x00,0x00,0x00
179+
180+
# ATT: shlxl %r18d, %r22d, %r26d
181+
# INTEL: shlx r26d, r22d, r18d
182+
0x62,0x6a,0x6d,0x00,0xf7,0xd6
183+
184+
# ATT: shlxl %r18d, 291(%r28,%r29,4), %r22d
185+
# INTEL: shlx r22d, dword ptr [r28 + 4*r29 + 291], r18d
186+
0x62,0x8a,0x69,0x00,0xf7,0xb4,0xac,0x23,0x01,0x00,0x00
187+
188+
# ATT: shlxq %r19, %r23, %r27
189+
# INTEL: shlx r27, r23, r19
190+
0x62,0x6a,0xe5,0x00,0xf7,0xdf
191+
192+
# ATT: shlxq %r19, 291(%r28,%r29,4), %r23
193+
# INTEL: shlx r23, qword ptr [r28 + 4*r29 + 291], r19
194+
0x62,0x8a,0xe1,0x00,0xf7,0xbc,0xac,0x23,0x01,0x00,0x00
195+
196+
# ATT: shrxl %ecx, %edx, %r10d
197+
# INTEL: shrx r10d, edx, ecx
198+
0x62,0x72,0x77,0x08,0xf7,0xd2
199+
200+
# ATT: shrxl %ecx, 123(%rax,%rbx,4), %edx
201+
# INTEL: shrx edx, dword ptr [rax + 4*rbx + 123], ecx
202+
0x62,0xf2,0x77,0x08,0xf7,0x94,0x98,0x7b,0x00,0x00,0x00
203+
204+
# ATT: shrxq %r9, %r15, %r11
205+
# INTEL: shrx r11, r15, r9
206+
0x62,0x52,0xb7,0x08,0xf7,0xdf
207+
208+
# ATT: shrxq %r9, 123(%rax,%rbx,4), %r15
209+
# INTEL: shrx r15, qword ptr [rax + 4*rbx + 123], r9
210+
0x62,0x72,0xb7,0x08,0xf7,0xbc,0x98,0x7b,0x00,0x00,0x00
211+
212+
# ATT: shrxl %r18d, %r22d, %r26d
213+
# INTEL: shrx r26d, r22d, r18d
214+
0x62,0x6a,0x6f,0x00,0xf7,0xd6
215+
216+
# ATT: shrxl %r18d, 291(%r28,%r29,4), %r22d
217+
# INTEL: shrx r22d, dword ptr [r28 + 4*r29 + 291], r18d
218+
0x62,0x8a,0x6b,0x00,0xf7,0xb4,0xac,0x23,0x01,0x00,0x00
219+
220+
# ATT: shrxq %r19, %r23, %r27
221+
# INTEL: shrx r27, r23, r19
222+
0x62,0x6a,0xe7,0x00,0xf7,0xdf
223+
224+
# ATT: shrxq %r19, 291(%r28,%r29,4), %r23
225+
# INTEL: shrx r23, qword ptr [r28 + 4*r29 + 291], r19
226+
0x62,0x8a,0xe3,0x00,0xf7,0xbc,0xac,0x23,0x01,0x00,0x00
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# RUN: llvm-mc --disassemble %s -triple=x86_64 | FileCheck %s --check-prefixes=ATT
2+
# RUN: llvm-mc --disassemble %s -triple=x86_64 -x86-asm-syntax=intel --output-asm-variant=1 | FileCheck %s --check-prefixes=INTEL
3+
4+
# ATT: wrssd %ecx, 123(%rax,%rbx,4)
5+
# INTEL: wrssd dword ptr [rax + 4*rbx + 123], ecx
6+
0x62,0xf4,0x7c,0x08,0x66,0x4c,0x98,0x7b
7+
8+
# ATT: wrssd %r18d, 291(%r28,%r29,4)
9+
# INTEL: wrssd dword ptr [r28 + 4*r29 + 291], r18d
10+
0x62,0x8c,0x78,0x08,0x66,0x94,0xac,0x23,0x01,0x00,0x00
11+
12+
# ATT: wrssq %r9, 123(%rax,%rbx,4)
13+
# INTEL: wrssq qword ptr [rax + 4*rbx + 123], r9
14+
0x62,0x74,0xfc,0x08,0x66,0x4c,0x98,0x7b
15+
16+
# ATT: wrssq %r19, 291(%r28,%r29,4)
17+
# INTEL: wrssq qword ptr [r28 + 4*r29 + 291], r19
18+
0x62,0x8c,0xf8,0x08,0x66,0x9c,0xac,0x23,0x01,0x00,0x00
19+
20+
# ATT: wrussd %ecx, 123(%rax,%rbx,4)
21+
# INTEL: wrussd dword ptr [rax + 4*rbx + 123], ecx
22+
0x62,0xf4,0x7d,0x08,0x65,0x4c,0x98,0x7b
23+
24+
# ATT: wrussd %r18d, 291(%r28,%r29,4)
25+
# INTEL: wrussd dword ptr [r28 + 4*r29 + 291], r18d
26+
0x62,0x8c,0x79,0x08,0x65,0x94,0xac,0x23,0x01,0x00,0x00
27+
28+
# ATT: wrussq %r9, 123(%rax,%rbx,4)
29+
# INTEL: wrussq qword ptr [rax + 4*rbx + 123], r9
30+
0x62,0x74,0xfd,0x08,0x65,0x4c,0x98,0x7b
31+
32+
# ATT: wrussq %r19, 291(%r28,%r29,4)
33+
# INTEL: wrussq qword ptr [r28 + 4*r29 + 291], r19
34+
0x62,0x8c,0xf9,0x08,0x65,0x9c,0xac,0x23,0x01,0x00,0x00

llvm/test/MC/Disassembler/X86/apx/invept.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

llvm/test/MC/Disassembler/X86/apx/invvpid.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

llvm/test/MC/Disassembler/X86/apx/movdir64b.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# RUN: llvm-mc --disassemble %s -triple=x86_64 | FileCheck %s --check-prefixes=ATT
22
# RUN: llvm-mc --disassemble %s -triple=x86_64 -x86-asm-syntax=intel --output-asm-variant=1 | FileCheck %s --check-prefixes=INTEL
33

4+
# ATT: movdir64b 123(%eax,%ebx,4), %ecx
5+
# INTEL: movdir64b ecx, zmmword ptr [eax + 4*ebx + 123]
6+
0x67,0x62,0xf4,0x7d,0x08,0xf8,0x4c,0x98,0x7b
7+
8+
# ATT: movdir64b 123(%rax,%rbx,4), %r9
9+
# INTEL: movdir64b r9, zmmword ptr [rax + 4*rbx + 123]
10+
0x62,0x74,0x7d,0x08,0xf8,0x4c,0x98,0x7b
11+
412
# ATT: movdir64b 291(%r28d,%r29d,4), %r18d
513
# INTEL: movdir64b r18d, zmmword ptr [r28d + 4*r29d + 291]
614
0x67,0x62,0x8c,0x79,0x08,0xf8,0x94,0xac,0x23,0x01,0x00,0x00

llvm/test/MC/Disassembler/X86/apx/movdiri.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# RUN: llvm-mc --disassemble %s -triple=x86_64 | FileCheck %s --check-prefixes=ATT
22
# RUN: llvm-mc --disassemble %s -triple=x86_64 -x86-asm-syntax=intel --output-asm-variant=1 | FileCheck %s --check-prefixes=INTEL
33

4+
# ATT: movdiri %ecx, 123(%eax,%ebx,4)
5+
# INTEL: movdiri dword ptr [eax + 4*ebx + 123], ecx
6+
0x67,0x62,0xf4,0x7c,0x08,0xf9,0x4c,0x98,0x7b
7+
8+
# ATT: movdiri %r9, 123(%rax,%rbx,4)
9+
# INTEL: movdiri qword ptr [rax + 4*rbx + 123], r9
10+
0x62,0x74,0xfc,0x08,0xf9,0x4c,0x98,0x7b
11+
412
# ATT: movdiri %r18d, 291(%r28,%r29,4)
513
# INTEL: movdiri dword ptr [r28 + 4*r29 + 291], r18d
614
0x62,0x8c,0x78,0x08,0xf9,0x94,0xac,0x23,0x01,0x00,0x00

0 commit comments

Comments
 (0)