[2/2] PHIOPT: add folding/simplification detail to the dump

Message ID 20230417221740.251864-2-apinski@marvell.com
State Accepted
Headers
Series [1/2] PHIOPT: small cleanup in match_simplify_replacement |

Checks

Context Check Description
snail/gcc-patch-check success Github commit url

Commit Message

Andrew Pinski April 17, 2023, 10:17 p.m. UTC
  While debugging PHI-OPT with match-and-simplify,
I found that adding more dumping to the debug dumps made
it easier to understand what was going on rather than stepping in
the debugger so this adds them. Note I used TDF_FOLDING rather
than TDF_DETAILS as these debug messages can be chatty and
only needed if you are debugging match and simplify
with PHI-OPT and match and simplify uses TDF_FOLDING as
its check.

OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions.

gcc/ChangeLog:

	* tree-ssa-phiopt.cc (gimple_simplify_phiopt): Dump
	the expression that is being tried when TDF_FOLDING
	is true.
	(phiopt_worker::match_simplify_replacement): Dump
	the sequence which was created by gimple_simplify_phiopt
	when TDF_FOLDING is true.
---
 gcc/tree-ssa-phiopt.cc | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
  

Comments

Richard Biener April 18, 2023, 6:24 a.m. UTC | #1
On Tue, Apr 18, 2023 at 12:18 AM Andrew Pinski via Gcc-patches
<gcc-patches@gcc.gnu.org> wrote:
>
> While debugging PHI-OPT with match-and-simplify,
> I found that adding more dumping to the debug dumps made
> it easier to understand what was going on rather than stepping in
> the debugger so this adds them. Note I used TDF_FOLDING rather
> than TDF_DETAILS as these debug messages can be chatty and
> only needed if you are debugging match and simplify
> with PHI-OPT and match and simplify uses TDF_FOLDING as
> its check.
>
> OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions.

OK.

