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, 2 insertions, 176 deletions

diff --git a/gcc/genattr.c b/gcc/genattr.c
index 41ff649f8f4..0be30352567 100644
--- a/gcc/genattr.c
+++ b/gcc/genattr.c
@@ -30,48 +30,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "gensupport.h"
 
 
-/* A range of values.  */
-
-struct range
-{
-  int min;
-  int max;
-};
-
-/* Record information about each function unit mentioned in a
-   DEFINE_FUNCTION_UNIT.  */
-
-struct function_unit
-{
-  char *name;			/* Function unit name.  */
-  struct function_unit *next;	/* Next function unit.  */
-  int multiplicity;		/* Number of units of this type.  */
-  int simultaneity;		/* Maximum number of simultaneous insns
-				   on this function unit or 0 if unlimited.  */
-  struct range ready_cost;	/* Range of ready cost values.  */
-  struct range issue_delay;	/* Range of issue delay values.  */
-};
-
-static void extend_range (struct range *, int, int);
-static void init_range (struct range *);
 static void write_upcase (const char *);
 static void gen_attr (rtx);
-static void write_units (int, struct range *, struct range *,
-			 struct range *, struct range *,
-			 struct range *);
-static void
-extend_range (struct range *range, int min, int max)
-{
-  if (range->min > min) range->min = min;
-  if (range->max < max) range->max = max;
-}
-
-static void
-init_range (struct range *range)
-{
-  range->min = 100000;
-  range->max = -1;
-}
 
 static void
 write_upcase (const char *str)
@@ -125,53 +85,6 @@ extern int insn_current_length (rtx);\n\n\
     }
 }
 
-static void
-write_units (int num_units, struct range *multiplicity, struct range *simultaneity,
-	     struct range *ready_cost, struct range *issue_delay,
-	     struct range *blockage)
-{
-  int i, q_size;
-
-  printf ("#define INSN_SCHEDULING\n\n");
-  printf ("extern int result_ready_cost (rtx);\n");
-  printf ("extern int function_units_used (rtx);\n\n");
-  printf ("extern const struct function_unit_desc\n");
-  printf ("{\n");
-  printf ("  const char *const name;\n");
-  printf ("  const int bitmask;\n");
-  printf ("  const int multiplicity;\n");
-  printf ("  const int simultaneity;\n");
-  printf ("  const int default_cost;\n");
-  printf ("  const int max_issue_delay;\n");
-  printf ("  int (*const ready_cost_function) (rtx);\n");
-  printf ("  int (*const conflict_cost_function) (rtx, rtx);\n");
-  printf ("  const int max_blockage;\n");
-  printf ("  unsigned int (*const blockage_range_function) (rtx);\n");
-  printf ("  int (*const blockage_function) (rtx, rtx);\n");
-  printf ("} function_units[];\n\n");
-  printf ("#define FUNCTION_UNITS_SIZE %d\n", num_units);
-  printf ("#define MIN_MULTIPLICITY %d\n", multiplicity->min);
-  printf ("#define MAX_MULTIPLICITY %d\n", multiplicity->max);
-  printf ("#define MIN_SIMULTANEITY %d\n", simultaneity->min);
-  printf ("#define MAX_SIMULTANEITY %d\n", simultaneity->max);
-  printf ("#define MIN_READY_COST %d\n", ready_cost->min);
-  printf ("#define MAX_READY_COST %d\n", ready_cost->max);
-  printf ("#define MIN_ISSUE_DELAY %d\n", issue_delay->min);
-  printf ("#define MAX_ISSUE_DELAY %d\n", issue_delay->max);
-  printf ("#define MIN_BLOCKAGE %d\n", blockage->min);
-  printf ("#define MAX_BLOCKAGE %d\n", blockage->max);
-  for (i = 0; (1 << i) < blockage->max; i++)
-    ;
-  printf ("#define BLOCKAGE_BITS %d\n", i + 1);
-
-  /* INSN_QUEUE_SIZE is a power of two larger than MAX_BLOCKAGE and
-     MAX_READY_COST.  This is the longest time an insn may be queued.  */
-  i = MAX (blockage->max, ready_cost->max);
-  for (q_size = 1; q_size <= i; q_size <<= 1)
-    ;
-  printf ("#define INSN_QUEUE_SIZE %d\n", q_size);
-}
-
 int
 main (int argc, char **argv)
 {
@@ -180,18 +93,8 @@ main (int argc, char **argv)
   int have_annul_true = 0;
   int have_annul_false = 0;
   int num_insn_reservations = 0;
-  int num_units = 0;
-  struct range all_simultaneity, all_multiplicity;
-  struct range all_ready_cost, all_issue_delay, all_blockage;
-  struct function_unit *units = 0, *unit;
   int i;
 
-  init_range (&all_multiplicity);
-  init_range (&all_simultaneity);
-  init_range (&all_ready_cost);
-  init_range (&all_issue_delay);
-  init_range (&all_blockage);
-
   progname = "genattr";
 
   if (argc <= 1)
@@ -253,92 +156,15 @@ main (int argc, char **argv)
 	    }
         }
 
