Skip to content

Commit e50f216

Browse files
committed
update test
1 parent 16b855c commit e50f216

File tree

11 files changed

+68
-38
lines changed

11 files changed

+68
-38
lines changed

llvm/lib/Target/X86/X86InstrArithmetic.td

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,13 +1321,11 @@ multiclass AndN<X86TypeInfo t, SDPatternOperator node, string suffix = ""> {
13211321
(t.LoadNode addr:$src2)))];
13221322
def rr#suffix : ITy<0xF2, MRMSrcReg, t, (outs t.RegClass:$dst),
13231323
(ins t.RegClass:$src1, t.RegClass:$src2), "andn",
1324-
binop_ndd_args, andn_rr_p>, VVVV, Sched<[WriteALU]>,
1325-
T8, NoCD8;
1324+
binop_ndd_args, andn_rr_p>, VVVV, Sched<[WriteALU]>, T8;
13261325
def rm#suffix : ITy<0xF2, MRMSrcMem, t, (outs t.RegClass:$dst),
13271326
(ins t.RegClass:$src1, t.MemOperand:$src2), "andn",
13281327
binop_ndd_args, andn_rm_p>, VVVV,
1329-
Sched<[WriteALU.Folded, WriteALU.ReadAfterFold]>,
1330-
T8, NoCD8;
1328+
Sched<[WriteALU.Folded, WriteALU.ReadAfterFold]>, T8;
13311329
}
13321330

13331331
// Complexity is reduced to give and with immediate a chance to match first.

llvm/lib/Target/X86/X86InstrMisc.td

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,13 +1298,13 @@ multiclass Bmi4VOp3<bits<8> o, string m, X86TypeInfo t, SDPatternOperator node,
12981298
let SchedRW = [sched], Form = MRMSrcReg4VOp3 in
12991299
def rr#Suffix : BinOpRR<o, m, binop_ndd_args, t, (outs t.RegClass:$dst),
13001300
[(set t.RegClass:$dst, EFLAGS,
1301-
(node t.RegClass:$src1, t.RegClass:$src2))]>, T8, NoCD8;
1301+
(node t.RegClass:$src1, t.RegClass:$src2))]>, T8;
13021302
let SchedRW = [sched.Folded,
13031303
ReadDefault, ReadDefault, ReadDefault, ReadDefault, ReadDefault,
13041304
sched.ReadAfterFold], Form = MRMSrcMem4VOp3 in
13051305
def rm#Suffix : BinOpMR<o, m, binop_ndd_args, t, (outs t.RegClass:$dst),
13061306
[(set t.RegClass:$dst, EFLAGS, (node (t.LoadNode addr:$src1),
1307-
t.RegClass:$src2))]>, T8, NoCD8;
1307+
t.RegClass:$src2))]>, T8;
13081308
}
13091309

