diff --git a/gcc/testsuite/g++.dg/pr83541.C b/gcc/testsuite/g++.dg/pr83541.C
index f5b181e064a6b806c2540d2ea2aff762874c87a9..a55147a2bb588201dbf14625ad99d2930bf080a4 100644
--- a/gcc/testsuite/g++.dg/pr83541.C
+++ b/gcc/testsuite/g++.dg/pr83541.C
@@ -1,6 +1,6 @@
 // PR tree-optimization/83541
 // { dg-do compile }
-// { dg-options "-O3 -std=c++17 -ffast-math -fdump-tree-evrp"  }
+// { dg-options "-O3 -std=c++17 -ffast-math -fdump-tree-evrp1"  }
 
 #include <limits>
 
@@ -13,5 +13,5 @@ int test(int x)
     return 42;
 }
 
-// { dg-final { scan-tree-dump "return 42"  evrp } }
-// { dg-final { scan-tree-dump-not "return _"  evrp } }
+// { dg-final { scan-tree-dump "return 42"  evrp1 } }
+// { dg-final { scan-tree-dump-not "return _"  evrp1 } }
diff --git a/gcc/testsuite/g++.dg/pr96707.C b/gcc/testsuite/g++.dg/pr96707.C
index 2653fe3d043177c4326a34b59e47d324c06977b1..add3ae0bb80709fe6037d9e0ea6d362f22ed264c 100644
--- a/gcc/testsuite/g++.dg/pr96707.C
+++ b/gcc/testsuite/g++.dg/pr96707.C
@@ -1,10 +1,10 @@
 /* { dg-do compile} */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 bool f(unsigned x, unsigned y)
 {
     return (x >> y) <= x;
 }
 
-/* { dg-final { scan-tree-dump "return 1" "evrp" } }  */
+/* { dg-final { scan-tree-dump "return 1" "evrp1" } }  */
 
diff --git a/gcc/testsuite/g++.dg/tree-ssa/empty-loop.C b/gcc/testsuite/g++.dg/tree-ssa/empty-loop.C
index 6b1e879e6a987965623db525f07a5f7e498e9a7e..a65724c4bd0e8f02e91b92b6dab88571f893f4bf 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/empty-loop.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/empty-loop.C
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-cddce2 -ffinite-loops" } */
+/* { dg-options "-O2 -fdump-tree-cddce3 -ffinite-loops" } */
 
 #include <string>
 #include <vector>
@@ -29,5 +29,5 @@ int foo (vector<string> &v, list<string> &l, set<string> &s, map<int, string> &m
 
   return 0;
 }
-/* { dg-final { scan-tree-dump-not "if" "cddce2"} } */
+/* { dg-final { scan-tree-dump-not "if" "cddce3"} } */
 
diff --git a/gcc/testsuite/g++.dg/tree-ssa/fwprop-align.C b/gcc/testsuite/g++.dg/tree-ssa/fwprop-align.C
index 5cc5f0d7d9124bf37f2f02fdd2b7917483a2ce0f..2f8b6c04b4f06fec945aa682135a74241e7b9316 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/fwprop-align.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/fwprop-align.C
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-forwprop2" } */
+/* { dg-options "-O2 -fdump-tree-forwprop4" } */
 
 struct A
 {
@@ -16,4 +16,4 @@ int main()
 }
 
 /* We should eliminate the check if p points to a virtual function. */
-/* { dg-final { scan-tree-dump-times "& 1" 0 "forwprop2" } } */
+/* { dg-final { scan-tree-dump-times "& 1" 0 "forwprop4" } } */
diff --git a/gcc/testsuite/g++.dg/tree-ssa/mull64.C b/gcc/testsuite/g++.dg/tree-ssa/mull64.C
index cad891e62a7fbe0ac848204877eb73b0b4ea68a5..3505fb5138a392dcf75522bcd11cc385bdd844fd 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/mull64.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/mull64.C
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fmerge-mull -Wno-psabi -fdump-tree-forwprop1-details -fdump-tree-forwprop4-details" } */
+/* { dg-options "-O2 -fmerge-mull -Wno-psabi -fdump-tree-forwprop1-details -fdump-tree-forwprop6-details" } */
 
 #  define BN_BITS4        32
 #  define BN_MASK2        (0xffffffffffffffffL)
@@ -32,4 +32,4 @@ void mul64(unsigned long in0, unsigned long in1,
 }
 
 /* { dg-final { scan-tree-dump "gimple_simplified to" "forwprop1" } } */
-/* { dg-final { scan-tree-dump-times "gimple_simplified to" 1 "forwprop4" } } */
+/* { dg-final { scan-tree-dump-times "gimple_simplified to" 1 "forwprop6" } } */
diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr106922.C b/gcc/testsuite/g++.dg/tree-ssa/pr106922.C
index 2aec4975aa8ddcf6fd3f860d82a1143bf23bc8cf..11fcb4eb4b24b7f276086ba791177f30cb62b17b 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/pr106922.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr106922.C
@@ -1,5 +1,5 @@
 // { dg-require-effective-target c++20 }
-// { dg-options "-O2 -fdump-tree-cddce3" }
+// { dg-options "-O2 -fdump-tree-cddce4" }
 
 template <typename> struct __new_allocator {
   void deallocate(int *, int) { operator delete(0); }
@@ -87,4 +87,4 @@ void testfunctionfoo() {
   }
 }
 
-// { dg-final { scan-tree-dump-not "m_initialized" "cddce3" } }
+// { dg-final { scan-tree-dump-not "m_initialized" "cddce4" } }
diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr14814.C b/gcc/testsuite/g++.dg/tree-ssa/pr14814.C
index f2177d257ad2a37c5295418a2347180f3037d77b..9372de88d31ec8a8abf399e4c3650a6127275610 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/pr14814.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr14814.C
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-forwprop2" } */
+/* { dg-options "-O2 -fdump-tree-forwprop4" } */
 
 class YY { public:
   YY(const YY &v) { e[0] = v.e[0]; e[1] = v.e[1]; e[2] = v.e[2]; }
@@ -14,6 +14,6 @@ int foo(XX& r) {
   if (r.direction().y() < 0.000001) return 0;
   return 1; }
 
-/* { dg-final { scan-tree-dump-times "&this" 0 "forwprop2" } } */
-/* { dg-final { scan-tree-dump-times "&r" 0 "forwprop2" } } */
+/* { dg-final { scan-tree-dump-times "&this" 0 "forwprop4" } } */
+/* { dg-final { scan-tree-dump-times "&r" 0 "forwprop4" } } */
 
diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr19476-6.C b/gcc/testsuite/g++.dg/tree-ssa/pr19476-6.C
index f6b06c93c1428a441ebb2dd020581dd22d35f8e7..30918bcfd210a01382519e5a06b690418d1b4a3a 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/pr19476-6.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr19476-6.C
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp -fdelete-null-pointer-checks" } */
+/* { dg-options "-O2 -fdump-tree-evrp1 -fdelete-null-pointer-checks" } */
 /* { dg-skip-if "" keeps_null_pointer_checks } */
 
 // See pr19476-7.C for a version without including <new>.
@@ -12,5 +12,5 @@ int g(){
   return 42 + (0 == new int[50]);
 }
 
-/* { dg-final { scan-tree-dump     "return 42" "evrp" } } */
-/* { dg-final { scan-tree-dump-not "return 33" "evrp" } } */
+/* { dg-final { scan-tree-dump     "return 42" "evrp1" } } */
+/* { dg-final { scan-tree-dump-not "return 33" "evrp1" } } */
diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr19476-7.C b/gcc/testsuite/g++.dg/tree-ssa/pr19476-7.C
index 38624f2bac37674976ade5f369e33350ea0a8b60..fb22528ccbcf38d8db9c235862b1f7fa93e8efcb 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/pr19476-7.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr19476-7.C
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp -fdelete-null-pointer-checks" } */
+/* { dg-options "-O2 -fdump-tree-evrp1 -fdelete-null-pointer-checks" } */
 /* { dg-skip-if "" keeps_null_pointer_checks } */
 
 // See pr19476-6.C for a version that includes <new>.
@@ -8,4 +8,4 @@ int g(){
   return 42 + (0 == new int[50]);
 }
 
-/* { dg-final { scan-tree-dump     "return 42" "evrp" } } */
+/* { dg-final { scan-tree-dump     "return 42" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/fuse-1.c b/gcc/testsuite/gcc.dg/graphite/fuse-1.c
index 61289d312c2b8dab136a71d567f8c6f8c9355008..0b36b37a19879ca0967f9bbf88c1e6c2ea5d07df 100644
--- a/gcc/testsuite/gcc.dg/graphite/fuse-1.c
+++ b/gcc/testsuite/gcc.dg/graphite/fuse-1.c
@@ -1,6 +1,6 @@
 /* Check that the two loops are fused and that we manage to fold the two xor
    operations.  */
-/* { dg-options "-O2 -fno-tree-vectorize -floop-nest-optimize -fdump-tree-forwprop4 -fdump-tree-graphite-all" } */
+/* { dg-options "-O2 -fno-tree-vectorize -floop-nest-optimize -fdump-tree-forwprop6 -fdump-tree-graphite-all" } */
 
 /* Make sure we fuse the loops like this:
 AST generated by isl:
@@ -12,7 +12,7 @@ for (int c0 = 0; c0 <= 99; c0 += 1) {
 /* { dg-final { scan-tree-dump-times "AST generated by isl:.*for \\(int c0 = 0; c0 <= 99; c0 \\+= 1\\) \\{.*S_.*\\(c0\\);.*S_.*\\(c0\\);.*S_.*\\(c0\\);.*\\}" 1 "graphite" } } */
 
 /* Check that after fusing the loops, the scalar computation is also fused.  */
-/* { dg-final { scan-tree-dump-times " \\^ 12;" 2 "forwprop4" } } */
+/* { dg-final { scan-tree-dump-times " \\^ 12;" 2 "forwprop6" } } */
 
 #define MAX 100
 int A[MAX];
diff --git a/gcc/testsuite/gcc.dg/lto/tbaa-1.c b/gcc/testsuite/gcc.dg/lto/tbaa-1.c
index 74c0496711330758e2b944fe60808273cb7dc7e6..2047c70c85dc45b8d4c18f7090ca9d86dee57357 100644
--- a/gcc/testsuite/gcc.dg/lto/tbaa-1.c
+++ b/gcc/testsuite/gcc.dg/lto/tbaa-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -flto -fdump-tree-evrp" } */
+/* { dg-options "-O2 -flto -fdump-tree-evrp1" } */
 typedef struct rtx_def *rtx;
 typedef struct cselib_val_struct
 {
@@ -38,4 +38,4 @@ discard_useless_locs (x, info)
       n_useless_values++;
     }
 }
-/* { dg-final { scan-tree-dump-times "n_useless_values" 2 "evrp" } } */                 
+/* { dg-final { scan-tree-dump-times "n_useless_values" 2 "evrp1" } } */                 
diff --git a/gcc/testsuite/gcc.dg/pr102738.c b/gcc/testsuite/gcc.dg/pr102738.c
index cd58c258990937e780891dd5590578cdd14cf98c..a5439e8cb0b732e892a0885e354b80d0727f2cce 100644
--- a/gcc/testsuite/gcc.dg/pr102738.c
+++ b/gcc/testsuite/gcc.dg/pr102738.c
@@ -1,5 +1,5 @@
 /* PR tree-optimization/102738 */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 /* { dg-do compile { target int128 } } */
 
 /* Remove arithmetic shift right when the LHS is known to be 0 or -1.  */
@@ -44,6 +44,6 @@ int a6(int f, int g)
     __builtin_unreachable();
 }
 
-/* { dg-final { scan-tree-dump-times " >> 127" 1 "evrp" } } */
-/* { dg-final { scan-tree-dump-times " >> 31" 1 "evrp" } } */
-/* { dg-final { scan-tree-dump-times " >> " 2 "evrp" } } */
+/* { dg-final { scan-tree-dump-times " >> 127" 1 "evrp1" } } */
+/* { dg-final { scan-tree-dump-times " >> 31" 1 "evrp1" } } */
+/* { dg-final { scan-tree-dump-times " >> " 2 "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr102983.c b/gcc/testsuite/gcc.dg/pr102983.c
index ef58af6def08df562fa27ba1f135f675ec01e23e..c4a3dfad63edf6d52cfb05beebfddd205fa221d3 100644
--- a/gcc/testsuite/gcc.dg/pr102983.c
+++ b/gcc/testsuite/gcc.dg/pr102983.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 void foo(void);
 
 static int a = 1;
@@ -18,4 +18,4 @@ int main() {
   }
 }
 
-/* { dg-final { scan-tree-dump-times "Folding predicate c_.* to 1" 1 "evrp" } } */
+/* { dg-final { scan-tree-dump-times "Folding predicate c_.* to 1" 1 "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr103359.c b/gcc/testsuite/gcc.dg/pr103359.c
index 13406f90d7d47d3c85f43e2055a98d9c1de3bd44..18785670258344e8eeeb7d3601bd98be15c222d4 100644
--- a/gcc/testsuite/gcc.dg/pr103359.c
+++ b/gcc/testsuite/gcc.dg/pr103359.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -fdump-tree-evrp" } */
+/* { dg-options "-O3 -fdump-tree-evrp1" } */
 
 void foo();
 static char a, c;
