Skip to content

R
riscv-gcc-1
Commit 7b5efe21 by Jeffrey A Law Committed by Jeff Law
Options

configure.in: Remove code to select/de-select the haifa scheduler. 

        * configure.in: Remove code to select/de-select the haifa
        scheduler.  Every scheduled port gets haifa now.
        * configure: Rebuilt.
        * flags.h, genattrtab.c, rtl.h, toplev.c: Remove HAIFA ifdefs.
        * sched.c Deleted.
        * Makefile.in: Corresponding changes.

From-SVN: r28809
parent 8614a1d6
Showing with 13 additions and 69 deletions
gcc/ChangeLog
Mon Aug 23 21:23:24 1999 Jeffrey A Law (law@cygnus.com)
* configure.in: Remove code to select/de-select the haifa
scheduler. Every scheduled port gets haifa now.
* configure: Rebuilt.
* flags.h, genattrtab.c, rtl.h, toplev.c: Remove HAIFA ifdefs.
* sched.c Deleted.
* Makefile.in: Corresponding changes.
Mon Aug 23 16:04:13 1999 Bernd Schmidt <bernds@cygnus.co.uk>
* optabs.c (prepare_cmp_insn): Turn COMPARISON arg into a pointer.
......
gcc/Makefile.in
......@@ -533,7 +533,7 @@ all: all.indirect
all.indirect: $(ALL)
# IN_GCC tells various files that system.h, toplev.c, etc are available.
INTERNAL_CFLAGS = $(CROSS) -DIN_GCC $(SCHED_CFLAGS) @extra_c_flags@
INTERNAL_CFLAGS = $(CROSS) -DIN_GCC @extra_c_flags@
# This is the variable actually used when we compile.
# If you change this line, you probably also need to change the definition
......@@ -657,9 +657,6 @@ C_AND_OBJC_OBJS = c-lex.o c-pragma.o c-decl.o c-typeck.o c-convert.o \
# Language-specific object files for C.
C_OBJS = c-parse.o c-lang.o $(C_AND_OBJC_OBJS)
SCHED_PREFIX = @sched_prefix@
SCHED_CFLAGS = @sched_cflags@
# Language-independent object files.
OBJS = toplev.o version.o tree.o print-tree.o stor-layout.o fold-const.o \
function.o stmt.o except.o expr.o calls.o expmed.o explow.o optabs.o real.o \
......@@ -667,7 +664,7 @@ OBJS = toplev.o version.o tree.o print-tree.o stor-layout.o fold-const.o \
dbxout.o sdbout.o dwarfout.o dwarf2out.o xcoffout.o bitmap.o alias.o gcse.o \
integrate.o jump.o cse.o loop.o unroll.o flow.o stupid.o combine.o varray.o \
regclass.o regmove.o local-alloc.o global.o reload.o reload1.o caller-save.o \
insn-peep.o reorg.o $(SCHED_PREFIX)sched.o final.o recog.o reg-stack.o \
insn-peep.o reorg.o haifa-sched.o final.o recog.o reg-stack.o \
insn-opinit.o insn-recog.o insn-extract.o insn-output.o insn-emit.o lcm.o \
profile.o insn-attrtab.o $(out_object_file) getpwd.o $(EXTRA_OBJS) convert.o \
mbchar.o dyn-string.o splay-tree.o graph.o sbitmap.o resource.o hash.o
......@@ -1569,7 +1566,7 @@ alias.o : alias.c $(CONFIG_H) system.h $(RTL_H) flags.h hard-reg-set.h \
regmove.o : regmove.c $(CONFIG_H) system.h $(RTL_H) insn-config.h \
$(RECOG_H) output.h reload.h $(REGS_H) hard-reg-set.h flags.h function.h \
$(EXPR_H) insn-flags.h $(BASIC_BLOCK_H) toplev.h
$(SCHED_PREFIX)sched.o : $(SCHED_PREFIX)sched.c $(CONFIG_H) system.h $(RTL_H) \
haifa-sched.o : haifa-sched.c $(CONFIG_H) system.h $(RTL_H) \
$(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h flags.h insn-config.h function.h \
insn-attr.h toplev.h recog.h
final.o : final.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h intl.h \
......
gcc/configure.in
......@@ -232,12 +232,6 @@ if test x$enable_fast_fixincludes = xno ; then
cp $srcdir/fixincludes ./fixinc.sh
fi)
# Enable Haifa scheduler.
AC_ARG_ENABLE(haifa,
[ --enable-haifa use the experimental scheduler.
--disable-haifa don't use the experimental scheduler for the
targets which normally enable it.])
# Enable threads
# Pass with no value to take the default
# Pass with a value to specify a thread package
......@@ -3682,14 +3676,6 @@ then float_h_file=Makefile.in
else float_h_file=float-$float_format.h
fi
if test x$enable_haifa = x
then
case $target in
alpha*-* | hppa*-* | powerpc*-* | rs6000-* | *sparc*-* | m32r*-*)
enable_haifa=yes;;
esac
fi
# Handle cpp installation.
if test x$enable_cpp != xno
then
......@@ -4504,26 +4490,6 @@ if test x$with_newlib = xyes; then
fi
AC_SUBST(inhibit_libc)
# Override SCHED_OBJ and SCHED_CFLAGS to enable the Haifa scheduler.
sched_prefix=
sched_cflags=
if test x$enable_haifa = xyes; then
echo "Using the Haifa scheduler."
sched_prefix=haifa-
sched_cflags=-DHAIFA
fi
AC_SUBST(sched_prefix)
AC_SUBST(sched_cflags)
if test x$enable_haifa != x; then
# Explicitly remove files that need to be recompiled for the Haifa scheduler.
for x in genattrtab.o toplev.o *sched.o; do
if test -f $x; then
echo "Removing $x"
rm -f $x
fi
done
fi
# If $(exec_prefix) exists and is not the same as $(prefix), then compute an
# absolute path for gcc_tooldir based on inserting the number of up-directory
# movements required to get from $(exec_prefix) to $(prefix) into the basic
......
gcc/flags.h
......@@ -349,7 +349,6 @@ extern int flag_shared_data;
extern int flag_schedule_insns;
extern int flag_schedule_insns_after_reload;
#ifdef HAIFA
/* The following flags have effect only for scheduling before register
allocation:
......@@ -364,7 +363,6 @@ extern int flag_schedule_interblock;
extern int flag_schedule_speculative;
extern int flag_schedule_speculative_load;
extern int flag_schedule_speculative_load_dangerous;
#endif /* HAIFA */
/* flag_on_branch_count_reg means try to replace add-1,compare,branch tupple
by a cheaper branch, on a count register. */
......
gcc/genattrtab.c
......@@ -2082,25 +2082,7 @@ expand_units ()
for (op = unit->ops; op; op = op->next)
{
#ifdef HAIFA
rtx blockage = op->issue_exp;
#else
rtx blockage = operate_exp (POS_MINUS_OP, readycost,
make_numeric_value (1));
if (unit->simultaneity != 0)
{
rtx filltime = make_numeric_value ((unit->simultaneity - 1)
* unit->issue_delay.min);
blockage = operate_exp (MIN_OP, blockage, filltime);
}
blockage = operate_exp (POS_MINUS_OP,
make_numeric_value (op->ready),
blockage);
blockage = operate_exp (MAX_OP, blockage, op->issue_exp);
#endif
blockage = simplify_knowing (blockage, unit->condexp);
/* Add this op's contribution to MAX (BLOCKAGE (E,*)) and
......
gcc/rtl.h
......@@ -1346,9 +1346,7 @@ extern void dump_combine_total_stats PROTO ((FILE *));
#ifdef BUFSIZ
extern void schedule_insns PROTO ((FILE *));
#endif
#ifdef HAIFA
extern void fix_sched_param PROTO ((const char *, const char *));
#endif
/* In print-rtl.c */
extern void debug_rtx PROTO ((rtx));
......
gcc/sched.c deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
gcc/toplev.c
......@@ -674,7 +674,6 @@ int flag_pedantic_errors = 0;
int flag_schedule_insns = 0;
int flag_schedule_insns_after_reload = 0;
#ifdef HAIFA
/* The following flags have effect only for scheduling before register
allocation:
......@@ -689,7 +688,6 @@ int flag_schedule_interblock = 1;
int flag_schedule_speculative = 1;
int flag_schedule_speculative_load = 0;
int flag_schedule_speculative_load_dangerous = 0;
#endif /* HAIFA */
/* flag_on_branch_count_reg means try to replace add-1,compare,branch tupple
by a cheaper branch, on a count register. */
......@@ -905,7 +903,6 @@ lang_independent_options f_options[] =
"Reschedule instructions to avoid pipeline stalls"},
{"schedule-insns2", &flag_schedule_insns_after_reload, 1,
"Run two passes of the instruction scheduler"},
#ifdef HAIFA
{"sched-interblock",&flag_schedule_interblock, 1,
"Enable scheduling across basic blocks" },
{"sched-spec",&flag_schedule_speculative, 1,
......@@ -914,7 +911,6 @@ lang_independent_options f_options[] =
"Allow speculative motion of some loads" },
{"sched-spec-load-dangerous",&flag_schedule_speculative_load_dangerous, 1,
"Allow speculative motion of more loads" },
#endif /* HAIFA */
{"branch-count-reg",&flag_branch_on_count_reg, 1,
"Replace add,compare,branch with branch on count reg"},
{"pic", &flag_pic, 1,
......@@ -4570,7 +4566,7 @@ display_help ()
printf (" -version Display the compiler's version\n");
printf (" -d[letters] Enable dumps from specific passes of the compiler\n");
printf (" -dumpbase <file> Base name to be used for dumps from specific passes\n");
#if defined HAIFA || defined INSN_SCHEDULING
#if defined INSN_SCHEDULING
printf (" -sched-verbose-<number> Set the verbosity level of the scheduler\n");
#endif
printf (" --help Display this information\n");
......@@ -5097,12 +5093,10 @@ main (argc, argv)
else if (!strncmp (p, "inline-limit-", 13))
inline_max_insns =
read_integral_parameter (p + 13, p - 2, inline_max_insns);
#ifdef HAIFA
#ifdef INSN_SCHEDULING
else if (!strncmp (p, "sched-verbose-",14))
fix_sched_param("verbose",&p[14]);
#endif
#endif /* HAIFA */
else if (!strncmp (p, "fixed-", 6))
fix_register (&p[6], 1, 1);
else if (!strncmp (p, "call-used-", 10))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment