2004-05-13 Benjamin Kosnik <bkoz@redhat.com>

[pf3gnuchains/gcc-fork.git] / gcc / sched-rgn.c

diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c
index 673416f..e02686d 100644 (file)
--- a/gcc/sched-rgn.c
+++ b/gcc/sched-rgn.c
@@ -63,6 +63,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "toplev.h"
 #include "recog.h"
 #include "cfglayout.h"
+#include "params.h"
 #include "sched-int.h"
 #include "target.h"
 
@@ -83,9 +84,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #define FED_BY_SPEC_LOAD(insn) (h_i_d[INSN_UID (insn)].fed_by_spec_load)
 #define IS_LOAD_INSN(insn)     (h_i_d[INSN_UID (insn)].is_load_insn)
 
-#define MAX_RGN_BLOCKS 10
-#define MAX_RGN_INSNS 100
-
 /* nr_inter/spec counts interblock/speculative motion for the function.  */
 static int nr_inter, nr_spec;
 
@@ -156,7 +154,7 @@ static int *containing_rgn;
 void debug_regions (void);
 static void find_single_block_region (void);
 static void find_rgns (struct edge_list *);
-static int too_large (int, int *, int *);
+static bool too_large (int, int *, int *);
 
 extern void debug_live (int, int);
 
@@ -551,19 +549,18 @@ find_single_block_region (void)
 }
 
 /* Update number of blocks and the estimate for number of insns
-   in the region.  Return 1 if the region is "too large" for interblock
-   scheduling (compile time considerations), otherwise return 0.  */
+   in the region.  Return true if the region is "too large" for interblock
+   scheduling (compile time considerations).  */
 
-static int
+static bool
 too_large (int block, int *num_bbs, int *num_insns)
 {
   (*num_bbs)++;
-  (*num_insns) += (INSN_LUID (BB_END (BASIC_BLOCK (block))) -
-                  INSN_LUID (BB_HEAD (BASIC_BLOCK (block))));
-  if ((*num_bbs > MAX_RGN_BLOCKS) || (*num_insns > MAX_RGN_INSNS))
-    return 1;
-  else
-    return 0;
+  (*num_insns) += (INSN_LUID (BB_END (BASIC_BLOCK (block)))
+                  - INSN_LUID (BB_HEAD (BASIC_BLOCK (block))));
+
+  return ((*num_bbs > PARAM_VALUE (PARAM_MAX_SCHED_REGION_BLOCKS))
+         || (*num_insns > PARAM_VALUE (PARAM_MAX_SCHED_REGION_INSNS)));
 }
 
 /* Update_loop_relations(blk, hdr): Check if the loop headed by max_hdr[blk]
@@ -1761,7 +1758,7 @@ init_ready_list (struct ready_list *ready)
 
          if (targetm.sched.adjust_priority)
            INSN_PRIORITY (insn) =
-             (*targetm.sched.adjust_priority) (insn, INSN_PRIORITY (insn));
+             targetm.sched.adjust_priority (insn, INSN_PRIORITY (insn));
        }
       target_n_insns++;
     }
@@ -1788,10 +1785,10 @@ init_ready_list (struct ready_list *ready)
            if (!CANT_MOVE (insn)
                && (!IS_SPECULATIVE_INSN (insn)
                    || ((((!targetm.sched.use_dfa_pipeline_interface
-                          || !(*targetm.sched.use_dfa_pipeline_interface) ())
+                          || !targetm.sched.use_dfa_pipeline_interface ())
                          && insn_issue_delay (insn) <= 3)
                         || (targetm.sched.use_dfa_pipeline_interface
-                            && (*targetm.sched.use_dfa_pipeline_interface) ()
+                            && targetm.sched.use_dfa_pipeline_interface ()
                             && (recog_memoized (insn) < 0
                                 || min_insn_conflict_delay (curr_state,
                                                             insn, insn) <= 3)))
@@ -1803,7 +1800,7 @@ init_ready_list (struct ready_list *ready)
 
                  if (targetm.sched.adjust_priority)
                    INSN_PRIORITY (insn) =
-                     (*targetm.sched.adjust_priority) (insn, INSN_PRIORITY (insn));
+                     targetm.sched.adjust_priority (insn, INSN_PRIORITY (insn));
                }
          }
       }
@@ -1887,12 +1884,12 @@ new_ready (rtx next)
          || (IS_SPECULATIVE_INSN (next)
              && (0
                  || (targetm.sched.use_dfa_pipeline_interface
-                     && (*targetm.sched.use_dfa_pipeline_interface) ()
+                     && targetm.sched.use_dfa_pipeline_interface ()
                      && recog_memoized (next) >= 0
                      && min_insn_conflict_delay (curr_state, next,
                                                  next) > 3)
                  || ((!targetm.sched.use_dfa_pipeline_interface
-                      || !(*targetm.sched.use_dfa_pipeline_interface) ())
+                      || !targetm.sched.use_dfa_pipeline_interface ())
                      && insn_issue_delay (next) > 3)
                  || !check_live (next, INSN_BB (next))
                  || !is_exception_free (next, INSN_BB (next), target_bb)))))
@@ -2293,7 +2290,7 @@ debug_dependencies (void)
                   BB_TO_BLOCK (bb), bb);
 
          if (targetm.sched.use_dfa_pipeline_interface
-             && (*targetm.sched.use_dfa_pipeline_interface) ())
+             && targetm.sched.use_dfa_pipeline_interface ())
            {
              fprintf (sched_dump, ";;   %7s%6s%6s%6s%6s%6s%14s\n",
                       "insn", "code", "bb", "dep", "prio", "cost",
@@ -2333,7 +2330,7 @@ debug_dependencies (void)
                }
 
              if (targetm.sched.use_dfa_pipeline_interface
-                 && (*targetm.sched.use_dfa_pipeline_interface) ())
+                 && targetm.sched.use_dfa_pipeline_interface ())
                {
                  fprintf (sched_dump,
                           ";;   %s%5d%6d%6d%6d%6d%6d   ",