From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id B774238460A2; Fri, 16 Apr 2021 11:45:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B774238460A2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-8215] aarch64: Fix up 2 other combine opt regressions vs. GCC8 [PR100075] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: 49e651990a6966936a0273138dd56ac394e57b16 X-Git-Newrev: 47f42744f6e10ad41db926d739306e6f237fd3ac Message-Id: <20210416114506.B774238460A2@sourceware.org> Date: Fri, 16 Apr 2021 11:45:06 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Apr 2021 11:45:06 -0000 https://gcc.gnu.org/g:47f42744f6e10ad41db926d739306e6f237fd3ac commit r11-8215-g47f42744f6e10ad41db926d739306e6f237fd3ac Author: Jakub Jelinek Date: Fri Apr 16 13:44:23 2021 +0200 aarch64: Fix up 2 other combine opt regressions vs. GCC8 [PR100075] The testcase used to be compiled at -O2 by GCC8 and earlier to: f1: neg w1, w0, asr 16 and w1, w1, 65535 orr w0, w1, w0, lsl 16 ret f2: neg w1, w0 extr w0, w1, w0, 16 ret but since GCC9 (r9-3594 for f1 and r9-6926 for f2) we compile it into: f1: mov w1, w0 sbfx x0, x1, 16, 16 neg w0, w0 bfi w0, w1, 16, 16 ret f2: neg w1, w0 sbfx x0, x0, 16, 16 bfi w0, w1, 16, 16 ret instead, i.e. one insn longer each. With this patch we get: f1: mov w1, w0 neg w0, w1, asr 16 bfi w0, w1, 16, 16 ret f2: neg w1, w0 extr w0, w1, w0, 16 ret i.e. identical f2 and same number of insns as in GCC8 in f1. The combiner unfortunately doesn't try splitters when doing 2 -> 1 combination, so it can't be implemented as combine splitters, but it could be implemented as define_insn_and_split if desirable. 2021-04-16 Jakub Jelinek PR target/100075 * config/aarch64/aarch64.md (*neg_asr_si2_extr, *extrsi5_insn_di): New define_insn patterns. * gcc.target/aarch64/pr100075.c: New test. Diff: --- gcc/config/aarch64/aarch64.md | 28 ++++++++++++++++++++++++++++ gcc/testsuite/gcc.target/aarch64/pr100075.c | 20 ++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md index 962640b1f93..abfd8452674 100644 --- a/gcc/config/aarch64/aarch64.md +++ b/gcc/config/aarch64/aarch64.md @@ -3572,6 +3572,18 @@ [(set_attr "autodetect_type" "alu_shift__op2")] ) +(define_insn "*neg_asr_si2_extr" + [(set (match_operand:SI 0 "register_operand" "=r") + (neg:SI (match_operator:SI 4 "subreg_lowpart_operator" + [(sign_extract:DI + (match_operand:DI 1 "register_operand" "r") + (match_operand 3 "aarch64_simd_shift_imm_offset_si" "n") + (match_operand 2 "aarch64_simd_shift_imm_offset_si" "n"))])))] + "INTVAL (operands[2]) + INTVAL (operands[3]) == 32" + "neg\\t%w0, %w1, asr %2" + [(set_attr "autodetect_type" "alu_shift_asr_op2")] +) + (define_insn "mul3" [(set (match_operand:GPI 0 "register_operand" "=r") (mult:GPI (match_operand:GPI 1 "register_operand" "r") @@ -5383,6 +5395,22 @@ [(set_attr "type" "rotate_imm")] ) +(define_insn "*extrsi5_insn_di" + [(set (match_operand:SI 0 "register_operand" "=r") + (ior:SI (ashift:SI (match_operand:SI 1 "register_operand" "r") + (match_operand 3 "const_int_operand" "n")) + (match_operator:SI 6 "subreg_lowpart_operator" + [(zero_extract:DI + (match_operand:DI 2 "register_operand" "r") + (match_operand 5 "const_int_operand" "n") + (match_operand 4 "const_int_operand" "n"))])))] + "UINTVAL (operands[3]) < 32 + && UINTVAL (operands[3]) + UINTVAL (operands[4]) == 32 + && INTVAL (operands[3]) == INTVAL (operands[5])" + "extr\\t%w0, %w1, %w2, %4" + [(set_attr "type" "rotate_imm")] +) + (define_insn "*ror3_insn" [(set (match_operand:GPI 0 "register_operand" "=r") (rotate:GPI (match_operand:GPI 1 "register_operand" "r") diff --git a/gcc/testsuite/gcc.target/aarch64/pr100075.c b/gcc/testsuite/gcc.target/aarch64/pr100075.c new file mode 100644 index 00000000000..6bdaa2f6407 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/pr100075.c @@ -0,0 +1,20 @@ +/* PR target/100075 */ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ +/* { dg-final { scan-assembler-not {\tsbfx\tx[0-9]+, x[0-9]+, 16, 16} } } */ +/* { dg-final { scan-assembler {\tneg\tw[0-9]+, w[0-9]+, asr 16} } } */ +/* { dg-final { scan-assembler {\textr\tw[0-9]+, w[0-9]+, w[0-9]+, 16} } } */ + +struct S { short x, y; }; + +struct S +f1 (struct S p) +{ + return (struct S) { -p.y, p.x }; +} + +struct S +f2 (struct S p) +{ + return (struct S) { p.y, -p.x }; +}