From patchwork Tue Aug 16 09:19:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 56773 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 477CE38582B4 for ; Tue, 16 Aug 2022 09:20:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 477CE38582B4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1660641614; bh=QqRhagFYMl9VHDeffMYo/xMkhSnjxzK+BGsymuqnWG8=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=gxKgB/u9QtLRePM0/hBEZeLToKSkD0RHowBlXvwwwDyzDtB6IERo850IEDY1pWcF/ hePKoCfuT5MG9G6M4JGhD5k+s8S9/dqJFHzYyvId4Q627O+GwSWeMz0q502zX59N2i GuAPVqOfLb6lhvoDDY4UXxHl8Kdxvxz/i+549Jig= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id BB956385828F for ; Tue, 16 Aug 2022 09:19:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BB956385828F Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id D2B4333B21 for ; Tue, 16 Aug 2022 09:19:43 +0000 (UTC) Received: from wotan.suse.de (wotan.suse.de [10.160.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id C3C952C149 for ; Tue, 16 Aug 2022 09:19:43 +0000 (UTC) Date: Tue, 16 Aug 2022 09:19:43 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [PATCH] middle-end/106630 - avoid ping-pong between extract_muldiv and match.pd User-Agent: Alpine 2.22 (LSU 394 2020-01-19) MIME-Version: 1.0 X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, 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: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Message-Id: <20220816092014.477CE38582B4@sourceware.org> The following avoids ping-pong between the match.pd pattern changing (sizetype) ((a_9 + 1) * 48) to (sizetype)(a_9 + 1) * 48 and extract_muldiv performing the reverse transform by restricting the match.pd pattern to narrowing conversions as the comment indicates. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR middle-end/106630 * match.pd ((T)(x * CST) -> (T)x * CST): Restrict to narrowing conversions. * gcc.dg/torture/pr106630.c: New testcase. --- gcc/match.pd | 2 +- gcc/testsuite/gcc.dg/torture/pr106630.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr106630.c diff --git a/gcc/match.pd b/gcc/match.pd index e32bda64e64..07d0a61fc3a 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -1917,7 +1917,7 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) (convert (mult@0 zero_one_valued_p@1 INTEGER_CST@2)) (if (INTEGRAL_TYPE_P (type) && INTEGRAL_TYPE_P (TREE_TYPE (@0)) - && TYPE_PRECISION (type) <= TYPE_PRECISION (TREE_TYPE (@0))) + && TYPE_PRECISION (type) < TYPE_PRECISION (TREE_TYPE (@0))) (mult (convert @1) (convert @2)))) /* (X << C) != 0 can be simplified to X, when C is zero_one_valued_p. diff --git a/gcc/testsuite/gcc.dg/torture/pr106630.c b/gcc/testsuite/gcc.dg/torture/pr106630.c new file mode 100644 index 00000000000..d608b9151be --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr106630.c @@ -0,0 +1,13 @@ +/* { dg-do compile } */ + +short d, e; +int f; +extern short g[][24]; +char c; +void h() { + char a = 6; + c = a; + for (unsigned long a = (d || e) - 1; a < c; a += f) + for (signed b = 0; b < 24; b++) + g[a][b] = 4; +}