From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <rguenth@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1666)
	id A1A3D385B52C; Fri, 17 Feb 2023 11:38:52 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A1A3D385B52C
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1676633932;
	bh=kJPky5VPzAetlNHBRIYMcGvAjietaJHfdEVE339JKK8=;
	h=From:To:Subject:Date:From;
	b=pdD/uXr734UeJtvkZX7uyDzz9ZXkbeP9E0NzHvaNMbizrSwocb0GDqyNVfULAQpdG
	 PuGzuGvDbORWilYkuHJSq4PDhH+/GK9qMJX8vFsa+lWe5b3L/TTdgyCz0Vb8FrWVy9
	 DUroaI40OQy71TlZojYyGyLNtmTkKGZGeAcuxSnk=
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Richard Biener <rguenth@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r13-6114] tree-optimization/108821 - store motion and volatiles
X-Act-Checkin: gcc
X-Git-Author: Richard Biener <rguenther@suse.de>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 417e95263ca4d7a6623783ad664cf6305d8d3fad
X-Git-Newrev: 4c4f0f7acd6b96ee744ef598cbea5c7046a33654
Message-Id: <20230217113852.A1A3D385B52C@sourceware.org>
Date: Fri, 17 Feb 2023 11:38:52 +0000 (GMT)
List-Id: <gcc-cvs.sourceware.org>

https://gcc.gnu.org/g:4c4f0f7acd6b96ee744ef598cbea5c7046a33654

commit r13-6114-g4c4f0f7acd6b96ee744ef598cbea5c7046a33654
Author: Richard Biener <rguenther@suse.de>
Date:   Fri Feb 17 12:36:44 2023 +0100

    tree-optimization/108821 - store motion and volatiles
    
    The following fixes store motion to not re-issue volatile stores
    to preserve TBAA behavior since that will result in the number
    of volatile accesses changing.
    
            PR tree-optimization/108821
            * tree-ssa-loop-im.cc (sm_seq_valid_bb): We can also not
            move volatile accesses.
    
            * gcc.dg/tree-ssa/ssa-lim-24.c: New testcase.

Diff:
---
 gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-24.c | 25 +++++++++++++++++++++++++
 gcc/tree-ssa-loop-im.cc                    |  4 +++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-24.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-24.c
new file mode 100644
index 00000000000..6b463490a91
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-24.c
@@ -0,0 +1,25 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-lim2-details -fdump-tree-optimized" } */
+
+extern volatile int *x;
+static int gCrc;
+
+static int __attribute__((noinline)) crc16Add(int crc, int b)
+{
+  return crc + b;
+}
+
+void f(int data, int dataSz)
+{
+  int i;
+
+  for(i=0;i<dataSz;i++)
+  {
+    gCrc = crc16Add(gCrc, data);
+    *x = data;
+  }
+}
+
+/* { dg-final { scan-tree-dump "Executing store motion of gCrc" "lim2" } } */
+/* { dg-final { scan-tree-dump-not "Re-issueing" "lim2" } } */
+/* { dg-final { scan-tree-dump-times "\\*x" 1 "optimized" } } */
diff --git a/gcc/tree-ssa-loop-im.cc b/gcc/tree-ssa-loop-im.cc
index 784f6f04e7d..86ce6acb023 100644
--- a/gcc/tree-ssa-loop-im.cc
+++ b/gcc/tree-ssa-loop-im.cc
@@ -2605,7 +2605,9 @@ sm_seq_valid_bb (class loop *loop, basic_block bb, tree vdef,
       if (data->ref == UNANALYZABLE_MEM_ID)
 	return -1;
       /* Stop at memory references which we can't move.  */
-      else if (memory_accesses.refs_list[data->ref]->mem.ref == error_mark_node)
+      else if (memory_accesses.refs_list[data->ref]->mem.ref == error_mark_node
+	       || TREE_THIS_VOLATILE
+		    (memory_accesses.refs_list[data->ref]->mem.ref))
 	{
 	  /* Mark refs_not_in_seq as unsupported.  */
 	  bitmap_ior_into (refs_not_supported, refs_not_in_seq);