From: Richard Biener <rguenther@suse.de>
Date: Tue, 16 Apr 2019 07:55:41 +0000 (+0000)
Subject: re PR tree-optimization/56049 (Simplification to constants not done)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8c996ec644d4dfa8d067f822ba63b3e4a3a17ef8;p=gcc.git

re PR tree-optimization/56049 (Simplification to constants not done)

2019-04-16  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/56049
	* tree-ssa-loop-im.c (mem_ref_hasher::equal): Elide alias-set
	equality check if alias-set zero will prevail.

	* gfortran.dg/pr56049.f90: New testcase.

From-SVN: r270378
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 018d006c47d..393e1761752 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-04-16  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/56049
+	* tree-ssa-loop-im.c (mem_ref_hasher::equal): Elide alias-set
+	equality check if alias-set zero will prevail.
+
 2019-04-15  Jeff Law  <law@redhat.com>
 
 	* config/microblaze/microblaze.c (microblaze_expand_block_move): Treat
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index aacdaff51ed..9f89fba152e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-04-16  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/56049
+	* gfortran.dg/pr56049.f90: New testcase.
+
 2019-04-15  Richard Biener  <rguenther@suse.de>
 
 	PR debug/90074
diff --git a/gcc/testsuite/gfortran.dg/pr56049.f90 b/gcc/testsuite/gfortran.dg/pr56049.f90
new file mode 100644
index 00000000000..d760320cd67
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr56049.f90
@@ -0,0 +1,29 @@
+! { dg-do compile }
+! { dg-options "-O3 -fdump-tree-optimized" }
+
+program inline
+
+    integer i
+    integer a(8,8), b(8,8)
+
+    a = 0
+    do i = 1, 10000000
+        call add(b, a, 1)
+        a = b
+    end do
+
+    print *, a
+
+contains
+
+    subroutine add(b, a, o)
+        integer, intent(inout) :: b(8,8)
+        integer, intent(in) :: a(8,8), o
+        b = a + o
+    end subroutine add
+
+end program inline
+
+! Check there's no loop left, just two bb 2 in two functions.
+! { dg-final { scan-tree-dump-times "<bb \[0-9\]*>" 2 "optimized" } }
+! { dg-final { scan-tree-dump-times "<bb 2>" 2 "optimized" } }
diff --git a/gcc/tree-ssa-loop-im.c b/gcc/tree-ssa-loop-im.c
index 631dd9059ae..56d8e8e4330 100644
--- a/gcc/tree-ssa-loop-im.c
+++ b/gcc/tree-ssa-loop-im.c
@@ -178,7 +178,17 @@ mem_ref_hasher::equal (const im_mem_ref *mem1, const ao_ref *obj2)
 	    && known_eq (mem1->mem.size, obj2->size)
 	    && known_eq (mem1->mem.max_size, obj2->max_size)
 	    && mem1->mem.volatile_p == obj2->volatile_p
-	    && mem1->mem.ref_alias_set == obj2->ref_alias_set
+	    && (mem1->mem.ref_alias_set == obj2->ref_alias_set
+		/* We are not canonicalizing alias-sets but for the
+		   special-case we didn't canonicalize yet and the
+		   incoming ref is a alias-set zero MEM we pick
+		   the correct one already.  */
+		|| (!mem1->ref_canonical
+		    && (TREE_CODE (obj2->ref) == MEM_REF
+			|| TREE_CODE (obj2->ref) == TARGET_MEM_REF)
+		    && obj2->ref_alias_set == 0)
+		/* Likewise if there's a canonical ref with alias-set zero.  */
+		|| (mem1->ref_canonical && mem1->mem.ref_alias_set == 0))
 	    && types_compatible_p (TREE_TYPE (mem1->mem.ref),
 				   TREE_TYPE (obj2->ref)));
   else