@@ -18,4 +18,4 @@ int main() {
     foo();
 }
 
-/* { dg-final { scan-tree-dump-not "c = 0" "evrp" } } */
+/* { dg-final { scan-tree-dump-not "c = 0" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr104288.c b/gcc/testsuite/gcc.dg/pr104288.c
index 95eb196f9e41f87c58d0d95a21bebb339f1ecd57..020beb044120f0b888bd80ce69a15604ceabf55f 100644
--- a/gcc/testsuite/gcc.dg/pr104288.c
+++ b/gcc/testsuite/gcc.dg/pr104288.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp -fdelete-null-pointer-checks" } */
+/* { dg-options "-O2 -fdump-tree-evrp1 -fdelete-null-pointer-checks" } */
 /* { dg-skip-if "" { keeps_null_pointer_checks } } */
 
 void keep(int result) __attribute__((noipa));
@@ -19,5 +19,5 @@ void bar (void *p)
     __builtin_abort ();
 }
 
-/* { dg-final { scan-tree-dump-not "abort" "evrp" } } */
-/* { dg-final { scan-tree-dump-times  "== 0B;" 1 "evrp" } } */
+/* { dg-final { scan-tree-dump-not "abort" "evrp1" } } */
+/* { dg-final { scan-tree-dump-times  "== 0B;" 1 "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr104526.c b/gcc/testsuite/gcc.dg/pr104526.c
index a29530829010fb93aed0609aa9e2b34cc596217a..574d414bc2e3da244130864623275fae49065159 100644
--- a/gcc/testsuite/gcc.dg/pr104526.c
+++ b/gcc/testsuite/gcc.dg/pr104526.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 void foo(void);
 
@@ -12,4 +12,4 @@ int main() {
   }
 }
 
-/* { dg-final { scan-tree-dump-not "foo" "evrp" } } */
+/* { dg-final { scan-tree-dump-not "foo" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr106063.c b/gcc/testsuite/gcc.dg/pr106063.c
index 467b31dea623e4509878b9834f9d5926cd56b85e..f715c295e3f2573bf4c3fd8e9e2282142348855c 100644
--- a/gcc/testsuite/gcc.dg/pr106063.c
+++ b/gcc/testsuite/gcc.dg/pr106063.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target int128 } } */
-/* { dg-options "-O2 -fno-tree-forwprop --disable-tree-evrp" } */
+/* { dg-options "-O2 -fno-tree-forwprop --disable-tree-evrp1" } */
 typedef __int128 __attribute__((__vector_size__ (16))) V;
 
 V
diff --git a/gcc/testsuite/gcc.dg/pr43513.c b/gcc/testsuite/gcc.dg/pr43513.c
index 9383a802c8ad2869df69761c779a482ffafe77eb..fb2673f08a970c0caed748ec2147519a432b6a9c 100644
--- a/gcc/testsuite/gcc.dg/pr43513.c
+++ b/gcc/testsuite/gcc.dg/pr43513.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-ccp2" } */
+/* { dg-options "-O2 -fdump-tree-ccp3" } */
 
 void bar (int *);
 void foo (char *, int);
@@ -15,4 +15,4 @@ foo3 ()
     foo ("%d ", results[i]);
 }
 
-/* { dg-final { scan-tree-dump-times "alloca" 0 "ccp2"} } */
+/* { dg-final { scan-tree-dump-times "alloca" 0 "ccp3"} } */
diff --git a/gcc/testsuite/gcc.dg/pr68217.c b/gcc/testsuite/gcc.dg/pr68217.c
index eb4f15e048fe3f84578283bf4fd7cdf0b87fb0ee..178cb5008b610472a8779b3e99048507bc8b89fb 100644
--- a/gcc/testsuite/gcc.dg/pr68217.c
+++ b/gcc/testsuite/gcc.dg/pr68217.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdisable-tree-evrp -fdump-tree-vrp1 -fno-tree-ccp" } */
+/* { dg-options "-O2 -fdisable-tree-evrp1 -fdump-tree-vrp1 -fno-tree-ccp" } */
 
 int foo (void)
 {
diff --git a/gcc/testsuite/gcc.dg/pr69047.c b/gcc/testsuite/gcc.dg/pr69047.c
index d562663d86a3908aee6367d5bcb624bbbf20b993..d32e449e9c0682cd07f69b958832a4ece9a1d096 100644
--- a/gcc/testsuite/gcc.dg/pr69047.c
+++ b/gcc/testsuite/gcc.dg/pr69047.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fdump-tree-forwprop4" } */
+/* { dg-options "-O -fdump-tree-forwprop6" } */
 
 __UINT8_TYPE__
 f(__UINT16_TYPE__ b)
@@ -15,4 +15,4 @@ f(__UINT16_TYPE__ b)
   return a;
 }
 
-/* { dg-final { scan-tree-dump "_\[0-9\]+ = \\(\[^)\]+\\) b" "forwprop4" } } */
+/* { dg-final { scan-tree-dump "_\[0-9\]+ = \\(\[^)\]+\\) b" "forwprop6" } } */
diff --git a/gcc/testsuite/gcc.dg/pr78888.c b/gcc/testsuite/gcc.dg/pr78888.c
index 77a130cf11c2285db1fd2ec48bff38df40f75859..2ab0995e7a3bc624cc987ebfa7e16ccc7fd9bfa9 100644
--- a/gcc/testsuite/gcc.dg/pr78888.c
+++ b/gcc/testsuite/gcc.dg/pr78888.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/78888 */
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 void kill (void);
 void keep (void);
@@ -25,5 +25,5 @@ void g (int x)
   if (__builtin_tolower ((unsigned char)x) == 'z')
     keep ();
 }
-/* { dg-final { scan-tree-dump-not "kill" "evrp" } }  */
-/* { dg-final { scan-tree-dump-times "keep" 4 "evrp"} } */
+/* { dg-final { scan-tree-dump-not "kill" "evrp1" } }  */
+/* { dg-final { scan-tree-dump-times "keep" 4 "evrp1"} } */
diff --git a/gcc/testsuite/gcc.dg/pr81192.c b/gcc/testsuite/gcc.dg/pr81192.c
index 6cab605655853ba5ed4e1efeff525b11df81dc5f..3e808d67cbe7fef7d8f4a2a57c5a40d0a167ac48 100644
--- a/gcc/testsuite/gcc.dg/pr81192.c
+++ b/gcc/testsuite/gcc.dg/pr81192.c
@@ -1,6 +1,6 @@
-/* { dg-options "-Os -fdump-tree-pre-details -fdisable-tree-evrp -fno-tree-dse" } */
+/* { dg-options "-Os -fdump-tree-pre-details -fdisable-tree-evrp1 -fno-tree-dse" } */
 
-/* Disable tree-evrp because the new version of evrp sees
+/* Disable tree-evrp1 because the new version of evrp1 sees
 <bb 3> :
   if (j_8(D) != 2147483647)
     goto <bb 4>; [50.00%]
diff --git a/gcc/testsuite/gcc.dg/pr83072-2.c b/gcc/testsuite/gcc.dg/pr83072-2.c
index f495f2582c437e411d1ecdfe002e526a6c20634e..c197a1a883824797f5f5f35359468cf3889008f5 100644
--- a/gcc/testsuite/gcc.dg/pr83072-2.c
+++ b/gcc/testsuite/gcc.dg/pr83072-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile} */
-/* { dg-options "-O2 -fdump-tree-evrp-details" } */
+/* { dg-options "-O2 -fdump-tree-evrp1-details" } */
 
 int f1(int a, int b, int c){
   if(c==0)__builtin_unreachable();
@@ -15,4 +15,4 @@ int f2(int a, int b, int c){
   return a == b;
 }
 
-/* { dg-final { scan-tree-dump-times "gimple_simplified to" 2 "evrp" } }  */
+/* { dg-final { scan-tree-dump-times "gimple_simplified to" 2 "evrp1" } }  */
diff --git a/gcc/testsuite/gcc.dg/pr83072.c b/gcc/testsuite/gcc.dg/pr83072.c
index 3bed8d890139c407a01d5aead5a88fb23f3d268e..71116bd0e9bb3928d3f6b6730b6b18d8b9ca64b0 100644
--- a/gcc/testsuite/gcc.dg/pr83072.c
+++ b/gcc/testsuite/gcc.dg/pr83072.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp -fno-tree-ccp -fno-tree-forwprop -fno-tree-fre" } */
+/* { dg-options "-O2 -fdump-tree-evrp1 -fno-tree-ccp -fno-tree-forwprop -fno-tree-fre" } */
 
 void kill (void);
 
@@ -11,4 +11,4 @@ int f(int c){
   return c;
 }
 
-/* { dg-final { scan-tree-dump-not "kill" "evrp" } }  */
+/* { dg-final { scan-tree-dump-not "kill" "evrp1" } }  */
diff --git a/gcc/testsuite/gcc.dg/pr83073.c b/gcc/testsuite/gcc.dg/pr83073.c
index 1168ae822a41b8656b253d3b186b9c21d6dfe206..899a53caa40d8763c675b18f4f463e4bef50229a 100644
--- a/gcc/testsuite/gcc.dg/pr83073.c
+++ b/gcc/testsuite/gcc.dg/pr83073.c
@@ -1,5 +1,5 @@
 /* { dg-do compile} */
-/* { dg-options "-O2 -fdump-tree-evrp-details -fno-tree-fre -fno-tree-ccp -fno-tree-forwprop" } */
+/* { dg-options "-O2 -fdump-tree-evrp1-details -fno-tree-fre -fno-tree-ccp -fno-tree-forwprop" } */
 
 int f(int x)
 {
@@ -7,4 +7,4 @@ int f(int x)
     return x & 1;
 }
 
-/* { dg-final { scan-tree-dump "gimple_simplified to.* = 1" "evrp" } }  */
+/* { dg-final { scan-tree-dump "gimple_simplified to.* = 1" "evrp1" } }  */
diff --git a/gcc/testsuite/gcc.dg/pr90838.c b/gcc/testsuite/gcc.dg/pr90838.c
index 7502b846346f1eb95d64dce8a2852edf0d528924..8e8bdeca79c0acb8dbab08773a8abca11cc1c410 100644
--- a/gcc/testsuite/gcc.dg/pr90838.c
+++ b/gcc/testsuite/gcc.dg/pr90838.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-forwprop2-details" } */
+/* { dg-options "-O2 -fdump-tree-forwprop4-details" } */
 /* { dg-additional-options "-mbmi" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 } } } } } */
 /* { dg-additional-options "-march=rv64gc_zbb" { target { rv64 } } } */
 /* { dg-additional-options "-march=rv32gc_zbb" { target { rv32 } } } */
@@ -59,7 +59,7 @@ int ctz4 (unsigned long x)
   return table[(lsb * magic) >> 58];
 }
 
-/* { dg-final { scan-tree-dump-times {= \.CTZ} 4 "forwprop2" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 } } } } } } */
+/* { dg-final { scan-tree-dump-times {= \.CTZ} 4 "forwprop4" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 } } } } } } */
 /* { dg-final { scan-assembler-times "tzcntq\t" 1 { target { { i?86-*-* x86_64-*-* } && { ! { ia32 } } } } } } */
 /* { dg-final { scan-assembler-times "tzcntl\t" 3 { target { { i?86-*-* x86_64-*-* } && { ! { ia32 } } } } } } */
 /* { dg-final { scan-assembler-times "andl\t" 2 { target { { i?86-*-* x86_64-*-* } && { ! { ia32 } } } } } } */
@@ -67,18 +67,18 @@ int ctz4 (unsigned long x)
 /* { dg-final { scan-assembler-not "imulq" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 } } } } } } */
 /* { dg-final { scan-assembler-not "shrq" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 } } } } } } */
 
-/* { dg-final { scan-tree-dump-times {= \.CTZ} 4 "forwprop2" { target aarch64*-*-* } } } */
+/* { dg-final { scan-tree-dump-times {= \.CTZ} 4 "forwprop4" { target aarch64*-*-* } } } */
 /* { dg-final { scan-assembler-times "clz\t" 4 { target aarch64*-*-* } } } */
 /* { dg-final { scan-assembler-times "and\t" 2 { target aarch64*-*-* } } } */
 /* { dg-final { scan-assembler-not "cmp\t.*0" { target aarch64*-*-* } } } */
 
