2004-07-19 Paolo Bonzini <bonzini@gnu.org>

	* genattr.c (struct range, struct function_unit,
	write_units, extend_range, init_range): Remove them.
	(main): Remove code dealing with DEFINE_FUNCTION_UNIT.
	Output "#define INSN_SCHEDULING" here.
	* genattrtab.c (struct range, struct function_unit_op,
	struct function_unit, struct dimension, enum operator,
	operate_exp, expand_units, simplify_knowing,
	encode_units_mask, simplify_by_exploding,
	find_and_mark_used_attributes, unmark_used_attributes,
	add_values_to_cover, increment_current_value,
	test_for_current_value, simplify_with_current_value,
	simplify_with_current_value_aux, gen_unit,
	write_unit_name, write_function_unit_info,
	write_complex_function, write_toplevel_expr,
	find_single_value, extend_range): Remove.
	(write_attr_get): Do not handle common_av->value
	being an FFS.
	(struct attr_desc): Remove func_units_p and blockage_p.
	(write_attr_valueq): Do not handle them.
	(find_attr): Do not clear them.
	(make_internal_attr): Do not initialize them.
	(main): Remove code dealing with DEFINE_FUNCTION_UNIT.
	* sched-vis.c (init_target_units, insn_print_units,
	init_block_visualization, print_block_visualization,
	visualize_scheduled_insns, visualize_no_unit,
	visualize_stall_cycles, visualize_alloc,
	visualize_free, target_units, get_visual_tbl_length,
	MAX_VISUAL_LINES, INSN_LEN, n_visual_lines,
	visual_tbl_line_length, visual_tbl, n_vis_no_unit,
	MAX_VISUAL_NO_UNIT, vis_no_unit): Remove.
	* haifa-sched.c (blockage_range, clear_units,
	schedule_unit, actual_hazard, potential_hazard,
	insn_unit, unit_last_insn, unit_tick,
	actual_hazard_this_instance, potential_hazard,
	schedule_unit, max_insn_queue_index_value): Remove.
	(MAX_INSN_QUEUE_INDEX): Removed, renamed throughout to
	max_insn_queue_index.
	* rtl.def (DEFINE_FUNCTION_UNIT): Remove.
	* doc/md.texi (Processor pipeline description): Remove
	references to old pipeline descriptions.
	(Automaton pipeline description): Merge with the above.
	(Old pipeline description, Comparison of the two descriptions):
	Remove.

	* bt-load.c (migrate_btr_def): Remove references to
	use_pipeline_interface.
	* haifa-sched.c (insn_cost, schedule_insn,
	schedule_block, advance_one_cycle, sched_init,
	queue_to_ready, sched_finish): Likewise.
	* modulo-sched.c (sms_schedule, advance_one_cycle,
	ps_has_conflicts): Likewise.
	* sched-rgn.c (init_ready): Likewise.
	(debug_dependencies): Likewise, and remove an "if (1)".
	* target.h (use_dfa_pipeline_interface): Remove.
	* config/alpha/alpha.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* config/arc/arc.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* config/arm/arm.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* config/c4x/c4x.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* config/frv/frv.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* config/i386/i386.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* config/ia64/ia64.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* config/iq2000/iq2000.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* config/m32r/m32r.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* config/mcore/mcore.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* config/mips/mips.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* config/pa/pa.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* config/rs6000/rs6000.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* config/s390/s390.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* config/sh/sh.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* config/sparc/sparc.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* config/v850/v850.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* config/xtensa/xtensa.c (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.
	* doc/tm.texi (TARGET_USE_DFA_PIPELINE_INTERFACE): Remove.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@84944 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 57 insertions, 108 deletions

diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c
index 698cadd2ede..325e1693cd4 100644
--- a/gcc/sched-rgn.c
+++ b/gcc/sched-rgn.c
@@ -1784,14 +1784,9 @@ 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 ())
-			  && insn_issue_delay (insn) <= 3)
-			 || (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)))
+		    || ((recog_memoized (insn) < 0
+			 || min_insn_conflict_delay (curr_state,
+						     insn, insn) <= 3)
 			&& check_live (insn, bb_src)
 			&& is_exception_free (insn, bb_src, target_bb))))
 	      if (INSN_DEP_COUNT (insn) == 0)