13101310
let Predicates = [HasBMI, NoEGPR], Defs = [EFLAGS] in {

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

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

2020
# ATT: {nf} blsil 123(%rax,%rbx,4), %ecx
2121
# INTEL: {nf} blsi ecx, dword ptr [rax + 4*rbx + 123]
22-
0x62,0xf2,0x74,0x0c,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00
22+
0x62,0xf2,0x74,0x0c,0xf3,0x5c,0x98,0x7b
2323

2424
# ATT: blsil 123(%rax,%rbx,4), %ecx
2525
# INTEL: blsi ecx, dword ptr [rax + 4*rbx + 123]
26-
0x62,0xf2,0x74,0x08,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00
26+
0x62,0xf2,0x74,0x08,0xf3,0x5c,0x98,0x7b
2727

2828
# ATT: {nf} blsiq 123(%rax,%rbx,4), %r9
2929
# INTEL: {nf} blsi r9, qword ptr [rax + 4*rbx + 123]
30-
0x62,0xf2,0xb4,0x0c,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00
30+
0x62,0xf2,0xb4,0x0c,0xf3,0x5c,0x98,0x7b
3131

3232
# ATT: blsiq 123(%rax,%rbx,4), %r9
3333
# INTEL: blsi r9, qword ptr [rax + 4*rbx + 123]
34-
0x62,0xf2,0xb4,0x08,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00
34+
0x62,0xf2,0xb4,0x08,0xf3,0x5c,0x98,0x7b
3535

3636
# ATT: blsil %r18d, %r22d
3737
# INTEL: blsi r22d, r18d

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,38 @@
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: {nf} blsmskl %ecx, %edx
5+
# INTEL: {nf} blsmsk edx, ecx
6+
0x62,0xf2,0x6c,0x0c,0xf3,0xd1
7+
8+
# ATT: blsmskl %ecx, %edx
9+
# INTEL: blsmsk edx, ecx
10+
0x62,0xf2,0x6c,0x08,0xf3,0xd1
11+
12+
# ATT: {nf} blsmskq %r9, %r15
13+
# INTEL: {nf} blsmsk r15, r9
14+
0x62,0xd2,0x84,0x0c,0xf3,0xd1
15+
16+
# ATT: blsmskq %r9, %r15
17+
# INTEL: blsmsk r15, r9
18+
0x62,0xd2,0x84,0x08,0xf3,0xd1
19+
20+
# ATT: {nf} blsmskl 123(%rax,%rbx,4), %ecx
21+
# INTEL: {nf} blsmsk ecx, dword ptr [rax + 4*rbx + 123]
22+
0x62,0xf2,0x74,0x0c,0xf3,0x54,0x98,0x7b
23+
24+
# ATT: blsmskl 123(%rax,%rbx,4), %ecx
25+
# INTEL: blsmsk ecx, dword ptr [rax + 4*rbx + 123]
26+
0x62,0xf2,0x74,0x08,0xf3,0x54,0x98,0x7b
27+
28+
# ATT: {nf} blsmskq 123(%rax,%rbx,4), %r9
29+
# INTEL: {nf} blsmsk r9, qword ptr [rax + 4*rbx + 123]
30+
0x62,0xf2,0xb4,0x0c,0xf3,0x54,0x98,0x7b
31+
32+
# ATT: blsmskq 123(%rax,%rbx,4), %r9
33+
# INTEL: blsmsk r9, qword ptr [rax + 4*rbx + 123]
34+
0x62,0xf2,0xb4,0x08,0xf3,0x54,0x98,0x7b
35+
436
# ATT: blsmskl %r18d, %r22d
537
# INTEL: blsmsk r22d, r18d
638
0x62,0xfa,0x4c,0x00,0xf3,0xd2

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

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

2020
# ATT: {nf} blsrl 123(%rax,%rbx,4), %ecx
2121
# INTEL: {nf} blsr ecx, dword ptr [rax + 4*rbx + 123]
22-
0x62,0xf2,0x74,0x0c,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00
22+
0x62,0xf2,0x74,0x0c,0xf3,0x4c,0x98,0x7b
2323

2424
# ATT: blsrl 123(%rax,%rbx,4), %ecx
2525
# INTEL: blsr ecx, dword ptr [rax + 4*rbx + 123]
26-
0x62,0xf2,0x74,0x08,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00
26+
0x62,0xf2,0x74,0x08,0xf3,0x4c,0x98,0x7b
2727

2828
# ATT: {nf} blsrq 123(%rax,%rbx,4), %r9
2929
# INTEL: {nf} blsr r9, qword ptr [rax + 4*rbx + 123]
30-
0x62,0xf2,0xb4,0x0c,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00
30+
0x62,0xf2,0xb4,0x0c,0xf3,0x4c,0x98,0x7b
3131

3232
# ATT: blsrq 123(%rax,%rbx,4), %r9
3333
# INTEL: blsr r9, qword ptr [rax + 4*rbx + 123]
34-
0x62,0xf2,0xb4,0x08,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00
34+
0x62,0xf2,0xb4,0x08,0xf3,0x4c,0x98,0x7b
3535

3636
# ATT: blsrl %r18d, %r22d
3737
# INTEL: blsr r22d, r18d

llvm/test/MC/X86/apx/blsi-att.s

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@
2020
{evex} blsiq %r9, %r15
2121

2222
# CHECK: {nf} blsil 123(%rax,%rbx,4), %ecx
23-
# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00]
23+
# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x5c,0x98,0x7b]
2424
{nf} blsil 123(%rax,%rbx,4), %ecx
2525

2626
# CHECK: {evex} blsil 123(%rax,%rbx,4), %ecx
27-
# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00]
27+
# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x5c,0x98,0x7b]
2828
{evex} blsil 123(%rax,%rbx,4), %ecx
2929

3030
# CHECK: {nf} blsiq 123(%rax,%rbx,4), %r9
31-
# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00]
31+
# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x5c,0x98,0x7b]
3232
{nf} blsiq 123(%rax,%rbx,4), %r9
3333

3434
# CHECK: {evex} blsiq 123(%rax,%rbx,4), %r9
35-
# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00]
35+
# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x5c,0x98,0x7b]
3636
{evex} blsiq 123(%rax,%rbx,4), %r9
3737

3838
# CHECK: blsil %r18d, %r22d

llvm/test/MC/X86/apx/blsi-intel.s

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
{evex} blsi r15, r9
1818

1919
# CHECK: {nf} blsi ecx, dword ptr [rax + 4*rbx + 123]
20-
# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00]
20+
# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x5c,0x98,0x7b]
2121
{nf} blsi ecx, dword ptr [rax + 4*rbx + 123]
2222

2323
# CHECK: {evex} blsi ecx, dword ptr [rax + 4*rbx + 123]
24-
# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00]
24+
# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x5c,0x98,0x7b]
2525
{evex} blsi ecx, dword ptr [rax + 4*rbx + 123]
2626

2727
# CHECK: {nf} blsi r9, qword ptr [rax + 4*rbx + 123]
28-
# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00]
28+
# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x5c,0x98,0x7b]
2929
{nf} blsi r9, qword ptr [rax + 4*rbx + 123]
3030

3131
# CHECK: {evex} blsi r9, qword ptr [rax + 4*rbx + 123]
32-
# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00]
32+
# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x5c,0x98,0x7b]
3333
{evex} blsi r9, qword ptr [rax + 4*rbx + 123]
3434

3535
# CHECK: blsi r22d, r18d

llvm/test/MC/X86/apx/blsmsk-att.s

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@
2020
{evex} blsmskq %r9, %r15
2121

2222
# CHECK: {nf} blsmskl 123(%rax,%rbx,4), %ecx
23-
# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x94,0x98,0x7b,0x00,0x00,0x00]
23+
# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x54,0x98,0x7b]
2424
{nf} blsmskl 123(%rax,%rbx,4), %ecx
2525

2626
# CHECK: {evex} blsmskl 123(%rax,%rbx,4), %ecx
27-
# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x94,0x98,0x7b,0x00,0x00,0x00]
27+
# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x54,0x98,0x7b]
2828
{evex} blsmskl 123(%rax,%rbx,4), %ecx
2929

3030
# CHECK: {nf} blsmskq 123(%rax,%rbx,4), %r9
31-
# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x94,0x98,0x7b,0x00,0x00,0x00]
31+
# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x54,0x98,0x7b]
3232
{nf} blsmskq 123(%rax,%rbx,4), %r9
3333

3434
# CHECK: {evex} blsmskq 123(%rax,%rbx,4), %r9
35-
# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x94,0x98,0x7b,0x00,0x00,0x00]
35+
# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x54,0x98,0x7b]
3636
{evex} blsmskq 123(%rax,%rbx,4), %r9
3737

3838
# CHECK: blsmskl %r18d, %r22d

llvm/test/MC/X86/apx/blsmsk-intel.s

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
{evex} blsmsk r15, r9
1818

1919
# CHECK: {nf} blsmsk ecx, dword ptr [rax + 4*rbx + 123]
20-
# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x94,0x98,0x7b,0x00,0x00,0x00]
20+
# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x54,0x98,0x7b]
2121
{nf} blsmsk ecx, dword ptr [rax + 4*rbx + 123]
2222

2323
# CHECK: {evex} blsmsk ecx, dword ptr [rax + 4*rbx + 123]
24-
# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x94,0x98,0x7b,0x00,0x00,0x00]
24+
# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x54,0x98,0x7b]
2525
{evex} blsmsk ecx, dword ptr [rax + 4*rbx + 123]
2626

2727
# CHECK: {nf} blsmsk r9, qword ptr [rax + 4*rbx + 123]
28-
# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x94,0x98,0x7b,0x00,0x00,0x00]
28+
# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x54,0x98,0x7b]
2929
{nf} blsmsk r9, qword ptr [rax + 4*rbx + 123]
3030

3131
# CHECK: {evex} blsmsk r9, qword ptr [rax + 4*rbx + 123]
32-
# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x94,0x98,0x7b,0x00,0x00,0x00]
32+
# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x54,0x98,0x7b]
3333
{evex} blsmsk r9, qword ptr [rax + 4*rbx + 123]
3434

3535
# CHECK: blsmsk r22d, r18d

llvm/test/MC/X86/apx/blsr-att.s

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@
2020
{evex} blsrq %r9, %r15
2121

2222
# CHECK: {nf} blsrl 123(%rax,%rbx,4), %ecx
23-
# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00]
23+
# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x4c,0x98,0x7b]
2424
{nf} blsrl 123(%rax,%rbx,4), %ecx
2525

2626
# CHECK: {evex} blsrl 123(%rax,%rbx,4), %ecx
27-
# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00]
27+
# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x4c,0x98,0x7b]
2828
{evex} blsrl 123(%rax,%rbx,4), %ecx
2929

3030
# CHECK: {nf} blsrq 123(%rax,%rbx,4), %r9
31-
# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00]
31+
# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x4c,0x98,0x7b]
3232
{nf} blsrq 123(%rax,%rbx,4), %r9
3333

3434
# CHECK: {evex} blsrq 123(%rax,%rbx,4), %r9
35-
# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00]
35+
# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x4c,0x98,0x7b]
3636
{evex} blsrq 123(%rax,%rbx,4), %r9
3737

3838
# CHECK: blsrl %r18d, %r22d

llvm/test/MC/X86/apx/blsr-intel.s

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
{evex} blsr r15, r9
1818

1919
# CHECK: {nf} blsr ecx, dword ptr [rax + 4*rbx + 123]
20-
# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00]
20+
# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x4c,0x98,0x7b]
2121
{nf} blsr ecx, dword ptr [rax + 4*rbx + 123]
2222

2323
# CHECK: {evex} blsr ecx, dword ptr [rax + 4*rbx + 123]
24-
# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00]
24+
# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x4c,0x98,0x7b]
2525
{evex} blsr ecx, dword ptr [rax + 4*rbx + 123]
2626

2727
# CHECK: {nf} blsr r9, qword ptr [rax + 4*rbx + 123]
28-
# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00]
28+
# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x4c,0x98,0x7b]
2929
{nf} blsr r9, qword ptr [rax + 4*rbx + 123]
3030

3131
# CHECK: {evex} blsr r9, qword ptr [rax + 4*rbx + 123]
32-
# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00]
32+
# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x4c,0x98,0x7b]
3333
{evex} blsr r9, qword ptr [rax + 4*rbx + 123]
3434

3535
# CHECK: blsr r22d, r18d

0 commit comments

Comments
 (0)