Skip to content

Commit be1d4c4

Browse files
XinWang10XinWang10
committed
rebase
1 parent 265602a commit be1d4c4

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

‎llvm/lib/Target/X86/X86InstrSSE.td‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6688,18 +6688,18 @@ let Predicates = [HasCRC32, NoEGPR], OpMap = T8, OpPrefix = XD in {
66886688
def CRC32r64m8 : Crc32m<Xi8, GR64, null_frag>, REX_W;
66896689
}
66906690

6691-
let Predicates = [HasCRC32, HasEGPR, In64BitMode], OpMap = T8, OpEnc = EncEVEX in {
6692-
def CRC32r32r8 : Crc32r<Xi8, GR32, int_x86_sse42_crc32_32_8>;
6693-
def CRC32r32m8 : Crc32m<Xi8, GR32, int_x86_sse42_crc32_32_8>;
6694-
def CRC32r32r16 : Crc32r<Xi16, GR32, int_x86_sse42_crc32_32_16>, PD;
6695-
def CRC32r32m16 : Crc32m<Xi16, GR32, int_x86_sse42_crc32_32_16>, PD;
6696-
def CRC32r32r32 : Crc32r<Xi32, GR32, int_x86_sse42_crc32_32_32>;
6697-
def CRC32r32m32 : Crc32m<Xi32, GR32, int_x86_sse42_crc32_32_32>;
6698-
def CRC32r64r64 : Crc32r<Xi64, GR64, int_x86_sse42_crc32_64_64>;
6699-
def CRC32r64m64 : Crc32m<Xi64, GR64, int_x86_sse42_crc32_64_64>;
6700-
def CRC32r64r8 : Crc32r<Xi8, GR64, null_frag>, REX_W;
6691+
let Predicates = [HasCRC32, HasEGPR, In64BitMode], OpMap = T_MAP4, OpEnc = EncEVEX in {
6692+
def CRC32r32r8_EVEX : Crc32r<Xi8, GR32, int_x86_sse42_crc32_32_8>;
6693+
def CRC32r32m8_EVEX : Crc32m<Xi8, GR32, int_x86_sse42_crc32_32_8>;
6694+
def CRC32r32r16_EVEX : Crc32r<Xi16, GR32, int_x86_sse42_crc32_32_16>, PD;
6695+
def CRC32r32m16_EVEX : Crc32m<Xi16, GR32, int_x86_sse42_crc32_32_16>, PD;
6696+
def CRC32r32r32_EVEX : Crc32r<Xi32, GR32, int_x86_sse42_crc32_32_32>;
6697+
def CRC32r32m32_EVEX : Crc32m<Xi32, GR32, int_x86_sse42_crc32_32_32>;
6698+
def CRC32r64r64_EVEX : Crc32r<Xi64, GR64, int_x86_sse42_crc32_64_64>;
6699+
def CRC32r64m64_EVEX : Crc32m<Xi64, GR64, int_x86_sse42_crc32_64_64>;
6700+
def CRC32r64r8_EVEX : Crc32r<Xi8, GR64, null_frag>, REX_W;
67016701
let mayLoad = 1 in
6702-
def CRC32r64m8 : Crc32m<Xi8, GR64, null_frag>, REX_W;
6702+
def CRC32r64m8_EVEX : Crc32m<Xi8, GR64, null_frag>, REX_W;
67036703
}
67046704

67056705
//===----------------------------------------------------------------------===//

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
# ATT: crc32q %rax, %rbx
2121
# INTEL: crc32 rbx, rax
22-
0x62,0xf4,0xfd,0x08,0xf1,0xd8
22+
0x62,0xf4,0xfc,0x08,0xf1,0xd8
2323

2424
# ATT: crc32w 291(%rax,%rbx,4), %ecx
2525
# INTEL: crc32 ecx, word ptr [rax + 4*rbx + 291]
@@ -35,7 +35,7 @@
3535

3636
# ATT: crc32q 291(%rax,%rbx,4), %rcx
3737
# INTEL: crc32 rcx, qword ptr [rax + 4*rbx + 291]
38-
0x62,0xf4,0xfd,0x08,0xf1,0x8c,0x98,0x23,0x01,0x00,0x00
38+
0x62,0xf4,0xfc,0x08,0xf1,0x8c,0x98,0x23,0x01,0x00,0x00
3939

4040
# ATT: crc32b %r16b, %r22d
4141
# INTEL: crc32 r22d, r16b
@@ -55,7 +55,7 @@
5555

5656
# ATT: crc32q %r19, %r23
5757
# INTEL: crc32 r23, r19
58-
0x62,0xec,0xfd,0x08,0xf1,0xfb
58+
0x62,0xec,0xfc,0x08,0xf1,0xfb
5959

6060
# ATT: crc32w 291(%r28,%r29,4), %r18d
6161
# INTEL: crc32 r18d, word ptr [r28 + 4*r29 + 291]
@@ -71,7 +71,7 @@
7171

7272
# ATT: crc32q 291(%r28,%r29,4), %r19
7373
# INTEL: crc32 r19, qword ptr [r28 + 4*r29 + 291]
74-
0x62,0x8c,0xf9,0x08,0xf1,0x9c,0xac,0x23,0x01,0x00,0x00
74+
0x62,0x8c,0xf8,0x08,0xf1,0x9c,0xac,0x23,0x01,0x00,0x00
7575

7676
# ATT: crc32w 123(%r28,%r29,4), %r18d
7777
# INTEL: crc32 r18d, word ptr [r28 + 4*r29 + 123]
@@ -87,4 +87,4 @@
8787

8888
# ATT: crc32q 123(%r28,%r29,4), %r19
8989
# INTEL: crc32 r19, qword ptr [r28 + 4*r29 + 123]
90-
0x62,0x8c,0xf9,0x08,0xf1,0x5c,0xac,0x7b
90+
0x62,0x8c,0xf8,0x08,0xf1,0x5c,0xac,0x7b

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{evex} crc32l %eax, %ebx
2121

2222
# CHECK: {evex} crc32q %rax, %rbx
23-
# CHECK: encoding: [0x62,0xf4,0xfd,0x08,0xf1,0xd8]
23+
# CHECK: encoding: [0x62,0xf4,0xfc,0x08,0xf1,0xd8]
2424
{evex} crc32q %rax, %rbx
2525

2626
# CHECK: {evex} crc32w 291(%rax,%rbx,4), %ecx
@@ -36,7 +36,7 @@
3636
{evex} crc32b 291(%rax,%rbx,4), %rcx
3737

3838
# CHECK: {evex} crc32q 291(%rax,%rbx,4), %rcx
39-
# CHECK: encoding: [0x62,0xf4,0xfd,0x08,0xf1,0x8c,0x98,0x23,0x01,0x00,0x00]
39+
# CHECK: encoding: [0x62,0xf4,0xfc,0x08,0xf1,0x8c,0x98,0x23,0x01,0x00,0x00]
4040
{evex} crc32q 291(%rax,%rbx,4), %rcx
4141

4242
# CHECK: crc32b %r16b, %r22d
@@ -56,7 +56,7 @@
5656
crc32l %r18d, %r22d
5757

5858
# CHECK: crc32q %r19, %r23
59-
# CHECK: encoding: [0x62,0xec,0xfd,0x08,0xf1,0xfb]
59+
# CHECK: encoding: [0x62,0xec,0xfc,0x08,0xf1,0xfb]
6060
crc32q %r19, %r23
6161

6262
# CHECK: crc32w 291(%r28,%r29,4), %r18d
@@ -72,7 +72,7 @@
7272
crc32b 291(%r28,%r29,4), %r19
7373

7474
# CHECK: crc32q 291(%r28,%r29,4), %r19
75-
# CHECK: encoding: [0x62,0x8c,0xf9,0x08,0xf1,0x9c,0xac,0x23,0x01,0x00,0x00]
75+
# CHECK: encoding: [0x62,0x8c,0xf8,0x08,0xf1,0x9c,0xac,0x23,0x01,0x00,0x00]
7676
crc32q 291(%r28,%r29,4), %r19
7777

7878
# CHECK: crc32w 123(%r28,%r29,4), %r18d
@@ -88,5 +88,5 @@
8888
crc32b 123(%r28,%r29,4), %r19
8989

9090
# CHECK: crc32q 123(%r28,%r29,4), %r19
91-
# CHECK: encoding: [0x62,0x8c,0xf9,0x08,0xf1,0x5c,0xac,0x7b]
91+
# CHECK: encoding: [0x62,0x8c,0xf8,0x08,0xf1,0x5c,0xac,0x7b]
9292
crc32q 123(%r28,%r29,4), %r19

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
{evex} crc32 ebx, eax
1818

1919
# CHECK: {evex} crc32 rbx, rax
20-
# CHECK: encoding: [0x62,0xf4,0xfd,0x08,0xf1,0xd8]
20+
# CHECK: encoding: [0x62,0xf4,0xfc,0x08,0xf1,0xd8]
2121
{evex} crc32 rbx, rax
2222

2323
# CHECK: {evex} crc32 ecx, word ptr [rax + 4*rbx + 291]
@@ -33,7 +33,7 @@
3333
{evex} crc32 rcx, byte ptr [rax + 4*rbx + 291]
3434

3535
# CHECK: {evex} crc32 rcx, qword ptr [rax + 4*rbx + 291]
36-
# CHECK: encoding: [0x62,0xf4,0xfd,0x08,0xf1,0x8c,0x98,0x23,0x01,0x00,0x00]
36+
# CHECK: encoding: [0x62,0xf4,0xfc,0x08,0xf1,0x8c,0x98,0x23,0x01,0x00,0x00]
3737
{evex} crc32 rcx, qword ptr [rax + 4*rbx + 291]
3838

3939
# CHECK: crc32 r22d, r16b
@@ -53,7 +53,7 @@
5353
crc32 r22d, r18d
5454

5555
# CHECK: crc32 r23, r19
56-
# CHECK: encoding: [0x62,0xec,0xfd,0x08,0xf1,0xfb]
56+
# CHECK: encoding: [0x62,0xec,0xfc,0x08,0xf1,0xfb]
5757
crc32 r23, r19
5858

5959
# CHECK: crc32 r18d, word ptr [r28 + 4*r29 + 291]
@@ -69,7 +69,7 @@
6969
crc32 r19, byte ptr [r28 + 4*r29 + 291]
7070

7171
# CHECK: crc32 r19, qword ptr [r28 + 4*r29 + 291]
72-
# CHECK: encoding: [0x62,0x8c,0xf9,0x08,0xf1,0x9c,0xac,0x23,0x01,0x00,0x00]
72+
# CHECK: encoding: [0x62,0x8c,0xf8,0x08,0xf1,0x9c,0xac,0x23,0x01,0x00,0x00]
7373
crc32 r19, qword ptr [r28 + 4*r29 + 291]
7474

7575
# CHECK: crc32 r18d, word ptr [r28 + 4*r29 + 123]
@@ -85,5 +85,5 @@
8585
crc32 r19, byte ptr [r28 + 4*r29 + 123]
8686

8787
# CHECK: crc32 r19, qword ptr [r28 + 4*r29 + 123]
88-
# CHECK: encoding: [0x62,0x8c,0xf9,0x08,0xf1,0x5c,0xac,0x7b]
88+
# CHECK: encoding: [0x62,0x8c,0xf8,0x08,0xf1,0x5c,0xac,0x7b]
8989
crc32 r19, qword ptr [r28 + 4*r29 + 123]

0 commit comments

Comments
 (0)