Skip to content

Commit 265602a

Browse files
XinWang10XinWang10
committed
resolve comments
1 parent 90572f2 commit 265602a

File tree

3 files changed

+132
-81
lines changed

3 files changed

+132
-81
lines changed

‎llvm/test/MC/Disassembler/X86/apx/crc32.txt

Lines changed: 43 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
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: crc32b %r16b, %r22d
5-
# INTEL: crc32 r22d, r16b
6-
0x62,0xec,0x7c,0x08,0xf0,0xf0
4+
# ATT: crc32b %al, %ebx
5+
# INTEL: crc32 ebx, al
6+
0x62,0xf4,0x7c,0x08,0xf0,0xd8
77

8-
# ATT: crc32b %r16b, %r23
9-
# INTEL: crc32 r23, r16b
10-
0x62,0xec,0xfc,0x08,0xf0,0xf8
8+
# ATT: crc32b %al, %rbx
9+
# INTEL: crc32 rbx, al
10+
0x62,0xf4,0xfc,0x08,0xf0,0xd8
1111

12-
# ATT: crc32w %r17w, %r22d
13-
# INTEL: crc32 r22d, r17w
14-
0x62,0xec,0x7d,0x08,0xf1,0xf1
12+
# ATT: crc32w %ax, %ebx
13+
# INTEL: crc32 ebx, ax
14+
0x62,0xf4,0x7d,0x08,0xf1,0xd8
1515

16-
# ATT: crc32l %r18d, %r22d
17-
# INTEL: crc32 r22d, r18d
18-
0x62,0xec,0x7c,0x08,0xf1,0xf2
16+
# ATT: crc32l %eax, %ebx
17+
# INTEL: crc32 ebx, eax
18+
0x62,0xf4,0x7c,0x08,0xf1,0xd8
1919

20-
# ATT: crc32q %r19, %r23
21-
# INTEL: crc32 r23, r19
22-
0x62,0xec,0xfd,0x08,0xf1,0xfb
20+
# ATT: crc32q %rax, %rbx
21+
# INTEL: crc32 rbx, rax
22+
0x62,0xf4,0xfd,0x08,0xf1,0xd8
2323

24-
# ATT: crc32w 291(%r28,%r29,4), %r18d
25-
# INTEL: crc32 r18d, word ptr [r28 + 4*r29 + 291]
26-
0x62,0x8c,0x79,0x08,0xf1,0x94,0xac,0x23,0x01,0x00,0x00
24+
# ATT: crc32w 291(%rax,%rbx,4), %ecx
25+
# INTEL: crc32 ecx, word ptr [rax + 4*rbx + 291]
26+
0x62,0xf4,0x7d,0x08,0xf1,0x8c,0x98,0x23,0x01,0x00,0x00
2727

28-
# ATT: crc32l 291(%r28,%r29,4), %r18d
29-
# INTEL: crc32 r18d, dword ptr [r28 + 4*r29 + 291]
30-
0x62,0x8c,0x78,0x08,0xf1,0x94,0xac,0x23,0x01,0x00,0x00
28+
# ATT: crc32l 291(%rax,%rbx,4), %ecx
29+
# INTEL: crc32 ecx, dword ptr [rax + 4*rbx + 291]
30+
0x62,0xf4,0x7c,0x08,0xf1,0x8c,0x98,0x23,0x01,0x00,0x00
3131

32-
# ATT: crc32b 291(%r28,%r29,4), %r19
33-
# INTEL: crc32 r19, byte ptr [r28 + 4*r29 + 291]
34-
0x62,0x8c,0xf8,0x08,0xf0,0x9c,0xac,0x23,0x01,0x00,0x00
32+
# ATT: crc32b 291(%rax,%rbx,4), %rcx
33+
# INTEL: crc32 rcx, byte ptr [rax + 4*rbx + 291]
34+
0x62,0xf4,0xfc,0x08,0xf0,0x8c,0x98,0x23,0x01,0x00,0x00
3535

