From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2119) id A13D83858D37; Fri, 28 Apr 2023 15:11:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A13D83858D37 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1682694671; bh=/mp4VaWEmj4qWO8Vhq2C0mC/YiD3pTfGYBR7r/kyPQE=; h=From:To:Subject:Date:From; b=UXfVM5QdXeD4jGbh+pCYLoJoWXQx7JmVUvv8BdjqlIwiljZMZ8mJinYH+moNOg097 7F0xKNYIPv/bk9/uY5pMUIKsktxVDvpsHjf06UADmniZHAvwb3j8g6u5bpO50lnHYm vKQo2WoHc4X7DNzS7dJOdb9GjPRTZIBbWSCtqLXQ= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jeff Law To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-340] RISC-V: Eliminate redundant zero extension of minu/maxu operands X-Act-Checkin: gcc X-Git-Author: Jivan Hakobyan X-Git-Refname: refs/heads/master X-Git-Oldrev: db7e7776b0f5ac2a0e803b197f7b2b8a35f14d8a X-Git-Newrev: 1966741378d5f456d0245960fa09074b6320b4d6 Message-Id: <20230428151111.A13D83858D37@sourceware.org> Date: Fri, 28 Apr 2023 15:11:11 +0000 (GMT) List-Id: https://gcc.gnu.org/g:1966741378d5f456d0245960fa09074b6320b4d6 commit r14-340-g1966741378d5f456d0245960fa09074b6320b4d6 Author: Jivan Hakobyan Date: Fri Apr 28 09:09:45 2023 -0600 RISC-V: Eliminate redundant zero extension of minu/maxu operands RV64 the following code: unsigned Min(unsigned a, unsigned b) { return a < b ? a : b; } Compiles to: Min: zext.w a1,a1 zext.w a0,a0 minu a0,a1,a0 sext.w a0,a0 ret This patch removes unnecessary zero extensions of minu/maxu operands. gcc/ChangeLog: * config/riscv/bitmanip.md: Added expanders for minu/maxu instructions gcc/testsuite/ChangeLog: * gcc.target/riscv/zbb-min-max-02.c: Updated scanning check. * gcc.target/riscv/zbb-min-max-03.c: New tests. Diff: --- gcc/config/riscv/bitmanip.md | 25 ++++++++++++++++++++++++- gcc/testsuite/gcc.target/riscv/zbb-min-max-02.c | 4 ++-- gcc/testsuite/gcc.target/riscv/zbb-min-max-03.c | 13 +++++++++++++ 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/gcc/config/riscv/bitmanip.md b/gcc/config/riscv/bitmanip.md index c21247aa3fa..6617876bb0b 100644 --- a/gcc/config/riscv/bitmanip.md +++ b/gcc/config/riscv/bitmanip.md @@ -401,7 +401,30 @@ DONE; }) -(define_insn "3" +(define_expand "di3" + [(set (match_operand:DI 0 "register_operand" "=r") + (bitmanip_minmax:DI (match_operand:DI 1 "register_operand" "r") + (match_operand:DI 2 "register_operand" "r")))] + "TARGET_64BIT && TARGET_ZBB") + +(define_expand "si3" + [(set (match_operand:SI 0 "register_operand" "=r") + (bitmanip_minmax:SI (match_operand:SI 1 "register_operand" "r") + (match_operand:SI 2 "register_operand" "r")))] + "TARGET_ZBB" +{ + if (TARGET_64BIT) + { + rtx t = gen_reg_rtx (DImode); + operands[1] = force_reg (DImode, gen_rtx_SIGN_EXTEND (DImode, operands[1])); + operands[2] = force_reg (DImode, gen_rtx_SIGN_EXTEND (DImode, operands[2])); + emit_insn (gen_di3 (t, operands[1], operands[2])); + emit_move_insn (operands[0], gen_lowpart (SImode, t)); + DONE; + } +}) + +(define_insn "*3" [(set (match_operand:X 0 "register_operand" "=r") (bitmanip_minmax:X (match_operand:X 1 "register_operand" "r") (match_operand:X 2 "reg_or_0_operand" "rJ")))] diff --git a/gcc/testsuite/gcc.target/riscv/zbb-min-max-02.c b/gcc/testsuite/gcc.target/riscv/zbb-min-max-02.c index b462859f10f..edfbf807d45 100644 --- a/gcc/testsuite/gcc.target/riscv/zbb-min-max-02.c +++ b/gcc/testsuite/gcc.target/riscv/zbb-min-max-02.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-march=rv64gc_zba_zbb -mabi=lp64" } */ -/* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Os" "-Oz" "-Og" } } */ +/* { dg-skip-if "" { *-*-* } { "-O0" } } */ int f(unsigned int* a) { @@ -9,6 +9,6 @@ int f(unsigned int* a) } /* { dg-final { scan-assembler-times "minu" 1 } } */ -/* { dg-final { scan-assembler-times "sext.w" 1 } } */ +/* { dg-final { scan-assembler-not "sext.w" } } */ /* { dg-final { scan-assembler-not "zext.w" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/zbb-min-max-03.c b/gcc/testsuite/gcc.target/riscv/zbb-min-max-03.c index c7de1004048..38c932b9580 100644 --- a/gcc/testsuite/gcc.target/riscv/zbb-min-max-03.c +++ b/gcc/testsuite/gcc.target/riscv/zbb-min-max-03.c @@ -6,5 +6,18 @@ int f(int x) { return x >= 0 ? x : 0; } +unsigned f2(unsigned x, unsigned y) { + return x > y ? x : y; +} + +unsigned f3(unsigned x, unsigned y) { + return x < y ? x : y; +} + /* { dg-final { scan-assembler-times "max\t" 1 } } */ /* { dg-final { scan-assembler-not "li\t" } } */ +/* { dg-final { scan-assembler-times "maxu\t" 1 } } */ +/* { dg-final { scan-assembler-times "minu\t" 1 } } */ +/* { dg-final { scan-assembler-not "zext.w" } } */ +/* { dg-final { scan-assembler-not "sext.w" } } */ +