-/* { dg-final { scan-tree-dump-times {= \.CTZ} 4 "forwprop2" { target { rv64 } } } } */
+/* { dg-final { scan-tree-dump-times {= \.CTZ} 4 "forwprop4" { target { rv64 } } } } */
 /* { dg-final { scan-assembler-times "ctz\t"  1 { target { rv64 } } } } */
 /* { dg-final { scan-assembler-times "ctzw\t" 3 { target { rv64 } } } } */
 /* { dg-final { scan-assembler-times "andi\t" 2 { target { rv64 } } } } */
 /* { dg-final { scan-assembler-not "mul" { target { rv64 } } } } */
 
-/* { dg-final { scan-tree-dump-times {= \.CTZ} 3 "forwprop2" { target { rv32 } } } } */
+/* { dg-final { scan-tree-dump-times {= \.CTZ} 3 "forwprop4" { target { rv32 } } } } */
 /* { dg-final { scan-assembler-times "ctz\t" 3 { target { rv32 } } } } */
 /* { dg-final { scan-assembler-times "andi\t" 1 { target { rv32 } } } } */
 /* { dg-final { scan-assembler-times "mul\t" 1 { target { rv32 } } } } */
diff --git a/gcc/testsuite/gcc.dg/pr91029.c b/gcc/testsuite/gcc.dg/pr91029.c
index 4904764e1ee7110bd11471ddc5aab1a6f4171c28..f29212c011a042146ac481440ae8dbd1dd0ce27e 100644
--- a/gcc/testsuite/gcc.dg/pr91029.c
+++ b/gcc/testsuite/gcc.dg/pr91029.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/91029 */
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 void kill (void);
 int xx;
@@ -45,4 +45,4 @@ void f4 (int i)
     }
 }
 
-/* { dg-final { scan-tree-dump-not "kill" "evrp" } }  */
+/* { dg-final { scan-tree-dump-not "kill" "evrp1" } }  */
diff --git a/gcc/testsuite/gcc.dg/pr93231.c b/gcc/testsuite/gcc.dg/pr93231.c
index cd0b3f320f78ffdd3d82cf487a63e861d0bf8eab..1898935a996c145dc7482666307f29728051c4dc 100644
--- a/gcc/testsuite/gcc.dg/pr93231.c
+++ b/gcc/testsuite/gcc.dg/pr93231.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-forwprop2-details -Wno-shift-count-negative" } */
+/* { dg-options "-O2 -fdump-tree-forwprop4-details -Wno-shift-count-negative" } */
 
 int ctz_ice1 (int x)
 {
@@ -32,4 +32,4 @@ int ctz_fail (unsigned x)
   return table[((x & -x) * 0x077CB531) >> 27];
 }
 
-/* { dg-final { scan-tree-dump-not {= \.CTZ} "forwprop2" } } */
+/* { dg-final { scan-tree-dump-not {= \.CTZ} "forwprop4" } } */
diff --git a/gcc/testsuite/gcc.dg/pr96542.c b/gcc/testsuite/gcc.dg/pr96542.c
index 5014f2acad8348368335bd1ecb425947afe6a494..5b924d568717b799c9e0bbfe29691e3ee759fe3e 100644
--- a/gcc/testsuite/gcc.dg/pr96542.c
+++ b/gcc/testsuite/gcc.dg/pr96542.c
@@ -1,5 +1,5 @@
 /* { dg-do compile} */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 
 unsigned char
@@ -22,6 +22,6 @@ baz (unsigned int x)
   return (-1U >> x) * 16;
 }
 
-/* { dg-final { scan-tree-dump-times  "254" 2 "evrp" } }  */
-/* { dg-final { scan-tree-dump "= PHI <32.*, 4294967280" "evrp" } }  */
+/* { dg-final { scan-tree-dump-times  "254" 2 "evrp1" } }  */
+/* { dg-final { scan-tree-dump "= PHI <32.*, 4294967280" "evrp1" } }  */
 
diff --git a/gcc/testsuite/gcc.dg/pr97505.c b/gcc/testsuite/gcc.dg/pr97505.c
index f01d912067a0b38692d93cee68ced24d43b1dc69..efd011059e7873f2f9713beb0c9ecc2ac5714ba8 100644
--- a/gcc/testsuite/gcc.dg/pr97505.c
+++ b/gcc/testsuite/gcc.dg/pr97505.c
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-Os -fsanitize=signed-integer-overflow -fdump-tree-evrp" }
+// { dg-options "-Os -fsanitize=signed-integer-overflow -fdump-tree-evrp1" }
 
 // Test that .UBSAN_CHECK_SUB(y, x) is treated as y-x for range
 // purposes, where X and Y are related to each other.
@@ -20,4 +20,4 @@ int foobar(int x, int y)
   return 5;
 }
 
-// { dg-final { scan-tree-dump-not "unreachable" "evrp" } }
+// { dg-final { scan-tree-dump-not "unreachable" "evrp1" } }
diff --git a/gcc/testsuite/gcc.dg/pr97515.c b/gcc/testsuite/gcc.dg/pr97515.c
index b4f2481cb03f96327b64e7e7d5186a68f655d8a6..7b860cc7b78e106bc68dcf957bb1f196c5dc355b 100644
--- a/gcc/testsuite/gcc.dg/pr97515.c
+++ b/gcc/testsuite/gcc.dg/pr97515.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-ccp2" } */
+/* { dg-options "-O2 -fdump-tree-ccp3" } */
 
 int
 e7 (int gg)
@@ -22,6 +22,6 @@ e7 (int gg)
 
 /* EVRP should be able to reduce this to a single goto when we can
  * revisit statements to try folding again based on changed inputs.
- * Until then, make sure its gone by ccp2.  */
+ * Until then, make sure its gone by ccp3.  */
  
-/* { dg-final { scan-tree-dump-times "goto" 1 "ccp2" } } */
+/* { dg-final { scan-tree-dump-times "goto" 1 "ccp3" } } */
diff --git a/gcc/testsuite/gcc.dg/pr97567-2.c b/gcc/testsuite/gcc.dg/pr97567-2.c
index c3ead54eaa8eefa409adfa35e4268267f45720ef..69447736b448fe4aeed4ac31f0f96489806335a4 100644
--- a/gcc/testsuite/gcc.dg/pr97567-2.c
+++ b/gcc/testsuite/gcc.dg/pr97567-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile} */
-/* { dg-options "-O2 -fdump-tree-evrp -fdisable-tree-ethread" } */
+/* { dg-options "-O2 -fdump-tree-evrp1 -fdisable-tree-ethread" } */
 
 char a[2];
 
@@ -21,4 +21,4 @@ void gg (void)
      foo ();
 }
 
-/* { dg-final { scan-tree-dump-not "foo" "evrp" } }  */
+/* { dg-final { scan-tree-dump-not "foo" "evrp1" } }  */
diff --git a/gcc/testsuite/gcc.dg/predict-1.c b/gcc/testsuite/gcc.dg/predict-1.c
index d2e753e624ed287869ae056fa70be7795c06ee3f..96e7474fdd17a14a3ca3624996195dcf5f0a48cc 100644
--- a/gcc/testsuite/gcc.dg/predict-1.c
+++ b/gcc/testsuite/gcc.dg/predict-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-profile_estimate --disable-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-profile_estimate --disable-tree-evrp1" } */
 
 extern int global;
 
diff --git a/gcc/testsuite/gcc.dg/predict-9.c b/gcc/testsuite/gcc.dg/predict-9.c
index cb68a218a931cd1b98c85bf25094f73f4668105f..01a8361cad39e6d12088a7e9536c42ab90f42aec 100644
--- a/gcc/testsuite/gcc.dg/predict-9.c
+++ b/gcc/testsuite/gcc.dg/predict-9.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdisable-tree-evrp -fdump-tree-profile_estimate -fno-finite-loops -fdisable-tree-ethread" } */
+/* { dg-options "-O2 -fdisable-tree-evrp1 -fdump-tree-profile_estimate -fno-finite-loops -fdisable-tree-ethread" } */
 
 /* Note: Threader causes removal of for loop.  */
 
diff --git a/gcc/testsuite/gcc.dg/torture/pr97812.c b/gcc/testsuite/gcc.dg/torture/pr97812.c
index 4d468adf8faafa0d6b5f33de7b05f25dffd012b7..7df29a69e642b1fbbf01e0d8a86f69bb2ac0cac4 100644
--- a/gcc/testsuite/gcc.dg/torture/pr97812.c
+++ b/gcc/testsuite/gcc.dg/torture/pr97812.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-additional-options "-fdisable-tree-evrp" } */
+/* { dg-additional-options "-fdisable-tree-evrp1" } */
 
 unsigned char c;
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030808-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030808-1.c
index 456f6f2712871627971c0845e0db4d59abfc5ab2..40b8e4cacb12bed091d86a4707e91dccfb995412 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030808-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030808-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O1 -fdump-tree-cddce3" } */
+/* { dg-options "-O1 -fdump-tree-cddce4" } */
       
 extern void abort (void);
 
@@ -33,8 +33,8 @@ delete_dead_jumptables ()
 /* There should be no loads of ->code.  If any exist, then we failed to
    optimize away all the IF statements and the statements feeding
    their conditions.  */
-/* { dg-final { scan-tree-dump-times "->code" 0 "cddce3"} } */
+/* { dg-final { scan-tree-dump-times "->code" 0 "cddce4"} } */
    
 /* There should be no IF statements.  */
-/* { dg-final { scan-tree-dump-times "if " 0 "cddce3"} } */
+/* { dg-final { scan-tree-dump-times "if " 0 "cddce4"} } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040211-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040211-1.c
index a9bdf26931aa758d85aee6174af37af5156eba7d..625426d2014e0b69748faa93585cd26336a8ec78 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040211-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040211-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-cddce2 -fno-finite-loops" } */
+/* { dg-options "-O2 -fdump-tree-cddce3 -fno-finite-loops" } */
 
 struct rtx_def;
 typedef struct rtx_def *rtx;
@@ -35,4 +35,4 @@ com (rtx insn, int blah)
 
 /* Cddce cannot remove possibly infinite loops and there is no way how to
    determine whether the loop in can_move_up ends.  */
-/* { dg-final { scan-tree-dump "if " "cddce2"} } */
+/* { dg-final { scan-tree-dump "if " "cddce3"} } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-17.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-17.c
index 62ef77622008c8bf611e19a43adc70dd2110a5db..0c05519df94449fd3ee17403191774c338bdafb4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-17.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-17.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fno-early-inlining -fdump-tree-ccp2" } */
+/* { dg-options "-O -fno-early-inlining -fdump-tree-ccp3" } */
 
 int *p;
 int inline bar(void) { return 0; }
@@ -14,4 +14,4 @@ int foo(int x)
   return *q + *p;
 }
 
-/* { dg-final { scan-tree-dump-not "NOTE: no flow-sensitive alias info for" "ccp2" } } */
+/* { dg-final { scan-tree-dump-not "NOTE: no flow-sensitive alias info for" "ccp3" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/andnot-2.c b/gcc/testsuite/gcc.dg/tree-ssa/andnot-2.c
index e0955ce3ffd9d1cf9bd47e6a5da5b7d5e32c1047..6e1563d192af7810a43738d4a082526f1fe56cc1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/andnot-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/andnot-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-forwprop3-raw -w -Wno-psabi" } */
+/* { dg-options "-O2 -fdump-tree-forwprop5-raw -w -Wno-psabi" } */
 
 typedef long vec __attribute__((vector_size(16)));
 vec f(vec x){
@@ -7,4 +7,4 @@ vec f(vec x){
   return y & (y == 0);
 }
 
-/* { dg-final { scan-tree-dump-not "_expr" "forwprop3" } } */
+/* { dg-final { scan-tree-dump-not "_expr" "forwprop5" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-22.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-22.c
index 82eb5851c59b0bb6776de4a67a474cb8805adab0..e7fdd7390fb7fb2679762b1c35ba9c62371a9e94 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-22.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-22.c
@@ -22,7 +22,7 @@ void g (char *s1, char *s2)
      [1] n_6: size_t [0, 1023]
      [2] d_8: size_t [0, 1023]
 
-     Whereas evrp can't really:
+     Whereas evrp1 can't really:
      [1] n_6: size_t [0, 9223372036854775805]
      [2] d_8: size_t [0, 9223372036854775805]
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-9.c b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-9.c
index 886dc147ad1a955c63bc1a0a560bb833e4181191..787e41a8a6fff270a51e39cf3c007bcfd102ca0e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-9.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-cunrolli-details -fdisable-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-cunrolli-details -fdisable-tree-evrp1" } */
 void abort (void);
 int q (void);
 int a[10];
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp-ignore.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp-ignore.c
index 9bfaed6a50a1bd6764fb95a824b79799a035632c..b4e687dfe82d3d1895d1dc8ec3804f36589a1b8a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp-ignore.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp-ignore.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp -fno-tree-fre -fdisable-tree-ethread" } */
+/* { dg-options "-O2 -fdump-tree-evrp1 -fno-tree-fre -fdisable-tree-ethread" } */
 
 void kill(void);
 
@@ -25,4 +25,4 @@ void foo (int x, int y, int z)
     kill();
 
 }
