From patchwork Tue Sep 13 18:37:20 2022
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Roger Sayle <roger@nextmovesoftware.com>
X-Patchwork-Id: 1677421
Return-Path: <gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@legolas.ozlabs.org
Authentication-Results: legolas.ozlabs.org;
 spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org
 (client-ip=8.43.85.97; helo=sourceware.org;
 envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org;
 receiver=<UNKNOWN>)
Authentication-Results: legolas.ozlabs.org;
	dkim=fail reason="signature verification failed" (2048-bit key;
 unprotected) header.d=nextmovesoftware.com header.i=@nextmovesoftware.com
 header.a=rsa-sha256 header.s=default header.b=La/KX8gX;
	dkim-atps=neutral
Received: from sourceware.org (server2.sourceware.org [8.43.85.97])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384)
	(No client certificate requested)
	by legolas.ozlabs.org (Postfix) with ESMTPS id 4MRsdt32KBz1ynm
	for <incoming@patchwork.ozlabs.org>; Wed, 14 Sep 2022 04:37:37 +1000 (AEST)
Received: from server2.sourceware.org (localhost [IPv6:::1])
	by sourceware.org (Postfix) with ESMTP id 38E64385BC23
	for <incoming@patchwork.ozlabs.org>; Tue, 13 Sep 2022 18:37:34 +0000 (GMT)
X-Original-To: gcc-patches@gcc.gnu.org
Delivered-To: gcc-patches@gcc.gnu.org
Received: from server.nextmovesoftware.com (server.nextmovesoftware.com
 [162.254.253.69])
 by sourceware.org (Postfix) with ESMTPS id AA39D3858D28
 for <gcc-patches@gcc.gnu.org>; Tue, 13 Sep 2022 18:37:22 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AA39D3858D28
Authentication-Results: sourceware.org; dmarc=none (p=none dis=none)
 header.from=nextmovesoftware.com
Authentication-Results: sourceware.org;
 spf=pass smtp.mailfrom=nextmovesoftware.com
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=nextmovesoftware.com; s=default; h=Content-Type:MIME-Version:Message-ID:
 Date:Subject:To:From:Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID:
 Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc
 :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:
 List-Subscribe:List-Post:List-Owner:List-Archive;
 bh=+hXwPZVh/oYEV2uXpN0YJOazRK8Xt1Fh8rbu5T0PSBA=; b=La/KX8gXX0hgoDKo2i/4VH+m4X
 2rb5Ng18briZIyJ5Om0/vTHf2xVK/FIeoUHx/ZUh7BBDYww+bqsYYj4LWgiMQni33DHjloKDNJnC2
 Lk9EmGoIw2hQWdJTEup8gKH0WlVZfYY8sXKC74Se2uB4OqI4rQPsh8HS+E7sBIFdjtCcsDP0E6bAQ
 efVsdU9Cxbr1umFCLJTnaQCCmBrwwA1suvp6FnA7hy8udNNFOKjmvlbcVrFw1KB83k94sNhrG/nzR
 kb8a+aCmyAhjrYTCrsr/31iypvS0m15ayr0IK4rl+BOqQZSCFXMo7lzPP6OJSzDEpVIWT3myiSgqY
 nMeWKYAw==;
Received: from [185.62.158.67] (port=65526 helo=Dell)
 by server.nextmovesoftware.com with esmtpsa (TLS1.2) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95)
 (envelope-from <roger@nextmovesoftware.com>) id 1oYAmf-0006ua-Ii
 for gcc-patches@gcc.gnu.org; Tue, 13 Sep 2022 14:37:21 -0400
From: "Roger Sayle" <roger@nextmovesoftware.com>
To: "'GCC Patches'" <gcc-patches@gcc.gnu.org>
Subject: [PATCH] Optimize (X<<C)+(Y<<C) as (X+Y)<<C for signed addition.
Date: Tue, 13 Sep 2022 19:37:20 +0100
Message-ID: <002d01d8c79f$dc5fe830$951fb890$@nextmovesoftware.com>
MIME-Version: 1.0
X-Mailer: Microsoft Outlook 16.0
Thread-Index: AdjHnskNwiLuCwEkRK2BcXF+Q6VAOw==
Content-Language: en-gb
X-AntiAbuse: This header was added to track abuse,
 please include it with any abuse report
X-AntiAbuse: Primary Hostname - server.nextmovesoftware.com
X-AntiAbuse: Original Domain - gcc.gnu.org
X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
X-AntiAbuse: Sender Address Domain - nextmovesoftware.com
X-Get-Message-Sender-Via: server.nextmovesoftware.com: authenticated_id:
 roger@nextmovesoftware.com
X-Authenticated-Sender: server.nextmovesoftware.com:
 roger@nextmovesoftware.com
X-Source: 
X-Source-Args: 
X-Source-Dir: 
X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED,
 DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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 <gcc-patches.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>,
 <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>,
 <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe>
Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org
Sender: "Gcc-patches"
 <gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org>

This patch tweaks the match.pd transformation previously added to fold
(X<<C)+(Y<<C) as (X+Y)<<C that was previously restricted to unsigned
(wrapping) types, to also allow signed integer types provided that they
don't trap and the overflow needn't be preserved for sanitization.
i.e. this should now apply (by default) for "int x,y;", but is disabled
with -ftrapv.

This unsigned transformation has baked on mainline without problems, so it's
time to turn up the heat...  LLVM, icc and MSVC perform this optimization.


This patch has been tested on x86_64-pc-linux-gnu with make bootstrap and
make -k check, both with and without --target_board=unix{-m32}, with no
new failures.  Ok for mainline?


2022-09-13  Roger Sayle  <roger@nextmovesoftware.com>

gcc/ChangeLog
        * match.pd (op (lshift @0 @1) (lshift @2 @1)): Optimize the
        expression (X<<C) + (Y<<C) to (X+Y)<<C for signed types, that
        may have undefined overflow, provided that they don't trap.

gcc/testsuite/ChangeLog
        * gcc.dg/pr71343-3.c: New test case.


Thanks in advance,
Roger

diff --git a/gcc/match.pd b/gcc/match.pd
index 17318f52..e1e6af9 100644
--- a/gcc/match.pd
+++ b/gcc/match.pd
@@ -988,7 +988,8 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
   (simplify
     (op (lshift:s @0 @1) (lshift:s @2 @1))
     (if (INTEGRAL_TYPE_P (type)
-	 && TYPE_OVERFLOW_WRAPS (type)
+	 && !TYPE_OVERFLOW_SANITIZED (type)
+	 && !TYPE_OVERFLOW_TRAPS (type)
 	 && !TYPE_SATURATING (type))
       (lshift (op @0 @2) @1))))
 
diff --git a/gcc/testsuite/gcc.dg/pr71343-3.c b/gcc/testsuite/gcc.dg/pr71343-3.c
new file mode 100644
index 0000000..d0bdbae
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr71343-3.c
@@ -0,0 +1,15 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-optimized" } */
+
+int foo(int a, int b)
+{
+  return (a << 2) + (b << 2);
+}
+
+int bar(int a, int b)
+{
+  return (a << 2) + (b << 2) == (a + b) << 2;
+}
+
+/* { dg-final { scan-tree-dump-times " << " 1 "optimized" } } */
+/* { dg-final { scan-tree-dump-times "return 1" 1 "optimized" } } */