From 7add9939175aa71faa37c40dcedcb9190e3b37d8 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 28 Jun 2024 08:24:12 +0200 Subject: x86/APX: extend TEST-by-imm7 optimization to CTESTcc The same properties apply there. --- gas/config/tc-i386.c | 10 +++++-- gas/testsuite/gas/i386/x86-64-optimize-3.d | 44 +++++++++++++++++++++++++++++ gas/testsuite/gas/i386/x86-64-optimize-3.s | 38 ++++++++++++++----------- gas/testsuite/gas/i386/x86-64-optimize-3b.d | 44 +++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+), 18 deletions(-) (limited to 'gas') diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index 7ad0267..4de5c01 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -4770,7 +4770,9 @@ optimize_encoding (void) } if (optimize_for_space - && i.tm.mnem_off == MN_test + && (i.tm.mnem_off == MN_test + || (i.tm.base_opcode == 0xf6 + && i.tm.opcode_space == SPACE_EVEXMAP4)) && i.reg_operands == 1 && i.imm_operands == 1 && !i.types[1].bitfield.byte @@ -4779,9 +4781,13 @@ optimize_encoding (void) && fits_in_imm7 (i.op[0].imms->X_add_number)) { /* Optimize: -Os: - test $imm7, %r64/%r32/%r16 -> test $imm7, %r8 + test $imm7, %r64/%r32/%r16 -> test $imm7, %r8 + ctest $imm7, %r64/%r32/%r16 -> ctest $imm7, %r8 */ unsigned int base_regnum = i.op[1].regs->reg_num; + + gas_assert (!i.tm.opcode_modifier.modrm || i.tm.extension_opcode == 0); + if (flag_code == CODE_64BIT || base_regnum < 4) { i.types[1].bitfield.byte = 1; diff --git a/gas/testsuite/gas/i386/x86-64-optimize-3.d b/gas/testsuite/gas/i386/x86-64-optimize-3.d index 23b9305..51513c8 100644 --- a/gas/testsuite/gas/i386/x86-64-optimize-3.d +++ b/gas/testsuite/gas/i386/x86-64-optimize-3.d @@ -28,6 +28,50 @@ Disassembly of section .text: +[a-f0-9]+: 41 f6 c4 7f test \$0x7f,%r12b +[a-f0-9]+: 41 f6 c4 7f test \$0x7f,%r12b +[a-f0-9]+: 41 f6 c4 7f test \$0x7f,%r12b + +[a-f0-9]+: d5 10 f6 c6 7f test \$0x7f,%r22b + +[a-f0-9]+: d5 10 f6 c6 7f test \$0x7f,%r22b + +[a-f0-9]+: d5 10 f6 c6 7f test \$0x7f,%r22b + +[a-f0-9]+: d5 10 f6 c6 7f test \$0x7f,%r22b + +[a-f0-9]+: 62 f4 04 0a f6 c3 7f ctestt( \{dfv=\})? \$0x7f,%bl + +[a-f0-9]+: 62 f4 04 0a f6 c3 7f ctestt( \{dfv=\})? \$0x7f,%bl + +[a-f0-9]+: 62 f4 04 0a f6 c3 7f ctestt( \{dfv=\})? \$0x7f,%bl + +[a-f0-9]+: 62 f4 04 0a f6 c3 7f ctestt( \{dfv=\})? \$0x7f,%bl + +[a-f0-9]+: 62 f4 04 0a f6 c7 7f ctestt( \{dfv=\})? \$0x7f,%dil + +[a-f0-9]+: 62 f4 04 0a f6 c7 7f ctestt( \{dfv=\})? \$0x7f,%dil + +[a-f0-9]+: 62 f4 04 0a f6 c7 7f ctestt( \{dfv=\})? \$0x7f,%dil + +[a-f0-9]+: 62 f4 04 0a f6 c7 7f ctestt( \{dfv=\})? \$0x7f,%dil + +[a-f0-9]+: 62 d4 04 0a f6 c1 7f ctestt( \{dfv=\})? \$0x7f,%r9b + +[a-f0-9]+: 62 d4 04 0a f6 c1 7f ctestt( \{dfv=\})? \$0x7f,%r9b + +[a-f0-9]+: 62 d4 04 0a f6 c1 7f ctestt( \{dfv=\})? \$0x7f,%r9b + +[a-f0-9]+: 62 d4 04 0a f6 c1 7f ctestt( \{dfv=\})? \$0x7f,%r9b + +[a-f0-9]+: 62 d4 04 0a f6 c4 7f ctestt( \{dfv=\})? \$0x7f,%r12b + +[a-f0-9]+: 62 d4 04 0a f6 c4 7f ctestt( \{dfv=\})? \$0x7f,%r12b + +[a-f0-9]+: 62 d4 04 0a f6 c4 7f ctestt( \{dfv=\})? \$0x7f,%r12b + +[a-f0-9]+: 62 d4 04 0a f6 c4 7f ctestt( \{dfv=\})? \$0x7f,%r12b + +[a-f0-9]+: 62 fc 04 0a f6 c6 7f ctestt( \{dfv=\})? \$0x7f,%r22b + +[a-f0-9]+: 62 fc 04 0a f6 c6 7f ctestt( \{dfv=\})? \$0x7f,%r22b + +[a-f0-9]+: 62 fc 04 0a f6 c6 7f ctestt( \{dfv=\})? \$0x7f,%r22b + +[a-f0-9]+: 62 fc 04 0a f6 c6 7f ctestt( \{dfv=\})? \$0x7f,%r22b + +[a-f0-9]+: 62 f4 04 02 f6 c3 7f ctestb( \{dfv=\})? \$0x7f,%bl + +[a-f0-9]+: 62 f4 04 02 f6 c3 7f ctestb( \{dfv=\})? \$0x7f,%bl + +[a-f0-9]+: 62 f4 04 02 f6 c3 7f ctestb( \{dfv=\})? \$0x7f,%bl + +[a-f0-9]+: 62 f4 04 02 f6 c3 7f ctestb( \{dfv=\})? \$0x7f,%bl + +[a-f0-9]+: 62 f4 04 02 f6 c7 7f ctestb( \{dfv=\})? \$0x7f,%dil + +[a-f0-9]+: 62 f4 04 02 f6 c7 7f ctestb( \{dfv=\})? \$0x7f,%dil + +[a-f0-9]+: 62 f4 04 02 f6 c7 7f ctestb( \{dfv=\})? \$0x7f,%dil + +[a-f0-9]+: 62 f4 04 02 f6 c7 7f ctestb( \{dfv=\})? \$0x7f,%dil + +[a-f0-9]+: 62 d4 04 02 f6 c1 7f ctestb( \{dfv=\})? \$0x7f,%r9b + +[a-f0-9]+: 62 d4 04 02 f6 c1 7f ctestb( \{dfv=\})? \$0x7f,%r9b + +[a-f0-9]+: 62 d4 04 02 f6 c1 7f ctestb( \{dfv=\})? \$0x7f,%r9b + +[a-f0-9]+: 62 d4 04 02 f6 c1 7f ctestb( \{dfv=\})? \$0x7f,%r9b + +[a-f0-9]+: 62 d4 04 02 f6 c4 7f ctestb( \{dfv=\})? \$0x7f,%r12b + +[a-f0-9]+: 62 d4 04 02 f6 c4 7f ctestb( \{dfv=\})? \$0x7f,%r12b + +[a-f0-9]+: 62 d4 04 02 f6 c4 7f ctestb( \{dfv=\})? \$0x7f,%r12b + +[a-f0-9]+: 62 d4 04 02 f6 c4 7f ctestb( \{dfv=\})? \$0x7f,%r12b + +[a-f0-9]+: 62 fc 04 02 f6 c6 7f ctestb( \{dfv=\})? \$0x7f,%r22b + +[a-f0-9]+: 62 fc 04 02 f6 c6 7f ctestb( \{dfv=\})? \$0x7f,%r22b + +[a-f0-9]+: 62 fc 04 02 f6 c6 7f ctestb( \{dfv=\})? \$0x7f,%r22b + +[a-f0-9]+: 62 fc 04 02 f6 c6 7f ctestb( \{dfv=\})? \$0x7f,%r22b +[a-f0-9]+: 20 c9 and %cl,%cl +[a-f0-9]+: 66 21 d2 and %dx,%dx +[a-f0-9]+: 21 db and %ebx,%ebx diff --git a/gas/testsuite/gas/i386/x86-64-optimize-3.s b/gas/testsuite/gas/i386/x86-64-optimize-3.s index 843c3e4..b2cf16d 100644 --- a/gas/testsuite/gas/i386/x86-64-optimize-3.s +++ b/gas/testsuite/gas/i386/x86-64-optimize-3.s @@ -6,22 +6,28 @@ _start: testl $0x7f, %eax testw $0x7f, %ax testb $0x7f, %al - test $0x7f, %rbx - test $0x7f, %ebx - test $0x7f, %bx - test $0x7f, %bl - test $0x7f, %rdi - test $0x7f, %edi - test $0x7f, %di - test $0x7f, %dil - test $0x7f, %r9 - test $0x7f, %r9d - test $0x7f, %r9w - test $0x7f, %r9b - test $0x7f, %r12 - test $0x7f, %r12d - test $0x7f, %r12w - test $0x7f, %r12b + .irp tst, test, "{evex} test", ctestc + \tst $0x7f, %rbx + \tst $0x7f, %ebx + \tst $0x7f, %bx + \tst $0x7f, %bl + \tst $0x7f, %rdi + \tst $0x7f, %edi + \tst $0x7f, %di + \tst $0x7f, %dil + \tst $0x7f, %r9 + \tst $0x7f, %r9d + \tst $0x7f, %r9w + \tst $0x7f, %r9b + \tst $0x7f, %r12 + \tst $0x7f, %r12d + \tst $0x7f, %r12w + \tst $0x7f, %r12b + \tst $0x7f, %r22 + \tst $0x7f, %r22d + \tst $0x7f, %r22w + \tst $0x7f, %r22b + .endr and %cl, %cl and %dx, %dx diff --git a/gas/testsuite/gas/i386/x86-64-optimize-3b.d b/gas/testsuite/gas/i386/x86-64-optimize-3b.d index 476708a..abfc8f9 100644 --- a/gas/testsuite/gas/i386/x86-64-optimize-3b.d +++ b/gas/testsuite/gas/i386/x86-64-optimize-3b.d @@ -29,6 +29,50 @@ Disassembly of section .text: +[a-f0-9]+: 41 f7 c4 7f 00 00 00 test \$0x7f,%r12d +[a-f0-9]+: 66 41 f7 c4 7f 00 test \$0x7f,%r12w +[a-f0-9]+: 41 f6 c4 7f test \$0x7f,%r12b + +[a-f0-9]+: d5 18 f7 c6 7f 00 00 00 test \$0x7f,%r22 + +[a-f0-9]+: d5 10 f7 c6 7f 00 00 00 test \$0x7f,%r22d + +[a-f0-9]+: 66 d5 10 f7 c6 7f 00 test \$0x7f,%r22w + +[a-f0-9]+: d5 10 f6 c6 7f test \$0x7f,%r22b + +[a-f0-9]+: 62 f4 84 0a f7 c3 7f 00 00 00 ctestt( \{dfv=\})? \$0x7f,%rbx + +[a-f0-9]+: 62 f4 04 0a f7 c3 7f 00 00 00 ctestt( \{dfv=\})? \$0x7f,%ebx + +[a-f0-9]+: 62 f4 05 0a f7 c3 7f 00 ctestt( \{dfv=\})? \$0x7f,%bx + +[a-f0-9]+: 62 f4 04 0a f6 c3 7f ctestt( \{dfv=\})? \$0x7f,%bl + +[a-f0-9]+: 62 f4 84 0a f7 c7 7f 00 00 00 ctestt( \{dfv=\})? \$0x7f,%rdi + +[a-f0-9]+: 62 f4 04 0a f7 c7 7f 00 00 00 ctestt( \{dfv=\})? \$0x7f,%edi + +[a-f0-9]+: 62 f4 05 0a f7 c7 7f 00 ctestt( \{dfv=\})? \$0x7f,%di + +[a-f0-9]+: 62 f4 04 0a f6 c7 7f ctestt( \{dfv=\})? \$0x7f,%dil + +[a-f0-9]+: 62 d4 84 0a f7 c1 7f 00 00 00 ctestt( \{dfv=\})? \$0x7f,%r9 + +[a-f0-9]+: 62 d4 04 0a f7 c1 7f 00 00 00 ctestt( \{dfv=\})? \$0x7f,%r9d + +[a-f0-9]+: 62 d4 05 0a f7 c1 7f 00 ctestt( \{dfv=\})? \$0x7f,%r9w + +[a-f0-9]+: 62 d4 04 0a f6 c1 7f ctestt( \{dfv=\})? \$0x7f,%r9b + +[a-f0-9]+: 62 d4 84 0a f7 c4 7f 00 00 00 ctestt( \{dfv=\})? \$0x7f,%r12 + +[a-f0-9]+: 62 d4 04 0a f7 c4 7f 00 00 00 ctestt( \{dfv=\})? \$0x7f,%r12d + +[a-f0-9]+: 62 d4 05 0a f7 c4 7f 00 ctestt( \{dfv=\})? \$0x7f,%r12w + +[a-f0-9]+: 62 d4 04 0a f6 c4 7f ctestt( \{dfv=\})? \$0x7f,%r12b + +[a-f0-9]+: 62 fc 84 0a f7 c6 7f 00 00 00 ctestt( \{dfv=\})? \$0x7f,%r22 + +[a-f0-9]+: 62 fc 04 0a f7 c6 7f 00 00 00 ctestt( \{dfv=\})? \$0x7f,%r22d + +[a-f0-9]+: 62 fc 05 0a f7 c6 7f 00 ctestt( \{dfv=\})? \$0x7f,%r22w + +[a-f0-9]+: 62 fc 04 0a f6 c6 7f ctestt( \{dfv=\})? \$0x7f,%r22b + +[a-f0-9]+: 62 f4 84 02 f7 c3 7f 00 00 00 ctestb( \{dfv=\})? \$0x7f,%rbx + +[a-f0-9]+: 62 f4 04 02 f7 c3 7f 00 00 00 ctestb( \{dfv=\})? \$0x7f,%ebx + +[a-f0-9]+: 62 f4 05 02 f7 c3 7f 00 ctestb( \{dfv=\})? \$0x7f,%bx + +[a-f0-9]+: 62 f4 04 02 f6 c3 7f ctestb( \{dfv=\})? \$0x7f,%bl + +[a-f0-9]+: 62 f4 84 02 f7 c7 7f 00 00 00 ctestb( \{dfv=\})? \$0x7f,%rdi + +[a-f0-9]+: 62 f4 04 02 f7 c7 7f 00 00 00 ctestb( \{dfv=\})? \$0x7f,%edi + +[a-f0-9]+: 62 f4 05 02 f7 c7 7f 00 ctestb( \{dfv=\})? \$0x7f,%di + +[a-f0-9]+: 62 f4 04 02 f6 c7 7f ctestb( \{dfv=\})? \$0x7f,%dil + +[a-f0-9]+: 62 d4 84 02 f7 c1 7f 00 00 00 ctestb( \{dfv=\})? \$0x7f,%r9 + +[a-f0-9]+: 62 d4 04 02 f7 c1 7f 00 00 00 ctestb( \{dfv=\})? \$0x7f,%r9d + +[a-f0-9]+: 62 d4 05 02 f7 c1 7f 00 ctestb( \{dfv=\})? \$0x7f,%r9w + +[a-f0-9]+: 62 d4 04 02 f6 c1 7f ctestb( \{dfv=\})? \$0x7f,%r9b + +[a-f0-9]+: 62 d4 84 02 f7 c4 7f 00 00 00 ctestb( \{dfv=\})? \$0x7f,%r12 + +[a-f0-9]+: 62 d4 04 02 f7 c4 7f 00 00 00 ctestb( \{dfv=\})? \$0x7f,%r12d + +[a-f0-9]+: 62 d4 05 02 f7 c4 7f 00 ctestb( \{dfv=\})? \$0x7f,%r12w + +[a-f0-9]+: 62 d4 04 02 f6 c4 7f ctestb( \{dfv=\})? \$0x7f,%r12b + +[a-f0-9]+: 62 fc 84 02 f7 c6 7f 00 00 00 ctestb( \{dfv=\})? \$0x7f,%r22 + +[a-f0-9]+: 62 fc 04 02 f7 c6 7f 00 00 00 ctestb( \{dfv=\})? \$0x7f,%r22d + +[a-f0-9]+: 62 fc 05 02 f7 c6 7f 00 ctestb( \{dfv=\})? \$0x7f,%r22w + +[a-f0-9]+: 62 fc 04 02 f6 c6 7f ctestb( \{dfv=\})? \$0x7f,%r22b +[a-f0-9]+: 84 c9 test %cl,%cl +[a-f0-9]+: 66 85 d2 test %dx,%dx +[a-f0-9]+: 21 db and %ebx,%ebx -- cgit v1.1