36-
# ATT: crc32q 291(%r28,%r29,4), %r19
37-
# INTEL: crc32 r19, qword ptr [r28 + 4*r29 + 291]
38-
0x62,0x8c,0xf9,0x08,0xf1,0x9c,0xac,0x23,0x01,0x00,0x00
36+
# ATT: crc32q 291(%rax,%rbx,4), %rcx
37+
# INTEL: crc32 rcx, qword ptr [rax + 4*rbx + 291]
38+
0x62,0xf4,0xfd,0x08,0xf1,0x8c,0x98,0x23,0x01,0x00,0x00
3939

4040
# ATT: crc32b %r16b, %r22d
4141
# INTEL: crc32 r22d, r16b
@@ -72,3 +72,19 @@
7272
# ATT: crc32q 291(%r28,%r29,4), %r19
7373
# INTEL: crc32 r19, qword ptr [r28 + 4*r29 + 291]
7474
0x62,0x8c,0xf9,0x08,0xf1,0x9c,0xac,0x23,0x01,0x00,0x00
75+
76+
# ATT: crc32w 123(%r28,%r29,4), %r18d
77+
# INTEL: crc32 r18d, word ptr [r28 + 4*r29 + 123]
78+
0x62,0x8c,0x79,0x08,0xf1,0x54,0xac,0x7b
79+
80+
# ATT: crc32l 123(%r28,%r29,4), %r18d
81+
# INTEL: crc32 r18d, dword ptr [r28 + 4*r29 + 123]
82+
0x62,0x8c,0x78,0x08,0xf1,0x54,0xac,0x7b
83+
84+
# ATT: crc32b 123(%r28,%r29,4), %r19
85+
# INTEL: crc32 r19, byte ptr [r28 + 4*r29 + 123]
86+
0x62,0x8c,0xf8,0x08,0xf0,0x5c,0xac,0x7b
87+
88+
# ATT: crc32q 123(%r28,%r29,4), %r19
89+
# INTEL: crc32 r19, qword ptr [r28 + 4*r29 + 123]
90+
0x62,0x8c,0xf9,0x08,0xf1,0x5c,0xac,0x7b

‎llvm/test/MC/X86/apx/crc32-att.s

Lines changed: 46 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,43 @@
11
# RUN: llvm-mc -triple x86_64 --show-encoding %s | FileCheck %s
2+
# RUN: not llvm-mc -triple i386 -show-encoding %s 2>&1 | FileCheck %s --check-prefix=ERROR
23

3-
# CHECK: crc32b %r16b, %r22d
4-
# CHECK: encoding: [0x62,0xec,0x7c,0x08,0xf0,0xf0]
5-
crc32b %r16b, %r22d
4+
# ERROR-COUNT-22: error:
5+
# ERROR-NOT: error:
6+
# CHECK: {evex} crc32b %al, %ebx
7+
# CHECK: encoding: [0x62,0xf4,0x7c,0x08,0xf0,0xd8]
8+
{evex} crc32b %al, %ebx
69

7-
# CHECK: crc32b %r16b, %r23
8-
# CHECK: encoding: [0x62,0xec,0xfc,0x08,0xf0,0xf8]
9-
crc32b %r16b, %r23
10+
# CHECK: {evex} crc32b %al, %rbx
11+
# CHECK: encoding: [0x62,0xf4,0xfc,0x08,0xf0,0xd8]
12+
{evex} crc32b %al, %rbx
1013

11-
# CHECK: crc32w %r17w, %r22d
12-
# CHECK: encoding: [0x62,0xec,0x7d,0x08,0xf1,0xf1]
13-
crc32w %r17w, %r22d
14+
# CHECK: {evex} crc32w %ax, %ebx
15+
# CHECK: encoding: [0x62,0xf4,0x7d,0x08,0xf1,0xd8]
16+
{evex} crc32w %ax, %ebx
1417