-/* { dg-final { scan-tree-dump-not "kill" "evrp" } } */
+/* { dg-final { scan-tree-dump-not "kill" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp-trans.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp-trans.c
index 8ee8e3c3f42dca22bae83069c5d6fb6316c91ed4..f07eee75dc728ddced21e8198d909d1816caec6d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp-trans.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp-trans.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 /* Simple tests to make sure transitives are working. */
 void keep();
@@ -140,5 +140,5 @@ f9 (int x, int y, int z)
       }
 }
 
-/* { dg-final { scan-tree-dump-not "kill" "evrp" } }  */
-/* { dg-final { scan-tree-dump-times "keep" 13 "evrp"} } */
+/* { dg-final { scan-tree-dump-not "kill" "evrp1" } }  */
+/* { dg-final { scan-tree-dump-times "keep" 13 "evrp1"} } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp-trans2.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp-trans2.c
index d6fe42714f641a465fa2826df726c1aaba559e9c..7a39f126daab277042ea171a5c7c95ce98d01e97 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp-trans2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp-trans2.c
@@ -1,8 +1,8 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 #define int unsigned
 #include "evrp-trans.c"
 
-/* { dg-final { scan-tree-dump-not "kill" "evrp" } }  */
-/* { dg-final { scan-tree-dump-times "keep" 13 "evrp"} } */
+/* { dg-final { scan-tree-dump-not "kill" "evrp1" } }  */
+/* { dg-final { scan-tree-dump-times "keep" 13 "evrp1"} } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp1.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp1.c
index f5f38c4ce19daa188accae0e407201ae1362dcda..d2561f6c65a8bda9626d93e3326b22dbcb6e78d5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp-details" } */
+/* { dg-options "-O2 -fdump-tree-evrp1-details" } */
 
 int foo (int i);
 int bar (int j)
@@ -10,4 +10,4 @@ int bar (int j)
     return j;
 }
 
-/* { dg-final { scan-tree-dump "\\\[5, \\+INF" "evrp" } } */
+/* { dg-final { scan-tree-dump "\\\[5, \\+INF" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp11.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp11.c
index d791305d426c9bc2b1d6cba73522acc78f5e88e8..457e155523901c42b3e354b5147ef087d1242181 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp11.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp -fdelete-null-pointer-checks" } */
+/* { dg-options "-O2 -fdump-tree-evrp1 -fdelete-null-pointer-checks" } */
 
 extern void link_error ();
 
@@ -20,4 +20,4 @@ void bar (char *x, int a)
     }
 }
 
-/* { dg-final { scan-tree-dump-not "link_error" "evrp" } }  */
+/* { dg-final { scan-tree-dump-not "link_error" "evrp1" } }  */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp12.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp12.c
index b3906c23465fe47ff86f53d91a9a3336e8b506db..e26fbf73d2a782f7d271ae0061fea5222be0b539 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp12.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp12.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 extern void link_error ();
 
@@ -18,4 +18,4 @@ f3 (unsigned int s)
     }
 }
 
-/* { dg-final { scan-tree-dump-not "link_error" "evrp" } } */
+/* { dg-final { scan-tree-dump-not "link_error" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp13.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp13.c
index cfa4e8256c07d8445561aff3367289bfcd31d369..4f3ec19c39373c5db133f87bb9736e4ea7452c9c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp13.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp13.c
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 #define ADD_NW(A,B) (__extension__({ __typeof(A+B) R; if(__builtin_add_overflow(A,B,&R)) __builtin_unreachable(); R ;}))
 _Bool a_b2(unsigned A,  unsigned B) { return ADD_NW(A,B) >= B; }
 
-/* { dg-final { scan-tree-dump "return 1;" "evrp" } } */
+/* { dg-final { scan-tree-dump "return 1;" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp2.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp2.c
index fc92cdfbc663900597255f8661e05413a3cc2ee5..099ca4a0cfd5b3e8870fae50e64f55dd66065447 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp-details" } */
+/* { dg-options "-O2 -fdump-tree-evrp1-details" } */
 
 int foo (int i);
 int bar2 (int j)
@@ -15,4 +15,4 @@ int bar2 (int j)
 }
 
 
-/* { dg-final { scan-tree-dump "\\\[4, 7\\\]" "evrp" } } */
+/* { dg-final { scan-tree-dump "\\\[4, 7\\\]" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp20.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp20.c
index 7d4d55f7638f74ddc27d30e7408b12d02518e055..5f847daef636c66733f61f52650a747565fb5fbb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp20.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp20.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 void call (void);
 
@@ -16,4 +16,4 @@ void foo (int base)
       }
 }
 
-/* { dg-final { scan-tree-dump-not "call" "evrp"} } */
+/* { dg-final { scan-tree-dump-not "call" "evrp1"} } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp21.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp21.c
index dae788cc2b6c2e55ec2872164d6be0a6cedde14e..ea03aa6ed7b0649e7f76a32641b80c16d5e1f043 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp21.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp21.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 extern void vrp_keep (void);
 extern void vrp_kill (void);
@@ -24,5 +24,5 @@ f2 (int s, int b)
     vrp_kill ();
 }
 
-/* { dg-final { scan-tree-dump-times "vrp_keep \\(" 1 "evrp"} } */
-/* { dg-final { scan-tree-dump-times "vrp_kill \\(" 0 "evrp"} } */
+/* { dg-final { scan-tree-dump-times "vrp_keep \\(" 1 "evrp1"} } */
+/* { dg-final { scan-tree-dump-times "vrp_kill \\(" 0 "evrp1"} } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp22.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp22.c
index 3dd47e55d04d0dcf538068814b4372a978ea2dac..777087810b632f51df5963fd5137e52d2f624933 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp22.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp22.c
@@ -1,6 +1,6 @@
 /* See backwards thru casts if the range fits the LHS type. */
 /* { dg-do compile } */
-/* { dg-options "-O2  -fdump-tree-evrp" } */
+/* { dg-options "-O2  -fdump-tree-evrp1" } */
 
 extern void kill(int i);
 extern void keep(int i);
@@ -38,6 +38,6 @@ foo (int i)
     }
 }
 
-/* { dg-final { scan-tree-dump-times "kill \\(" 0 "evrp"} } */
-/* { dg-final { scan-tree-dump-times "keep \\(" 1 "evrp"} } */
+/* { dg-final { scan-tree-dump-times "kill \\(" 0 "evrp1"} } */
+/* { dg-final { scan-tree-dump-times "keep \\(" 1 "evrp1"} } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp3.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp3.c
index 805652b956a338590e631bcd0c0f2ffd3a0af3be..e4ef79b38695ecb6527d27c74c87819674aa9738 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp-details" } */
+/* { dg-options "-O2 -fdump-tree-evrp1-details" } */
 
 int foo (int i);
 void bar (int j)
@@ -11,5 +11,5 @@ void bar (int j)
     }
 }
 
-/* { dg-final { scan-tree-dump "\\\[1, 10\\\]" "evrp" } } */
+/* { dg-final { scan-tree-dump "\\\[1, 10\\\]" "evrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp30.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp30.c
index 2c5ff41ecd9403597e654799095cb7b4d1b47381..a80ca9bfab4623ca21c8ff546b6e44798e5284c5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp30.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp30.c
@@ -1,6 +1,6 @@
 /* Confirm the ranger is picking up a relationship with equivalences.  */
 /* { dg-do compile } */
-/* { dg-options "-O2  -fdump-tree-evrp" } */
+/* { dg-options "-O2  -fdump-tree-evrp1" } */
 
 extern void foo ();
 
@@ -12,5 +12,5 @@ void f (unsigned int a, unsigned int b)
 	foo (); /* Unreachable */
 }
 
-/* { dg-final { scan-tree-dump-times "foo\\(" 0 "evrp"} } */
+/* { dg-final { scan-tree-dump-times "foo\\(" 0 "evrp1"} } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp4.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp4.c
index e3f4531b16c938f2cd1b6dffcf86db2a3951d922..500a6828a8f4037f0b653ebf051e63101608a524 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp-details" } */
+/* { dg-options "-O2 -fdump-tree-evrp1-details" } */
 
 int foo (int *p);
 
@@ -17,4 +17,4 @@ int bar (struct st *s)
   foo (&s->a);
 }
 
-/* { dg-final { scan-tree-dump "\\\[1B, \\+INF\\\]" "evrp" } } */
+/* { dg-final { scan-tree-dump "\\\[1B, \\+INF\\\]" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp6.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp6.c
index aaeec68866e25758387936e2da2f14de96950441..27d569090e40071a2088473710950676f6dc5c68 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp6.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp-details" } */
+/* { dg-options "-O2 -fdump-tree-evrp1-details" } */
 
 extern void abort (void);
 
@@ -18,4 +18,4 @@ foo (int k, int j)
 
   return j;
 }
-/* { dg-final { scan-tree-dump "\\\[12, \\+INF" "evrp" } } */
+/* { dg-final { scan-tree-dump "\\\[12, \\+INF" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp7.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp7.c
index 16fbe65e4d9e69c465bc76078f81e4ff7a222e18..3c193d0cce5b171ec916cb61b5cc3e06cf897a97 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp7.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp-details" } */
+/* { dg-options "-O2 -fdump-tree-evrp1-details" } */
 
 int test1(int i, int k)
 {
@@ -11,4 +11,4 @@ int test1(int i, int k)
   return 1;
 }
 
-/* { dg-final { scan-tree-dump "Removing dead stmt \[^\r\n\]* = j_.* == 10" "evrp" } } */
+/* { dg-final { scan-tree-dump "Removing dead stmt \[^\r\n\]* = j_.* == 10" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp8.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp8.c
index b7e5c7aa2de8f090a6e0d6ec17aff878fb48909c..a0690e1e2f7034abf3a309f4d99cdcc2bdcc586c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp8.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp-details" } */
+/* { dg-options "-O2 -fdump-tree-evrp1-details" } */
 
 int foo(int i)
 {
@@ -8,4 +8,4 @@ int foo(int i)
   return 1;
 }
 
-/* { dg-final { scan-tree-dump "Removing dead stmt \[^\r\n\]* = i_.* == 1" "evrp" } } */
+/* { dg-final { scan-tree-dump "Removing dead stmt \[^\r\n\]* = i_.* == 1" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp9.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp9.c
index fb7c319fc4359a9e476e47954824589fdc326515..853fd9b72fa86dd09e28deeb418bc4e5f008d631 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/evrp9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp9.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/49039 */
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 extern void bar (void);
 
@@ -24,7 +24,7 @@ foo (unsigned int x, unsigned int y)
     bar ();
 }
 
-/* { dg-final { scan-tree-dump-times "Folding predicate minv_.* == 5 to 0" 1 "evrp" } } */
-/* { dg-final { scan-tree-dump-times "Folding predicate minv_.* == 6 to 0" 1 "evrp" } } */
-/* { dg-final { scan-tree-dump-times "Folding predicate maxv_.* == 5 to 0" 1 "evrp" } } */
-/* { dg-final { scan-tree-dump-times "Folding predicate maxv_.* == 6 to 0" 1 "evrp" } } */
+/* { dg-final { scan-tree-dump-times "Folding predicate minv_.* == 5 to 0" 1 "evrp1" } } */
+/* { dg-final { scan-tree-dump-times "Folding predicate minv_.* == 6 to 0" 1 "evrp1" } } */
+/* { dg-final { scan-tree-dump-times "Folding predicate maxv_.* == 5 to 0" 1 "evrp1" } } */
+/* { dg-final { scan-tree-dump-times "Folding predicate maxv_.* == 6 to 0" 1 "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/foldconst-4.c b/gcc/testsuite/gcc.dg/tree-ssa/foldconst-4.c
index 0e9b676f66bd10112cad6fe543ecafc49f064aa0..f58bf667f2b97bd36edc6f2a585c717dee9d6306 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/foldconst-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/foldconst-4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fdump-tree-ccp2" } */
+/* { dg-options "-O -fdump-tree-ccp3" } */
 
 struct a {int a,b;};
 const static struct a a;
@@ -10,4 +10,4 @@ test()
 {
   return a.a+b[c];
 }
-/* { dg-final { scan-tree-dump "return 0;" "ccp2" } } */
+/* { dg-final { scan-tree-dump "return 0;" "ccp3" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-33.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-33.c
index c7124deee11f3655d7c50bd9605bb7caddba6470..ab8b5ba3bb392fc90edbebe710f708a25d3e350a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-33.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-33.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-forwprop3" } */
+/* { dg-options "-O2 -fdump-tree-forwprop5" } */
 
 unsigned short
 test1 (unsigned short a)
@@ -9,7 +9,7 @@ test1 (unsigned short a)
   a |= 0x8000; /* Simplify to ((a >> 1) ^ 0xa001).  */
   return a;
 }
-/* { dg-final { scan-tree-dump "\\^ 40961" "forwprop3" } } */
+/* { dg-final { scan-tree-dump "\\^ 40961" "forwprop5" } } */
 
 unsigned short
 test2 (unsigned short a)