> gcc/ChangeLog:
>
>         * tree-ssa-phiopt.cc (gimple_simplify_phiopt): Dump
>         the expression that is being tried when TDF_FOLDING
>         is true.
>         (phiopt_worker::match_simplify_replacement): Dump
>         the sequence which was created by gimple_simplify_phiopt
>         when TDF_FOLDING is true.
> ---
>  gcc/tree-ssa-phiopt.cc | 29 +++++++++++++++++++++++++++++
>  1 file changed, 29 insertions(+)
>
> diff --git a/gcc/tree-ssa-phiopt.cc b/gcc/tree-ssa-phiopt.cc
> index 4ddb4d5db90..616b5778602 100644
> --- a/gcc/tree-ssa-phiopt.cc
> +++ b/gcc/tree-ssa-phiopt.cc
> @@ -916,6 +916,18 @@ gimple_simplify_phiopt (bool early_p, tree type, gimple *comp_stmt,
>       "a != 0".  */
>    tree cond = build2_loc (loc, comp_code, boolean_type_node,
>                           cmp0, cmp1);
> +
> +  if (dump_file && (dump_flags & TDF_FOLDING))
> +    {
> +      fprintf (dump_file, "\nphiopt match-simplify trying:\n\t");
> +      print_generic_expr (dump_file, cond);
> +      fprintf (dump_file, " ? ");
> +      print_generic_expr (dump_file, arg0);
> +      fprintf (dump_file, " : ");
> +      print_generic_expr (dump_file, arg1);
> +      fprintf (dump_file, "\n");
> +    }
> +
>    gimple_match_op op (gimple_match_cond::UNCOND,
>                       COND_EXPR, type, cond, arg0, arg1);
>
> @@ -947,6 +959,18 @@ gimple_simplify_phiopt (bool early_p, tree type, gimple *comp_stmt,
>    cond = build2_loc (loc,
>                      comp_code, boolean_type_node,
>                      cmp0, cmp1);
> +
> +  if (dump_file && (dump_flags & TDF_FOLDING))
> +    {
> +      fprintf (dump_file, "\nphiopt match-simplify trying:\n\t");
> +      print_generic_expr (dump_file, cond);
> +      fprintf (dump_file, " ? ");
> +      print_generic_expr (dump_file, arg1);
> +      fprintf (dump_file, " : ");
> +      print_generic_expr (dump_file, arg0);
> +      fprintf (dump_file, "\n");
> +    }
> +
>    gimple_match_op op1 (gimple_match_cond::UNCOND,
>                        COND_EXPR, type, cond, arg1, arg0);
>
> @@ -1078,6 +1102,11 @@ match_simplify_replacement (basic_block cond_bb, basic_block middle_bb,
>           if (name && TREE_CODE (name) == SSA_NAME)
>             bitmap_set_bit (inserted_exprs, SSA_NAME_VERSION (name));
>         }
> +      if (dump_file && (dump_flags & TDF_FOLDING))
> +       {
> +         fprintf (dump_file, "Folded into the sequence:\n");
> +         print_gimple_seq (dump_file, seq, 0, TDF_VOPS|TDF_MEMSYMS);
> +       }
>      gsi_insert_seq_before (&gsi, seq, GSI_CONTINUE_LINKING);
>    }
>
> --
> 2.31.1
>
  

Patch

diff --git a/gcc/tree-ssa-phiopt.cc b/gcc/tree-ssa-phiopt.cc
index 4ddb4d5db90..616b5778602 100644
--- a/gcc/tree-ssa-phiopt.cc
+++ b/gcc/tree-ssa-phiopt.cc
@@ -916,6 +916,18 @@  gimple_simplify_phiopt (bool early_p, tree type, gimple *comp_stmt,
      "a != 0".  */
   tree cond = build2_loc (loc, comp_code, boolean_type_node,
 			  cmp0, cmp1);
+
+  if (dump_file && (dump_flags & TDF_FOLDING))
+    {
+      fprintf (dump_file, "\nphiopt match-simplify trying:\n\t");
+      print_generic_expr (dump_file, cond);
+      fprintf (dump_file, " ? ");
+      print_generic_expr (dump_file, arg0);
+      fprintf (dump_file, " : ");
+      print_generic_expr (dump_file, arg1);
+      fprintf (dump_file, "\n");
+    }
+
   gimple_match_op op (gimple_match_cond::UNCOND,
 		      COND_EXPR, type, cond, arg0, arg1);
 
@@ -947,6 +959,18 @@  gimple_simplify_phiopt (bool early_p, tree type, gimple *comp_stmt,
   cond = build2_loc (loc,
 		     comp_code, boolean_type_node,
 		     cmp0, cmp1);
+
+  if (dump_file && (dump_flags & TDF_FOLDING))
+    {
+      fprintf (dump_file, "\nphiopt match-simplify trying:\n\t");
+      print_generic_expr (dump_file, cond);
+      fprintf (dump_file, " ? ");
+      print_generic_expr (dump_file, arg1);
+      fprintf (dump_file, " : ");
+      print_generic_expr (dump_file, arg0);
+      fprintf (dump_file, "\n");
+    }
+
   gimple_match_op op1 (gimple_match_cond::UNCOND,
 		       COND_EXPR, type, cond, arg1, arg0);
 
@@ -1078,6 +1102,11 @@  match_simplify_replacement (basic_block cond_bb, basic_block middle_bb,
 	  if (name && TREE_CODE (name) == SSA_NAME)
 	    bitmap_set_bit (inserted_exprs, SSA_NAME_VERSION (name));
 	}
+      if (dump_file && (dump_flags & TDF_FOLDING))
+	{
+	  fprintf (dump_file, "Folded into the sequence:\n");
+	  print_gimple_seq (dump_file, seq, 0, TDF_VOPS|TDF_MEMSYMS);
+	}
     gsi_insert_seq_before (&gsi, seq, GSI_CONTINUE_LINKING);
   }