15-
# CHECK: crc32l %r18d, %r22d
16-
# CHECK: encoding: [0x62,0xec,0x7c,0x08,0xf1,0xf2]
17-
crc32l %r18d, %r22d
18+
# CHECK: {evex} crc32l %eax, %ebx
19+
# CHECK: encoding: [0x62,0xf4,0x7c,0x08,0xf1,0xd8]
20+
{evex} crc32l %eax, %ebx
1821

19-
# CHECK: crc32q %r19, %r23
20-
# CHECK: encoding: [0x62,0xec,0xfd,0x08,0xf1,0xfb]
21-
crc32q %r19, %r23
22+
# CHECK: {evex} crc32q %rax, %rbx
23+
# CHECK: encoding: [0x62,0xf4,0xfd,0x08,0xf1,0xd8]
24+
{evex} crc32q %rax, %rbx
2225

23-
# CHECK: crc32w 291(%r28,%r29,4), %r18d
24-
# CHECK: encoding: [0x62,0x8c,0x79,0x08,0xf1,0x94,0xac,0x23,0x01,0x00,0x00]
25-
crc32w 291(%r28,%r29,4), %r18d
26+
# CHECK: {evex} crc32w 291(%rax,%rbx,4), %ecx
27+
# CHECK: encoding: [0x62,0xf4,0x7d,0x08,0xf1,0x8c,0x98,0x23,0x01,0x00,0x00]
28+
{evex} crc32w 291(%rax,%rbx,4), %ecx
2629

27-
# CHECK: crc32l 291(%r28,%r29,4), %r18d
28-
# CHECK: encoding: [0x62,0x8c,0x78,0x08,0xf1,0x94,0xac,0x23,0x01,0x00,0x00]
29-
crc32l 291(%r28,%r29,4), %r18d
30+
# CHECK: {evex} crc32l 291(%rax,%rbx,4), %ecx
31+
# CHECK: encoding: [0x62,0xf4,0x7c,0x08,0xf1,0x8c,0x98,0x23,0x01,0x00,0x00]
32+
{evex} crc32l 291(%rax,%rbx,4), %ecx
3033

31-
# CHECK: crc32b 291(%r28,%r29,4), %r19
32-
# CHECK: encoding: [0x62,0x8c,0xf8,0x08,0xf0,0x9c,0xac,0x23,0x01,0x00,0x00]
33-
crc32b 291(%r28,%r29,4), %r19
34+
# CHECK: {evex} crc32b 291(%rax,%rbx,4), %rcx
35+
# CHECK: encoding: [0x62,0xf4,0xfc,0x08,0xf0,0x8c,0x98,0x23,0x01,0x00,0x00]
36+
{evex} crc32b 291(%rax,%rbx,4), %rcx
3437

35-
# CHECK: crc32q 291(%r28,%r29,4), %r19
36-
# CHECK: encoding: [0x62,0x8c,0xf9,0x08,0xf1,0x9c,0xac,0x23,0x01,0x00,0x00]
37-
crc32q 291(%r28,%r29,4), %r19
38+
# CHECK: {evex} crc32q 291(%rax,%rbx,4), %rcx
39+
# CHECK: encoding: [0x62,0xf4,0xfd,0x08,0xf1,0x8c,0x98,0x23,0x01,0x00,0x00]
40+
{evex} crc32q 291(%rax,%rbx,4), %rcx
3841