-      else if (GET_CODE (desc) == DEFINE_FUNCTION_UNIT)
-	{
-	  const char *name = XSTR (desc, 0);
-	  int multiplicity = XINT (desc, 1);
-	  int simultaneity = XINT (desc, 2);
-	  int ready_cost = MAX (XINT (desc, 4), 1);
-	  int issue_delay = MAX (XINT (desc, 5), 1);
-	  int issueexp_p = (XVEC (desc, 6) != 0);
-
-	  for (unit = units; unit; unit = unit->next)
-	    if (strcmp (unit->name, name) == 0)
-	      break;
-
-	  if (unit == 0)
-	    {
-	      unit = xmalloc (sizeof (struct function_unit));
-	      unit->name = xstrdup (name);
-	      unit->multiplicity = multiplicity;
-	      unit->simultaneity = simultaneity;
-	      unit->ready_cost.min = unit->ready_cost.max = ready_cost;
-	      unit->issue_delay.min = unit->issue_delay.max = issue_delay;
-	      unit->next = units;
-	      units = unit;
-	      num_units++;
-
-	      extend_range (&all_multiplicity, multiplicity, multiplicity);
-	      extend_range (&all_simultaneity, simultaneity, simultaneity);
-	    }
-	  else if (unit->multiplicity != multiplicity
-		   || unit->simultaneity != simultaneity)
-	    fatal ("Differing specifications given for `%s' function unit",
-		   unit->name);
-
-	  extend_range (&unit->ready_cost, ready_cost, ready_cost);
-	  extend_range (&unit->issue_delay,
-			issueexp_p ? 1 : issue_delay, issue_delay);
-	  extend_range (&all_ready_cost,
-			unit->ready_cost.min, unit->ready_cost.max);
-	  extend_range (&all_issue_delay,
-			unit->issue_delay.min, unit->issue_delay.max);
-	}
       else if (GET_CODE (desc) == DEFINE_INSN_RESERVATION)
 	num_insn_reservations++;
     }
 
-  if (num_units > 0 || num_insn_reservations > 0)
+  if (num_insn_reservations > 0)
     {
-      /* Compute the range of blockage cost values.  See genattrtab.c
-	 for the derivation.  BLOCKAGE (E,C) when SIMULTANEITY is zero is
-
-	     MAX (ISSUE-DELAY (E,C),
-		  READY-COST (E) - (READY-COST (C) - 1))
-
-	 and otherwise
-
-	     MAX (ISSUE-DELAY (E,C),
-		  READY-COST (E) - (READY-COST (C) - 1),
-		  READY-COST (E) - FILL-TIME)  */
-
-      for (unit = units; unit; unit = unit->next)
-	{
-	  struct range blockage;
-
-	  blockage = unit->issue_delay;
-	  blockage.max = MAX (unit->ready_cost.max
-			      - (unit->ready_cost.min - 1),
-			      blockage.max);
-	  blockage.min = MAX (1, blockage.min);
-
-	  if (unit->simultaneity != 0)
-	    {
-	      int fill_time = ((unit->simultaneity - 1)
-			       * unit->issue_delay.min);
-	      blockage.min = MAX (unit->ready_cost.min - fill_time,
-				  blockage.min);
-	      blockage.max = MAX (unit->ready_cost.max - fill_time,
-				  blockage.max);
-	    }
-	  extend_range (&all_blockage, blockage.min, blockage.max);
-	}
-
-      write_units (num_units, &all_multiplicity, &all_simultaneity,
-		   &all_ready_cost, &all_issue_delay, &all_blockage);
-
       /* Output interface for pipeline hazards recognition based on
 	 DFA (deterministic finite state automata.  */
+      printf ("\n#define INSN_SCHEDULING\n");
       printf ("\n/* DFA based pipeline interface.  */");
       printf ("\n#ifndef AUTOMATON_ALTS\n");
       printf ("#define AUTOMATON_ALTS 0\n");