cfgloopanal.c (seq_cost): Delete.

2014-10-21  Zhenqiang Chen  <zhenqiang.chen@arm.com>

	* cfgloopanal.c (seq_cost): Delete.
	* rtl.h (seq_cost): New prototype.
	* rtlanal.c (seq_cost): New function.
	* tree-ssa-loop-ivopts.c (seq_cost): Delete.

From-SVN: r216501

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cbc899c2c5eb0aa8f87c779c715a30c1c381be8d..f7dedb56edfd518bf2d1950ea066e1256bf9a77d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-21  Zhenqiang Chen  <zhenqiang.chen@arm.com>
+
+       * cfgloopanal.c (seq_cost): Delete.
+       * rtl.h (seq_cost): New prototype.
+       * rtlanal.c (seq_cost): New function.
+       * tree-ssa-loop-ivopts.c (seq_cost): Delete.
+
 2014-10-20  Andrew MacLeod  <amacleod@redhat.com>
 
        * cfgrtl.h: New.  Add prototypes for cfgrtl.c.

diff --git a/gcc/cfgloopanal.c b/gcc/cfgloopanal.c
index 7ea1a5f920fe2ec3061ea090cb7c352b65d8d759..006b4197028a1bac384c11ceb840d06f8e6e561a 100644 (file)
--- a/gcc/cfgloopanal.c
+++ b/gcc/cfgloopanal.c
@@ -302,26 +302,6 @@ get_loop_level (const struct loop *loop)
   return mx;
 }
 
-/* Returns estimate on cost of computing SEQ.  */
-
-static unsigned
-seq_cost (const rtx_insn *seq, bool speed)
-{
-  unsigned cost = 0;
-  rtx set;
-
-  for (; seq; seq = NEXT_INSN (seq))
-    {
-      set = single_set (seq);
-      if (set)
-       cost += set_rtx_cost (set, speed);
-      else
-       cost++;
-    }
-
-  return cost;
-}
-
 /* Initialize the constants for computing set costs.  */
 
 void

diff --git a/gcc/rtl.h b/gcc/rtl.h
index 496d824fb6ae56a275bd01357768ebeea6ca459e..2c614c328b61685573846212d79842fec304cdcd 100644 (file)
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2912,6 +2912,7 @@ extern rtx_insn *find_first_parameter_load (rtx_insn *, rtx_insn *);
 extern bool keep_with_call_p (const rtx_insn *);
 extern bool label_is_jump_target_p (const_rtx, const rtx_insn *);
 extern int insn_rtx_cost (rtx, bool);
+extern unsigned seq_cost (const rtx_insn *, bool);
 
 /* Given an insn and condition, return a canonical description of
    the test being made.  */

diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index 75362e4b79b8ab9fa32aee8fac42df3c91286ebf..6459238db0df1b7ed81578ec5828af1e647ad29f 100644 (file)
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -5051,6 +5051,26 @@ insn_rtx_cost (rtx pat, bool speed)
   return cost > 0 ? cost : COSTS_N_INSNS (1);
 }
 
+/* Returns estimate on cost of computing SEQ.  */
+
+unsigned
+seq_cost (const rtx_insn *seq, bool speed)
+{
+  unsigned cost = 0;
+  rtx set;
+
+  for (; seq; seq = NEXT_INSN (seq))
+    {
+      set = single_set (seq);
+      if (set)
+        cost += set_rtx_cost (set, speed);
+      else
+        cost++;
+    }
+
+  return cost;
+}
+
 /* Given an insn INSN and condition COND, return the condition in a
    canonical form to simplify testing by callers.  Specifically:
 

diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c
index 400798ab9158b343799fe29a52f4d7926194c2d5..087ca26fbbaabef5c383ec69272dccc933e26f97 100644 (file)
--- a/gcc/tree-ssa-loop-ivopts.c
+++ b/gcc/tree-ssa-loop-ivopts.c
@@ -2842,26 +2842,6 @@ get_use_iv_cost (struct ivopts_data *data, struct iv_use *use,
   return NULL;
 }
 
-/* Returns estimate on cost of computing SEQ.  */
-
-static unsigned
-seq_cost (rtx_insn *seq, bool speed)
-{
-  unsigned cost = 0;
-  rtx set;
-
-  for (; seq; seq = NEXT_INSN (seq))
-    {
-      set = single_set (seq);
-      if (set)
-       cost += set_src_cost (SET_SRC (set), speed);
-      else
-       cost++;
-    }
-
-  return cost;
-}
-
 /* Produce DECL_RTL for object obj so it looks like it is stored in memory.  */
 static rtx
 produce_memory_decl_rtl (tree obj, int *regno)