3942
# CHECK: crc32b %r16b, %r22d
4043
# CHECK: encoding: [0x62,0xec,0x7c,0x08,0xf0,0xf0]
@@ -71,3 +74,19 @@
7174
# CHECK: crc32q 291(%r28,%r29,4), %r19
7275
# CHECK: encoding: [0x62,0x8c,0xf9,0x08,0xf1,0x9c,0xac,0x23,0x01,0x00,0x00]
7376
crc32q 291(%r28,%r29,4), %r19
77+
78+
# CHECK: crc32w 123(%r28,%r29,4), %r18d
79+
# CHECK: encoding: [0x62,0x8c,0x79,0x08,0xf1,0x54,0xac,0x7b]
80+
crc32w 123(%r28,%r29,4), %r18d
81+
82+
# CHECK: crc32l 123(%r28,%r29,4), %r18d
83+
# CHECK: encoding: [0x62,0x8c,0x78,0x08,0xf1,0x54,0xac,0x7b]
84+
crc32l 123(%r28,%r29,4), %r18d
85+
86+
# CHECK: crc32b 123(%r28,%r29,4), %r19
87+
# CHECK: encoding: [0x62,0x8c,0xf8,0x08,0xf0,0x5c,0xac,0x7b]
88+
crc32b 123(%r28,%r29,4), %r19
89+
90+
# CHECK: crc32q 123(%r28,%r29,4), %r19
91+
# CHECK: encoding: [0x62,0x8c,0xf9,0x08,0xf1,0x5c,0xac,0x7b]
92+
crc32q 123(%r28,%r29,4), %r19

‎llvm/test/MC/X86/apx/crc32-intel.s

Lines changed: 43 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
# RUN: llvm-mc -triple x86_64 -x86-asm-syntax=intel -output-asm-variant=1 --show-encoding %s | FileCheck %s
22

3-
# CHECK: crc32 r22d, r16b
4-
# CHECK: encoding: [0x62,0xec,0x7c,0x08,0xf0,0xf0]
5-
crc32 r22d, r16b
3+
# CHECK: {evex} crc32 ebx, al
4+
# CHECK: encoding: [0x62,0xf4,0x7c,0x08,0xf0,0xd8]
5+
{evex} crc32 ebx, al
66

7-
# CHECK: crc32 r23, r16b
8-
# CHECK: encoding: [0x62,0xec,0xfc,0x08,0xf0,0xf8]
9-
crc32 r23, r16b
7+
# CHECK: {evex} crc32 rbx, al
8+
# CHECK: encoding: [0x62,0xf4,0xfc,0x08,0xf0,0xd8]
9+
{evex} crc32 rbx, al
1010

11-
# CHECK: crc32 r22d, r17w
12-
# CHECK: encoding: [0x62,0xec,0x7d,0x08,0xf1,0xf1]
13-
crc32 r22d, r17w
11+
# CHECK: {evex} crc32 ebx, ax
12+
# CHECK: encoding: [0x62,0xf4,0x7d,0x08,0xf1,0xd8]
13+
{evex} crc32 ebx, ax
1414

15-
# CHECK: crc32 r22d, r18d
16-
# CHECK: encoding: [0x62,0xec,0x7c,0x08,0xf1,0xf2]
17-
crc32 r22d, r18d
15+
# CHECK: {evex} crc32 ebx, eax
16+
# CHECK: encoding: [0x62,0xf4,0x7c,0x08,0xf1,0xd8]
17+
{evex} crc32 ebx, eax
1818

19-
# CHECK: crc32 r23, r19
20-
# CHECK: encoding: [0x62,0xec,0xfd,0x08,0xf1,0xfb]
21-
crc32 r23, r19
19+
# CHECK: {evex} crc32 rbx, rax
20+
# CHECK: encoding: [0x62,0xf4,0xfd,0x08,0xf1,0xd8]
21+
{evex} crc32 rbx, rax
2222

23-
# CHECK: crc32 r18d, word ptr [r28 + 4*r29 + 291]
24-
# CHECK: encoding: [0x62,0x8c,0x79,0x08,0xf1,0x94,0xac,0x23,0x01,0x00,0x00]
25-
crc32 r18d, word ptr [r28 + 4*r29 + 291]
23+
# CHECK: {evex} crc32 ecx, word ptr [rax + 4*rbx + 291]
24+
# CHECK: encoding: [0x62,0xf4,0x7d,0x08,0xf1,0x8c,0x98,0x23,0x01,0x00,0x00]
25+
{evex} crc32 ecx, word ptr [rax + 4*rbx + 291]
2626

