This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Re: i386 REG_ALLOC_ORDER tweek


> I'd prefer we just nuked order_regs_for_local_alloc and
> the associated option.
Sure! I was thinking about that too, but came to conclusion that I am getting
ofter overzelaous...

Wed Feb 14 12:25:28 CET 2001  Jan Hubicka  <jh@suse.cz>

	* invoke.texi (-mreg-alloc): Nuke.
	* i386.c (ix86_reg_alloc_order, regs_allocated,
	order_regs_for_local_alloc): Nuke.
	(override_options): Kill reg_alloc code.
	* i386.h (TARGET_OPTIONS): Kill reg-alloc.
	(REG_ALLOC_ORDER): SSE goes before I387.
	(ORDER_REGS_FOR_LOCAL_ALLOC): Kill.
	(ix86_reg_alloc_order): Likewise.

Index: invoke.texi
===================================================================
RCS file: /cvs/gcc/egcs/gcc/invoke.texi,v
retrieving revision 1.274
diff -c -3 -p -r1.274 invoke.texi
*** invoke.texi	2001/02/12 14:06:22	1.274
--- invoke.texi	2001/02/14 22:26:47
*************** in the following sections.
*** 457,468 ****
  -mintel-syntax -mieee-fp  -mno-fancy-math-387 @gol
  -mno-fp-ret-in-387  -msoft-float  -msvr3-shlib @gol
  -mno-wide-multiply  -mrtd  -malign-double @gol
- -mreg-alloc=@var{list}  -mregparm=@var{num} @gol
  -malign-jumps=@var{num}  -malign-loops=@var{num} @gol
  -malign-functions=@var{num} -mpreferred-stack-boundary=@var{num} @gol
  -mthreads -mno-align-stringops -minline-all-stringops @gol
  -mpush-args -maccumulate-outgoing-args -m128bit-long-double @gol
! -m96bit-long-double}
  
  @emph{HPPA Options}
  @gccoptlist{
--- 457,467 ----
  -mintel-syntax -mieee-fp  -mno-fancy-math-387 @gol
  -mno-fp-ret-in-387  -msoft-float  -msvr3-shlib @gol
  -mno-wide-multiply  -mrtd  -malign-double @gol
  -malign-jumps=@var{num}  -malign-loops=@var{num} @gol
  -malign-functions=@var{num} -mpreferred-stack-boundary=@var{num} @gol
  -mthreads -mno-align-stringops -minline-all-stringops @gol
  -mpush-args -maccumulate-outgoing-args -m128bit-long-double @gol
! -m96bit-long-double} -mregparm=@var{num} @gol
  
  @emph{HPPA Options}
  @gccoptlist{
*************** functions.
*** 6645,6657 ****
  In addition, seriously incorrect code will result if you call a
  function with too many arguments.  (Normally, extra arguments are
  harmlessly ignored.)
- 
- @item -mreg-alloc=@var{regs}
- Control the default allocation order of integer registers.  The
- string @var{regs} is a series of letters specifying a register.  The
- supported letters are: @code{a} allocate EAX; @code{b} allocate EBX;
- @code{c} allocate ECX; @code{d} allocate EDX; @code{S} allocate ESI;
- @code{D} allocate EDI; @code{B} allocate EBP.
  
  @item -mregparm=@var{num}
  Control how many registers are used to pass integer arguments.  By
--- 6644,6649 ----
Index: config/i386/i386.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config/i386/i386.c,v
retrieving revision 1.219
diff -c -3 -p -r1.219 i386.c
*** i386.c	2001/02/14 21:20:21	1.219
--- i386.c	2001/02/14 22:26:52
*************** int ix86_arch;
*** 412,421 ****
  const char *ix86_cpu_string;		/* for -mcpu=<xxx> */
  const char *ix86_arch_string;		/* for -march=<xxx> */
  
- /* Register allocation order */
- const char *ix86_reg_alloc_order;
- static char regs_allocated[FIRST_PSEUDO_REGISTER];
- 
  /* # of registers to use to pass arguments.  */
  const char *ix86_regparm_string;
  
--- 412,417 ----
*************** override_options ()
*** 611,649 ****
    mark_machine_status = ix86_mark_machine_status;
    free_machine_status = ix86_free_machine_status;
  
-   /* Validate registers in register allocation order.  */
-   if (ix86_reg_alloc_order)
-     {
-       int  ch;
- 
-       for (i = 0; (ch = ix86_reg_alloc_order[i]) != '\0'; i++)
- 	{
- 	  int regno = -1;
- 
- 	  switch (ch)
- 	    {
- 	    case 'a':	regno = 0;	break;
- 	    case 'd':	regno = 1;	break;
- 	    case 'c':	regno = 2;	break;
- 	    case 'b':	regno = 3;	break;
- 	    case 'S':	regno = 4;	break;
- 	    case 'D':	regno = 5;	break;
- 	    case 'B':	regno = 6;	break;
- 
- 	    default:	error ("Register '%c' is unknown", ch);
- 	    }
- 
- 	  if (regno >= 0)
- 	    {
- 	      if (regs_allocated[regno])
- 		error ("Register '%c' already specified in allocation order",
- 		       ch);
- 
- 	      regs_allocated[regno] = 1;
- 	    }
- 	}
-     }
- 
    /* Validate -mregparm= value.  */
    if (ix86_regparm_string)
      {
--- 607,612 ----
*************** override_options ()
*** 724,784 ****
       on by -msse.  */
    if (TARGET_SSE)
      target_flags |= MASK_MMX;
- }
- 
- /* A C statement (sans semicolon) to choose the order in which to
-    allocate hard registers for pseudo-registers local to a basic
-    block.
- 
-    Store the desired register order in the array `reg_alloc_order'.
-    Element 0 should be the register to allocate first; element 1, the
-    next register; and so on.
- 
-    The macro body should not assume anything about the contents of
-    `reg_alloc_order' before execution of the macro.
- 
-    On most machines, it is not necessary to define this macro.  */
- 
- void
- order_regs_for_local_alloc ()
- {
-   int i, ch, order;
- 
-   /* User specified the register allocation order.  */
- 
-   if (ix86_reg_alloc_order)
-     {
-       for (i = order = 0; (ch = ix86_reg_alloc_order[i]) != '\0'; i++)
- 	{
- 	  int regno = 0;
- 
- 	  switch (ch)
- 	    {
- 	    case 'a':	regno = 0;	break;
- 	    case 'd':	regno = 1;	break;
- 	    case 'c':	regno = 2;	break;
- 	    case 'b':	regno = 3;	break;
- 	    case 'S':	regno = 4;	break;
- 	    case 'D':	regno = 5;	break;
- 	    case 'B':	regno = 6;	break;
- 	    }
- 
- 	  reg_alloc_order[order++] = regno;
- 	}
- 
-       for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
- 	{
- 	  if (! regs_allocated[i])
- 	    reg_alloc_order[order++] = i;
- 	}
-     }
- 
-   /* If user did not specify a register allocation order, use natural order.  */
-   else
-     {
-       for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
- 	reg_alloc_order[i] = i;
-     }
  }
  
  void
--- 687,692 ----
Index: config/i386/i386.h
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config/i386/i386.h,v
retrieving revision 1.154
diff -c -3 -p -r1.154 i386.h
*** i386.h	2001/02/14 22:03:39	1.154
--- i386.h	2001/02/14 22:26:53
*************** extern int ix86_arch;
*** 366,373 ****
      N_("Schedule code for given CPU")},				\
    { "arch=",		&ix86_arch_string,			\
      N_("Generate code for given CPU")},				\
