Rename existing insn_cost to insn_sched_cost

haifa-sched exports an insn_cost function, but it is only used in a
few places and specialised to scheduling.  This patch renames it to
insn_sched_cost.

	* haifa-sched.c: Rename insn_cost to insn_sched_cost.
	* sched-rgn.c: Ditto.
	* sel-sched-ir.c: Ditto.

From-SVN: r253072

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7c0674d5ad72d018c0815092b6068259f45c85d5..ec429c91e3174f1bf452f86936605a4ca393a641 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-09-21  Segher Boessenkool  <segher@kernel.crashing.org>
+
+       * haifa-sched.c: Rename insn_cost to insn_sched_cost.
+       * sched-rgn.c: Ditto.
+       * sel-sched-ir.c: Ditto.
+
 2017-09-21  Alexander Monakov  <amonakov@ispras.ru>
 
        * toplev.h (set_random_seed): Adjust return type.

diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index af0ed27b18ff250b4b3cf8a964c9d94aeed61d3a..d1378d0465f8ffcec6bf409d211026f2359cd19c 100644 (file)
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -225,7 +225,7 @@ struct common_sched_info_def *common_sched_info;
 #define FEEDS_BACKTRACK_INSN(INSN) (HID (INSN)->feeds_backtrack_insn)
 #define SHADOW_P(INSN) (HID (INSN)->shadow_p)
 #define MUST_RECOMPUTE_SPEC_P(INSN) (HID (INSN)->must_recompute_spec)
-/* Cached cost of the instruction.  Use insn_cost to get cost of the
+/* Cached cost of the instruction.  Use insn_sched_cost to get cost of the
    insn.  -1 here means that the field is not initialized.  */
 #define INSN_COST(INSN)        (HID (INSN)->cost)
 
@@ -1383,7 +1383,7 @@ static rtx_insn *nonscheduled_insns_begin;
    This is the number of cycles between instruction issue and
    instruction results.  */
 int
-insn_cost (rtx_insn *insn)
+insn_sched_cost (rtx_insn *insn)
 {
   int cost;
 
@@ -1470,7 +1470,7 @@ dep_cost_1 (dep_t link, dw_t dw)
     {
       enum reg_note dep_type = DEP_TYPE (link);
 
-      cost = insn_cost (insn);
+      cost = insn_sched_cost (insn);
 
       if (INSN_CODE (insn) >= 0)
        {
@@ -1608,11 +1608,11 @@ priority (rtx_insn *insn)
          INSN_FUSION_PRIORITY (insn) = this_fusion_priority;
        }
       else if (dep_list_size (insn, SD_LIST_FORW) == 0)
-       /* ??? We should set INSN_PRIORITY to insn_cost when and insn has
-          some forward deps but all of them are ignored by
+       /* ??? We should set INSN_PRIORITY to insn_sched_cost when and insn
+          has some forward deps but all of them are ignored by
           contributes_to_priority hook.  At the moment we set priority of
           such insn to 0.  */
-       this_priority = insn_cost (insn);
+       this_priority = insn_sched_cost (insn);
       else
        {
          rtx_insn *prev_first, *twin;
@@ -1683,7 +1683,7 @@ priority (rtx_insn *insn)
        {
          gcc_assert (this_priority == -1);
 
-         this_priority = insn_cost (insn);
+         this_priority = insn_sched_cost (insn);
        }
 
       INSN_PRIORITY (insn) = this_priority;

diff --git a/gcc/sched-int.h b/gcc/sched-int.h
index 624d8925c8d29633cfc60e25b10ee2b8a813b068..2af8f9fc32c0085c18511bbc83ad52c6ec31f671 100644 (file)
--- a/gcc/sched-int.h
+++ b/gcc/sched-int.h
@@ -1403,7 +1403,7 @@ extern void get_ebb_head_tail (basic_block, basic_block,
                               rtx_insn **, rtx_insn **);
 extern int no_real_insns_p (const rtx_insn *, const rtx_insn *);
 
-extern int insn_cost (rtx_insn *);
+extern int insn_sched_cost (rtx_insn *);
 extern int dep_cost_1 (dep_t, dw_t);
 extern int dep_cost (dep_t);
 extern int set_priorities (rtx_insn *, rtx_insn *);

diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c
index 492094e36240cbeb52684bd87c155831e97def93..ba5b47c73d9a67c19fcc61e89456fa15a8123697 100644 (file)
--- a/gcc/sched-rgn.c
+++ b/gcc/sched-rgn.c
@@ -2837,8 +2837,8 @@ void debug_dependencies (rtx_insn *head, rtx_insn *tail)
                               : INSN_PRIORITY (insn))
                : INSN_PRIORITY (insn)),
               (sel_sched_p () ? (sched_emulate_haifa_p ? -1
-                              : insn_cost (insn))
-               : insn_cost (insn)));
+                              : insn_sched_cost (insn))
+               : insn_sched_cost (insn)));
 
       if (recog_memoized (insn) < 0)
        fprintf (sched_dump, "nothing");

diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c
index fa88259733bb5867d156ce2f5de49b4042beeb8e..c0e835fd09b811e386d4cea05adc6fffc24d41f2 100644 (file)
--- a/gcc/sel-sched-ir.c
+++ b/gcc/sel-sched-ir.c
@@ -1324,7 +1324,7 @@ sel_insn_rtx_cost (rtx_insn *insn)
 }
 
 /* Return the cost of the VI.
-   !!! FIXME: Unify with haifa-sched.c: insn_cost ().  */
+   !!! FIXME: Unify with haifa-sched.c: insn_sched_cost ().  */
 int
 sel_vinsn_cost (vinsn_t vi)
 {