From patchwork Mon May 10 12:39:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Christoph_M=C3=BCllner?= X-Patchwork-Id: 1476394 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=skMhafAw; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Ff0wz4z7mz9sj5 for ; Mon, 10 May 2021 22:39:14 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5DCD2396C837; Mon, 10 May 2021 12:39:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5DCD2396C837 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1620650352; bh=osU692hxUNbQR4YLj3so7q/+HpOzGKNjJuhDTayAz9s=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=skMhafAwMA9oVFoFzOP3/Os2QQ6Rb6R7lJl7t9pZOXFKlgJ0HOQVPo4DyPQoS1p1G i9GuaSjhjcDHE2YdsoYO5IpSLJLsUWUhGAVkkEzsPdPsBqlw0kNGIRZy4ixYo7qN5V p9xWQ9z4jHJ+2c8Dnl3tL8fwcbF0kne9IwJcaB0w= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by sourceware.org (Postfix) with ESMTPS id B9B0F395C809; Mon, 10 May 2021 12:39:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B9B0F395C809 Received: by mail-ej1-f41.google.com with SMTP id l4so24251068ejc.10; Mon, 10 May 2021 05:39:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=osU692hxUNbQR4YLj3so7q/+HpOzGKNjJuhDTayAz9s=; b=Y6H6XDEgUCUZO9B2NOt3Az8k6A4yXZrNd9ufw5wCJAC6NPfsb6qx2P/lZgkBEUwsCk QKHynNQY+2wxCxlJE+KUnmLMd8CsujuOi2PO+f/F8hSpCo/TPvRgSMgTShoEu4Jx/50+ p9bIgr+oy+A4upZK9RCJ/AYLrFdYjc2CMqndFtrV/5+L3RYtZEta6arwwC5Gdj7ySeZW atKibJ6rMhcugEgdrTftceg7D16Kjq2TQbwyGIR/35VNYLy2eOjgAZ6wCpTqJZChd6dW xCmdpnfaUrl2yviQMCnCa6PldUY/vJFo64qsxBUcTaDLV9D5LFynxcuqb1wcz1Qbi3ws 8eEw== X-Gm-Message-State: AOAM531CJLFKi8Q8IOAhoAlFNuHyZFlbtn0G36v6GpnJ/dvdlp2KiZf/ qL0DcjWMNtJKPEETjso03Crp3CitxU8Nrisg X-Google-Smtp-Source: ABdhPJzMmoCkv9x5KcZyuP/jVCLx8dAq5KtRp6wnYUH1BRqy9e2CPMen5pUul1kHRnIaLGcHV+6YJg== X-Received: by 2002:a17:907:2bc7:: with SMTP id gv7mr25443589ejc.187.1620650347452; Mon, 10 May 2021 05:39:07 -0700 (PDT) Received: from beast.fritz.box (62-178-148-172.cable.dynamic.surfer.at. [62.178.148.172]) by smtp.gmail.com with ESMTPSA id t7sm11348951eds.26.2021.05.10.05.39.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 05:39:07 -0700 (PDT) To: gcc-patches@gcc.gnu.org, Jim Wilson , Jeff Law Subject: [PATCH v2] REE: PR rtl-optimization/100264: Handle more PARALLEL SET expressions Date: Mon, 10 May 2021 14:39:03 +0200 Message-Id: <20210510123903.3121625-1-cmuellner@gcc.gnu.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Christoph Muellner via Gcc-patches From: =?utf-8?q?Christoph_M=C3=BCllner?= Reply-To: Christoph Muellner Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Move the check for register targets (i.e. REG_P ()) into the function get_sub_rtx () and change the restriction of REE to "only one child of a PARALLEL expression is a SET register expression" (was "only one child of a PARALLEL expression is a SET expression"). This allows to handle more PARALLEL SET expressions. gcc/ChangeLog: PR rtl-optimization/100264 * ree.c (get_sub_rtx): Ignore SET expressions without register destinations and remove assertion, as it is not valid anymore with this new behaviour. (merge_def_and_ext): Eliminate destination check for register as such SET expressions can't occur anymore. (combine_reaching_defs): Likewise. --- gcc/ree.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/gcc/ree.c b/gcc/ree.c index 65457c582c6a..e31ca2fa1a80 100644 --- a/gcc/ree.c +++ b/gcc/ree.c @@ -658,10 +658,11 @@ make_defs_and_copies_lists (rtx_insn *extend_insn, const_rtx set_pat, return ret; } -/* If DEF_INSN has single SET expression, possibly buried inside - a PARALLEL, return the address of the SET expression, else - return NULL. This is similar to single_set, except that - single_set allows multiple SETs when all but one is dead. */ +/* If DEF_INSN has single SET expression with a register + destination, possibly buried inside a PARALLEL, return + the address of the SET expression, else return NULL. + This is similar to single_set, except that single_set + allows multiple SETs when all but one is dead. */ static rtx * get_sub_rtx (rtx_insn *def_insn) { @@ -675,6 +676,8 @@ get_sub_rtx (rtx_insn *def_insn) rtx s_expr = XVECEXP (PATTERN (def_insn), 0, i); if (GET_CODE (s_expr) != SET) continue; + if (!REG_P (SET_DEST (s_expr))) + continue; if (sub_rtx == NULL) sub_rtx = &XVECEXP (PATTERN (def_insn), 0, i); @@ -686,14 +689,12 @@ get_sub_rtx (rtx_insn *def_insn) } } else if (code == SET) - sub_rtx = &PATTERN (def_insn); - else { - /* It is not a PARALLEL or a SET, what could it be ? */ - return NULL; + rtx s_expr = PATTERN (def_insn); + if (REG_P (SET_DEST (s_expr))) + sub_rtx = &PATTERN (def_insn); } - gcc_assert (sub_rtx != NULL); return sub_rtx; } @@ -712,13 +713,12 @@ merge_def_and_ext (ext_cand *cand, rtx_insn *def_insn, ext_state *state) if (sub_rtx == NULL) return false; - if (REG_P (SET_DEST (*sub_rtx)) - && (GET_MODE (SET_DEST (*sub_rtx)) == ext_src_mode + if (GET_MODE (SET_DEST (*sub_rtx)) == ext_src_mode || ((state->modified[INSN_UID (def_insn)].kind == (cand->code == ZERO_EXTEND ? EXT_MODIFIED_ZEXT : EXT_MODIFIED_SEXT)) && state->modified[INSN_UID (def_insn)].mode - == ext_src_mode))) + == ext_src_mode)) { if (GET_MODE_UNIT_SIZE (GET_MODE (SET_DEST (*sub_rtx))) >= GET_MODE_UNIT_SIZE (cand->mode)) @@ -853,8 +853,7 @@ combine_reaching_defs (ext_cand *cand, const_rtx set_pat, ext_state *state) CAND->insn, then this transformation is not safe. Note we have to test in the widened mode. */ rtx *dest_sub_rtx = get_sub_rtx (def_insn); - if (dest_sub_rtx == NULL - || !REG_P (SET_DEST (*dest_sub_rtx))) + if (dest_sub_rtx == NULL) return false; rtx tmp_reg = gen_rtx_REG (GET_MODE (SET_DEST (set)), @@ -947,8 +946,7 @@ combine_reaching_defs (ext_cand *cand, const_rtx set_pat, ext_state *state) break; rtx *dest_sub_rtx2 = get_sub_rtx (def_insn2); - if (dest_sub_rtx2 == NULL - || !REG_P (SET_DEST (*dest_sub_rtx2))) + if (dest_sub_rtx2 == NULL) break; /* On RISC machines we must make sure that changing the mode of