From patchwork Tue May 30 09:50:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takayuki 'January June' Suwa X-Patchwork-Id: 70305 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 533913858D20 for ; Tue, 30 May 2023 09:51:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 533913858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685440290; bh=u7w1QxAZFn7vZZKo0XrgG5ixt7NnGYp0A0UvnlKhWZM=; h=Date:To:Cc:Subject:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=ctTjQLNAF+dJYTB9c+Jg5YQhcjPw3B7nKg7LRLD4524gNk/XXdtO2AmtRPmHdoczR 3s2sEaKAFWQiGjsIgtgIBC1t7OJ32RLI6G/0J11Pk43w1xKaxNZClisNBs/Lw1EvY/ TikJFSuGv3O0gepa2KRlzz/kfSFPkrSsV1wG39fc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from omggw7015.mail.djm.ynwl.yahoo.co.jp (omggw7015.mail.djm.yahoo.co.jp [183.79.54.36]) by sourceware.org (Postfix) with ESMTPS id B95DA3857341 for ; Tue, 30 May 2023 09:50:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B95DA3857341 X-YMail-OSG: TeDWU9QVM1nsS_ez05zifvERb7XKeO0FmBEsaS57OBKg1sZYPcrhGZfIhvBZNcm O_cPFKjALqg5jDXQKVnEDlChuWdhAwfV0kZ3JTToes.JLnmh3su0fp1.Oo3zn8LYU9juSn3wwoOU IJGs7NnoTU4ZdiG1vOvXAmfomWt7sArBMWPKciWuf1M9ytyN_Il8bSatUHt0gaYR2uJciOj4ll9O TXXnlVjL4bvrNRW8ZO34ZnyoPv53B7ghLk9kdiRvnYhlzX2kv7o8EM8ovodqFOM26JHYP0ZFj5vO _eOl6xeYRr.IuVAvn7xPqQxSvW2OyEmenuo47CX9gAlc0ibLkq6lgaujfaMl_4OUSZVQfnoS938H bI1kTh9vOcI6WIi7xRlgcxWNoq4Ya9tPC3aBpzsAXbd10cZ94pE5dEZDQrag_2batZloV0I8BaEU cv2hzdk_zcySUflmUi2sbQSoc17gfw1XqHMys2YGK7sV642Zvu7BhXejsQFnfED37qoQSPk2Zwmm tAteonvnZiV0kJcpFyApD5ipCWUD._T59J0BbmWYKk7X6hUooueIGfYpeuO_gjqwBbwLc1mwTm3j 1s8sTKi5KG9po66.wD.YxEwyWv0e7hW_0c.y_L5p1eakn3.aSZ_acQ7Kl1Bku7XYoG2XbQjF3rGy Kkm0OJAQ9xrcQl2PPsjXGidW.63rf3S6BNXr7n2nyyXIJH2qEaQTqCeCbxF8c7ZEweuzSmU3E8zH AkF5iphOYEKYJCYCpZHdHSjLF.X3.5k3b4P2vZwj_wYHgG8bOt_RrHwhdktnzzWpFsNO1OVY5xfx ACImUlX0zkYDXICbAdV0eBoNQtv1BPwxt_lUr.pCzW0jYco8grcfvs6xrmIKtBIWeMFfDvy8g6gd NXPP.7p2Ij0cyhHeoRWQWV04WY_W8sOS86gnnmtTKkzpiZnLm3DWy2K_tTBpBLNtbajum2YeiSnz o.8bsjaHeOoFMe5Y2C7am9_tTrRR2Aotm40WdibbI0fqa1MnGD7KCDw.5tFyXbPppTfM- Received: from sonicgw.mail.yahoo.co.jp by sonicconh5003.mail.kks.yahoo.co.jp with HTTP; Tue, 30 May 2023 09:50:24 +0000 Received: by smtphe5003.mail.kks.ynwp.yahoo.co.jp (YJ Hermes SMTP Server) with ESMTPA ID b4cc1a27d95cfb1afa9b6c50b071683d; Tue, 30 May 2023 18:50:21 +0900 (JST) Message-ID: <95b8b130-caef-12c8-b247-25ec7dbf0ac3@yahoo.co.jp> Date: Tue, 30 May 2023 18:50:20 +0900 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.11.2 To: GCC Patches Cc: Max Filippov Subject: [PATCH 2/3 v2] xtensa: Add 'adddi3' and 'subdi3' insn patterns References: <95b8b130-caef-12c8-b247-25ec7dbf0ac3.ref@yahoo.co.jp> X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Takayuki 'January June' Suwa via Gcc-patches From: Takayuki 'January June' Suwa Reply-To: Takayuki 'January June' Suwa Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Resubmitting the correct one due to a mistake in merging order of fixes. --- More optimized than the default RTL generation. gcc/ChangeLog: * config/xtensa/xtensa.md (adddi3, subdi3): New RTL generation patterns implemented according to the instruc- tion idioms described in the Xtensa ISA reference manual (p. 600). --- gcc/config/xtensa/xtensa.md | 52 +++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md index eda1353894b..6882baaedfd 100644 --- a/gcc/config/xtensa/xtensa.md +++ b/gcc/config/xtensa/xtensa.md @@ -190,6 +190,32 @@ (set_attr "mode" "SI") (set_attr "length" "3")]) +(define_expand "adddi3" + [(set (match_operand:DI 0 "register_operand") + (plus:DI (match_operand:DI 1 "register_operand") + (match_operand:DI 2 "register_operand")))] + "" +{ + rtx lo_dest, hi_dest, lo_op0, hi_op0, lo_op1, hi_op1; + rtx_code_label *label; + lo_dest = gen_lowpart (SImode, operands[0]); + hi_dest = gen_highpart (SImode, operands[0]); + lo_op0 = gen_lowpart (SImode, operands[1]); + hi_op0 = gen_highpart (SImode, operands[1]); + lo_op1 = gen_lowpart (SImode, operands[2]); + hi_op1 = gen_highpart (SImode, operands[2]); + if (rtx_equal_p (lo_dest, lo_op1)) + FAIL; + emit_clobber (operands[0]); + emit_insn (gen_addsi3 (lo_dest, lo_op0, lo_op1)); + emit_insn (gen_addsi3 (hi_dest, hi_op0, hi_op1)); + emit_cmp_and_jump_insns (lo_dest, lo_op1, GEU, const0_rtx, + SImode, true, label = gen_label_rtx ()); + emit_insn (gen_addsi3 (hi_dest, hi_dest, const1_rtx)); + emit_label (label); + DONE; +}) + (define_insn "addsf3" [(set (match_operand:SF 0 "register_operand" "=f") (plus:SF (match_operand:SF 1 "register_operand" "%f") @@ -237,6 +263,32 @@ (const_int 5) (const_int 6)))]) +(define_expand "subdi3" + [(set (match_operand:DI 0 "register_operand") + (minus:DI (match_operand:DI 1 "register_operand") + (match_operand:DI 2 "register_operand")))] + "" +{ + rtx lo_dest, hi_dest, lo_op0, hi_op0, lo_op1, hi_op1; + rtx_code_label *label; + lo_dest = gen_lowpart (SImode, operands[0]); + hi_dest = gen_highpart (SImode, operands[0]); + lo_op0 = gen_lowpart (SImode, operands[1]); + hi_op0 = gen_highpart (SImode, operands[1]); + lo_op1 = gen_lowpart (SImode, operands[2]); + hi_op1 = gen_highpart (SImode, operands[2]); + if (rtx_equal_p (lo_op0, lo_op1)) + FAIL; + emit_clobber (operands[0]); + emit_insn (gen_subsi3 (lo_dest, lo_op0, lo_op1)); + emit_insn (gen_subsi3 (hi_dest, hi_op0, hi_op1)); + emit_cmp_and_jump_insns (lo_op0, lo_op1, GEU, const0_rtx, + SImode, true, label = gen_label_rtx ()); + emit_insn (gen_addsi3 (hi_dest, hi_dest, constm1_rtx)); + emit_label (label); + DONE; +}) + (define_insn "subsf3" [(set (match_operand:SF 0 "register_operand" "=f") (minus:SF (match_operand:SF 1 "register_operand" "f") From patchwork Tue May 30 09:51:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takayuki 'January June' Suwa X-Patchwork-Id: 70306 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1D96538560A7 for ; Tue, 30 May 2023 09:52:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1D96538560A7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685440347; bh=qKENrmYexuStbAMxVLd/Pup/kkYMNQr/pDsQwUg0g1Q=; h=Date:To:Cc:Subject:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=QYAkRv2SMkz1lsgPw7sOdx5FC/7linGBTZ5UkcngJmTds9z/8zlWCfpN3AH+wmx5c 2TE3nnrx8LrN7TY7GzVq4pTu4/6csOyPVZR3ixl6ttOOaBbqaoUAvYWmh3HsqgQGwd a1OHvVsuHQgLIZ4Iys8UMJMwro2n7qPKwfoxULvY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from omggw7010-vm1.mail.djm.yahoo.co.jp (omggw7010-vm1.mail.djm.yahoo.co.jp [183.79.54.172]) by sourceware.org (Postfix) with ESMTPS id D2AFB3857729 for ; Tue, 30 May 2023 09:51:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D2AFB3857729 X-YMail-OSG: GYiMlJoVM1kmbSFLOTXkpCyDhErqADhHiTCoy1NZQ2VW6ybH7aqxWjxR.dBcM9h UeSzR9zFAQlFbWS7GUXiUGvsyuD1UK6LDGcSFlVq80kZ2uabDmTmUxjE7e.wJUhNVLfDiGscgyZA OP_JkDZ4pvZ_SM7a8LSliQmKPAAFCaI6NJ4m1Wi7FAqFaZo5YaDz9pHsz4RFbvjCvx0ho4_7zpuh WLsSxEJfzAMU8NpioI2w9n_4F3EUMa5SdLrGSAOihZQIUAqkZsDWtdkdz6Gr.klcKp8GewGblaoJ gcjE9HUlwsQrTimjGzwcSv6At_THAn9SFuRSGOK7sqVwAeTN6fKc8SlsLoAEnJQqWfoG8LM0J2E0 Xz543SvU8i3sFZcO1Diz7FU_0fNrBEueGs9KZbdbbaa1orB5SWXiVuLQEDwX4HvGSIk4cil0q6eM sK0WJxezjr6kK7.2593DNSEvOZ3lf5bBOMUL6JdscB9kIhkdZCzT1C6lGqvPTTzk0D2plCYjeVld qYU9xbMK16YE5gL9a8zilINZOOabMzob4YBje_R9PsAicYjjg2N0ydEiHu4ij82WSRkmwgiyOO2M 3NrLj4b8tM_UtY6Mq.bZ0Qi2akTC6xCt1Kal6WKCZe_if4HuPbTYgnkEMh_qkmLIYvSmKmLlOn_8 Xu3jrjbwcPtkwm7tmsCsIp4v2OWGC23x6RCDxIw3ajni1kzi7t6Jz0v9sgm07ZVERZExH6cXQ5MS vKGhyLwQBz1.ycF9FrDdZGRgjMaNkoPVoLT2qPtKzBF8q.eZ5kTtfA18iwCcCWueespKQCmAu746 IXzWGlSsZaT.K2HssGLNK3mqDu5p_BC8ZvzvsxrkQfhxgpq4k1yXxRlJ5EsYvLdk6eKQIps8qhfG XtByObIaQWG8g8nAyabi1.WQlasOBfmVm2eSLt9GnmPsyG3JCyDyz6pfwConOxSYLYAwJXkwpg9D TAsaR7ZlMcBl3z5zvnY6eekO9MSkUndmQrGeCKiT7ymZIr8QnTBN46zhzY8EekSXmBGk- Received: from sonicgw.mail.yahoo.co.jp by sonicconh5001.mail.kks.yahoo.co.jp with HTTP; Tue, 30 May 2023 09:51:22 +0000 Received: by smtphe5001.mail.kks.ynwp.yahoo.co.jp (YJ Hermes SMTP Server) with ESMTPA ID efdebf42a58abb5e27e890768069e387; Tue, 30 May 2023 18:51:18 +0900 (JST) Message-ID: Date: Tue, 30 May 2023 18:51:17 +0900 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.11.2 To: GCC Patches Cc: Max Filippov Subject: [PATCH 3/3 v2] xtensa: Optimize 'cstoresi4' insn pattern References: X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Takayuki 'January June' Suwa via Gcc-patches From: Takayuki 'January June' Suwa Reply-To: Takayuki 'January June' Suwa Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Resubmitting the correct one due to a mistake in merging order of fixes. --- This patch introduces more optimized implementations for the 6 cstoresi4 insn comparison methods (eq/ne/lt/le/gt/ge, however, required TARGET_NSA for eq). gcc/ChangeLog: * config/xtensa/xtensa.cc (xtensa_expand_scc): Add dedicated optimization code for cstoresi4 (eq/ne/gt/ge/lt/le). * config/xtensa/xtensa.md (xtensa_ge_zero): Rename from '*signed_ge_zero', because it had to be called from 'xtensa_expand_scc()'. --- gcc/config/xtensa/xtensa.cc | 106 ++++++++++++++++++++++++++++++++---- gcc/config/xtensa/xtensa.md | 2 +- 2 files changed, 96 insertions(+), 12 deletions(-) diff --git a/gcc/config/xtensa/xtensa.cc b/gcc/config/xtensa/xtensa.cc index 3b5d25b660a..64efd3d7287 100644 --- a/gcc/config/xtensa/xtensa.cc +++ b/gcc/config/xtensa/xtensa.cc @@ -991,24 +991,108 @@ xtensa_expand_conditional_move (rtx *operands, int isflt) int xtensa_expand_scc (rtx operands[4], machine_mode cmp_mode) { - rtx dest = operands[0]; - rtx cmp; - rtx one_tmp, zero_tmp; + rtx dest = operands[0], op0 = operands[2], op1 = operands[3]; + enum rtx_code code = GET_CODE (operands[1]); + rtx cmp, tmp0, tmp1; rtx (*gen_fn) (rtx, rtx, rtx, rtx, rtx); - if (!(cmp = gen_conditional_move (GET_CODE (operands[1]), cmp_mode, - operands[2], operands[3]))) - return 0; + /* Dedicated optimizations for cstoresi4. + a. In a magnitude comparison operator, swapping both sides and + inverting magnitude does not change the result, + eg. '(x >= y) != (y <= x)' is a constant of zero + (GE is changed to LE, not LT). + b. Due to room for further optimization, we use subtraction rather + than XOR (the default for RTL expansion of EQ/NE) as the binary + operation which is zero if both sides are the same and non-zero + otherwise. */ + if (cmp_mode == SImode) + switch (code) + { + /* EQ(op0, op1) := clz(op0 - op1) / 32 [requires TARGET_NSA] */ + case EQ: + if (!TARGET_NSA) + break; + /* EQ to EQZ conversion by subtracting op1 from op0. */ + emit_move_insn (dest, + expand_binop (SImode, sub_optab, op0, op1, + 0, 0, OPTAB_LIB_WIDEN)); + /* NSAU instruction will return 32 iff the source is zero, + zero through 31 otherwise (See Xtensa ISA Reference Manual, + p. 462) */ + emit_insn (gen_clzsi2 (dest, dest)); + emit_insn (gen_lshrsi3 (dest, dest, GEN_INT (5))); + return 1; + + /* NE(op0, op1) := (op0 - op1) == 0 ? 0 : 1 */ + case NE: + /* NE to NEZ conversion by subtracting op1 from op0. */ + emit_move_insn (tmp0 = gen_reg_rtx (SImode), + expand_binop (SImode, sub_optab, op0, op1, + 0, 0, OPTAB_LIB_WIDEN)); + emit_move_insn (dest, const_true_rtx); + emit_move_insn (dest, + gen_rtx_fmt_eee (IF_THEN_ELSE, SImode, + gen_rtx_fmt_ee (EQ, VOIDmode, + tmp0, const0_rtx), + tmp0, dest)); + return 1; + + case LE: + if (REG_P (op1)) + { + /* LE to GE conversion by swapping both sides. */ + tmp0 = op0, op0 = op1, op1 = tmp0; + goto case_GE_reg; + } + /* LE to LT conversion by adding one to op1. */ + op1 = GEN_INT (INTVAL (op1) + 1); + /* fallthru */ + + /* LT(op0, op1) := (unsigned)(op0 - op1) >> 31 */ + case LT: +case_LT: + /* LT to LTZ conversion by subtracting op1 from op0. */ + emit_move_insn (dest, + expand_binop (SImode, sub_optab, op0, op1, + 0, 0, OPTAB_LIB_WIDEN)); + emit_insn (gen_lshrsi3 (dest, dest, GEN_INT (31))); + return 1; + + case GE: + if (REG_P (op1)) + { +case_GE_reg: + /* GE to GEZ conversion by subtracting op1 from op0. */ + emit_move_insn (dest, + expand_binop (SImode, sub_optab, op0, op1, + 0, 0, OPTAB_LIB_WIDEN)); + /* Emitting the dedicated insn pattern. */ + emit_insn (gen_xtensa_ge_zero (dest, dest)); + return 1; + } + /* GE to GT conversion by subtracting one from op1. */ + op1 = GEN_INT (INTVAL (op1) - 1); + /* fallthru */ - one_tmp = gen_reg_rtx (SImode); - zero_tmp = gen_reg_rtx (SImode); - emit_insn (gen_movsi (one_tmp, const_true_rtx)); - emit_insn (gen_movsi (zero_tmp, const0_rtx)); + case GT: + /* GT to LT conversion by swapping both sides. */ + tmp0 = op0, op0 = op1, op1 = tmp0; + goto case_LT; + default: + break; + } + + if (! (cmp = gen_conditional_move (code, cmp_mode, op0, op1))) + return 0; + + tmp0 = force_reg (SImode, const0_rtx); + tmp1 = force_reg (SImode, const_true_rtx); gen_fn = (cmp_mode == SImode ? gen_movsicc_internal0 : gen_movsicc_internal1); - emit_insn (gen_fn (dest, XEXP (cmp, 0), one_tmp, zero_tmp, cmp)); + emit_insn (gen_fn (dest, XEXP (cmp, 0), tmp1, tmp0, cmp)); + return 1; } diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md index 6882baaedfd..ebc305bd387 100644 --- a/gcc/config/xtensa/xtensa.md +++ b/gcc/config/xtensa/xtensa.md @@ -3136,7 +3136,7 @@ (const_int 5) (const_int 6)))]) -(define_insn_and_split "*signed_ge_zero" +(define_insn_and_split "xtensa_ge_zero" [(set (match_operand:SI 0 "register_operand" "=a") (ge:SI (match_operand:SI 1 "register_operand" "r") (const_int 0)))]