diff mbox series

[01/12] ipa: IPA-SRA split detection simplification

Message ID	ri6v8nlkkth.fsf@suse.cz
State	Accepted
Headers	Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 06DE438438E2 From: Martin Jambor <mjambor@suse.cz> To: GCC Patches <gcc-patches@gcc.gnu.org> Cc: Jan Hubicka <jh@suse.cz>, Jan Hubicka <hubicka@ucw.cz> Subject: [PATCH 01/12] ipa: IPA-SRA split detection simplification User-Agent: Notmuch/0.37 (https://notmuchmail.org) Emacs/28.1 (x86_64-suse-linux-gnu) Date: Sat, 12 Nov 2022 02:44:58 +0100 Message-ID: <ri6v8nlkkth.fsf@suse.cz> MIME-Version: 1.0 Content-Type: text/plain Precedence: list Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" <gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org> X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
Series	[01/12] ipa: IPA-SRA split detection simplification \| [01/12] ipa: IPA-SRA split detection simplification [02/12] ipa-cp: Do not consider useless aggregate constants [03/12] ipa-cp: Write transformation summaries of all functions [04/12] ipa: Better way of applying both IPA-CP and IPA-SRA (PR 103227) [05/12] ipa-sra: Dump edge summaries also for non-candidates [06/12] ipa-cp: Leave removal of unused parameters to IPA-SRA [07/12] ipa-sra: Treat REFERENCE_TYPES as always dereferencable [08/12] ipa-sra: Move caller->callee propagation before callee->caller one [09/12] ipa-sra: Be optimistic about Fortran descriptors [10/12] ipa-sra: Forward propagation of sizes which are safe to dereference [11/12] ipa-sra: Make scan_expr_access bail out on uninteresting expressions [12/12] ipa: Avoid looking for IPA-SRA replacements where there are none

Checks

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

Commit Message

Martin Jambor Nov. 12, 2022, 1:44 a.m. UTC

  Hi,

I have noticed that the flag m_split_modifications_p of
ipa_param_body_adjustments is not really necessary as it has to
correspond to whether m_replacements is non-empty so this patch
removes it.  This also simplifies a bit some patches I work on.

Bootstrapped and tested on x86_64-linux.  OK for master?

Thanks,

Martin


gcc/ChangeLog:

2022-11-10  Martin Jambor  <mjambor@suse.cz>

	* ipa-param-manipulation.cc
	(ipa_param_body_adjustments::common_initialization): Do not set
	m_split_modifications_p.
	(ipa_param_body_adjustments::ipa_param_body_adjustments): Remove
	initializations of m_split_modifications_p.
	(ipa_param_body_adjustments::modify_call_stmt): Check that
	m_replacements is empty instead of m_split_modifications_p.
---
 gcc/ipa-param-manipulation.cc | 29 +++++++++++++----------------
 gcc/ipa-param-manipulation.h  |  4 ----
 2 files changed, 13 insertions(+), 20 deletions(-)

Comments

Jan Hubicka Nov. 16, 2022, 10:49 a.m. UTC | #1

> Hi,
> 
> I have noticed that the flag m_split_modifications_p of
> ipa_param_body_adjustments is not really necessary as it has to
> correspond to whether m_replacements is non-empty so this patch
> removes it.  This also simplifies a bit some patches I work on.
> 
> Bootstrapped and tested on x86_64-linux.  OK for master?
OK,
thanks!
Honza
> 
> Thanks,
> 
> Martin
> 
> 
> gcc/ChangeLog:
> 
> 2022-11-10  Martin Jambor  <mjambor@suse.cz>
> 
> 	* ipa-param-manipulation.cc
> 	(ipa_param_body_adjustments::common_initialization): Do not set
> 	m_split_modifications_p.
> 	(ipa_param_body_adjustments::ipa_param_body_adjustments): Remove
> 	initializations of m_split_modifications_p.
> 	(ipa_param_body_adjustments::modify_call_stmt): Check that
> 	m_replacements is empty instead of m_split_modifications_p.
> ---
>  gcc/ipa-param-manipulation.cc | 29 +++++++++++++----------------
>  gcc/ipa-param-manipulation.h  |  4 ----
>  2 files changed, 13 insertions(+), 20 deletions(-)
> 
> diff --git a/gcc/ipa-param-manipulation.cc b/gcc/ipa-param-manipulation.cc
> index 23a8cb84d48..cee0e23f946 100644
> --- a/gcc/ipa-param-manipulation.cc
> +++ b/gcc/ipa-param-manipulation.cc
> @@ -1378,7 +1378,6 @@ ipa_param_body_adjustments::common_initialization (tree old_fndecl,
>  
>  	  if (apm->op == IPA_PARAM_OP_SPLIT)
>  	    {
> -	      m_split_modifications_p = true;
>  	      split[prev_index] = true;
>  	      register_replacement (apm, new_parm);
>  	    }
> @@ -1472,10 +1471,10 @@ ipa_param_body_adjustments
>  ::ipa_param_body_adjustments (vec<ipa_adjusted_param, va_gc> *adj_params,
>  			      tree fndecl)
>    : m_adj_params (adj_params), m_adjustments (NULL), m_reset_debug_decls (),
> -    m_split_modifications_p (false), m_dead_stmts (), m_dead_ssas (),
> -    m_dead_ssa_debug_equiv (), m_dead_stmt_debug_equiv (), m_fndecl (fndecl),
> -    m_id (NULL), m_oparms (), m_new_decls (), m_new_types (), m_replacements (),
> -    m_removed_decls (), m_removed_map (), m_method2func (false)
> +    m_dead_stmts (), m_dead_ssas (), m_dead_ssa_debug_equiv (),
> +    m_dead_stmt_debug_equiv (), m_fndecl (fndecl), m_id (NULL), m_oparms (),
> +    m_new_decls (), m_new_types (), m_replacements (), m_removed_decls (),
> +    m_removed_map (), m_method2func (false)
>  {
>    common_initialization (fndecl, NULL, NULL);
>  }
> @@ -1489,11 +1488,10 @@ ipa_param_body_adjustments
>  ::ipa_param_body_adjustments (ipa_param_adjustments *adjustments,
>  			      tree fndecl)
>    : m_adj_params (adjustments->m_adj_params), m_adjustments (adjustments),
> -    m_reset_debug_decls (), m_split_modifications_p (false), m_dead_stmts (),
> -    m_dead_ssas (), m_dead_ssa_debug_equiv (), m_dead_stmt_debug_equiv (),
> -    m_fndecl (fndecl), m_id (NULL), m_oparms (), m_new_decls (),
> -    m_new_types (), m_replacements (), m_removed_decls (), m_removed_map (),
> -    m_method2func (false)
> +    m_reset_debug_decls (), m_dead_stmts (), m_dead_ssas (),
> +    m_dead_ssa_debug_equiv (), m_dead_stmt_debug_equiv (), m_fndecl (fndecl),
> +    m_id (NULL), m_oparms (), m_new_decls (), m_new_types (), m_replacements (),
> +    m_removed_decls (), m_removed_map (), m_method2func (false)
>  {
>    common_initialization (fndecl, NULL, NULL);
>  }
> @@ -1513,11 +1511,10 @@ ipa_param_body_adjustments
>  			      copy_body_data *id, tree *vars,
>  			      vec<ipa_replace_map *, va_gc> *tree_map)
>    : m_adj_params (adjustments->m_adj_params), m_adjustments (adjustments),
> -    m_reset_debug_decls (), m_split_modifications_p (false), m_dead_stmts (),
> -    m_dead_ssas (), m_dead_ssa_debug_equiv (), m_dead_stmt_debug_equiv (),
> -    m_fndecl (fndecl), m_id (id), m_oparms (), m_new_decls (), m_new_types (),
> -    m_replacements (), m_removed_decls (), m_removed_map (),
> -    m_method2func (false)
> +    m_reset_debug_decls (), m_dead_stmts (), m_dead_ssas (),
> +    m_dead_ssa_debug_equiv (), m_dead_stmt_debug_equiv (), m_fndecl (fndecl),
> +    m_id (id), m_oparms (), m_new_decls (), m_new_types (), m_replacements (),
> +    m_removed_decls (), m_removed_map (), m_method2func (false)
>  {
>    common_initialization (old_fndecl, vars, tree_map);
>  }
> @@ -1979,7 +1976,7 @@ ipa_param_body_adjustments::modify_call_stmt (gcall **stmt_p,
>  	  && m_dead_ssas.contains (t))
>  	recreate = true;
>  
> -      if (!m_split_modifications_p)
> +      if (m_replacements.is_empty ())
>  	continue;
>  
>        tree base;
> diff --git a/gcc/ipa-param-manipulation.h b/gcc/ipa-param-manipulation.h
> index a9ad2b216be..e5654f4ff70 100644
> --- a/gcc/ipa-param-manipulation.h
> +++ b/gcc/ipa-param-manipulation.h
> @@ -350,10 +350,6 @@ public:
>  
>    auto_vec<tree, 16> m_reset_debug_decls;
>  
> -  /* Set to true if there are any IPA_PARAM_OP_SPLIT adjustments among stored
> -     adjustments.  */
> -  bool m_split_modifications_p;
> -
>    /* Sets of statements and SSA_NAMEs that only manipulate data from parameters
>       removed because they are not necessary.  */
>    hash_set<gimple *> m_dead_stmts;
> -- 
> 2.38.0
>

diff mbox series

Patch

diff --git a/gcc/ipa-param-manipulation.cc b/gcc/ipa-param-manipulation.cc
index 23a8cb84d48..cee0e23f946 100644
--- a/gcc/ipa-param-manipulation.cc
+++ b/gcc/ipa-param-manipulation.cc
@@ -1378,7 +1378,6 @@  ipa_param_body_adjustments::common_initialization (tree old_fndecl,
 
 	  if (apm->op == IPA_PARAM_OP_SPLIT)
 	    {
-	      m_split_modifications_p = true;
 	      split[prev_index] = true;
 	      register_replacement (apm, new_parm);
 	    }
@@ -1472,10 +1471,10 @@  ipa_param_body_adjustments
 ::ipa_param_body_adjustments (vec<ipa_adjusted_param, va_gc> *adj_params,
 			      tree fndecl)
   : m_adj_params (adj_params), m_adjustments (NULL), m_reset_debug_decls (),
-    m_split_modifications_p (false), m_dead_stmts (), m_dead_ssas (),
-    m_dead_ssa_debug_equiv (), m_dead_stmt_debug_equiv (), m_fndecl (fndecl),
-    m_id (NULL), m_oparms (), m_new_decls (), m_new_types (), m_replacements (),
-    m_removed_decls (), m_removed_map (), m_method2func (false)
+    m_dead_stmts (), m_dead_ssas (), m_dead_ssa_debug_equiv (),
+    m_dead_stmt_debug_equiv (), m_fndecl (fndecl), m_id (NULL), m_oparms (),
+    m_new_decls (), m_new_types (), m_replacements (), m_removed_decls (),
+    m_removed_map (), m_method2func (false)
 {
   common_initialization (fndecl, NULL, NULL);
 }
@@ -1489,11 +1488,10 @@  ipa_param_body_adjustments
 ::ipa_param_body_adjustments (ipa_param_adjustments *adjustments,
 			      tree fndecl)
   : m_adj_params (adjustments->m_adj_params), m_adjustments (adjustments),
-    m_reset_debug_decls (), m_split_modifications_p (false), m_dead_stmts (),
-    m_dead_ssas (), m_dead_ssa_debug_equiv (), m_dead_stmt_debug_equiv (),
-    m_fndecl (fndecl), m_id (NULL), m_oparms (), m_new_decls (),
-    m_new_types (), m_replacements (), m_removed_decls (), m_removed_map (),
-    m_method2func (false)
+    m_reset_debug_decls (), m_dead_stmts (), m_dead_ssas (),
+    m_dead_ssa_debug_equiv (), m_dead_stmt_debug_equiv (), m_fndecl (fndecl),
+    m_id (NULL), m_oparms (), m_new_decls (), m_new_types (), m_replacements (),
+    m_removed_decls (), m_removed_map (), m_method2func (false)
 {
   common_initialization (fndecl, NULL, NULL);
 }
@@ -1513,11 +1511,10 @@  ipa_param_body_adjustments
 			      copy_body_data *id, tree *vars,
 			      vec<ipa_replace_map *, va_gc> *tree_map)
   : m_adj_params (adjustments->m_adj_params), m_adjustments (adjustments),
-    m_reset_debug_decls (), m_split_modifications_p (false), m_dead_stmts (),
-    m_dead_ssas (), m_dead_ssa_debug_equiv (), m_dead_stmt_debug_equiv (),
-    m_fndecl (fndecl), m_id (id), m_oparms (), m_new_decls (), m_new_types (),
-    m_replacements (), m_removed_decls (), m_removed_map (),
-    m_method2func (false)
+    m_reset_debug_decls (), m_dead_stmts (), m_dead_ssas (),
+    m_dead_ssa_debug_equiv (), m_dead_stmt_debug_equiv (), m_fndecl (fndecl),
+    m_id (id), m_oparms (), m_new_decls (), m_new_types (), m_replacements (),
+    m_removed_decls (), m_removed_map (), m_method2func (false)
 {
   common_initialization (old_fndecl, vars, tree_map);
 }
@@ -1979,7 +1976,7 @@  ipa_param_body_adjustments::modify_call_stmt (gcall **stmt_p,
 	  && m_dead_ssas.contains (t))
 	recreate = true;
 
-      if (!m_split_modifications_p)
+      if (m_replacements.is_empty ())
 	continue;
 
       tree base;
diff --git a/gcc/ipa-param-manipulation.h b/gcc/ipa-param-manipulation.h
index a9ad2b216be..e5654f4ff70 100644
--- a/gcc/ipa-param-manipulation.h
+++ b/gcc/ipa-param-manipulation.h
@@ -350,10 +350,6 @@  public:
 
   auto_vec<tree, 16> m_reset_debug_decls;
 
-  /* Set to true if there are any IPA_PARAM_OP_SPLIT adjustments among stored
-     adjustments.  */
-  bool m_split_modifications_p;
-
   /* Sets of statements and SSA_NAMEs that only manipulate data from parameters
      removed because they are not necessary.  */
   hash_set<gimple *> m_dead_stmts;