27-
# CHECK: crc32 r18d, dword ptr [r28 + 4*r29 + 291]
28-
# CHECK: encoding: [0x62,0x8c,0x78,0x08,0xf1,0x94,0xac,0x23,0x01,0x00,0x00]
29-
crc32 r18d, dword ptr [r28 + 4*r29 + 291]
27+
# CHECK: {evex} crc32 ecx, dword ptr [rax + 4*rbx + 291]
28+
# CHECK: encoding: [0x62,0xf4,0x7c,0x08,0xf1,0x8c,0x98,0x23,0x01,0x00,0x00]
29+
{evex} crc32 ecx, dword ptr [rax + 4*rbx + 291]
3030

31-
# CHECK: crc32 r19, byte ptr [r28 + 4*r29 + 291]
32-
# CHECK: encoding: [0x62,0x8c,0xf8,0x08,0xf0,0x9c,0xac,0x23,0x01,0x00,0x00]
33-
crc32 r19, byte ptr [r28 + 4*r29 + 291]
31+
# CHECK: {evex} crc32 rcx, byte ptr [rax + 4*rbx + 291]
32+
# CHECK: encoding: [0x62,0xf4,0xfc,0x08,0xf0,0x8c,0x98,0x23,0x01,0x00,0x00]
33+
{evex} crc32 rcx, byte ptr [rax + 4*rbx + 291]
3434

35-
# CHECK: crc32 r19, qword ptr [r28 + 4*r29 + 291]
36-
# CHECK: encoding: [0x62,0x8c,0xf9,0x08,0xf1,0x9c,0xac,0x23,0x01,0x00,0x00]
37-
crc32 r19, qword ptr [r28 + 4*r29 + 291]
35+
# CHECK: {evex} crc32 rcx, qword ptr [rax + 4*rbx + 291]
36+
# CHECK: encoding: [0x62,0xf4,0xfd,0x08,0xf1,0x8c,0x98,0x23,0x01,0x00,0x00]
37+
{evex} crc32 rcx, qword ptr [rax + 4*rbx + 291]
3838

3939
# CHECK: crc32 r22d, r16b
4040
# CHECK: encoding: [0x62,0xec,0x7c,0x08,0xf0,0xf0]
@@ -71,3 +71,19 @@
7171
# CHECK: crc32 r19, qword ptr [r28 + 4*r29 + 291]
7272
# CHECK: encoding: [0x62,0x8c,0xf9,0x08,0xf1,0x9c,0xac,0x23,0x01,0x00,0x00]
7373
crc32 r19, qword ptr [r28 + 4*r29 + 291]
74+
75+
# CHECK: crc32 r18d, word ptr [r28 + 4*r29 + 123]
76+
# CHECK: encoding: [0x62,0x8c,0x79,0x08,0xf1,0x54,0xac,0x7b]
77+
crc32 r18d, word ptr [r28 + 4*r29 + 123]
78+
79+
# CHECK: crc32 r18d, dword ptr [r28 + 4*r29 + 123]
80+
# CHECK: encoding: [0x62,0x8c,0x78,0x08,0xf1,0x54,0xac,0x7b]
81+
crc32 r18d, dword ptr [r28 + 4*r29 + 123]
82+
83+
# CHECK: crc32 r19, byte ptr [r28 + 4*r29 + 123]
84+
# CHECK: encoding: [0x62,0x8c,0xf8,0x08,0xf0,0x5c,0xac,0x7b]
85+
crc32 r19, byte ptr [r28 + 4*r29 + 123]
86+
87+
# CHECK: crc32 r19, qword ptr [r28 + 4*r29 + 123]
88+
# CHECK: encoding: [0x62,0x8c,0xf9,0x08,0xf1,0x5c,0xac,0x7b]
89+
crc32 r19, qword ptr [r28 + 4*r29 + 123]

0 commit comments

Comments
 (0)