@@ -19,7 +19,7 @@ test2 (unsigned short a)
   a ^= 0x0001; /* Simplify to ((a << 1) | 0x8005).  */
   return a;
 }
-/* { dg-final { scan-tree-dump "\\| 32773" "forwprop3" } } */
+/* { dg-final { scan-tree-dump "\\| 32773" "forwprop5" } } */
 
 unsigned short
 test3 (unsigned short a)
@@ -29,7 +29,7 @@ test3 (unsigned short a)
   a |= 0xc031; /* Simplify to ((a & 0xd123) | 0xe071).  */
   return a;
 }
-/* { dg-final { scan-tree-dump "\\| 57457" "forwprop3" } } */
+/* { dg-final { scan-tree-dump "\\| 57457" "forwprop5" } } */
 
 unsigned short
 test4 (unsigned short a)
@@ -39,7 +39,7 @@ test4 (unsigned short a)
   a |= 0x8000;
   return a;
 }
-/* { dg-final { scan-tree-dump "\\^ 49153" "forwprop3" } } */
+/* { dg-final { scan-tree-dump "\\^ 49153" "forwprop5" } } */
 
 unsigned short
 test5 (unsigned short a)
@@ -49,8 +49,8 @@ test5 (unsigned short a)
   a |= 0x8001; /* Only move shift inward: (((a >> 1) ^ 0x4001) | 0x8001).  */
   return a;
 }
-/* { dg-final { scan-tree-dump "\\^ 16385" "forwprop3" } } */
-/* { dg-final { scan-tree-dump "\\| 32769" "forwprop3" } } */
+/* { dg-final { scan-tree-dump "\\^ 16385" "forwprop5" } } */
+/* { dg-final { scan-tree-dump "\\| 32769" "forwprop5" } } */
 
 short
 test6 (short a)
@@ -59,7 +59,7 @@ test6 (short a)
   a >>= 2;
   return a;
 }
-/* { dg-final { scan-tree-dump "\\& 8191" "forwprop3" } } */
+/* { dg-final { scan-tree-dump "\\& 8191" "forwprop5" } } */
 
 short
 test7 (short a)
@@ -68,4 +68,4 @@ test7 (short a)
   a >>= 2;
   return a;
 }
-/* { dg-final { scan-tree-dump "\\& -7169" "forwprop3" } } */
+/* { dg-final { scan-tree-dump "\\& -7169" "forwprop5" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/isolate-2.c b/gcc/testsuite/gcc.dg/tree-ssa/isolate-2.c
index f5cd23ab24201f04070a58386d0dae3214cd4193..37dcb2a5fab5a26b9a948f7dfe0c5959e24c1ed2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/isolate-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/isolate-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */ 
-/* { dg-options "-O2 -fdelete-null-pointer-checks -fisolate-erroneous-paths-attribute -fdump-tree-isolate-paths -fdump-tree-forwprop3" } */
+/* { dg-options "-O2 -fdelete-null-pointer-checks -fisolate-erroneous-paths-attribute -fdump-tree-isolate-paths -fdump-tree-forwprop5" } */
 /* { dg-skip-if "" keeps_null_pointer_checks } */
 
 
@@ -37,6 +37,6 @@ bar (void)
    We also verify that after isolation cprop simplifies the
    return statement so that it returns &z directly. */
 /* { dg-final { scan-tree-dump-times "__builtin_trap" 2 "isolate-paths"} } */
-/* { dg-final { scan-tree-dump-times "return &z;" 1 "forwprop3"} } */
+/* { dg-final { scan-tree-dump-times "return &z;" 1 "forwprop5"} } */
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/isolate-4.c b/gcc/testsuite/gcc.dg/tree-ssa/isolate-4.c
index f357e16d3d7cc3d4f1892ea3d70c537b6ffcac52..978d2936f1fcf35ff76d4ecce04aef6dd405d171 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/isolate-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/isolate-4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */ 
-/* { dg-options "-O2 -fdelete-null-pointer-checks -fisolate-erroneous-paths-attribute -fdump-tree-isolate-paths -fdump-tree-ccp3" } */
+/* { dg-options "-O2 -fdelete-null-pointer-checks -fisolate-erroneous-paths-attribute -fdump-tree-isolate-paths -fdump-tree-ccp4" } */
 /* { dg-skip-if "" keeps_null_pointer_checks } */
 
 
@@ -26,6 +26,6 @@ bar (void)
    We also verify that after isolation phi-cprop simplifies the
    return statement so that it returns &z directly. */
 /* { dg-final { scan-tree-dump-times "__builtin_trap" 2 "isolate-paths"} } */
-/* { dg-final { scan-tree-dump-times "foo .&z.;" 1 "ccp3"} } */
+/* { dg-final { scan-tree-dump-times "foo .&z.;" 1 "ccp4"} } */
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr14814.c b/gcc/testsuite/gcc.dg/tree-ssa/pr14814.c
index 60d9649a189aeec8e60675642b5d19e4988990ad..5df4e49c22085fe5b02aac05bf3453f435207cc1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr14814.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr14814.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-tree-sra -fdump-tree-forwprop2" } */
+/* { dg-options "-O2 -fno-tree-sra -fdump-tree-forwprop4" } */
 
 struct YY {
   double e[3];  };
@@ -18,4 +18,4 @@ int foo(const struct XX* r) {
   return 1;
 }
 
-/* { dg-final { scan-tree-dump-times "= &" 0 "forwprop2" } } */
+/* { dg-final { scan-tree-dump-times "= &" 0 "forwprop4" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr20318.c b/gcc/testsuite/gcc.dg/tree-ssa/pr20318.c
index 80fd72668715909ce45f57553db5e9601ce1adf7..2537855f68771eb34a3839d526e2a993adebeb9c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr20318.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr20318.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target { ! keeps_null_pointer_checks } } } */
-/* { dg-options "-O2 -fdump-tree-original -fdump-tree-vrp1 -fdelete-null-pointer-checks -fdisable-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-original -fdump-tree-vrp1 -fdelete-null-pointer-checks -fdisable-tree-evrp1" } */
 
 extern int* f(int) __attribute__((returns_nonnull));
 extern void eliminate ();
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr20657.c b/gcc/testsuite/gcc.dg/tree-ssa/pr20657.c
index e67823150dab50a1e971f5fc329f096fa064d260..f7cab6fe2a0481552db4150aa2d3d2e18be374ea 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr20657.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr20657.c
@@ -3,7 +3,7 @@
    statement, which was needed to eliminate the second "if" statement.  */
 
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-tree-dominator-opts -fno-tree-fre -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fno-tree-dominator-opts -fno-tree-fre -fdump-tree-evrp1" } */
 
 int
 foo (int a)
@@ -14,4 +14,4 @@ foo (int a)
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "if" 1 "evrp"} } */
+/* { dg-final { scan-tree-dump-times "if" 1 "evrp1"} } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr20702.c b/gcc/testsuite/gcc.dg/tree-ssa/pr20702.c
index 81129674d8af33bc16155ee13aa61633a5b67e73..9374bcdc3fb8530758aa38565e6e5dddf905fc14 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr20702.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr20702.c
@@ -4,7 +4,7 @@
    immediate successors of the basic block.  */
 
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-thread-jumps -fdisable-tree-evrp -fdump-tree-vrp1-details -fdelete-null-pointer-checks" } */
+/* { dg-options "-O2 -fno-thread-jumps -fdisable-tree-evrp1 -fdump-tree-vrp1-details -fdelete-null-pointer-checks" } */
 
 extern void bar (int);
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21001.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21001.c
index f9216a44a754233353bee80c29679108301a9d5f..d2c8ecf64793476e6b22d900f0d41466d6cba345 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21001.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21001.c
@@ -5,7 +5,7 @@
    range information out of the conditional.  */
 
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-tree-fre -fdisable-tree-evrp -fno-thread-jumps -fdump-tree-vrp1-details" } */
+/* { dg-options "-O2 -fno-tree-fre -fdisable-tree-evrp1 -fno-thread-jumps -fdump-tree-vrp1-details" } */
 /* { dg-additional-options "-fdisable-tree-ethread -fdisable-tree-thread1" } */
 
 int
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21086.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21086.c
index 9b93d39d4e440a6c46ebfd79ebb2c7c1bf74dd5e..19f15d0845759b671513c70834bb91ac215d75fa 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21086.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21086.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-thread-jumps -fdisable-tree-evrp -fdump-tree-vrp1 -fdump-tree-dce2 -fdelete-null-pointer-checks" } */
+/* { dg-options "-O2 -fno-thread-jumps -fdisable-tree-evrp1 -fdump-tree-vrp1 -fdump-tree-dce2 -fdelete-null-pointer-checks" } */
 
 int
 foo (int *p)
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21090.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21090.c
index 92a87688601366f2b401fd6f3e6dc75c2cd28a51..eaef51dc92caf5eecd0da5e24193b4e9af0f56a6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21090.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21090.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-thread-jumps -fdisable-tree-evrp -fdump-tree-vrp1 -fdelete-null-pointer-checks" } */
+/* { dg-options "-O2 -fno-thread-jumps -fdisable-tree-evrp1 -fdump-tree-vrp1 -fdelete-null-pointer-checks" } */
 
 int g, h;
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21294.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21294.c
index 8c8f4479a77cb6e2d1fa1dd3f49f0aeb4384ac96..6a5343fd793b760f44928422591ffdb3ba7ca517 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21294.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21294.c
@@ -4,7 +4,7 @@
    allows us to eliminate the second "if" statement.  */
 
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-tree-dominator-opts -fdisable-tree-evrp -fdisable-tree-ethread -fdisable-tree-threadfull1 -fdump-tree-vrp1-details" } */
+/* { dg-options "-O2 -fno-tree-dominator-opts -fdisable-tree-evrp1 -fdisable-tree-ethread -fdisable-tree-threadfull1 -fdump-tree-vrp1-details" } */
 
 struct f {
   int i;
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21458-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21458-2.c
index 9610570e2729afffec8adc2849382f0548891cf3..4bdf1b1613bfe7b457169189a993df51d8384191 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21458-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21458-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp-details -fdisable-tree-ethread" } */
+/* { dg-options "-O2 -fdump-tree-evrp1-details -fdisable-tree-ethread" } */
 
 extern void g (void);
 extern void bar (int);
@@ -16,4 +16,4 @@ foo (int a)
     }
 }
 
-/* { dg-final { scan-tree-dump-times "Folding predicate.* to 1" 1 "evrp" } } */
+/* { dg-final { scan-tree-dump-times "Folding predicate.* to 1" 1 "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21458.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21458.c
index 97d17f21cfbbaf2f4fd5aba23574eefe4dc928b1..c6a0c51ffad24fa94023ea77ed31fb7b4d03f47f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21458.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21458.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdisable-tree-evrp -fdump-tree-vrp1" } */
+/* { dg-options "-O2 -fdisable-tree-evrp1 -fdump-tree-vrp1" } */
 
 extern void g (void);
 extern void bar (int);
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21559.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21559.c
index 83b7c802e358894498e5915edaae2f386ac4fd05..c477fdf75d695911f871078a1ebc538158a08127 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21559.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21559.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp-details" } */
+/* { dg-options "-O2 -fdump-tree-evrp1-details" } */
 
 static int blocksize = 4096;
 
@@ -33,4 +33,4 @@ void foo (void)
 
 
 /* First, we should simplify the bits < 0 test within the loop.  */