-   { "reg-alloc=",	&ix86_reg_alloc_order,			\
-     N_("Control allocation order of integer registers") },	\
    { "regparm=",		&ix86_regparm_string,			\
      N_("Number of registers used to pass integer arguments") },	\
    { "align-loops=",	&ix86_align_loops_string,		\
--- 366,371 ----
*************** extern int ix86_arch;
*** 717,746 ****
     Generated by allocating edx first, so restore the 'natural' order of things. */
  
  #define REG_ALLOC_ORDER 					\
! /*ax,dx,cx,bx,si,di,bp,sp,st,st1,st2,st3,st4,st5,st6,st7*/	\
! {  0, 1, 2, 3, 4, 5, 6, 7, 8,  9, 10, 11, 12, 13, 14, 15,	\
  /*,arg,cc,fpsr,dir,frame*/					\
       16,17, 18, 19,   20,					\
  /*xmm0,xmm1,xmm2,xmm3,xmm4,xmm5,xmm6,xmm7*/			\
      21,  22,  23,  24,  25,  26,  27,  28,			\
  /*mmx0,mmx1,mmx2,mmx3,mmx4,mmx5,mmx6,mmx7*/			\
      29,  30,  31,  32,  33,  34,  35,  36 }
  
- /* A C statement (sans semicolon) to choose the order in which to
-    allocate hard registers for pseudo-registers local to a basic
-    block.
- 
-    Store the desired register order in the array `reg_alloc_order'.
-    Element 0 should be the register to allocate first; element 1, the
-    next register; and so on.
- 
-    The macro body should not assume anything about the contents of
-    `reg_alloc_order' before execution of the macro.
- 
-    On most machines, it is not necessary to define this macro.  */
- 
- #define ORDER_REGS_FOR_LOCAL_ALLOC order_regs_for_local_alloc ()
- 
  /* Macro to conditionally modify fixed_regs/call_used_regs.  */
  #define CONDITIONAL_REGISTER_USAGE					\
    {									\
--- 715,731 ----
     generated by allocating edx first, so restore the 'natural' order of things. */
  
  #define REG_ALLOC_ORDER 					\
! /*ax,dx,cx,bx,si,di,bp,sp*/					\
! {  0, 1, 2, 3, 4, 5, 6, 7,					\
  /*,arg,cc,fpsr,dir,frame*/					\
       16,17, 18, 19,   20,					\
  /*xmm0,xmm1,xmm2,xmm3,xmm4,xmm5,xmm6,xmm7*/			\
      21,  22,  23,  24,  25,  26,  27,  28,			\
+ /*st,st1,st2,st3,st4,st5,st6,st7*/				\
+    8,  9, 10, 11, 12, 13, 14, 15,				\
  /*mmx0,mmx1,mmx2,mmx3,mmx4,mmx5,mmx6,mmx7*/			\
      29,  30,  31,  32,  33,  34,  35,  36 }
  
  /* Macro to conditionally modify fixed_regs/call_used_regs.  */
  #define CONDITIONAL_REGISTER_USAGE					\
    {									\
*************** do { long l;						\
*** 2897,2903 ****
  /* Variables in i386.c */
  extern const char *ix86_cpu_string;		/* for -mcpu=<xxx> */
  extern const char *ix86_arch_string;		/* for -march=<xxx> */
- extern const char *ix86_reg_alloc_order;	/* register allocation order */
  extern const char *ix86_regparm_string;		/* # registers to use to pass args */
  extern const char *ix86_align_loops_string;	/* power of two alignment for loops */
  extern const char *ix86_align_jumps_string;	/* power of two alignment for non-loop jumps */
--- 2882,2887 ----


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]