From patchwork Mon Jul 25 19:34:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Feifer X-Patchwork-Id: 56317 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 E9DD6383A30C for ; Mon, 25 Jul 2022 19:37:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E9DD6383A30C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1658777821; bh=bWJkWXGf/ChabhhOOFOHqgqsoiGRBf81JFoINPqxq9k=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=On2eA2y/K5nImCXbdEtAevFiguk2NM0j3QwZKwjSURwj7Z6fs2Wwve5tgB6RCrmiH M2VfbwvR2OZxqMJJPE/02evHYnIM6O49RzNRD87lXg7IU/B8b01T/cPwTCbR3tf9Um Ep2LdYKeqIiPiejbNzyfBYiai9DRTFl8TuEr4Aew= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 15C563858413 for ; Mon, 25 Jul 2022 19:36:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 15C563858413 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-341-BSc9R6LlMbq4XtrtweDgGA-1; Mon, 25 Jul 2022 15:36:31 -0400 X-MC-Unique: BSc9R6LlMbq4XtrtweDgGA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4F62D185A7B2 for ; Mon, 25 Jul 2022 19:36:31 +0000 (UTC) Received: from sfeifer.remote.csb (unknown [10.22.18.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1F041141511F for ; Mon, 25 Jul 2022 19:36:30 +0000 (UTC) To: GCC Patches Subject: [PATCH] match.pd: Add new division pattern [PR104992] Date: Mon, 25 Jul 2022 15:34:25 -0400 Message-Id: <20220725193425.511903-1-sfeifer@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP 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: Sam Feifer via Gcc-patches From: Sam Feifer Reply-To: Sam Feifer Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" This patch fixes a missed optimization in match.pd. It takes the pattern, x / y * y == x, and optimizes it to x % y == 0. This produces fewer instructions. There are also tests for the optimizations to be added to the test suite. Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? PR tree-optimization/104992 gcc/ChangeLog: * match.pd x / y * y == x: New simplification. gcc/testsuite/ChangeLog: * gcc.dg/pr104992-1.c: New test. * gcc.dg/pr104992.c: New test. --- gcc/match.pd | 5 +++++ gcc/testsuite/gcc.dg/pr104992-1.c | 30 ++++++++++++++++++++++++++ gcc/testsuite/gcc.dg/pr104992.c | 35 +++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/pr104992-1.c create mode 100644 gcc/testsuite/gcc.dg/pr104992.c base-commit: 633e9920589ddfaf2d6da1c24ce99b18a2638db4 diff --git a/gcc/match.pd b/gcc/match.pd index 9736393061a..f7ab2174b8a 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -8054,3 +8054,8 @@ and, (if (TYPE_UNSIGNED (TREE_TYPE (@0))) (bit_and @0 @1) (cond (le @0 @1) @0 (bit_and @0 @1)))))) + +/* x / y * y == x -> x % y == 0. */ +(simplify + (eq (mult (trunc_div @0 @1) @1) @0) + (eq (trunc_mod @0 @1) { build_zero_cst TREE_TYPE(@0); })) diff --git a/gcc/testsuite/gcc.dg/pr104992-1.c b/gcc/testsuite/gcc.dg/pr104992-1.c new file mode 100644 index 00000000000..a80e5e180ce --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr104992-1.c @@ -0,0 +1,30 @@ +/* PR tree-optimization/104992 */ +/* { dg-do run } */ +/* { dg-options "-O2"} */ + +#include "pr104992.c" + +int main () { + + /* Should be true. */ + if (!foo(6, 3) + || !bar(12, 2) + || !baz(34, 17) + || !qux(50, 10) + || !fred(16, 8) + || !baz(-9, 3) + || !baz(9, -3) + || !baz(-9, -3) + ) { + __builtin_abort(); + } + + /* Should be false. */ + if (foo(5, 30) + || bar(72, 27) + || baz(42, 15)) { + __builtin_abort(); + } + + return 0; +} diff --git a/gcc/testsuite/gcc.dg/pr104992.c b/gcc/testsuite/gcc.dg/pr104992.c new file mode 100644 index 00000000000..b4b0ca53118 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr104992.c @@ -0,0 +1,35 @@ +/* PR tree-optimization/104992 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ + +/* Form from PR. */ +__attribute__((noipa)) unsigned foo(unsigned x, unsigned y) +{ + return x / y * y == x; +} + +__attribute__((noipa)) unsigned bar(unsigned x, unsigned y) { + return x == x / y * y; +} + +/* Signed test case. */ +__attribute__((noipa)) unsigned baz (int x, int y) { + return x / y * y == x; +} + +/* Changed order. */ +__attribute__((noipa)) unsigned qux (unsigned x, unsigned y) { + return y * (x / y) == x; +} + +/* Wrong order. */ +__attribute__((noipa)) unsigned fred (unsigned x, unsigned y) { + return y * x / y == x; +} + +/* Wrong pattern. */ +__attribute__((noipa)) unsigned waldo (unsigned x, unsigned y, unsigned z) { + return x / y * z == x; +} + +/* { dg-final {scan-tree-dump-times " % " 4 "optimized" } } */