From patchwork Mon May 22 07:03:51 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: 97096 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1257623vqo; Mon, 22 May 2023 00:07:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6YeXZaCZWWKyOZPl4/PR8hDFrCecWv5o3DWxiE7pvJgh6BLpBuJS/WWunL6t9NUTzK21/v X-Received: by 2002:a17:907:7f12:b0:96f:a0ee:1143 with SMTP id qf18-20020a1709077f1200b0096fa0ee1143mr6591221ejc.10.1684739247158; Mon, 22 May 2023 00:07:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684739247; cv=none; d=google.com; s=arc-20160816; b=scMQ/LII11EsIyInJ6Bh7mSX3ggRAuoL4XlDjS1A1XuEuzSSstvYjvObwvzOOCorjV yWkN129BbAIAYYCXXGyNjmYw436gIDo6W4bF0CteO6lzxybczSk9XYATl9t2LdpI+AIq FtMlI3PmeRVa0BOXv6zL3/gcDZKRr1AdlJ2crLfe3nRSj7p0JJPXgjicr3t8Qu3GXxJX SmM3iwjC5bvoSjq3RzdYTmdHfnImF/gUqGlxmx6WbDTQF5qFLLsEhd6VOY0Kuw4n6U0v yaUhHzzSx/5JNg1+tjuADPZwWMRyRFZBc5HZvjXOnaM6TWsZWs3NtJPD04/pQ3GVlvog x5xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:references :content-transfer-encoding:subject:cc:to:user-agent:mime-version :date:message-id:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=2q3ZIk3i6ZeZA5OvLS/gAI2Gw+jcFyx3jG/THOFOwGQ=; b=F4oOySMhoH3ZHaVisFjGT243+O459GYoFV2+B9MnMBW2fO63GloJoWkd0PIVWgaUb5 0ICcKKim0oYa0kOwWVSQD0CU2syFrnoPXDycqb9LrXbAA/fyi7lBqBmRmt1ClD42XcPB R7S8k1ZIDc13etDoC6R3azqQ1V0TbUOWMpsoZRH9+9UjhAejBK8DvGv0aD7D7YSWhMJs yPyxsechgFVIwnDTyPFwkJn9B67Ubyo+N//mqWNqExr9LqWVWzQOPAlavH6Jr7/x/+I0 Cq8oB0QnlllZMD4q+AdpP83Yz2PyuIL5lG0Ej5xuhs6KSiV40H9Qujkbz/Kpfhqea/Na O2jQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=FK6ZB6tM; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id hg24-20020a1709072cd800b0096f7df15c81si3692960ejc.774.2023.05.22.00.07.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 00:07:27 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=FK6ZB6tM; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 834C9385734E for ; Mon, 22 May 2023 07:07:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 834C9385734E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1684739234; bh=2q3ZIk3i6ZeZA5OvLS/gAI2Gw+jcFyx3jG/THOFOwGQ=; h=Date:To:Cc:Subject:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=FK6ZB6tMjCBMgDbghaAqAw+i2mT0CYI8WNbUortIWxhueSLXFwPTtHAVOoq51UIUB qJBHgyhlQU4njGuO2MQ64AHdUYwwbewSpfPWr9ECG1mXcNfhljt3CmClJbnKVtXLaJ JDyA1NoAinEc2jtprWeJG71UNhAoIyUEYOzLUQzE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from omggw0011-vm0.mail.otm.yahoo.co.jp (omggw0011-vm0.mail.otm.yahoo.co.jp [182.22.18.184]) by sourceware.org (Postfix) with ESMTPS id C0BF93858D20 for ; Mon, 22 May 2023 07:06:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C0BF93858D20 X-YMail-OSG: l91Z3DUVM1mDTFiT2U6Xoq4wLaN33PZ2hZWL.Uju4RxMTFjn2HiUizwbD5K02ui FtjV8gnKaVWGs6R.n9vnWJl7VhA9EF_7sKC9WKdMnIVCnEAtuD4.6fZzHa7c9NjKnanZW8nOH1Yy LUf9uiloyBQtx_sc7FoViWtLr1Sf1pQ3fPk4CH0ptzHQ2D0D3YPnbOuGNUU4JJi8oKmZeOh18l9o wYb5uHJzgc4b8SLStW5XddsOccf.f7bSFMnRUaC6_wIMM_5lY_Mh93gyN2lD8rXCXIN8vckCcHTn 3PY_1yj9b3q0tgVWl2Ee3Stz4KopIEPxNevXP1GnUyEqykpCshNCl8LOH769kDGyUUkG7gjBt5wi wbH1c4vdtQAI5nAZGkaQMiUK4rC1W5phGDx6p8zpfshycA4x4P3pgRZJxcAG_pp08D8vHmc.x7Nh Csn1Ccer.wxgxmkk0grWM1dka8nZ..FppuvL7hcYTUgKHhORYr_KDzK2Baok_HMKpsRbrIpM7gWf e_qjP7TxyeS0Kpww.fWArWprCAzqlXZECuDAGXv2RlPYyEUWVur4US0Ka.dbJ9r68wFBFqaZDpZ5 p3bXdY9cl3tgMdAW_REV4oIXR6wE9ssTuFGFU0P3D_Cr4eLgUwWEXre6crSALixsKz2OrmSuZ5EZ LSS.6V1HMn58YcPcfvXY6Ns23K0eKMoJU1QDfmJKCyXWmwrjZGII6Km22vsgPfnjtJxPLB0DEFO. nHZFL8XjJV6wZlGdKM5dU3lDXA02xxxicDvnuUAphM2ptu_iYo5ACIWQDZLl60n44.2MOUtPpch. 4j3f1LGJfAZH6hvGbl66oYAIyyDekrTn1orFCIfnRSW_jBNZv0aRBzkzs5yRKta7MiBwo2BXrGmP 2Skz2YZ7jcxjVj3Iz.WqthG25ZG0WSrBEqHQ2XfcVDgsZEH.4ji3PVMB5Gm6g1LVDP5uafdg3t09 sDLZ6.APraSdA2Lvmee4egS7rSPgiSfMfJ38UCP97get0lxk77nlvPOXckXn3yXOzXaOw Received: from sonicgw.mail.yahoo.co.jp by sonicconh6001.mail.ssk.yahoo.co.jp with HTTP; Mon, 22 May 2023 07:06:25 +0000 Received: by smtphe6002.mail.ssk.ynwp.yahoo.co.jp (YJ Hermes SMTP Server) with ESMTPA ID f6b29b5f3c91a71d3ebf19f8b2e9e881; Mon, 22 May 2023 16:06:24 +0900 (JST) Message-ID: Date: Mon, 22 May 2023 16:03:51 +0900 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 To: GCC Patches Cc: Max Filippov Subject: [PATCH 1/2] xtensa: Optimize '(x & CST1_POW2) != 0 ? CST2_POW2 : 0' References: X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, KAM_DMARC_STATUS, NML_ADSP_CUSTOM_MED, PLING_QUERY, 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+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766577141050496918?= X-GMAIL-MSGID: =?utf-8?q?1766577141050496918?= This patch decreses one machine instruction from "single bit extraction with shifting" operation, and tries to eliminate the conditional branch if CST2_POW2 doesn't fit into signed 12 bits with the help of ifcvt optimization. /* example #1 */ int test0(int x) { return (x & 1048576) != 0 ? 1024 : 0; } extern int foo(void); int test1(void) { return (foo() & 1048576) != 0 ? 16777216 : 0; } ;; before test0: movi a9, 0x400 srai a2, a2, 10 and a2, a2, a9 ret.n test1: addi sp, sp, -16 s32i.n a0, sp, 12 call0 foo extui a2, a2, 20, 1 slli a2, a2, 20 beqz.n a2, .L2 movi.n a2, 1 slli a2, a2, 24 .L2: l32i.n a0, sp, 12 addi sp, sp, 16 ret.n ;; after test0: extui a2, a2, 20, 1 slli a2, a2, 10 ret.n test1: addi sp, sp, -16 s32i.n a0, sp, 12 call0 foo l32i.n a0, sp, 12 extui a2, a2, 20, 1 slli a2, a2, 24 addi sp, sp, 16 ret.n In addition, if the left shift amount ('exact_log2(CST2_POW2)') is between 1 through 3 and a either addition or subtraction with another register follows, emit a ADDX[248] or SUBX[248] machine instruction instead of separate left shift and add/subtract ones. /* example #2 */ int test2(int x, int y) { return ((x & 1048576) != 0 ? 4 : 0) + y; } int test3(int x, int y) { return ((x & 2) != 0 ? 8 : 0) - y; } ;; before test2: movi.n a9, 4 srai a2, a2, 18 and a2, a2, a9 add.n a2, a2, a3 ret.n test3: movi.n a9, 8 slli a2, a2, 2 and a2, a2, a9 sub a2, a2, a3 ret.n ;; after test2: extui a2, a2, 20, 1 addx4 a2, a2, a3 ret.n test3: extui a2, a2, 1, 1 subx8 a2, a2, a3 ret.n gcc/ChangeLog: * config/xtensa/predicates.md (addsub_operator): New. * config/xtensa/xtensa.md (*extzvsi-1bit_ashlsi3, *extzvsi-1bit_addsubx): New insn_and_split patterns. * config/xtensa/xtensa.cc (xtensa_rtx_costs): Add a special case about ifcvt 'noce_try_cmove()' to handle constant loads that do not fit into signed 12 bits in the patterns added above. --- gcc/config/xtensa/predicates.md | 3 ++ gcc/config/xtensa/xtensa.cc | 3 +- gcc/config/xtensa/xtensa.md | 75 +++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 1 deletion(-) diff --git a/gcc/config/xtensa/predicates.md b/gcc/config/xtensa/predicates.md index 2dac193373a..5faf1be8c15 100644 --- a/gcc/config/xtensa/predicates.md +++ b/gcc/config/xtensa/predicates.md @@ -191,6 +191,9 @@ (define_predicate "logical_shift_operator" (match_code "ashift,lshiftrt")) +(define_predicate "addsub_operator" + (match_code "plus,minus")) + (define_predicate "xtensa_cstoresi_operator" (match_code "eq,ne,gt,ge,lt,le")) diff --git a/gcc/config/xtensa/xtensa.cc b/gcc/config/xtensa/xtensa.cc index bb1444c44b6..e3af78cd228 100644 --- a/gcc/config/xtensa/xtensa.cc +++ b/gcc/config/xtensa/xtensa.cc @@ -4355,7 +4355,8 @@ xtensa_rtx_costs (rtx x, machine_mode mode, int outer_code, switch (outer_code) { case SET: - if (xtensa_simm12b (INTVAL (x))) + if (xtensa_simm12b (INTVAL (x)) + || (current_pass && current_pass->tv_id == TV_IFCVT)) { *total = speed ? COSTS_N_INSNS (1) : 0; return true; diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md index 3521fa33b47..bd4614e4be0 100644 --- a/gcc/config/xtensa/xtensa.md +++ b/gcc/config/xtensa/xtensa.md @@ -997,6 +997,81 @@ (set_attr "mode" "SI") (set_attr "length" "3")]) +(define_insn_and_split "*extzvsi-1bit_ashlsi3" + [(set (match_operand:SI 0 "register_operand" "=a") + (and:SI (match_operator:SI 4 "logical_shift_operator" + [(match_operand:SI 1 "register_operand" "r") + (match_operand:SI 2 "const_int_operand" "i")]) + (match_operand:SI 3 "const_int_operand" "i")))] + "exact_log2 (INTVAL (operands[3])) > 0" + "#" + "&& 1" + [(set (match_dup 0) + (zero_extract:SI (match_dup 1) + (const_int 1) + (match_dup 2))) + (set (match_dup 0) + (ashift:SI (match_dup 0) + (match_dup 3)))] +{ + int shift = floor_log2 (INTVAL (operands[3])); + switch (GET_CODE (operands[4])) + { + case ASHIFT: + operands[2] = GEN_INT (shift - INTVAL (operands[2])); + break; + case LSHIFTRT: + operands[2] = GEN_INT (shift + INTVAL (operands[2])); + break; + default: + gcc_unreachable (); + } + operands[3] = GEN_INT (shift); +} + [(set_attr "type" "arith") + (set_attr "mode" "SI") + (set_attr "length" "6")]) + +(define_insn_and_split "*extzvsi-1bit_addsubx" + [(set (match_operand:SI 0 "register_operand" "=a") + (match_operator:SI 5 "addsub_operator" + [(and:SI (match_operator:SI 6 "logical_shift_operator" + [(match_operand:SI 1 "register_operand" "r") + (match_operand:SI 3 "const_int_operand" "i")]) + (match_operand:SI 4 "const_int_operand" "i")) + (match_operand:SI 2 "register_operand" "r")]))] + "TARGET_ADDX + && IN_RANGE (exact_log2 (INTVAL (operands[4])), 1, 3)" + "#" + "&& 1" + [(set (match_dup 0) + (zero_extract:SI (match_dup 1) + (const_int 1) + (match_dup 3))) + (set (match_dup 0) + (match_op_dup 5 + [(ashift:SI (match_dup 0) + (match_dup 4)) + (match_dup 2)]))] +{ + int shift = floor_log2 (INTVAL (operands[4])); + switch (GET_CODE (operands[6])) + { + case ASHIFT: + operands[3] = GEN_INT (shift - INTVAL (operands[3])); + break; + case LSHIFTRT: + operands[3] = GEN_INT (shift + INTVAL (operands[3])); + break; + default: + gcc_unreachable (); + } + operands[4] = GEN_INT (shift); +} + [(set_attr "type" "arith") + (set_attr "mode" "SI") + (set_attr "length" "6")]) + ;; Conversions.