@@ -1882,15 +1877,8 @@ new_ready (rtx next)
       && (!IS_VALID (INSN_BB (next))
 	  || CANT_MOVE (next)
 	  || (IS_SPECULATIVE_INSN (next)
-	      && (0
-		  || (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 ())
-		      && insn_issue_delay (next) > 3)
+	      && ((recog_memoized (next) >= 0
+		   && min_insn_conflict_delay (curr_state, next, next) > 3)
 		  || !check_live (next, INSN_BB (next))
 		  || !is_exception_free (next, INSN_BB (next), target_bb)))))
     return 0;
@@ -2278,106 +2266,67 @@ debug_dependencies (void)
   fprintf (sched_dump, ";;   --------------- forward dependences: ------------ \n");
   for (bb = 0; bb < current_nr_blocks; bb++)
     {
-      if (1)
-	{
-	  rtx head, tail;
-	  rtx next_tail;
-	  rtx insn;
-
-	  get_block_head_tail (BB_TO_BLOCK (bb), &head, &tail);
-	  next_tail = NEXT_INSN (tail);
-	  fprintf (sched_dump, "\n;;   --- Region Dependences --- b %d bb %d \n",
-		   BB_TO_BLOCK (bb), bb);
+      rtx head, tail;
+      rtx next_tail;
+      rtx insn;
 
-	  if (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",
-		       "reservation");
-	      fprintf (sched_dump, ";;   %7s%6s%6s%6s%6s%6s%14s\n",
-		       "----", "----", "--", "---", "----", "----",
-		       "-----------");
-	    }
-	  else
-	    {
-	      fprintf (sched_dump, ";;   %7s%6s%6s%6s%6s%6s%11s%6s\n",
-	      "insn", "code", "bb", "dep", "prio", "cost", "blockage", "units");
-	      fprintf (sched_dump, ";;   %7s%6s%6s%6s%6s%6s%11s%6s\n",
-	      "----", "----", "--", "---", "----", "----", "--------", "-----");
-	    }
+      get_block_head_tail (BB_TO_BLOCK (bb), &head, &tail);
+      next_tail = NEXT_INSN (tail);
+      fprintf (sched_dump, "\n;;   --- Region Dependences --- b %d bb %d \n",
+	       BB_TO_BLOCK (bb), bb);
+
+      fprintf (sched_dump, ";;   %7s%6s%6s%6s%6s%6s%14s\n",
+	       "insn", "code", "bb", "dep", "prio", "cost",
+	       "reservation");
+      fprintf (sched_dump, ";;   %7s%6s%6s%6s%6s%6s%14s\n",
+	       "----", "----", "--", "---", "----", "----",
+	       "-----------");
+
+      for (insn = head; insn != next_tail; insn = NEXT_INSN (insn))
+	{
+	  rtx link;
 
-	  for (insn = head; insn != next_tail; insn = NEXT_INSN (insn))
+	  if (! INSN_P (insn))
 	    {
-	      rtx link;
-
-	      if (! INSN_P (insn))
+	      int n;
+	      fprintf (sched_dump, ";;   %6d ", INSN_UID (insn));
+	      if (NOTE_P (insn))
 		{
-		  int n;
-		  fprintf (sched_dump, ";;   %6d ", INSN_UID (insn));
-		  if (NOTE_P (insn))
+		  n = NOTE_LINE_NUMBER (insn);
+		  if (n < 0)
+		    fprintf (sched_dump, "%s\n", GET_NOTE_INSN_NAME (n));
+		  else
 		    {
-		      n = NOTE_LINE_NUMBER (insn);
-		      if (n < 0)
-			fprintf (sched_dump, "%s\n", GET_NOTE_INSN_NAME (n));
-		      else
-			{
-			  expanded_location xloc;
-			  NOTE_EXPANDED_LOCATION (xloc, insn);
-			  fprintf (sched_dump, "line %d, file %s\n",
-				   xloc.line, xloc.file);
-			}
+		      expanded_location xloc;
+		      NOTE_EXPANDED_LOCATION (xloc, insn);
+		      fprintf (sched_dump, "line %d, file %s\n",
+			       xloc.line, xloc.file);
 		    }
-		  else
-		    fprintf (sched_dump, " {%s}\n", GET_RTX_NAME (GET_CODE (insn)));
-		  continue;
-		}
-
-	      if (targetm.sched.use_dfa_pipeline_interface
-		  && targetm.sched.use_dfa_pipeline_interface ())
-		{
-		  fprintf (sched_dump,
-			   ";;   %s%5d%6d%6d%6d%6d%6d   ",
-			   (SCHED_GROUP_P (insn) ? "+" : " "),
-			   INSN_UID (insn),
-			   INSN_CODE (insn),
-			   INSN_BB (insn),
-			   INSN_DEP_COUNT (insn),
-			   INSN_PRIORITY (insn),
-			   insn_cost (insn, 0, 0));
-
-		  if (recog_memoized (insn) < 0)
-		    fprintf (sched_dump, "nothing");
-		  else
-		    print_reservation (sched_dump, insn);
 		}
 	      else
-		{
-		  int unit = insn_unit (insn);
-		  int range
-		    = (unit < 0
-		       || function_units[unit].blockage_range_function == 0
-		       ? 0
-		       : function_units[unit].blockage_range_function (insn));
-		  fprintf (sched_dump,
-			   ";;   %s%5d%6d%6d%6d%6d%6d  %3d -%3d   ",
-			   (SCHED_GROUP_P (insn) ? "+" : " "),
-			   INSN_UID (insn),
-			   INSN_CODE (insn),
-			   INSN_BB (insn),
-			   INSN_DEP_COUNT (insn),
-			   INSN_PRIORITY (insn),
-			   insn_cost (insn, 0, 0),
-			   (int) MIN_BLOCKAGE_COST (range),
-			   (int) MAX_BLOCKAGE_COST (range));
-		  insn_print_units (insn);
-		}
-
-	      fprintf (sched_dump, "\t: ");
-	      for (link = INSN_DEPEND (insn); link; link = XEXP (link, 1))
-		fprintf (sched_dump, "%d ", INSN_UID (XEXP (link, 0)));
-	      fprintf (sched_dump, "\n");
+		fprintf (sched_dump, " {%s}\n", GET_RTX_NAME (GET_CODE (insn)));
+	      continue;
 	    }
+
+	  fprintf (sched_dump,
+		   ";;   %s%5d%6d%6d%6d%6d%6d   ",
+		   (SCHED_GROUP_P (insn) ? "+" : " "),
+		   INSN_UID (insn),
+		   INSN_CODE (insn),
+		   INSN_BB (insn),
+		   INSN_DEP_COUNT (insn),
+		   INSN_PRIORITY (insn),
+		   insn_cost (insn, 0, 0));
+
+	  if (recog_memoized (insn) < 0)
+	    fprintf (sched_dump, "nothing");
+	  else
+	    print_reservation (sched_dump, insn);
+
+	  fprintf (sched_dump, "\t: ");
+	  for (link = INSN_DEPEND (insn); link; link = XEXP (link, 1))
+	    fprintf (sched_dump, "%d ", INSN_UID (XEXP (link, 0)));
+	  fprintf (sched_dump, "\n");
 	}
     }
   fprintf (sched_dump, "\n");