-/* { dg-final { scan-tree-dump-times "Simplified relational" 1 "evrp" } } */
+/* { dg-final { scan-tree-dump-times "Simplified relational" 1 "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21563.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21563.c
index 504b3cce6e6a81e37b73d7142c58606854885293..2863d80e53e7aa8a43492cab08330c9865eb6bf7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21563.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21563.c
@@ -2,7 +2,7 @@
    Make sure VRP folds the second "if" statement.  */
 
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-thread-jumps -fdisable-tree-evrp -fdump-tree-vrp1-details" } */
+/* { dg-options "-O2 -fno-thread-jumps -fdisable-tree-evrp1 -fdump-tree-vrp1-details" } */
 
 int
 foo (int a)
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23744.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23744.c
index f70f2546bf1b3e06eb0911b12e46dda8deb721cd..0a339f2f700d8980524520c65a0d277fd7c732b6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr23744.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23744.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-tree-ccp -fdisable-tree-evrp -fdump-tree-vrp1" } */
+/* { dg-options "-O2 -fno-tree-ccp -fdisable-tree-evrp1 -fdump-tree-vrp1" } */
 
 void h (void);
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr25382.c b/gcc/testsuite/gcc.dg/tree-ssa/pr25382.c
index 8634c0a78952812313fdababbb1c8169727151f7..a302ec63aa18b1f98499805073561d63d1336c29 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr25382.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr25382.c
@@ -3,7 +3,7 @@
    Check that VRP now gets ranges from BIT_AND_EXPRs.  */
 
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-thread-jumps -fno-tree-ccp -fdisable-tree-evrp -fdump-tree-vrp1" } */
+/* { dg-options "-O2 -fno-thread-jumps -fno-tree-ccp -fdisable-tree-evrp1 -fdump-tree-vrp1" } */
 
 int
 foo (int a)
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr45397.c b/gcc/testsuite/gcc.dg/tree-ssa/pr45397.c
index 8eacb5187773b530ea89cfc39c8d1f1e06ef7958..79cfc9d00a0c49f629b18f8de6a83ea085f5ab7f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr45397.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr45397.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-phiopt -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-phiopt -fdump-tree-evrp1" } */
 
 int foo_add (const unsigned char *tmp, int i, int val)
 {
@@ -20,7 +20,7 @@ int foo_mul (const unsigned char *tmp, int i, int val)
    have no control flow.  */
 /* EVRP leaves copies in the IL which confuses phiopt1 so we have
    to rely on phiopt2 instead.  */
-/* { dg-final { scan-tree-dump-not " & 255;" "evrp" } } */
+/* { dg-final { scan-tree-dump-not " & 255;" "evrp1" } } */
 /* { dg-final { scan-tree-dump-times "MAX_EXPR" 3 "phiopt1" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "MIN_EXPR" 3 "phiopt1" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-not "if " "phiopt1" { xfail *-*-* } } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr49039.c b/gcc/testsuite/gcc.dg/tree-ssa/pr49039.c
index 102b07346b434f96f031276430165d69acebe217..797a7cd444de71615f82d859f7eaf7b468d087f0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr49039.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr49039.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/49039 */
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdisable-tree-evrp -fdump-tree-vrp1 -fno-thread-jumps" } */
+/* { dg-options "-O2 -fdisable-tree-evrp1 -fdump-tree-vrp1 -fno-thread-jumps" } */
 
 extern void bar (void);
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr58480.c b/gcc/testsuite/gcc.dg/tree-ssa/pr58480.c
index f11623b7c6b61c446d609f1c9e903b04c152c0ae..2767e7ed53cc55da3da378c96f62ce9e713967ab 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr58480.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr58480.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target { ! keeps_null_pointer_checks } } } */
-/* { dg-options "-O2 -fno-thread-jumps -fdisable-tree-evrp -fdump-tree-vrp1 -fdelete-null-pointer-checks" } */
+/* { dg-options "-O2 -fno-thread-jumps -fdisable-tree-evrp1 -fdump-tree-vrp1 -fdelete-null-pointer-checks" } */
 
 extern void eliminate (void);
 extern void* f1 (void *a, void *b) __attribute__((nonnull));
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr61839_1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr61839_1.c
index f5af7a1d6b6758f6a1566d17138880e429bb0fda..61c2c45910563a0b5d92443a6c655764dc42b3a5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr61839_1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr61839_1.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/61839.  */
 /* { dg-do run } */
-/* { dg-options "-O2 -fdisable-tree-evrp -fdisable-tree-ethread -fdisable-tree-threadfull1 -fdump-tree-vrp1 -fdump-tree-optimized" } */
+/* { dg-options "-O2 -fdisable-tree-evrp1 -fdisable-tree-ethread -fdisable-tree-threadfull1 -fdump-tree-vrp1 -fdump-tree-optimized" } */
 /* { dg-require-effective-target int32plus } */
 
 __attribute__ ((noinline))
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr61839_2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr61839_2.c
index 0e0f4c02113163b76147189264c8cb93ed8b029d..ba1e9ba5eb74554a60b68c62a816b94009d953d7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr61839_2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr61839_2.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/61839.  */
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 /* { dg-require-effective-target int32plus } */
 
 __attribute__ ((noinline))
@@ -72,13 +72,13 @@ int mod (int a, int b)
 
 /* EVRP now makes transformations in all functions, leaving a single
  * builtin_abort call in bar2. */
-/* { dg-final { scan-tree-dump-times "__builtin_abort" 1 "evrp" } } */
+/* { dg-final { scan-tree-dump-times "__builtin_abort" 1 "evrp1" } } */
 
 /* Make sure to optimize 972195717 / 0 in function foo.  */
-/* { dg-final { scan-tree-dump-times "972195717 / " 0  "evrp" } } */
+/* { dg-final { scan-tree-dump-times "972195717 / " 0  "evrp1" } } */
 /* Make sure  to optimize 972195717 % 0 in function bar.  */
-/* { dg-final { scan-tree-dump-times "972195717 % " 0 "evrp" } } */
+/* { dg-final { scan-tree-dump-times "972195717 % " 0 "evrp1" } } */
 /* Make sure to optimize 972195717 % [1,2] function bar2.  */
-/* { dg-final { scan-tree-dump-times "972195715 % " 0 "evrp" } } */
+/* { dg-final { scan-tree-dump-times "972195715 % " 0 "evrp1" } } */
 /* [12,12][24,24][48,48] % [0,0][3,3][6,6][12,12] == [0,0] */
-/* { dg-final { scan-tree-dump-times "%" 0 "evrp" } } */
+/* { dg-final { scan-tree-dump-times "%" 0 "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr61839_4.c b/gcc/testsuite/gcc.dg/tree-ssa/pr61839_4.c
index a346912d12167de3d36ee4d29297095a8236332d..bc0290dc182e77eb085bb07a2243250259467657 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr61839_4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr61839_4.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/61839.  */
 /* { dg-do run } */
-/* { dg-options "-O2 -fdump-tree-vrp1 -fdisable-tree-evrp -fdump-tree-optimized" } */
+/* { dg-options "-O2 -fdump-tree-vrp1 -fdisable-tree-evrp1 -fdump-tree-optimized" } */
 /* { dg-require-effective-target int32plus } */
 
 __attribute__ ((noinline))
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr64130.c b/gcc/testsuite/gcc.dg/tree-ssa/pr64130.c
index b694ec171c156ff65af76135f6d2a26ea51b570c..17d71dcd9bbb9b42ad221e28025bd3f02dae3c58 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr64130.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr64130.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp-details" } */
+/* { dg-options "-O2 -fdump-tree-evrp1-details" } */
 
 __extension__ typedef __UINT32_TYPE__ uint32_t;
 
@@ -14,6 +14,6 @@ int funsigned2 (uint32_t a)
   return (-1 * 0x1ffffffffL) / a == 0;
 }
 
-/* { dg-final { scan-tree-dump "int \\\[2, 8589934591\\\]" "evrp" } } */
-/* { dg-final { scan-tree-dump "int \\\[-8589934591, -2\\\]" "evrp" } } */
+/* { dg-final { scan-tree-dump "int \\\[2, 8589934591\\\]" "evrp1" } } */
+/* { dg-final { scan-tree-dump "int \\\[-8589934591, -2\\\]" "evrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr68431.c b/gcc/testsuite/gcc.dg/tree-ssa/pr68431.c
index 9c42563b67b91ca13deff4f7335fed17323f2eb5..1de9aa5402da3c9b0cb6087ab8d8870ebe18b5b5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr68431.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr68431.c
@@ -1,5 +1,5 @@
 /* PR tree-optimization/68431 */
-/* { dg-options "-O2 -fdisable-tree-evrp -fdump-tree-vrp1-details" } */
+/* { dg-options "-O2 -fdisable-tree-evrp1 -fdump-tree-vrp1-details" } */
 
 unsigned int x = 1;
 int
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr77445-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr77445-2.c
index b3db1bca6173d58620a4307fa5fdcf4231761775..de49f747010f1c9c79d6fc78ebefa0f8f9240923 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr77445-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr77445-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdisable-tree-evrp -fdump-tree-thread-details-blocks-stats -fdump-tree-threadfull1-blocks-stats -fdump-tree-threadfull2-blocks-stats" } */
+/* { dg-options "-O2 -fdisable-tree-evrp1 -fdump-tree-thread-details-blocks-stats -fdump-tree-threadfull1-blocks-stats -fdump-tree-threadfull2-blocks-stats" } */
 typedef enum STATES {
 	START=0,
 	INVALID,
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr78153-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr78153-1.c
index 2530ba08e1ca53fd7df7d467b2da5602f42f6fe0..174adca338a4387d15d33e0007154e77989829e6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr78153-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr78153-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp-slim" } */
+/* { dg-options "-O2 -fdump-tree-evrp1-slim" } */
 
 void f(const char *s)
 {
@@ -7,4 +7,4 @@ void f(const char *s)
     __builtin_abort ();
 }
 
-/* { dg-final { scan-tree-dump-not "__builtin_abort" "evrp" } } */
+/* { dg-final { scan-tree-dump-not "__builtin_abort" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr78153-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr78153-2.c
index de70450f1c9f6715ca72e46823494eeeb2ad3a5d..11ace86d95c6265cde1e98e7d857bdf9950f98e4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr78153-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr78153-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp-slim" } */
+/* { dg-options "-O2 -fdump-tree-evrp1-slim" } */
 
 void f(const char *s)
 {
@@ -8,4 +8,4 @@ void f(const char *s)
     __builtin_abort ();
 }
 
-/* { dg-final { scan-tree-dump-not "__builtin_abort" "evrp" } } */
+/* { dg-final { scan-tree-dump-not "__builtin_abort" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr78154.c b/gcc/testsuite/gcc.dg/tree-ssa/pr78154.c
index 3ba8f64e2664bbd9570f28df6699838e01ef8379..6dff0977a8c8d96d23d37bb558d6e295c8be26fa 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr78154.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr78154.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp-slim -fdelete-null-pointer-checks" } */
+/* { dg-options "-O2 -fdump-tree-evrp1-slim -fdelete-null-pointer-checks" } */
 /* { dg-skip-if "" { keeps_null_pointer_checks } } */
 
 void f(void *d, const void *s, __SIZE_TYPE__ n)
@@ -41,4 +41,4 @@ void f(void *d, const void *s, __SIZE_TYPE__ n)
     __builtin_abort ();
 }
 
-/* { dg-final { scan-tree-dump-not "__builtin_abort" "evrp" } } */
+/* { dg-final { scan-tree-dump-not "__builtin_abort" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr78655.c b/gcc/testsuite/gcc.dg/tree-ssa/pr78655.c
index e9158e072688e3dc741ac238f206ae3537f0d764..e406f085554a5774c67a01b66ac347edf021fabc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr78655.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr78655.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-tree-ccp -fno-tree-forwprop -fno-tree-fre -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fno-tree-ccp -fno-tree-forwprop -fno-tree-fre -fdump-tree-evrp1" } */
 
 struct A{int a,b;};
 inline int*f1(struct A*p){return&p->a;}   /* offset of 0.  */
@@ -33,5 +33,5 @@ main()
   
 }
 
-/* { dg-final { scan-tree-dump-not "bad" "evrp"} } */
+/* { dg-final { scan-tree-dump-not "bad" "evrp1"} } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr91029-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr91029-1.c
index d52734b20f98d89def89d5c53812e21c52831e34..3e079712b9adaf29aafddd9d292cdc236d79bca5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr91029-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr91029-1.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/91029 */
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 void kill (void);
 int xx;
@@ -65,4 +65,4 @@ void f6 (int i, int j)
     }
 }
 
-/* { dg-final { scan-tree-dump-not "kill" "evrp" } }  */
+/* { dg-final { scan-tree-dump-not "kill" "evrp1" } }  */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr91029-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr91029-2.c
index ad9213a41b792dda3ad6680b7142d87acd8d689d..8b10645f39a482bb1619505bc54b8c33cc4ef02c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr91029-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr91029-2.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/91029 */
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 void kill (void);
 int xx;
@@ -95,4 +95,4 @@ void f9 (unsigned int i, unsigned int j)
     }
 }
 
-/* { dg-final { scan-tree-dump-not "kill" "evrp" } }  */
+/* { dg-final { scan-tree-dump-not "kill" "evrp1" } }  */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr93781-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr93781-1.c
index b2505f3959de69447629ecde09c8e79f64169d94..9f0bb21a742a8183085ba4b048fc5992a97dd22b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr93781-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr93781-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 void kill (void);
 
@@ -16,5 +16,5 @@ void foo (unsigned int arg)
     kill ();;
 }
 
-/* { dg-final { scan-tree-dump-not "kill" "evrp" } }  */
+/* { dg-final { scan-tree-dump-not "kill" "evrp1" } }  */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr93781-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr93781-2.c
index c9b28783c1249641ad94b5a05c4b81fd3fb40c90..fc4f2924839f8271111e98f543efa25f328587fb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr93781-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr93781-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 void kill (void);
 
@@ -14,4 +14,4 @@ void foo (unsigned int arg)
     kill ();
 }
 
-/* { dg-final { scan-tree-dump-not "kill" "evrp" } } */
+/* { dg-final { scan-tree-dump-not "kill" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr93781-3.c b/gcc/testsuite/gcc.dg/tree-ssa/pr93781-3.c
index e1d2be0ea7fc031de7db5275bb579e66da2afb2f..0f9298bd612b96ef2ec0055a5c3a17c2c9564aab 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr93781-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr93781-3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 void kill (void);
 
@@ -18,4 +18,4 @@ void foo (unsigned int arg)
    kill ();
 }
 
-/* { dg-final { scan-tree-dump-not "kill" "evrp" } } */
+/* { dg-final { scan-tree-dump-not "kill" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr95906.c b/gcc/testsuite/gcc.dg/tree-ssa/pr95906.c
index 3d820a58e9303823e146559ad3dfa1e2d714c81e..c9543d04e41c04eaa22109ddc361135e03449a3b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr95906.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr95906.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-forwprop3-raw -w -Wno-psabi" } */
+/* { dg-options "-O2 -fdump-tree-forwprop5-raw -w -Wno-psabi" } */
 
 // FIXME: this should further optimize to a MAX_EXPR
 typedef signed char v16i8 __attribute__((vector_size(16)));
@@ -9,5 +9,5 @@ v16i8 f(v16i8 a, v16i8 b)
     return (cmp & a) | (~cmp & b);
 }
 
-/* { dg-final { scan-tree-dump-not "bit_(and|ior)_expr" "forwprop3" } } */
-/* { dg-final { scan-tree-dump-times "vec_cond_expr" 1 "forwprop3" } } */
+/* { dg-final { scan-tree-dump-not "bit_(and|ior)_expr" "forwprop5" } } */
+/* { dg-final { scan-tree-dump-times "vec_cond_expr" 1 "forwprop5" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr98513.c b/gcc/testsuite/gcc.dg/tree-ssa/pr98513.c
index c15d6bd708e9beedac4b9089d9a970e36c0dbbee..8a32f2c0e6a01ce2fc8b7aadce5ae13c09131e35 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr98513.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr98513.c
@@ -2,7 +2,7 @@
 /* { dg-options "-O2 -fgimple" } */
 
 __attribute__((noipa))
-void __GIMPLE (ssa,startwith("evrp"))
+void __GIMPLE (ssa,startwith("evrp1"))
 foo (int x, int minus_1)
 {
   int tem;
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-29.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-29.c
index 3c1a848f50bc48914627d537430615397448e462..c93a8d0d23a7468787697ccf556dbd591d4759c8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-29.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-29.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fdump-tree-ccp2" } */
+/* { dg-options "-O -fdump-tree-ccp3" } */
 
 static double num;
 int foo (void)
@@ -7,4 +7,4 @@ int foo (void)
   return *(unsigned *)&num;
 }
 
-/* { dg-final { scan-tree-dump "return 0;" "ccp2" } } */
+/* { dg-final { scan-tree-dump "return 0;" "ccp3" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-3.c
index 1c8c318ce4f0f6e8ef1acf48d296a8ef974760a8..48427de64934b45d058f1bbff49f185466f9c50d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fdump-tree-ccp2" } */
+/* { dg-options "-O -fdump-tree-ccp3" } */
 
 extern void link_error (void);
 
@@ -133,4 +133,4 @@ int* test666 (int * __restrict__ rp1, int * __restrict__ rp2, int *p1)
    optimization has failed */
 /* ??? While we indeed don't handle some of these, a couple of the
    restrict tests are incorrect.  */
-/* { dg-final { scan-tree-dump-times "link_error" 0 "ccp2" { xfail *-*-* } } } */
+/* { dg-final { scan-tree-dump-times "link_error" 0 "ccp3" { xfail *-*-* } } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-30.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-30.c
index 9f56b392cdd9d2abed37b4e0514b41ad7bef94de..1401d23e1a6493a34b51bb48d2d95af6a25ac546 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-30.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-30.c
@@ -28,8 +28,8 @@ void test_bzero (void)
 
 /* { dg-final { scan-tree-dump-times "builtin_memset" 1 "dse1" } } */
 
-/* Merging the evrp folder into substitute_and_fold_engine shuffled
-   the order of gimple_fold a bit, so evrp is no longer folding the
+/* Merging the evrp1 folder into substitute_and_fold_engine shuffled
+   the order of gimple_fold a bit, so evrp1 is no longer folding the
    memmove inline.  This folding is instead done by forwprop.  Thus, I
    have remmoved the |memmove in the test below as this is not done
    until after dse.
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-54.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-54.c
index 02ebf068a619033119cb9a84842afb98602b9c3b..f0a1fab4cce08554096e1774871b7fbb6dc36f87 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-54.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-54.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
 /* { dg-require-effective-target int32plus } */
-/* { dg-options "-O -fdump-tree-forwprop4 -fdump-tree-dse1" } */
+/* { dg-options "-O -fdump-tree-forwprop6 -fdump-tree-dse1" } */
 
 extern void abort (void);
 
@@ -51,6 +51,6 @@ int main()
   return 0;
 }
 
-/* { dg-final { scan-tree-dump "\\(char\\) i_" "forwprop4" } } */
-/* { dg-final { scan-tree-dump "\\(short int\\) i_" "forwprop4" } } */
+/* { dg-final { scan-tree-dump "\\(char\\) i_" "forwprop6" } } */
+/* { dg-final { scan-tree-dump "\\(short int\\) i_" "forwprop6" } } */
 /* { dg-final { scan-tree-dump-not "u.i =" "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-19.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-19.c
index e98d13fe85bbbfc9b2ff45f23d775f1e8f5265f1..ad6eb62700284b8bce90f138960d1a6dd2513b18 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-19.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-19.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-sink1-details -fdump-tree-cddce2-details" } */
+/* { dg-options "-O2 -fdump-tree-sink1-details -fdump-tree-cddce3-details" } */
 
 static int b=4;
 int c;
@@ -18,4 +18,4 @@ main()
    applying store motion to c and b.  */
 /* { dg-final { scan-tree-dump "Sinking # VUSE" "sink1" } } */
 /* And remove the loop after final value replacement.  */
-/* { dg-final { scan-tree-dump "fix_loop_structure: removing loop" "cddce2" } } */
+/* { dg-final { scan-tree-dump "fix_loop_structure: removing loop" "cddce3" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp02.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp02.c
index 6e9c8df2f0a2336c1caa8bbd88ec35b258a13231..df83d6a45aef17acfb1bffb529b5ff1ca838c114 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp02.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp02.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-vrp1 -fdelete-null-pointer-checks -fdisable-tree-evrp -fno-thread-jumps" } */
+/* { dg-options "-O2 -fdump-tree-vrp1 -fdelete-null-pointer-checks -fdisable-tree-evrp1 -fno-thread-jumps" } */
 
 struct A
 {
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp03.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp03.c
index 4cbaca4133212254a05276693f4d988dd699970c..8897d85bde313fd79e87d03bdd2603037ddf94f7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp03.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp03.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdisable-tree-evrp -fdump-tree-vrp1 -fno-thread-jumps" } */
+/* { dg-options "-O2 -fdisable-tree-evrp1 -fdump-tree-vrp1 -fno-thread-jumps" } */
 
 struct A
 {
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp06.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp06.c
index 898477e42fbceed499e958759aa3957ff04e12d0..59c4319113d2ee81e093b8f088dd8cb96a79c7c3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp06.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp06.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdisable-tree-evrp -fdump-tree-vrp1 -fno-thread-jumps" } */
+/* { dg-options "-O2 -fdisable-tree-evrp1 -fdump-tree-vrp1 -fno-thread-jumps" } */
 
 int baz (void);
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp07.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp07.c
index ec5f6cce46fe995719a2670cf97b3527cc8b1fc1..f53ea54cca753acb406a72e1683344728082cc46 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp07.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp07.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-tree-fre -fdisable-tree-evrp -fdump-tree-vrp1-details -fdelete-null-pointer-checks -fno-thread-jumps" } */
+/* { dg-options "-O2 -fno-tree-fre -fdisable-tree-evrp1 -fdump-tree-vrp1-details -fdelete-null-pointer-checks -fno-thread-jumps" } */
 
 int
 foo (int i, int *p)
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp08.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp08.c
index c9d9023671559d00cf1d54591a4d3545cee65af8..a9bc856865a639b2560df3c0fff744d965e6b66f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp08.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp08.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-tree-fre -fdisable-tree-evrp -fdump-tree-vrp1-details -fno-thread-jumps -fdelete-null-pointer-checks" } */
+/* { dg-options "-O2 -fno-tree-fre -fdisable-tree-evrp1 -fdump-tree-vrp1-details -fno-thread-jumps -fdelete-null-pointer-checks" } */
 
 /* Compile with -fno-tree-fre -O2 to prevent CSEing *p.  */
 int
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp09.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp09.c
index 354169692d66be185a02e37e578d9c18deb017d0..48a79e42824449b25ea30dc6368acb154b56118f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp09.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp09.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-tree-fre -fdisable-tree-evrp -fdump-tree-vrp1 -std=gnu89 -fno-thread-jumps" } */
+/* { dg-options "-O2 -fno-tree-fre -fdisable-tree-evrp1 -fdump-tree-vrp1 -std=gnu89 -fno-thread-jumps" } */
 
 foo (int *p)
 {
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp111.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp111.c
index cae2bc75aff9a37bcf7adeb942af2653648eddb8..a4e35833a4081689cb9e51e7f89e7b488a6abd93 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp111.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp111.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp -fdelete-null-pointer-checks" } */
+/* { dg-options "-O2 -fdump-tree-evrp1 -fdelete-null-pointer-checks" } */
 /* { dg-skip-if "" { keeps_null_pointer_checks } } */
 
 void foo (void *p) __attribute__((nonnull(1)));
@@ -11,4 +11,4 @@ void bar (void *p)
     __builtin_abort ();
 }
 
-/* { dg-final { scan-tree-dump-not "abort" "evrp" } } */
+/* { dg-final { scan-tree-dump-not "abort" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp113.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp113.c
index dfe4989d313d98ae89f10884327c3a878cfed119..dc7e5e583102f09064134b795809c3710cb477df 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp113.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp113.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-vrp1 -fdisable-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-vrp1 -fdisable-tree-evrp1" } */
 
 int f(int a) {
     switch (a & 1) {
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp114.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp114.c
index 5c2c1a0b500b3290234e975fb826321cf69f0659..33adac61aba53474c0cd386bd22a9d2f492d5702 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp114.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp114.c
@@ -1,5 +1,5 @@
 /* { dg-do link { target int32plus } } */
-/* { dg-options "-O2 -fdump-tree-fre1 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-fre1 -fdump-tree-evrp1" } */
 
 extern void link_error ();
 void foo (int a)
@@ -21,4 +21,4 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "link_error" 1 "fre1" } } */
-/* { dg-final { scan-tree-dump-times "link_error" 0 "evrp" } } */
+/* { dg-final { scan-tree-dump-times "link_error" 0 "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp115.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp115.c
index 6d1c9c50b37c4512d97d7ab874e0e0832a71da6f..47fecebe1ca824bf51e8d364f5394a8b2969b129 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp115.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp115.c
@@ -1,7 +1,7 @@
 /* PR tree-optimization/80558 */
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
-/* { dg-final { scan-tree-dump-not "link_error" "evrp" } } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
+/* { dg-final { scan-tree-dump-not "link_error" "evrp1" } } */
 
 void link_error (void);
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp117.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp117.c
index d07a6722cd7ab346c9a2e2cb5d1ff1b6e23505da..47194eec09b0bb6099271fedec00cef8804ac5b2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp117.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp117.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 void link_error (void);
 
@@ -13,4 +13,4 @@ void foo (int i)
     }
 }
 
-/* { dg-final { scan-tree-dump-not "link_error" "evrp" } } */
+/* { dg-final { scan-tree-dump-not "link_error" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp120.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp120.c
index 4dcee2341f77856d0194bf1e7882e5887d6be712..b4ea5b1c3aeafddb4e89addb89ca0f8ecb1c2f32 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp120.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp120.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 #include "vrp113.c"
 
-/* { dg-final { scan-tree-dump "return 3;" "evrp" } } */
+/* { dg-final { scan-tree-dump "return 3;" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp16.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp16.c
index d09f3aea46aa3eb4c501e215b4f5d01aa7c211f5..2243a87c3d40691399f416c9a1062e4ede0f0355 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp16.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp16.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-tree-fre -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fno-tree-fre -fdump-tree-evrp1" } */
 
 
 extern void abort (void) __attribute__ ((__noreturn__));
@@ -19,5 +19,5 @@ nonlocal_mentioned_p (rtx x)
 	abort ();
 }
 
-/* { dg-final { scan-tree-dump-times "if" 0 "evrp" } } */
+/* { dg-final { scan-tree-dump-times "if" 0 "evrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp17.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp17.c
index b8470e7a3dbeb413859c68e93488b783baff1e0b..3c0ec8c11669dfe13e433c956f9ac4e175caec5e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp17.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp17.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 extern void abort (void) __attribute__ ((__noreturn__));
 union tree_node;
@@ -27,5 +27,5 @@ gimplify_for_stmt (tree stmt)
     abort ();
 }
 
-/* { dg-final { scan-tree-dump-times "Simplified relational" 1 "evrp" } } */
+/* { dg-final { scan-tree-dump-times "Simplified relational" 1 "evrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp18.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp18.c
index d7ab3f69f3798731a26b6e5cf2265576dd83f954..393e7d402fb626835d8c00ad4817c76fd720d901 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp18.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp18.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp" } */
+/* { dg-options "-O2 -fdump-tree-evrp1" } */
 
 static int blocksize = 4096;
 
@@ -30,4 +30,4 @@ void foo (void)
     eof_reached = 1;
 }
 
-/* { dg-final { scan-tree-dump-times "Simplified relational" 1 "evrp" } } */
+/* { dg-final { scan-tree-dump-times "Simplified relational" 1 "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp19.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp19.c
index 98a8da6d05e9f1ac4313f02b9286d4f500b17e53..ea95ecb91c3f8292acb268ad0e6ffe741169b878 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp19.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp19.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fwrapv -O1 -ftree-vrp -fdisable-tree-evrp -fdump-tree-vrp1 -fdisable-tree-ethread -fdisable-tree-thread1" } */
+/* { dg-options "-fwrapv -O1 -ftree-vrp -fdisable-tree-evrp1 -fdump-tree-vrp1 -fdisable-tree-ethread -fdisable-tree-thread1" } */
 
 #include <limits.h>
 extern void abort ();
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp20.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp20.c
index e5822992fe485a55b0196a8c5616f65d6e86f6df..52e489f9f424b78dcb99b6d00ea1ee9e77a7a8c7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp20.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp20.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fwrapv -O1 -fno-tree-fre -fdisable-tree-evrp -ftree-vrp -fdump-tree-vrp1 -fdisable-tree-ethread -fdisable-tree-thread1" } */
+/* { dg-options "-fwrapv -O1 -fno-tree-fre -fdisable-tree-evrp1 -ftree-vrp -fdump-tree-vrp1 -fdisable-tree-ethread -fdisable-tree-thread1" } */
 
 extern void abort ();
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp23.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp23.c
index 6ac8d55600d21ac359d13524999b38551dccd280..fa78a4c7f9b0097cdbf76be7818240b9cfa0d294 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp23.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp23.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-tree-forwprop -fdump-tree-evrp-details" } */
+/* { dg-options "-O2 -fno-tree-forwprop -fdump-tree-evrp1-details" } */
 
 void aa (void);
 void aos (void);
@@ -45,5 +45,5 @@ L8:
 /* The n_sets > 0 test can be simplified into n_sets == 1 since the
    only way to reach the test is when n_sets <= 1, and the only value
    which satisfies both conditions is n_sets == 1.  */
-/* { dg-final { scan-tree-dump-times "Simplified relational" 1 "evrp" } } */
+/* { dg-final { scan-tree-dump-times "Simplified relational" 1 "evrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp24.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp24.c
index 91015da86aebe385c6d47256d2e8e1e0782bc640..b4a0ecc5cb23e7caa284b4648a12b630cae34c39 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp24.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp24.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-tree-forwprop -fdump-tree-evrp-details -fdump-tree-optimized -fno-tree-ccp" } */
+/* { dg-options "-O2 -fno-tree-forwprop -fdump-tree-evrp1-details -fdump-tree-optimized -fno-tree-ccp" } */
 
 
 struct rtx_def;
@@ -88,6 +88,6 @@ L7:
    n_sets can only have the values [0, 1] as it's the result of a
    boolean operation.  */
 
-/* { dg-final { scan-tree-dump-times "Simplified relational" 2 "evrp" } } */
+/* { dg-final { scan-tree-dump-times "Simplified relational" 2 "evrp1" } } */
 /* { dg-final { scan-tree-dump-times "if " 4 "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp33.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp33.c
index 470675ef50e5b1530afdd0987e2ac3222c6cc60c..82c63f556dd70b2b26113f7c8dfa37ead11b06a8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp33.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp33.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-vrp1 -fno-tree-fre -fdisable-tree-evrp -fno-thread-jumps" } */
+/* { dg-options "-O2 -fdump-tree-vrp1 -fno-tree-fre -fdisable-tree-evrp1 -fno-thread-jumps" } */
 
 /* This is from PR14052.  */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp35.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp35.c
index a372a18cc4355ea26a518476dab8ffdd0ab42a03..502070634d8568e7341c46b182a3250e1c1a0266 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp35.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp35.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdisable-tree-evrp -fdump-tree-vrp1-details" } */
+/* { dg-options "-O2 -fdisable-tree-evrp1 -fdump-tree-vrp1-details" } */
 
 int test1(int i, int k)
 {
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp36.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp36.c
index 1f77b539d70e07669d1c85960a9387f947362d32..bff236e2c2473557a5306bd7bdce63933a74740b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp36.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp36.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdisable-tree-evrp -fdump-tree-vrp1-details" } */
+/* { dg-options "-O2 -fdisable-tree-evrp1 -fdump-tree-vrp1-details" } */
 
 int foo(int i)
 {
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp92.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp92.c
index 9e53547dadc3c62d527601221d46138caf381b07..7c3988ce0e02b92804da7ada08ca2bb71d92fe3b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp92.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp92.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdisable-tree-evrp -fno-tree-fre -fdump-tree-vrp1 -fdisable-tree-ethread" } */
+/* { dg-options "-O2 -fdisable-tree-evrp1 -fno-tree-fre -fdump-tree-vrp1 -fdisable-tree-ethread" } */
 
 void bar (void);
 int foo (int i, int j)
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp98-1.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp98-1.c
index daa3f073b9239405ac15469b9c180c2fafd9bd12..290a83a8f37dea09701a6f7bf9aad40b2d58768f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp98-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp98-1.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target int128 } */
-/* { dg-options "-Os -fdump-tree-evrp-details" } */
+/* { dg-options "-Os -fdump-tree-evrp1-details" } */
 
 #include <stdint.h>
 #include <limits.h>
@@ -36,6 +36,6 @@ foo (bigger_than_word a, word b, uint8_t c)
   return ret;
 }
 
-/* { dg-final { scan-tree-dump "Folded into: if \\(_\[0-9\]+ == 1\\)" "evrp" } } */
-/* { dg-final { scan-tree-dump-not "Folded into: if \\(_\[0-9\]+ == 2\\)" "evrp" } } */
-/* { dg-final { scan-tree-dump "Folded into: if \\(_\[0-9\]+ == 3\\)" "evrp" } } */
+/* { dg-final { scan-tree-dump "Folded into: if \\(_\[0-9\]+ == 1\\)" "evrp1" } } */
+/* { dg-final { scan-tree-dump-not "Folded into: if \\(_\[0-9\]+ == 2\\)" "evrp1" } } */
+/* { dg-final { scan-tree-dump "Folded into: if \\(_\[0-9\]+ == 3\\)" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp98.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp98.c
index 78d3bbaf4999a02279b4983b3e24d6a3bf692314..b57c160d576187d16fef87ce3b3b23ec7458dd6e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp98.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp98.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target int128 } */
-/* { dg-options "-Os -fdisable-tree-evrp -fdump-tree-vrp1-details" } */
+/* { dg-options "-Os -fdisable-tree-evrp1 -fdump-tree-vrp1-details" } */
 
 #include <stdint.h>
 #include <limits.h>
diff --git a/gcc/testsuite/gcc.dg/vrp-min-max-1.c b/gcc/testsuite/gcc.dg/vrp-min-max-1.c
index b9c8379c832b5a3628f599bc50903d5a9219e5e7..93ff9f8d7045dc197e36102e3ce01237735c260a 100644
--- a/gcc/testsuite/gcc.dg/vrp-min-max-1.c
+++ b/gcc/testsuite/gcc.dg/vrp-min-max-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-vrp1 -fdisable-tree-evrp -fdump-tree-mergephi2" } */
+/* { dg-options "-O2 -fdump-tree-vrp1 -fdisable-tree-evrp1 -fdump-tree-mergephi2" } */
 
 int bar (void);
 
diff --git a/gcc/testsuite/gcc.dg/vrp-min-max-3.c b/gcc/testsuite/gcc.dg/vrp-min-max-3.c
index 1fffee7bbd97da7e66393151442f88095a04f515..ab1fc1de0b1772972da160ca363579b5d369c57c 100644
--- a/gcc/testsuite/gcc.dg/vrp-min-max-3.c
+++ b/gcc/testsuite/gcc.dg/vrp-min-max-3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-evrp -fdump-tree-fre1" } */
+/* { dg-options "-O2 -fdump-tree-evrp1 -fdump-tree-fre1" } */
 
 int bar (void);
 
@@ -23,5 +23,5 @@ int foo2 (int x, int y)
 
 /* { dg-final { scan-tree-dump-times "MIN_EXPR" 1 "fre1" } } */
 /* { dg-final { scan-tree-dump-times "MAX_EXPR" 1 "fre1" } } */
-/* { dg-final { scan-tree-dump-not "MIN_EXPR" "evrp" } } */
-/* { dg-final { scan-tree-dump-not "MAX_EXPR" "evrp" } } */
+/* { dg-final { scan-tree-dump-not "MIN_EXPR" "evrp1" } } */
+/* { dg-final { scan-tree-dump-not "MAX_EXPR" "evrp1" } } */
diff --git a/gcc/testsuite/gcc.target/i386/vect-gather-1.c b/gcc/testsuite/gcc.target/i386/vect-gather-1.c
index 261b66be061dfb8fd5e6fac622cea61d4954e1ec..76c9322a4de0392867f16d745b125ce043eae181 100644
--- a/gcc/testsuite/gcc.target/i386/vect-gather-1.c
+++ b/gcc/testsuite/gcc.target/i386/vect-gather-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-Ofast -msse2 -fdump-tree-vect-details -fdump-tree-forwprop4" } */
+/* { dg-options "-Ofast -msse2 -fdump-tree-vect-details -fdump-tree-forwprop6" } */
 
 #ifndef INDEXTYPE
 #define INDEXTYPE int
@@ -17,4 +17,4 @@ double vmul(INDEXTYPE *rowstart, INDEXTYPE *rowend,
    even with plain SSE2.  */
 /* { dg-final { scan-tree-dump "loop vectorized" "vect" } } */
 /* The index vector loads and promotions should be scalar after forwprop.  */
-/* { dg-final { scan-tree-dump-not "vec_unpack" "forwprop4" } } */
+/* { dg-final { scan-tree-dump-not "vec_unpack" "forwprop6" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vect-gather-1.c b/gcc/testsuite/gcc.target/powerpc/vect-gather-1.c
index bf98045ab03cf59439e718c125575ebfe0f4003a..bf00093c362e0e8d9d0811a1f2da2ab1bdecb85d 100644
--- a/gcc/testsuite/gcc.target/powerpc/vect-gather-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vect-gather-1.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* Profitable from Power8 since it supports efficient unaligned load.  */
-/* { dg-options "-Ofast -mdejagnu-cpu=power8 -fdump-tree-vect-details -fdump-tree-forwprop4" } */
+/* { dg-options "-Ofast -mdejagnu-cpu=power8 -fdump-tree-vect-details -fdump-tree-forwprop6" } */
 
 #ifndef INDEXTYPE
 #define INDEXTYPE unsigned int
@@ -17,4 +17,4 @@ double vmul(INDEXTYPE *rowstart, INDEXTYPE *rowend,
 /* With gather emulation this should be profitable to vectorize from Power8.  */
 /* { dg-final { scan-tree-dump "loop vectorized" "vect" } } */
 /* The index vector loads and promotions should be scalar after forwprop.  */
-/* { dg-final { scan-tree-dump-not "vec_unpack" "forwprop4" } } */
+/* { dg-final { scan-tree-dump-not "vec_unpack" "forwprop6" } } */
diff --git a/gcc/testsuite/gfortran.dg/pr45636.f90 b/gcc/testsuite/gfortran.dg/pr45636.f90
index 958833c35bc44e594520b18f60a4f884b563812a..304efa7c6defc8caaf6e512df9d069c14587b704 100644
--- a/gcc/testsuite/gfortran.dg/pr45636.f90
+++ b/gcc/testsuite/gfortran.dg/pr45636.f90
@@ -1,6 +1,6 @@
 ! PR fortran/45636
 ! { dg-do compile }
-! { dg-options "-O2 -fdump-tree-forwprop2" }
+! { dg-options "-O2 -fdump-tree-forwprop4" }
 ! PR 45636 - make sure no memset is needed for a short right-hand side.
 program main
   character(len=2), parameter :: x='a '
@@ -12,4 +12,4 @@ program main
 end program main
 ! This test will fail on targets which prefer memcpy/memset over
 ! move_by_pieces/store_by_pieces.
-! { dg-final { scan-tree-dump-times "memset" 0 "forwprop2" { xfail { { hppa*-*-* && { ! lp64 } } || { mips*-*-* && { ! nomips16 } } } } } }
+! { dg-final { scan-tree-dump-times "memset" 0 "forwprop4" { xfail { { hppa*-*-* && { ! lp64 } } || { mips*-*-* && { ! nomips16 } } } } } }