Re: Let's backport speedups from 3.4 to 3.3

Re: Let's backport speedups from 3.4 to 3.3

[Kaoru Fukui]

On 13 Feb, To: ghazi@caip.rutgers.edu wrote:
> On 12 Feb, Kaveh R. Ghazi wrote:
>> I've heard some mention that 3.4 is faster in some cases than 3.3.
>> 
>> I know several speedup tweeks have been made since the branch was
>> created.  Not all of them have been backported.
>> 
>> If they're not too invasive, let's consider them for 3.3.  I'm willing
>> to help by regtesting patches if people can point out safe candidates.
>> Though I'd certainly appreciate assistance from others. :-)
>> 
>> 		Thanks,
>> 		--Kaveh
>> --
>> Kaveh R. Ghazi			ghazi@caip.rutgers.edu
> 
> http://gcc.gnu.org/ml/gcc-patches/2003-02/msg00377.html
> http://gcc.gnu.org/ml/gcc-patches/2003-02/msg00560.htm
> There is Mike's info.
> 
> 
> I tried popcontext-fsf-2.diffs which is speedy, see below 
> 
> http://gcc.gnu.org/ml/gcc-patches/2003-02/msg00380.html
> gcc-3.3 doesn't pch, so it needs to adjust.

This is my adjusted Mike's patch for gcc-3.3.

Thanks Mike
Kaoru

====================================
	* ggc-page.c (struct page_entry): Add index_by_depth field.
	Remove save_in_use_p field.
	(struct globals): Add by_depth, depth, and save_in_use fields.
	(INITIAL_PTE_COUNT): Add.
	(save_in_use_p_i): Add.
	(save_in_use_p): Add.
	(adjust_depth): Add.
	(move_ptes_to_front): Add.
	(free_page): Add support for and use faster data structures.
	(ggc_alloc): Likewise.
	(init_ggc): Likewise.
	(ggc_recalculate_in_use_p): Likewise.
	(ggc_pop_context): Likewise.
	(clear_marks): Likewise.
	(ggc_pch_read): Likewise.

	(ggc_varray_type): Add.
	(ggc_varray_head_tag): Add.
	(ggc_varray_data_enum): Add.
	(GGC_VARRAY_DATA_C): Add.
	(GGC_VARRAY_DATA_GENERICNGC): Add.
	(GGC_VARRAY_DATA_UNGC): Add.
	(GGC_NUM_VARRAY_DATA): Add.
	(union ggc_varray_data_tag): Add.
	(ggc_varray_data): Add.
	(ggc_varray_init): Add.
	(GGC_VARRAY_GENERIC_PTRNGC_INIT): Add.
	(GGC_VARRAY_UINTNGC_INIT): Add.
	(GGC_VARRAY_GENERIC_PTRNGC): Add.
	(GGC_VARRAY_UINTNGC): Add.
	(GGC_VARRAY_PUSH_GENERIC_PTRNGC): Add.
	(GGC_VARRAY_PUSH_UINTNGC): Add.
	(GGC_VARRAY_TOP_GENERIC_PTRNGC): Add.
	(GGC_VARRAY_TOP_UINTNGC): Add.
	(GGC_VARRAY_FREE): Add.
	(GGC_VARRAY_GROW): Add.
	(GGC_VARRAY_PUSH): Add.
	(GGC_VARRAY_POP): Add.
	(GGC_VARRAY_TOP): Add.
	(GGC_VARRAY_HDR_SIZE): Add.
	(ggc_varray_init): Add.
	(ggc_varray_grow): Add.
	(ggc_varray_check_failed): Add.
	(GGC_VARRAY_ACTIVE_SIZE): Add.

	* varray.c (element_size): Remove.
	(uses_ggc): Remove.
	(element): Add.
	(varray_init): Use new interface.
	(varray_grow): Use new interface.
	(varray_clear): Use new interface.

Index: varray.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/varray.c,v
retrieving revision 1.16
diff -p -r1.16 varray.c
*** varray.c	16 Dec 2002 18:20:02 -0000	1.16
--- varray.c	6 Feb 2003 01:54:07 -0000
***************
*** 29,62 ****
  
  #define VARRAY_HDR_SIZE (sizeof (struct varray_head_tag) - sizeof (varray_data))
  
! static const size_t element_size[NUM_VARRAY_DATA] = {
!   sizeof (char),
!   sizeof (unsigned char),
!   sizeof (short),
!   sizeof (unsigned short),
!   sizeof (int),
!   sizeof (unsigned int),
!   sizeof (long),
!   sizeof (unsigned long),
!   sizeof (HOST_WIDE_INT),
!   sizeof (unsigned HOST_WIDE_INT),
!   sizeof (PTR),
!   sizeof (char *),
!   sizeof (struct rtx_def *),
!   sizeof (struct rtvec_def *),
!   sizeof (union tree_node *),
!   sizeof (struct bitmap_head_def *),
!   sizeof (struct reg_info_def *),
!   sizeof (struct const_equiv_data),
!   sizeof (struct basic_block_def *),
!   sizeof (struct elt_list *)
! };
  
! static const int uses_ggc[NUM_VARRAY_DATA] = {
!   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* unsigned HOST_WIDE_INT */
!   1, /* PTR */
!   1, 1, 1, 1, 1, /* bitmap_head_def */
!   0, 0, 0, 1
  };
  
  /* Allocate a virtual array with NUM_ELEMENT elements, each of which is
--- 29,61 ----
  
  #define VARRAY_HDR_SIZE (sizeof (struct varray_head_tag) - sizeof (varray_data))
  
! /* Do not add any more non-GC items here.  Please either remove or GC those items that
!    are not GCed.  */
  
! static const struct {
!   size_t size;
!   int uses_ggc;
! } element[NUM_VARRAY_DATA] = {
!   { sizeof (char), 1 },
!   { sizeof (unsigned char), 1 },
!   { sizeof (short), 1 },
!   { sizeof (unsigned short), 1 },
!   { sizeof (int), 1 },
!   { sizeof (unsigned int), 1 },
!   { sizeof (long), 1 },
!   { sizeof (unsigned long), 1 },
!   { sizeof (HOST_WIDE_INT), 1 },
!   { sizeof (unsigned HOST_WIDE_INT), 1 },
!   { sizeof (PTR), 1 },
!   { sizeof (char *), 1 },
!   { sizeof (struct rtx_def *), 1 },
!   { sizeof (struct rtvec_def *), 1 },
!   { sizeof (union tree_node *), 1 },
!   { sizeof (struct bitmap_head_def *), 1 },
!   { sizeof (struct reg_info_def *), 0 },
!   { sizeof (struct const_equiv_data), 0 },
!   { sizeof (struct basic_block_def *), 0 },
!   { sizeof (struct elt_list *), 1 },
  };
  
  /* Allocate a virtual array with NUM_ELEMENT elements, each of which is
*************** varray_init (num_elements, element_kind,
*** 67,75 ****
       enum varray_data_enum element_kind;
       const char *name;
  {
!   size_t data_size = num_elements * element_size[element_kind];
    varray_type ptr;
!   if (uses_ggc [element_kind])
      ptr = (varray_type) ggc_alloc_cleared (VARRAY_HDR_SIZE + data_size);
    else
      ptr = (varray_type) xcalloc (VARRAY_HDR_SIZE + data_size, 1);
--- 66,74 ----
       enum varray_data_enum element_kind;
       const char *name;
  {
!   size_t data_size = num_elements * element[element_kind].size;
    varray_type ptr;
!   if (element[element_kind].uses_ggc)
      ptr = (varray_type) ggc_alloc_cleared (VARRAY_HDR_SIZE + data_size);
    else
      ptr = (varray_type) xcalloc (VARRAY_HDR_SIZE + data_size, 1);
*************** varray_grow (va, n)
*** 92,102 ****
  
    if (n != old_elements)
      {
!       size_t elem_size = element_size[va->type];
        size_t old_data_size = old_elements * elem_size;
        size_t data_size = n * elem_size;
  
!       if (uses_ggc[va->type])
  	va = (varray_type) ggc_realloc (va, VARRAY_HDR_SIZE + data_size);
        else
  	va = (varray_type) xrealloc ((char *) va, VARRAY_HDR_SIZE + data_size);
--- 91,101 ----
  
    if (n != old_elements)
      {
!       size_t elem_size = element[va->type].size;
        size_t old_data_size = old_elements * elem_size;
        size_t data_size = n * elem_size;
  
!       if (element[va->type].uses_ggc)
  	va = (varray_type) ggc_realloc (va, VARRAY_HDR_SIZE + data_size);
        else
  	va = (varray_type) xrealloc ((char *) va, VARRAY_HDR_SIZE + data_size);
*************** void
*** 113,119 ****
  varray_clear (va)
       varray_type va;
  {
!   size_t data_size = element_size[va->type] * va->num_elements;
  
    memset (va->data.c, 0, data_size);
    va->elements_used = 0;
--- 112,118 ----
  varray_clear (va)
       varray_type va;
  {
!   size_t data_size = element[va->type].size * va->num_elements;
  
    memset (va->data.c, 0, data_size);
    va->elements_used = 0;
Index: varray.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/varray.h,v
retrieving revision 1.29
diff -p -r1.29 varray.h
*** varray.h	16 Dec 2002 18:20:02 -0000	1.29
--- varray.h	6 Feb 2003 01:54:07 -0000
*************** struct const_equiv_data GTY(()) {
*** 57,63 ****
  };
  
  /* Enum indicating what the varray contains.  
!    If this is changed, `element_size' in varray.c needs to be updated.  */
  
  enum varray_data_enum {
    VARRAY_DATA_C,
--- 57,63 ----
  };
  
  /* Enum indicating what the varray contains.  
!    If this is changed, `element' in varray.c needs to be updated.  */
  
  enum varray_data_enum {
    VARRAY_DATA_C,
Index: ggc-page.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ggc-page.c,v
retrieving revision 1.61
diff -p -r1.61 ggc-page.c
*** ggc-page.c	30 Jan 2003 18:14:06 -0000	1.61
--- ggc-page.c	6 Feb 2003 01:54:09 -0000
*************** Software Foundation, 59 Temple Place - S
*** 26,32 ****
  #include "rtl.h"
  #include "tm_p.h"
  #include "toplev.h"
- #include "varray.h"
  #include "flags.h"
  #include "ggc.h"
  #include "timevar.h"
--- 26,31 ----
*************** typedef struct page_entry
*** 253,261 ****
    struct page_group *group;
  #endif
  
!   /* Saved in-use bit vector for pages that aren't in the topmost
!      context during collection.  */
!   unsigned long *save_in_use_p;
  
    /* Context depth of this page.  */
    unsigned short context_depth;
--- 252,260 ----
    struct page_group *group;
  #endif
  
!   /* This is the index in the by_depth varray where this page table
!      can be found.  */
!   unsigned long index_by_depth;
  
    /* Context depth of this page.  */
    unsigned short context_depth;
*************** typedef struct page_table_chain
*** 314,319 ****
--- 313,320 ----
  
  #endif
  
+ typedef struct ggc_varray_head_tag *ggc_varray_type;
+ 
  /* The rest of the global variables.  */
  static struct globals
  {
*************** static struct globals
*** 367,372 ****
--- 368,391 ----
  
    /* The file descriptor for debugging output.  */
    FILE *debug_file;
+ 
+   /* Each element of this array is a page_entry, all page_entries can
+      be found in here by increasing depth.  index_by_depth in the
+      page_entry is the index into this data structure where that
+      page_entry can be found.  This is used to speed up finding all
+      page_entries at a particular depth.  */
+   ggc_varray_type by_depth;
+ 
+   /* Each element is an index in by_depth where the given depth
+      starts.  This structure is indexed by that given depth we are
+      interested in.  */
+   ggc_varray_type depth;
+ 
+   /* Each element is a pointer to the saved in_use_p bits, if any,
+      zero otherwise.  We allocate them all together, to enable a
+      better runtime data access pattern.  */
+   ggc_varray_type save_in_use;
+ 
  } G;
  
  /* The size in bytes required to maintain a bitmap for the objects
*************** static struct globals
*** 379,384 ****
--- 398,406 ----
     free list.  This cannot be larger than HOST_BITS_PER_INT for the
     in_use bitmask for page_group.  */
  #define GGC_QUIRE_SIZE 16
+ 
+ /* Initial guess as to how many page table entries we might need.  */
+ #define INITIAL_PTE_COUNT 128
  \f
  static int ggc_allocated_p PARAMS ((const void *));
  static page_entry *lookup_page_table_entry PARAMS ((const void *));
*************** static void clear_marks PARAMS ((void));
*** 398,403 ****
--- 420,427 ----
  static void sweep_pages PARAMS ((void));
  static void ggc_recalculate_in_use_p PARAMS ((page_entry *));
  static void compute_inverse PARAMS ((unsigned));
+ static inline void adjust_depth PARAMS ((void));
+ static void move_ptes_to_front PARAMS ((int, int));
  
  #ifdef ENABLE_GC_CHECKING
  static void poison_pages PARAMS ((void));
*************** static void poison_pages PARAMS ((void))
*** 405,410 ****
--- 429,597 ----
  
  void debug_print_page_list PARAMS ((int));
  \f
+ /* Internal varray management code.  This is separated from varrays to
+    enable the removal of non-GCed objects from varray.[ch] */
+ 
+ enum ggc_varray_data_enum {
+   GGC_VARRAY_DATA_C,
+   GGC_VARRAY_DATA_GENERICNGC,
+   GGC_VARRAY_DATA_UNGC,
+   GGC_NUM_VARRAY_DATA
+ };
+ 
+ /* Union of various array types that are used.  */
+ typedef union ggc_varray_data_tag {
+   char	       c[1];
+   PTR	       genericngc[1];
+   unsigned int ungc[1];
+ } ggc_varray_data;
+ 
+ /* Virtual array of pointers header.  */
+ struct ggc_varray_head_tag {
+   size_t	num_elements;	/* Maximum element number allocated.  */
+   size_t        elements_used;  /* The number of elements used, if
+ 				   using GGC_VARRAY_PUSH/GGC_VARRAY_POP.  */
+   enum ggc_varray_data_enum type;	/* The kind of elements in the varray.  */
+   const char *name;		/* name of the varray for reporting errors */
+   ggc_varray_data data;		/* The data elements follow, must be last.  */
+ };
+ 
+ /* Allocate a virtual array with NUM elements, each of which is SIZE bytes
+    long, named NAME.  Array elements are zeroed.  */
+ static ggc_varray_type ggc_varray_init	PARAMS ((size_t, enum ggc_varray_data_enum, 
+ 						 const char *));
+ 
+ #define GGC_VARRAY_GENERIC_PTRNGC_INIT(va, num, name) \
+   va = ggc_varray_init (num, GGC_VARRAY_DATA_GENERICNGC, name)
+ 
+ #define GGC_VARRAY_UINTNGC_INIT(va, num, name) \
+   va = ggc_varray_init (num, GGC_VARRAY_DATA_UNGC, name)
+ 
+ #define GGC_VARRAY_GENERIC_PTRNGC(VA,N)	GGC_VARRAY_CHECK (VA, N, genericngc)
+ #define GGC_VARRAY_UINTNGC(VA, N)	GGC_VARRAY_CHECK (VA, N, ungc)
+ 
+ /* Free up memory allocated by the virtual array, but do not free any of the
+    elements involved.  */
+ #define GGC_VARRAY_FREE(vp) \
+   do { if (vp) { free (vp); vp = (ggc_varray_type) 0; } } while (0)
+ #define GGC_VARRAY_GROW(VA, N) ((VA) = ggc_varray_grow (VA, N))
+ 
+ /* Push X onto VA.  T is the name of the field in varray_data
+    corresponding to the type of X.  */
+ #define GGC_VARRAY_PUSH(VA, T, X)			\
+   do							\
+     {							\
+       if ((VA)->elements_used >= (VA)->num_elements)	\
+         GGC_VARRAY_GROW ((VA), 2 * (VA)->num_elements);	\
+       (VA)->data.T[(VA)->elements_used++] = (X);	\
+     }							\
+   while (0)
+ 
+ #define GGC_VARRAY_PUSH_GENERIC_PTRNGC(VA, X)	GGC_VARRAY_PUSH (VA, genericngc, X)
+ #define GGC_VARRAY_PUSH_UINTNGC(VA, X)	GGC_VARRAY_PUSH (VA, ungc, X)
+ 
+ /* Pop the top element of VA.  */
+ #define GGC_VARRAY_POP(VA) \
+   ((VA)->elements_used--)
+ 
+ /* Return the top element of VA.  */
+ #define GGC_VARRAY_TOP(VA, T) \
+   ((VA)->data.T[(VA)->elements_used - 1])
+ #define GGC_VARRAY_TOP_GENERIC_PTRNGC(VA)	GGC_VARRAY_TOP (VA, genericngc)
+ #define GGC_VARRAY_TOP_UINTNGC(VA)		GGC_VARRAY_TOP (VA, ungc)
+ 
+ #define GGC_VARRAY_HDR_SIZE (sizeof (struct ggc_varray_head_tag) - sizeof (ggc_varray_data))
+ 
+ static const size_t element[GGC_NUM_VARRAY_DATA] = {
+   sizeof (char),
+   sizeof (PTR),
+   sizeof (unsigned int)
+ };
+ 
+ static inline ggc_varray_type ggc_varray_grow	PARAMS ((ggc_varray_type, size_t));
+ 
+ /* Allocate a virtual array with NUM_ELEMENT elements, each of which is
+    ELEMENT_SIZE bytes long, named NAME.  Array elements are zeroed.  */
+ static ggc_varray_type
+ ggc_varray_init (num_elements, element_kind, name)
+      size_t num_elements;
+      enum ggc_varray_data_enum element_kind;
+      const char *name;
+ {
+   size_t data_size = num_elements * element[element_kind];
+   ggc_varray_type ptr;
+   ptr = (ggc_varray_type) xcalloc (GGC_VARRAY_HDR_SIZE + data_size, 1);
+ 
+   ptr->num_elements = num_elements;
+   ptr->elements_used = 0;
+   ptr->type = element_kind;
+   ptr->name = name;
+   return ptr;
+ }
+ 
+ /* Grow/shrink the virtual array VA to N elements.  Zero any new elements
+    allocated.  */
+ static inline ggc_varray_type
+ ggc_varray_grow (va, n)
+      ggc_varray_type va;
+      size_t n;
+ {
+   size_t old_elements = va->num_elements;
+ 
+   if (n != old_elements)
+     {
+       size_t elem_size = element[va->type];
+       size_t old_data_size = old_elements * elem_size;
+       size_t data_size = n * elem_size;
+ 
+       va = (ggc_varray_type) xrealloc ((char *) va, GGC_VARRAY_HDR_SIZE + data_size);
+       va->num_elements = n;
+       if (n > old_elements)
+ 	memset (&va->data.c[old_data_size], 0, data_size - old_data_size);
+     }
+ 
+   return va;
+ }
+ 
+ /* Check the bounds of a varray access.  */
+ 
+ #if defined ENABLE_CHECKING && (GCC_VERSION >= 2007)
+ extern void ggc_varray_check_failed PARAMS ((ggc_varray_type, size_t,
+ 					     const char *, int,
+ 					     const char *)) ATTRIBUTE_NORETURN;
+ #define GGC_VARRAY_CHECK(VA, N, T) __extension__			\
+ (*({ ggc_varray_type const _va = (VA);				\
+      const size_t _n = (N); 					\
+      if (_n >= _va->num_elements)				\
+        ggc_varray_check_failed (_va, _n, __FILE__, __LINE__, __FUNCTION__);	\
+      &_va->data.T[_n]; }))
+ 
+ extern void error PARAMS ((const char *, ...))	ATTRIBUTE_PRINTF_1;
+ 
+ void
+ ggc_varray_check_failed (va, n, file, line, function)
+      ggc_varray_type va;
+      size_t n;
+      const char *file;
+      int line;
+      const char *function;
+ {
+   internal_error ("virtual array %s[%lu]: element %lu out of bounds in %s, at %s:%d",
+ 		  va->name, (unsigned long) va->num_elements, (unsigned long) n,
+ 		  function, trim_filename (file), line);
+ }
+ #else
+ #define GGC_VARRAY_CHECK(VA, N, T) ((VA)->data.T[N])
+ #endif
+ 
+ #define GGC_VARRAY_ACTIVE_SIZE(VA)	((VA)->elements_used)
+ \f
+ 
+ #define save_in_use_p_i(__i) \
+   (*(unsigned long **)&GGC_VARRAY_GENERIC_PTRNGC (G.save_in_use, __i))
+ #define save_in_use_p(__p) \
+   (save_in_use_p_i (__p->index_by_depth))
+ \f
  /* Returns nonzero if P was allocated in GC'able memory.  */
  
  static inline int
*************** alloc_page (order)
*** 772,777 ****
--- 959,983 ----
    return entry;
  }
  
+ /* Adjust the size of G.depth so that no index greater than the one
+    used by the top of the G.by_depth varray is used.  */
+ 
+ static inline void
+ adjust_depth ()
+ {
+   page_entry *top;
+ 
+   if (GGC_VARRAY_ACTIVE_SIZE (G.by_depth))
+     {
+       top = GGC_VARRAY_TOP_GENERIC_PTRNGC (G.by_depth);
+       /* Peel back indicies in depth that index into by_depth, so that
+ 	 as new elements are added to by_depth, we note the indicies
+ 	 of those elements, if they are for new context depths.  */
+       while (GGC_VARRAY_ACTIVE_SIZE (G.depth) > (size_t)top->context_depth+1)
+ 	GGC_VARRAY_POP (G.depth);
+     }
+ }
+ 
  /* For a page that is no longer needed, put it on the free page list.  */
  
  static inline void
*************** free_page (entry)
*** 793,798 ****
--- 999,1030 ----
    clear_page_group_in_use (entry->group, entry->page);
  #endif
  
+   if (GGC_VARRAY_ACTIVE_SIZE (G.by_depth) > 1)
+     {
+       page_entry *top = GGC_VARRAY_TOP_GENERIC_PTRNGC (G.by_depth);
+ 
+       /* If they are at the same depth, put top element into freed
+ 	 slot.  */
+       if (entry->context_depth == top->context_depth)
+ 	{
+ 	  int i = entry->index_by_depth;
+ 	  GGC_VARRAY_GENERIC_PTRNGC (G.by_depth, i) = top;
+ 	  GGC_VARRAY_GENERIC_PTRNGC (G.save_in_use, i)
+ 	    = GGC_VARRAY_TOP_GENERIC_PTRNGC (G.save_in_use);
+ 	  top->index_by_depth = i;
+ 	}
+       else
+ 	{
+ 	  /* We cannot free a page from a context deeper than the
+ 	     current one.  */
+ 	  abort ();
+ 	}
+     }
+   GGC_VARRAY_POP (G.by_depth);
+   GGC_VARRAY_POP (G.save_in_use);
+ 
+   adjust_depth ();
+ 
    entry->next = G.free_pages;
    G.free_pages = entry;
  }
*************** ggc_alloc (size)
*** 916,921 ****
--- 1148,1162 ----
        struct page_entry *new_entry;
        new_entry = alloc_page (order);
  
+       new_entry->index_by_depth = GGC_VARRAY_ACTIVE_SIZE (G.by_depth);
+       GGC_VARRAY_PUSH_GENERIC_PTRNGC (G.by_depth, new_entry);
+       GGC_VARRAY_PUSH_GENERIC_PTRNGC (G.save_in_use, 0);
+ 
+       /* We can skip context depths, if we do, make sure we go all the
+ 	 way to the new depth.  */
+       while (new_entry->context_depth >= GGC_VARRAY_ACTIVE_SIZE (G.depth))
+ 	GGC_VARRAY_PUSH_UINTNGC (G.depth, GGC_VARRAY_ACTIVE_SIZE (G.by_depth)-1);
+ 
        /* If this is the only entry, it's also the tail.  */
        if (entry == NULL)
  	G.page_tails[order] = new_entry;
*************** init_ggc ()
*** 1218,1223 ****
--- 1459,1468 ----
        for (i = OBJECT_SIZE (order); size_lookup [i] == o; --i)
  	size_lookup[i] = order;
      }
+ 
+   GGC_VARRAY_GENERIC_PTRNGC_INIT (G.by_depth, INITIAL_PTE_COUNT, "by_depth");
+   GGC_VARRAY_GENERIC_PTRNGC_INIT (G.save_in_use, INITIAL_PTE_COUNT, "save_in_use");
+   GGC_VARRAY_UINTNGC_INIT (G.depth, 10, "depth");
  }
  
  /* Increment the `GC context'.  Objects allocated in an outer context
*************** ggc_recalculate_in_use_p (p)
*** 1260,1266 ****
  
        /* Something is in use if it is marked, or if it was in use in a
  	 context further down the context stack.  */
!       p->in_use_p[i] |= p->save_in_use_p[i];
  
        /* Decrement the free object count for every object allocated.  */
        for (j = p->in_use_p[i]; j; j >>= 1)
--- 1505,1511 ----
  
        /* Something is in use if it is marked, or if it was in use in a
  	 context further down the context stack.  */
!       p->in_use_p[i] |= save_in_use_p (p)[i];
  
        /* Decrement the free object count for every object allocated.  */
        for (j = p->in_use_p[i]; j; j >>= 1)
*************** void
*** 1278,1284 ****
  ggc_pop_context ()
  {
    unsigned long omask;
!   unsigned order, depth;
  
    depth = --G.context_depth;
    omask = (unsigned long)1 << (depth + 1);
--- 1523,1532 ----
  ggc_pop_context ()
  {
    unsigned long omask;
!   unsigned depth, i, e;
! #ifdef ENABLE_CHECKING
!   unsigned order;
! #endif
  
    depth = --G.context_depth;
    omask = (unsigned long)1 << (depth + 1);
*************** ggc_pop_context ()
*** 1290,1298 ****
    G.context_depth_allocations &= omask - 1;
    G.context_depth_collections &= omask - 1;
  
!   /* Any remaining pages in the popped context are lowered to the new
!      current context; i.e. objects allocated in the popped context and
!      left over are imported into the previous context.  */
    for (order = 2; order < NUM_ORDERS; order++)
      {
        page_entry *p;
--- 1538,1603 ----
    G.context_depth_allocations &= omask - 1;
    G.context_depth_collections &= omask - 1;
  
!   /* The G.depth array is shortend so that the last index is the
!      context_depth of the top element of by_depth.  */
!   if (depth+1 < GGC_VARRAY_ACTIVE_SIZE (G.depth))
!     e = GGC_VARRAY_UINTNGC (G.depth, depth+1);
!   else
!     e = GGC_VARRAY_ACTIVE_SIZE (G.by_depth);
! 
!   /* We might not have any PTEs of depth depth.  */
!   if (depth < GGC_VARRAY_ACTIVE_SIZE (G.depth))
!     {    
! 
!       /* First we go through all the pages at depth depth to
! 	 recalculate the in use bits.  */
!       for (i = GGC_VARRAY_UINTNGC (G.depth, depth); i < e; ++i)
! 	{
! 	  page_entry *p;
! 
! #ifdef ENABLE_CHECKING
! 	  p = GGC_VARRAY_GENERIC_PTRNGC (G.by_depth, i);
! 
! 	  /* Check that all of the pages really are at the depth that
! 	     we expect.  */
! 	  if (p->context_depth != depth)
! 	    abort ();
! 	  if (p->index_by_depth != i)
! 	    abort ();
! #endif
! 
! 	  __builtin_prefetch (&save_in_use_p_i (i+8));
! 	  __builtin_prefetch (&save_in_use_p_i (i+16));
! 	  if (save_in_use_p_i (i))
! 	    {
! 	      p = GGC_VARRAY_GENERIC_PTRNGC (G.by_depth, i);
! 	      ggc_recalculate_in_use_p (p);
! 	      free (save_in_use_p_i (i));
! 	      save_in_use_p_i (i) = 0;
! 	    }
! 	}
!     }
! 
!   /* Then, we reset all page_entries with a depth greater than depth
!      to be at depth.  */
!   for (i = e; i < GGC_VARRAY_ACTIVE_SIZE (G.by_depth); ++i)
!     {
!       page_entry *p = GGC_VARRAY_GENERIC_PTRNGC (G.by_depth, i);
! 
!       /* Check that all of the pages really are at the depth we
! 	 expect.  */
! #ifdef ENABLE_CHECKING
!       if (p->context_depth <= depth)
! 	abort ();
!       if (p->index_by_depth != i)
! 	abort ();
! #endif
!       p->context_depth = depth;
!     }
! 
!   adjust_depth ();
! 
! #ifdef ENABLE_CHECKING
    for (order = 2; order < NUM_ORDERS; order++)
      {
        page_entry *p;
*************** ggc_pop_context ()
*** 1300,1317 ****
        for (p = G.pages[order]; p != NULL; p = p->next)
  	{
  	  if (p->context_depth > depth)
! 	    p->context_depth = depth;
! 
! 	  /* If this page is now in the topmost context, and we'd
! 	     saved its allocation state, restore it.  */
! 	  else if (p->context_depth == depth && p->save_in_use_p)
! 	    {
! 	      ggc_recalculate_in_use_p (p);
! 	      free (p->save_in_use_p);
! 	      p->save_in_use_p = 0;
! 	    }
  	}
      }
  }
  \f
  /* Unmark all objects.  */
--- 1605,1616 ----
        for (p = G.pages[order]; p != NULL; p = p->next)
  	{
  	  if (p->context_depth > depth)
! 	    abort ();
! 	  else if (p->context_depth == depth && save_in_use_p (p))
! 	    abort ();
  	}
      }
+ #endif
  }
  \f
  /* Unmark all objects.  */
*************** clear_marks ()
*** 1341,1349 ****
  	     marks.  So, back them up first.  */
  	  if (p->context_depth < G.context_depth)
  	    {
! 	      if (! p->save_in_use_p)
! 		p->save_in_use_p = xmalloc (bitmap_size);
! 	      memcpy (p->save_in_use_p, p->in_use_p, bitmap_size);
  	    }
  
  	  /* Reset reset the number of free objects and clear the
--- 1640,1648 ----
  	     marks.  So, back them up first.  */
  	  if (p->context_depth < G.context_depth)
  	    {
! 	      if (! save_in_use_p (p))
! 		save_in_use_p (p) = xmalloc (bitmap_size);
! 	      memcpy (save_in_use_p (p), p->in_use_p, bitmap_size);
  	    }
  
  	  /* Reset reset the number of free objects and clear the
*************** ggc_pch_finish (d, f)
*** 1777,1782 ****
--- 2076,2148 ----
    free (d);
  }
  
+ /* Move the PCH PTE entries just added to the end of by_depth, to the
+    front.  */
+ 
+ static void
+ move_ptes_to_front (count_old_page_tables, count_new_page_tables)
+      int count_old_page_tables;
+      int count_new_page_tables;
+ {
+   unsigned i;
+ 
+   /* First, we swap the new entries to the front of the varrays.  */
+ 
+   ggc_varray_type new_by_depth;
+   ggc_varray_type new_save_in_use;
+   int c;
+ 
+   c = count_old_page_tables + count_new_page_tables;
+   /* Allow for at least 25% growth without resizing.  */
+   c = c + c/4;
+   c = MAX (c, INITIAL_PTE_COUNT);
+ 
+   GGC_VARRAY_GENERIC_PTRNGC_INIT (new_by_depth,
+ 				  c,
+ 				  "by_depth");
+   GGC_VARRAY_GENERIC_PTRNGC_INIT (new_save_in_use,
+ 			      c,
+ 			      "save_in_use");
+   GGC_VARRAY_ACTIVE_SIZE (new_by_depth) = count_old_page_tables
+     + count_new_page_tables;
+   GGC_VARRAY_ACTIVE_SIZE (new_save_in_use) = count_old_page_tables
+     + count_new_page_tables;
+ 
+   memcpy (&GGC_VARRAY_GENERIC_PTRNGC (new_by_depth, 0),
+ 	  &GGC_VARRAY_GENERIC_PTRNGC (G.by_depth, count_old_page_tables),
+ 	  count_new_page_tables * sizeof (void *));
+   memcpy (&GGC_VARRAY_GENERIC_PTRNGC (new_by_depth, count_new_page_tables),
+ 	  &GGC_VARRAY_GENERIC_PTRNGC (G.by_depth, 0),
+ 	  count_old_page_tables * sizeof (void *));
+   memcpy (&GGC_VARRAY_GENERIC_PTRNGC (new_save_in_use, 0),
+ 	  &GGC_VARRAY_GENERIC_PTRNGC (G.save_in_use, count_old_page_tables),
+ 	  count_new_page_tables * sizeof (void *));
+   memcpy (&GGC_VARRAY_GENERIC_PTRNGC (new_save_in_use, count_new_page_tables),
+ 	  &GGC_VARRAY_GENERIC_PTRNGC (G.save_in_use, 0),
+ 	  count_old_page_tables * sizeof (void *));
+ 
+   GGC_VARRAY_FREE (G.by_depth);
+   GGC_VARRAY_FREE (G.save_in_use);
+     
+   G.by_depth = new_by_depth;
+   G.save_in_use = new_save_in_use;
+ 
+   /* Now update all the index_by_depth fields.  */
+   for (i = GGC_VARRAY_ACTIVE_SIZE (G.by_depth); i > 0; --i)
+     {
+       page_entry *p = GGC_VARRAY_GENERIC_PTRNGC (G.by_depth, i-1);
+       p->index_by_depth = i-1;
+     }
+ 
+   /* And last, we update the depth pointers in G.depth.  The first
+      entry is already 0, and context 0 entries always start at index
+      0, so there is nothing to update in the first slot.  We need a
+      second slot, only if we have old ptes, and if we do, they start
+      at index count_new_page_tables.  */
+   if (count_old_page_tables)
+     GGC_VARRAY_PUSH_UINTNGC (G.depth, count_new_page_tables);
+ }
+ 
  void
  ggc_pch_read (f, addr)
       FILE *f;
*************** ggc_pch_read (f, addr)
*** 1785,1793 ****
    struct ggc_pch_ondisk d;
    unsigned i;
    char *offs = addr;
!   
!   /* We've just read in a PCH file.  So, every object that used to be allocated
!      is now free.  */
    clear_marks ();
  #ifdef GGC_POISON
    poison_pages ();
--- 2151,2163 ----
    struct ggc_pch_ondisk d;
    unsigned i;
    char *offs = addr;
!   unsigned long count_old_page_tables;
!   unsigned long count_new_page_tables;
! 
!   count_old_page_tables = GGC_VARRAY_ACTIVE_SIZE (G.by_depth);
! 
!   /* We've just read in a PCH file.  So, every object that used to be
!      allocated is now free.  */
    clear_marks ();
  #ifdef GGC_POISON
    poison_pages ();
*************** ggc_pch_read (f, addr)
*** 1818,1827 ****
        size_t bytes;
        size_t num_objs;
        size_t j;
!       
        if (d.totals[i] == 0)
  	continue;
!       
        bytes = ROUND_UP (d.totals[i] * OBJECT_SIZE (i), G.pagesize);
        num_objs = bytes / OBJECT_SIZE (i);
        entry = xcalloc (1, (sizeof (struct page_entry) 
--- 2188,2197 ----
        size_t bytes;
        size_t num_objs;
        size_t j;
! 
        if (d.totals[i] == 0)
  	continue;
! 
        bytes = ROUND_UP (d.totals[i] * OBJECT_SIZE (i), G.pagesize);
        num_objs = bytes / OBJECT_SIZE (i);
        entry = xcalloc (1, (sizeof (struct page_entry) 
*************** ggc_pch_read (f, addr)
*** 1852,1858 ****
--- 2222,2243 ----
        else
  	G.pages[i] = entry;
        G.page_tails[i] = entry;
+ 
+       /* We start off by just adding all the new information to the
+ 	 end of the varrays, later, we will move the new information
+ 	 to the front of the varrays, as the PCH page tables are at
+ 	 context 0.  */
+       GGC_VARRAY_PUSH_GENERIC_PTRNGC (G.by_depth, entry);
+       GGC_VARRAY_PUSH_GENERIC_PTRNGC (G.save_in_use, 0);
      }
+ 
+   /* Now, we update the various data structures that speed page table
+      handling.  */
+ 
+   count_new_page_tables = GGC_VARRAY_ACTIVE_SIZE (G.by_depth)
+     - count_old_page_tables;
+ 
+   move_ptes_to_front (count_old_page_tables, count_new_page_tables);
  
    /* Update the statistics.  */
    G.allocated = G.allocated_last_gc = offs - (char *)addr;

Re: Let's backport speedups from 3.4 to 3.3

[Karel Gardas]

On Thu, 13 Feb 2003, Kaoru Fukui wrote:

> > http://gcc.gnu.org/ml/gcc-patches/2003-02/msg00377.html
> > http://gcc.gnu.org/ml/gcc-patches/2003-02/msg00560.htm
> > There is Mike's info.
> >
> >
> > I tried popcontext-fsf-2.diffs which is speedy, see below
> >
> > http://gcc.gnu.org/ml/gcc-patches/2003-02/msg00380.html
> > gcc-3.3 doesn't pch, so it needs to adjust.
>
> This is my adjusted Mike's patch for gcc-3.3.
>

Sorry, but I'm not able to patch my todays gcc3.3 sources:

thinkpad:~/cvs/gcc/gcc33-test/gcc$ patch < /tmp/gcc33-patch
patching file varray.c
Hunk #1 succeeded at 27 (offset -2 lines).
Hunk #2 succeeded at 64 (offset -2 lines).
Hunk #3 succeeded at 89 (offset -2 lines).
Hunk #4 succeeded at 110 (offset -2 lines).
patching file varray.h
Hunk #1 succeeded at 55 (offset -2 lines).
patching file ggc-page.c
Hunk #1 succeeded at 24 (offset -2 lines).
Hunk #2 succeeded at 238 (offset -14 lines).
Hunk #3 succeeded at 299 (offset -14 lines).
Hunk #4 succeeded at 348 (offset -20 lines).
Hunk #5 succeeded at 378 (offset -20 lines).
Hunk #6 succeeded at 400 (offset -20 lines).
Hunk #7 succeeded at 409 (offset -20 lines).
Hunk #8 succeeded at 937 (offset -22 lines).
Hunk #9 succeeded at 977 (offset -22 lines).
Hunk #10 succeeded at 1126 (offset -22 lines).
Hunk #11 succeeded at 1437 (offset -22 lines).
Hunk #12 succeeded at 1483 (offset -22 lines).
Hunk #13 FAILED at 1501.
Hunk #14 succeeded at 1507 with fuzz 2 (offset -31 lines).
Hunk #15 succeeded at 1574 (offset -31 lines).
Hunk #16 succeeded at 1608 (offset -32 lines).
Hunk #17 succeeded at 1835 with fuzz 2 (offset -241 lines).
Hunk #18 FAILED at 1910.
Hunk #19 FAILED at 1947.
Hunk #20 FAILED at 1981.
4 out of 20 hunks FAILED -- saving rejects to file ggc-page.c.rej
thinkpad:~/cvs/gcc/gcc33-test/gcc$

Any problem with gcc-page.c?

Thanks,

Karel
PS: rejects look:

***************
*** 1256,1262 ****
  ggc_pop_context ()
  {
    unsigned long omask;
!   unsigned order, depth;

    depth = --G.context_depth;
    omask = (unsigned long)1 << (depth + 1);
--- 1501,1510 ----
  ggc_pop_context ()
  {
    unsigned long omask;
!   unsigned depth, i, e;
! #ifdef ENABLE_CHECKING
!   unsigned order;
! #endif

    depth = --G.context_depth;
    omask = (unsigned long)1 << (depth + 1);
***************
*** 1544,1552 ****
    struct ggc_pch_ondisk d;
    unsigned i;
    char *offs = addr;
!
!   /* We've just read in a PCH file.  So, every object that used to be allocated
!      is now free.  */
    clear_marks ();
  #ifdef GGC_POISON
    poison_pages ();
--- 1910,1922 ----
    struct ggc_pch_ondisk d;
    unsigned i;
    char *offs = addr;
!   unsigned long count_old_page_tables;
!   unsigned long count_new_page_tables;
!
!   count_old_page_tables = GGC_VARRAY_ACTIVE_SIZE (G.by_depth);
!
!   /* We've just read in a PCH file.  So, every object that used to be
!      allocated is now free.  */
    clear_marks ();
  #ifdef GGC_POISON
    poison_pages ();
***************
*** 1577,1586 ****
        size_t bytes;
        size_t num_objs;
        size_t j;
!
        if (d.totals[i] == 0)
  	continue;
!
        bytes = ROUND_UP (d.totals[i] * OBJECT_SIZE (i), G.pagesize);
        num_objs = bytes / OBJECT_SIZE (i);
        entry = xcalloc (1, (sizeof (struct page_entry)
--- 1947,1956 ----
        size_t bytes;
        size_t num_objs;
        size_t j;
!
        if (d.totals[i] == 0)
  	continue;
!
        bytes = ROUND_UP (d.totals[i] * OBJECT_SIZE (i), G.pagesize);
        num_objs = bytes / OBJECT_SIZE (i);
        entry = xcalloc (1, (sizeof (struct page_entry)
***************
*** 1611,1617 ****
        else
  	G.pages[i] = entry;
        G.page_tails[i] = entry;
      }

    /* Update the statistics.  */
    G.allocated = G.allocated_last_gc = offs - (char *)addr;
--- 1981,2002 ----
        else
  	G.pages[i] = entry;
        G.page_tails[i] = entry;
+
+       /* We start off by just adding all the new information to the
+ 	 end of the varrays, later, we will move the new information
+ 	 to the front of the varrays, as the PCH page tables are at
+ 	 context 0.  */
+       GGC_VARRAY_PUSH_GENERIC_PTRNGC (G.by_depth, entry);
+       GGC_VARRAY_PUSH_GENERIC_PTRNGC (G.save_in_use, 0);
      }
+
+   /* Now, we update the various data structures that speed page table
+      handling.  */
+
+   count_new_page_tables = GGC_VARRAY_ACTIVE_SIZE (G.by_depth)
+     - count_old_page_tables;
+
+   move_ptes_to_front (count_old_page_tables, count_new_page_tables);

    /* Update the statistics.  */
    G.allocated = G.allocated_last_gc = offs - (char *)addr;
--
Karel Gardas                  kgardas@objectsecurity.com
ObjectSecurity Ltd.           http://www.objectsecurity.com

Re: Let's backport speedups from 3.4 to 3.3

[Mark Mitchell]

--On Thursday, February 13, 2003 02:50:14 AM +0900 Kaoru Fukui 
<k_fukui@highway.ne.jp> wrote:

> On 13 Feb, To: ghazi@caip.rutgers.edu wrote:
>> On 12 Feb, Kaveh R. Ghazi wrote:
>>> I've heard some mention that 3.4 is faster in some cases than 3.3.
>>>
>>> I know several speedup tweeks have been made since the branch was
>>> created.  Not all of them have been backported.

Just to make sure I'm clear, I don't object in any way to backporting 
changes that speed up the compiler -- as long as the person approving them 
feels that they're safe.  Let's not do anything too radical, but relatively 
simple changes are fine.

Thanks,

-- 
Mark Mitchell                mark@codesourcery.com
CodeSourcery, LLC            http://www.codesourcery.com

Re: Let's backport speedups from 3.4 to 3.3

[Kaveh R. Ghazi]

 > From: Mark Mitchell <mark@codesourcery.com>
 > 
 > --On Thursday, February 13, 2003 02:50:14 AM +0900 Kaoru Fukui 
 > <k_fukui@highway.ne.jp> wrote:
 > 
 > > On 13 Feb, To: ghazi@caip.rutgers.edu wrote:
 > >> On 12 Feb, Kaveh R. Ghazi wrote:
 > >>> I've heard some mention that 3.4 is faster in some cases than 3.3.
 > >>>
 > >>> I know several speedup tweeks have been made since the branch was
 > >>> created.  Not all of them have been backported.
 > 
 > Just to make sure I'm clear, I don't object in any way to backporting 
 > changes that speed up the compiler -- as long as the person approving them 
 > feels that they're safe.  Let's not do anything too radical, but relatively 
 > simple changes are fine.

Are there any more anyone would like to recommend for consideration?

		--Kaveh
--
Kaveh R. Ghazi			ghazi@caip.rutgers.edu

Re: Let's backport speedups from 3.4 to 3.3

[Mike Stump]

On Thursday, February 20, 2003, at 12:37 PM, Kaveh R. Ghazi wrote:
> Are there any more anyone would like to recommend for consideration?

Zack has three hunks that I think might be interesting.

There is the smarter selection of GC heapsize param.

Thanks about it.

Zack?  Any reasons to keep your changes out of 3.3?

heapsize, is it in mainline yet?

Re: Let's backport speedups from 3.4 to 3.3

[Mark Mitchell]

--On Thursday, February 20, 2003 02:42:16 PM -0800 Mike Stump 
<mstump@apple.com> wrote:

> On Thursday, February 20, 2003, at 12:37 PM, Kaveh R. Ghazi wrote:
>> Are there any more anyone would like to recommend for consideration?
>
> Zack has three hunks that I think might be interesting.
>
> There is the smarter selection of GC heapsize param.
>
> Thanks about it.
>
> Zack?  Any reasons to keep your changes out of 3.3?

If you want me to consider a patch make it easy for me: give me a URL.

Thanks,

-- 
Mark Mitchell                mark@codesourcery.com
CodeSourcery, LLC            http://www.codesourcery.com

Re: Let's backport speedups from 3.4 to 3.3

[Zack Weinberg]

Mike Stump <mstump@apple.com> writes:

> On Thursday, February 20, 2003, at 12:37 PM, Kaveh R. Ghazi wrote:
>> Are there any more anyone would like to recommend for consideration?
>
> Zack has three hunks that I think might be interesting.

Are you talking about the 'congerie' patches?  Otherwise I don't know
what you're referring to.

zw

Re: Let's backport speedups from 3.4 to 3.3

[Mike Stump]

On Thursday, February 20, 2003, at 03:33 PM, Zack Weinberg wrote:
> Mike Stump <mstump@apple.com> writes:
>
>> On Thursday, February 20, 2003, at 12:37 PM, Kaveh R. Ghazi wrote:
>>> Are there any more anyone would like to recommend for consideration?
>>
>> Zack has three hunks that I think might be interesting.
>
> Are you talking about the 'congerie' patches?

Yes.

Re: Let's backport speedups from 3.4 to 3.3

[Kaveh R. Ghazi]

 > From: Mike Stump <mstump@apple.com>
 > 
 > On Thursday, February 20, 2003, at 12:37 PM, Kaveh R. Ghazi wrote:
 > > Are there any more anyone would like to recommend for consideration?
 > 
 > There is the smarter selection of GC heapsize param.
 > heapsize, is it in mainline yet?

The "heapsize" libiberty bits were approved and I just checked them
into the trunk and 3.3.  The gcc dir bits for [take 2] await a review.

http://gcc.gnu.org/ml/gcc-patches/2003-02/msg01662.html

--
Kaveh R. Ghazi			ghazi@caip.rutgers.edu

Re: Let's backport speedups from 3.4 to 3.3

[Gabriel Dos Reis]

"Kaveh R. Ghazi" <ghazi@caip.rutgers.edu> writes:

|  > From: Mark Mitchell <mark@codesourcery.com>
|  > 
|  > --On Thursday, February 13, 2003 02:50:14 AM +0900 Kaoru Fukui 
|  > <k_fukui@highway.ne.jp> wrote:
|  > 
|  > > On 13 Feb, To: ghazi@caip.rutgers.edu wrote:
|  > >> On 12 Feb, Kaveh R. Ghazi wrote:
|  > >>> I've heard some mention that 3.4 is faster in some cases than 3.3.
|  > >>>
|  > >>> I know several speedup tweeks have been made since the branch was
|  > >>> created.  Not all of them have been backported.
|  > 
|  > Just to make sure I'm clear, I don't object in any way to backporting 
|  > changes that speed up the compiler -- as long as the person approving them 
|  > feels that they're safe.  Let's not do anything too radical, but relatively 
|  > simple changes are fine.
| 
| Are there any more anyone would like to recommend for consideration?

Not one that is currently on mainline.  
I'm actually working on a patch that speeds up name lookup phase.
I'll like first to apply it on mainline and a day or two after on
3_3-branch.  That patches essentially removes "tree" abusing.
Unfortunately, I'm on the road and don't know exactly when I'll be in
position to submit and apply the patch (but that will happen certainly
before next Monday). 

-- Gaby

Re: Let's backport speedups from 3.4 to 3.3

[Kaveh R. Ghazi]

 > From: Gabriel Dos Reis <gdr@integrable-solutions.net>
 > 
 > "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu> writes:
 > 
 > |  > From: Mark Mitchell <mark@codesourcery.com>
 > |  > 
 > |  > Just to  make sure  I'm clear,  I don't object  in any  way to
 > |  > backporting changes that  speed up the compiler --  as long as
 > |  > the person approving them  feels that they're safe.  Let's not
 > |  > do  anything too  radical, but  relatively simple  changes are
 > |  > fine.
 > | 
 > | Are there any more anyone would like to recommend for consideration?
 > 
 > Not one that is currently on mainline.  
 > -- Gaby

Ok, I'm asking because various people claim 3.4 is faster than 3.3
(independent of 3.4-only things like PCH.)  I wonder if that's still
the case.

--
Kaveh R. Ghazi			ghazi@caip.rutgers.edu

Re: Let's backport speedups from 3.4 to 3.3

[Mark Mitchell]

--On Thursday, February 20, 2003 07:46:42 PM -0500 "Kaveh R. Ghazi" 
<ghazi@caip.rutgers.edu> wrote:

> The "heapsize" libiberty bits were approved and I just checked them
> into the trunk and 3.3.  The gcc dir bits for [take 2] await a review.

Looks good to me.  Check in please!

-- 
Mark Mitchell                mark@codesourcery.com
CodeSourcery, LLC            http://www.codesourcery.com

Re: Let's backport speedups from 3.4 to 3.3

[Kaoru Fukui]

On 21 Feb, Kaveh R. Ghazi wrote:

>  > mainline 3.4 was included Zack's BI tree which was just faster than the
>  > mainline(this is 3.3 now) on that tme.
>  > Kaoru
> 
> Sorry, I'm not sure what you mean.  Are you saying that there is a
> patch we should backport to 3.3?  Or are you saying that this patch is
> now in 3.3 and made 3.3 as fast as 3.4?
> 
gcc-3_4-basic-improvements was just faster than mainline Which become to
gcc-3.3.

gcc-3.4 has merged,so it be just different speed without mike's patch.

Kaoru
PS sorry my English.

Re: Let's backport speedups from 3.4 to 3.3

[Kaveh R. Ghazi]

 > From: Kaoru Fukui <k_fukui@highway.ne.jp>
 > 
 > On 21 Feb, Kaveh R. Ghazi wrote:
 > >  > From: Gabriel Dos Reis <gdr@integrable-solutions.net>
 > >  > 
 > >  > "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu> writes:
 > >  > 
 > >  > |  > From: Mark Mitchell <mark@codesourcery.com>
 > >  > |  > 
 > >  > |  > Just to  make sure  I'm clear,  I don't object  in any  way to
 > >  > |  > backporting changes that  speed up the compiler --  as long as
 > >  > |  > the person approving them  feels that they're safe.  Let's not
 > >  > |  > do  anything too  radical, but  relatively simple  changes are
 > >  > |  > fine.
 > >  > | 
 > >  > | Are there any more anyone would like to recommend for consideration?
 > >  > 
 > >  > Not one that is currently on mainline.  
 > >  > -- Gaby
 > > 
 > > Ok, I'm asking because various people claim 3.4 is faster than 3.3
 > > (independent of 3.4-only things like PCH.)  I wonder if that's still
 > > the case.
 > > 
 > 
 > mainline 3.4 was included Zack's BI tree which was just faster than the
 > mainline(this is 3.3 now) on that tme.
 > Kaoru

Sorry, I'm not sure what you mean.  Are you saying that there is a
patch we should backport to 3.3?  Or are you saying that this patch is
now in 3.3 and made 3.3 as fast as 3.4?

--
Kaveh R. Ghazi			ghazi@caip.rutgers.edu

Re: Let's backport speedups from 3.4 to 3.3

[Kaoru Fukui]

On 21 Feb, Kaveh R. Ghazi wrote:
>  > From: Gabriel Dos Reis <gdr@integrable-solutions.net>
>  > 
>  > "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu> writes:
>  > 
>  > |  > From: Mark Mitchell <mark@codesourcery.com>
>  > |  > 
>  > |  > Just to  make sure  I'm clear,  I don't object  in any  way to
>  > |  > backporting changes that  speed up the compiler --  as long as
>  > |  > the person approving them  feels that they're safe.  Let's not
>  > |  > do  anything too  radical, but  relatively simple  changes are
>  > |  > fine.
>  > | 
>  > | Are there any more anyone would like to recommend for consideration?
>  > 
>  > Not one that is currently on mainline.  
>  > -- Gaby
> 
> Ok, I'm asking because various people claim 3.4 is faster than 3.3
> (independent of 3.4-only things like PCH.)  I wonder if that's still
> the case.
> 

mainline 3.4 was included Zack's BI tree which was just faster than the
mainline(this is 3.3 now) on that tme.

Kaoru

Re: Let's backport speedups from 3.4 to 3.3

[Karel Gardas]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 2180 bytes --]

On Thu, 13 Feb 2003, Mike Stump wrote:

> On Thursday, February 13, 2003, at 02:04 PM, Karel Gardas wrote:
> > Anything other which should I test?
>
> A regression test of the patch in mainline and in 3.4.
>
> make check
> [ save off baseline ]
> apply patch
> make clean && make bootstrap && make check
> contrib/cmp_logs before/gcc.sum after/gcc.sum
> [all the other .sum files]
>

Done. As I said this patch doesn't bring any speedup for our sources:
http://gcc.gnu.org/ml/gcc/2003-02/msg01014.html

I've configured gcc with:

thinkpad:~/cvs/gcc/obj$ ./gcc/g++ -v
Reading specs from
/home/karel/usr/local/gcc3.3.x/lib/gcc-lib/i686-pc-linux-gnu/3.3/specs
Configured with: ../gcc-3_3-branch/configure
--prefix=/home/karel/usr/local/gcc3.3.x --enable-shared --enable-threads
--disable-checking --enable-__cxa_atexit
Thread model: posix
gcc version 3.3 20030218 (prerelease)
thinkpad:~/cvs/gcc/obj$

As I said here: http://gcc.gnu.org/ml/gcc/2003-02/msg01267.html
I'm not able to use compare_test utility, so I used simple xxdiff for
quick review which files are different in important aspects (not only
directory path and starting time).

g++.sum - the same
g77.sum - the same
gcc.sum - different! The strange is that patched version is better...
(diff attached)
libjava.sum - different! Whole libjava testing seems to be quite strange
on my platform...(diff included)
libstdc++-v3.sum - the same
objc.sum - the same


Short note: I've updated both gcc3.3 source trees to yesterdays sources,
but this update conflicts in ggc-page.c in patched version in
ggc_pop_context functions at the begining of variable declaration. I've
modified sources to:

void
ggc_pop_context ()
{
  unsigned long omask;
  unsigned depth, i, e;
#ifdef ENABLE_CHECKING
  unsigned order;
#endif

I've attached whole patch to this email too.

What other should I test? (i.e. I'm interested in C++ compilation speedup
patches).

BTW: I don't have too much experience with gcc testing, so please excuse
me if I've done anything wrong and point me to the right direction.

Thanks,

Karel
--
Karel Gardas                  kgardas@objectsecurity.com
ObjectSecurity Ltd.           http://www.objectsecurity.com



[-- Attachment #2: Type: TEXT/plain, Size: 21642 bytes --]

diff -Nru gcc-3_3-branch/gcc/ggc-page.c gcc33-test/gcc/ggc-page.c
--- gcc-3_3-branch/gcc/ggc-page.c	Tue Feb 18 23:27:47 2003
+++ gcc33-test/gcc/ggc-page.c	Tue Feb 18 23:24:17 2003
@@ -24,7 +24,6 @@
 #include "rtl.h"
 #include "tm_p.h"
 #include "toplev.h"
-#include "varray.h"
 #include "flags.h"
 #include "ggc.h"
 #include "timevar.h"
@@ -239,9 +238,9 @@
   struct page_group *group;
 #endif
 
-  /* Saved in-use bit vector for pages that aren't in the topmost
-     context during collection.  */
-  unsigned long *save_in_use_p;
+  /* This is the index in the by_depth varray where this page table
+     can be found.  */
+  unsigned long index_by_depth;
 
   /* Context depth of this page.  */
   unsigned short context_depth;
@@ -300,6 +299,8 @@
 
 #endif
 
+typedef struct ggc_varray_head_tag *ggc_varray_type;
+
 /* The rest of the global variables.  */
 static struct globals
 {
@@ -353,6 +354,24 @@
 
   /* The file descriptor for debugging output.  */
   FILE *debug_file;
+
+  /* Each element of this array is a page_entry, all page_entries can
+     be found in here by increasing depth.  index_by_depth in the
+     page_entry is the index into this data structure where that
+     page_entry can be found.  This is used to speed up finding all
+     page_entries at a particular depth.  */
+  ggc_varray_type by_depth;
+
+  /* Each element is an index in by_depth where the given depth
+     starts.  This structure is indexed by that given depth we are
+     interested in.  */
+  ggc_varray_type depth;
+
+  /* Each element is a pointer to the saved in_use_p bits, if any,
+     zero otherwise.  We allocate them all together, to enable a
+     better runtime data access pattern.  */
+  ggc_varray_type save_in_use;
+
 } G;
 
 /* The size in bytes required to maintain a bitmap for the objects
@@ -365,6 +384,9 @@
    free list.  This cannot be larger than HOST_BITS_PER_INT for the
    in_use bitmask for page_group.  */
 #define GGC_QUIRE_SIZE 16
+
+/* Initial guess as to how many page table entries we might need.  */
+#define INITIAL_PTE_COUNT 128
 \f
 static int ggc_allocated_p PARAMS ((const void *));
 static page_entry *lookup_page_table_entry PARAMS ((const void *));
@@ -384,6 +406,8 @@
 static void sweep_pages PARAMS ((void));
 static void ggc_recalculate_in_use_p PARAMS ((page_entry *));
 static void compute_inverse PARAMS ((unsigned));
+static inline void adjust_depth PARAMS ((void));
+static void move_ptes_to_front PARAMS ((int, int));
 
 #ifdef ENABLE_GC_CHECKING
 static void poison_pages PARAMS ((void));
@@ -391,6 +415,169 @@
 
 void debug_print_page_list PARAMS ((int));
 \f
+/* Internal varray management code.  This is separated from varrays to
+   enable the removal of non-GCed objects from varray.[ch] */
+
+enum ggc_varray_data_enum {
+  GGC_VARRAY_DATA_C,
+  GGC_VARRAY_DATA_GENERICNGC,
+  GGC_VARRAY_DATA_UNGC,
+  GGC_NUM_VARRAY_DATA
+};
+
+/* Union of various array types that are used.  */
+typedef union ggc_varray_data_tag {
+  char	       c[1];
+  PTR	       genericngc[1];
+  unsigned int ungc[1];
+} ggc_varray_data;
+
+/* Virtual array of pointers header.  */
+struct ggc_varray_head_tag {
+  size_t	num_elements;	/* Maximum element number allocated.  */
+  size_t        elements_used;  /* The number of elements used, if
+				   using GGC_VARRAY_PUSH/GGC_VARRAY_POP.  */
+  enum ggc_varray_data_enum type;	/* The kind of elements in the varray.  */
+  const char *name;		/* name of the varray for reporting errors */
+  ggc_varray_data data;		/* The data elements follow, must be last.  */
+};
+
+/* Allocate a virtual array with NUM elements, each of which is SIZE bytes
+   long, named NAME.  Array elements are zeroed.  */
+static ggc_varray_type ggc_varray_init	PARAMS ((size_t, enum ggc_varray_data_enum, 
+						 const char *));
+
+#define GGC_VARRAY_GENERIC_PTRNGC_INIT(va, num, name) \
+  va = ggc_varray_init (num, GGC_VARRAY_DATA_GENERICNGC, name)
+
+#define GGC_VARRAY_UINTNGC_INIT(va, num, name) \
+  va = ggc_varray_init (num, GGC_VARRAY_DATA_UNGC, name)
+
+#define GGC_VARRAY_GENERIC_PTRNGC(VA,N)	GGC_VARRAY_CHECK (VA, N, genericngc)
+#define GGC_VARRAY_UINTNGC(VA, N)	GGC_VARRAY_CHECK (VA, N, ungc)
+
+/* Free up memory allocated by the virtual array, but do not free any of the
+   elements involved.  */
+#define GGC_VARRAY_FREE(vp) \
+  do { if (vp) { free (vp); vp = (ggc_varray_type) 0; } } while (0)
+#define GGC_VARRAY_GROW(VA, N) ((VA) = ggc_varray_grow (VA, N))
+
+/* Push X onto VA.  T is the name of the field in varray_data
+   corresponding to the type of X.  */
+#define GGC_VARRAY_PUSH(VA, T, X)			\
+  do							\
+    {							\
+      if ((VA)->elements_used >= (VA)->num_elements)	\
+        GGC_VARRAY_GROW ((VA), 2 * (VA)->num_elements);	\
+      (VA)->data.T[(VA)->elements_used++] = (X);	\
+    }							\
+  while (0)
+
+#define GGC_VARRAY_PUSH_GENERIC_PTRNGC(VA, X)	GGC_VARRAY_PUSH (VA, genericngc, X)
+#define GGC_VARRAY_PUSH_UINTNGC(VA, X)	GGC_VARRAY_PUSH (VA, ungc, X)
+
+/* Pop the top element of VA.  */
+#define GGC_VARRAY_POP(VA) \
+  ((VA)->elements_used--)
+
+/* Return the top element of VA.  */
+#define GGC_VARRAY_TOP(VA, T) \
+  ((VA)->data.T[(VA)->elements_used - 1])
+#define GGC_VARRAY_TOP_GENERIC_PTRNGC(VA)	GGC_VARRAY_TOP (VA, genericngc)
+#define GGC_VARRAY_TOP_UINTNGC(VA)		GGC_VARRAY_TOP (VA, ungc)
+
+#define GGC_VARRAY_HDR_SIZE (sizeof (struct ggc_varray_head_tag) - sizeof (ggc_varray_data))
+
+static const size_t element[GGC_NUM_VARRAY_DATA] = {
+  sizeof (char),
+  sizeof (PTR),
+  sizeof (unsigned int)
+};
+
+static inline ggc_varray_type ggc_varray_grow	PARAMS ((ggc_varray_type, size_t));
+
+/* Allocate a virtual array with NUM_ELEMENT elements, each of which is
+   ELEMENT_SIZE bytes long, named NAME.  Array elements are zeroed.  */
+static ggc_varray_type
+ggc_varray_init (num_elements, element_kind, name)
+     size_t num_elements;
+     enum ggc_varray_data_enum element_kind;
+     const char *name;
+{
+  size_t data_size = num_elements * element[element_kind];
+  ggc_varray_type ptr;
+  ptr = (ggc_varray_type) xcalloc (GGC_VARRAY_HDR_SIZE + data_size, 1);
+
+  ptr->num_elements = num_elements;
+  ptr->elements_used = 0;
+  ptr->type = element_kind;
+  ptr->name = name;
+  return ptr;
+}
+
+/* Grow/shrink the virtual array VA to N elements.  Zero any new elements
+   allocated.  */
+static inline ggc_varray_type
+ggc_varray_grow (va, n)
+     ggc_varray_type va;
+     size_t n;
+{
+  size_t old_elements = va->num_elements;
+
+  if (n != old_elements)
+    {
+      size_t elem_size = element[va->type];
+      size_t old_data_size = old_elements * elem_size;
+      size_t data_size = n * elem_size;
+
+      va = (ggc_varray_type) xrealloc ((char *) va, GGC_VARRAY_HDR_SIZE + data_size);
+      va->num_elements = n;
+      if (n > old_elements)
+	memset (&va->data.c[old_data_size], 0, data_size - old_data_size);
+    }
+
+  return va;
+}
+
+/* Check the bounds of a varray access.  */
+
+#if defined ENABLE_CHECKING && (GCC_VERSION >= 2007)
+extern void ggc_varray_check_failed PARAMS ((ggc_varray_type, size_t,
+					     const char *, int,
+					     const char *)) ATTRIBUTE_NORETURN;
+#define GGC_VARRAY_CHECK(VA, N, T) __extension__			\
+(*({ ggc_varray_type const _va = (VA);				\
+     const size_t _n = (N); 					\
+     if (_n >= _va->num_elements)				\
+       ggc_varray_check_failed (_va, _n, __FILE__, __LINE__, __FUNCTION__);	\
+     &_va->data.T[_n]; }))
+
+extern void error PARAMS ((const char *, ...))	ATTRIBUTE_PRINTF_1;
+
+void
+ggc_varray_check_failed (va, n, file, line, function)
+     ggc_varray_type va;
+     size_t n;
+     const char *file;
+     int line;
+     const char *function;
+{
+  internal_error ("virtual array %s[%lu]: element %lu out of bounds in %s, at %s:%d",
+		  va->name, (unsigned long) va->num_elements, (unsigned long) n,
+		  function, trim_filename (file), line);
+}
+#else
+#define GGC_VARRAY_CHECK(VA, N, T) ((VA)->data.T[N])
+#endif
+
+#define GGC_VARRAY_ACTIVE_SIZE(VA)	((VA)->elements_used)
+\f
+
+#define save_in_use_p_i(__i) \
+  (*(unsigned long **)&GGC_VARRAY_GENERIC_PTRNGC (G.save_in_use, __i))
+#define save_in_use_p(__p) \
+  (save_in_use_p_i (__p->index_by_depth))
+\f
 /* Returns nonzero if P was allocated in GC'able memory.  */
 
 static inline int
@@ -758,6 +945,25 @@
   return entry;
 }
 
+/* Adjust the size of G.depth so that no index greater than the one
+   used by the top of the G.by_depth varray is used.  */
+
+static inline void
+adjust_depth ()
+{
+  page_entry *top;
+
+  if (GGC_VARRAY_ACTIVE_SIZE (G.by_depth))
+    {
+      top = GGC_VARRAY_TOP_GENERIC_PTRNGC (G.by_depth);
+      /* Peel back indicies in depth that index into by_depth, so that
+	 as new elements are added to by_depth, we note the indicies
+	 of those elements, if they are for new context depths.  */
+      while (GGC_VARRAY_ACTIVE_SIZE (G.depth) > (size_t)top->context_depth+1)
+	GGC_VARRAY_POP (G.depth);
+    }
+}
+
 /* For a page that is no longer needed, put it on the free page list.  */
 
 static inline void
@@ -779,6 +985,32 @@
   clear_page_group_in_use (entry->group, entry->page);
 #endif
 
+  if (GGC_VARRAY_ACTIVE_SIZE (G.by_depth) > 1)
+    {
+      page_entry *top = GGC_VARRAY_TOP_GENERIC_PTRNGC (G.by_depth);
+
+      /* If they are at the same depth, put top element into freed
+	 slot.  */
+      if (entry->context_depth == top->context_depth)
+	{
+	  int i = entry->index_by_depth;
+	  GGC_VARRAY_GENERIC_PTRNGC (G.by_depth, i) = top;
+	  GGC_VARRAY_GENERIC_PTRNGC (G.save_in_use, i)
+	    = GGC_VARRAY_TOP_GENERIC_PTRNGC (G.save_in_use);
+	  top->index_by_depth = i;
+	}
+      else
+	{
+	  /* We cannot free a page from a context deeper than the
+	     current one.  */
+	  abort ();
+	}
+    }
+  GGC_VARRAY_POP (G.by_depth);
+  GGC_VARRAY_POP (G.save_in_use);
+
+  adjust_depth ();
+
   entry->next = G.free_pages;
   G.free_pages = entry;
 }
@@ -902,6 +1134,15 @@
       struct page_entry *new_entry;
       new_entry = alloc_page (order);
 
+      new_entry->index_by_depth = GGC_VARRAY_ACTIVE_SIZE (G.by_depth);
+      GGC_VARRAY_PUSH_GENERIC_PTRNGC (G.by_depth, new_entry);
+      GGC_VARRAY_PUSH_GENERIC_PTRNGC (G.save_in_use, 0);
+
+      /* We can skip context depths, if we do, make sure we go all the
+	 way to the new depth.  */
+      while (new_entry->context_depth >= GGC_VARRAY_ACTIVE_SIZE (G.depth))
+	GGC_VARRAY_PUSH_UINTNGC (G.depth, GGC_VARRAY_ACTIVE_SIZE (G.by_depth)-1);
+
       /* If this is the only entry, it's also the tail.  */
       if (entry == NULL)
 	G.page_tails[order] = new_entry;
@@ -1204,6 +1445,10 @@
       for (i = OBJECT_SIZE (order); size_lookup [i] == o; --i)
 	size_lookup[i] = order;
     }
+
+  GGC_VARRAY_GENERIC_PTRNGC_INIT (G.by_depth, INITIAL_PTE_COUNT, "by_depth");
+  GGC_VARRAY_GENERIC_PTRNGC_INIT (G.save_in_use, INITIAL_PTE_COUNT, "save_in_use");
+  GGC_VARRAY_UINTNGC_INIT (G.depth, 10, "depth");
 }
 
 /* Increment the `GC context'.  Objects allocated in an outer context
@@ -1246,7 +1491,7 @@
 
       /* Something is in use if it is marked, or if it was in use in a
 	 context further down the context stack.  */
-      p->in_use_p[i] |= p->save_in_use_p[i];
+      p->in_use_p[i] |= save_in_use_p (p)[i];
 
       /* Decrement the free object count for every object allocated.  */
       for (j = p->in_use_p[i]; j; j >>= 1)
@@ -1264,7 +1509,10 @@
 ggc_pop_context ()
 {
   unsigned long omask;
-  unsigned order, depth;
+  unsigned depth, i, e;
+#ifdef ENABLE_CHECKING
+  unsigned order;
+#endif
 
   depth = --G.context_depth;
   omask = (unsigned long)1 << (depth + 1);
@@ -1276,9 +1524,66 @@
   G.context_depth_allocations &= omask - 1;
   G.context_depth_collections &= omask - 1;
 
-  /* Any remaining pages in the popped context are lowered to the new
-     current context; i.e. objects allocated in the popped context and
-     left over are imported into the previous context.  */
+  /* The G.depth array is shortend so that the last index is the
+     context_depth of the top element of by_depth.  */
+  if (depth+1 < GGC_VARRAY_ACTIVE_SIZE (G.depth))
+    e = GGC_VARRAY_UINTNGC (G.depth, depth+1);
+  else
+    e = GGC_VARRAY_ACTIVE_SIZE (G.by_depth);
+
+  /* We might not have any PTEs of depth depth.  */
+  if (depth < GGC_VARRAY_ACTIVE_SIZE (G.depth))
+    {    
+
+      /* First we go through all the pages at depth depth to
+	 recalculate the in use bits.  */
+      for (i = GGC_VARRAY_UINTNGC (G.depth, depth); i < e; ++i)
+	{
+	  page_entry *p;
+
+#ifdef ENABLE_CHECKING
+	  p = GGC_VARRAY_GENERIC_PTRNGC (G.by_depth, i);
+
+	  /* Check that all of the pages really are at the depth that
+	     we expect.  */
+	  if (p->context_depth != depth)
+	    abort ();
+	  if (p->index_by_depth != i)
+	    abort ();
+#endif
+
+/*	  __builtin_prefetch (&save_in_use_p_i (i+8));
+	  __builtin_prefetch (&save_in_use_p_i (i+16)); */
+	  if (save_in_use_p_i (i))
+	    {
+	      p = GGC_VARRAY_GENERIC_PTRNGC (G.by_depth, i);
+	      ggc_recalculate_in_use_p (p);
+	      free (save_in_use_p_i (i));
+	      save_in_use_p_i (i) = 0;
+	    }
+	}
+    }
+
+  /* Then, we reset all page_entries with a depth greater than depth
+     to be at depth.  */
+  for (i = e; i < GGC_VARRAY_ACTIVE_SIZE (G.by_depth); ++i)
+    {
+      page_entry *p = GGC_VARRAY_GENERIC_PTRNGC (G.by_depth, i);
+
+      /* Check that all of the pages really are at the depth we
+	 expect.  */
+#ifdef ENABLE_CHECKING
+      if (p->context_depth <= depth)
+	abort ();
+      if (p->index_by_depth != i)
+	abort ();
+#endif
+      p->context_depth = depth;
+    }
+
+  adjust_depth ();
+
+#ifdef ENABLE_CHECKING
   for (order = 2; order < NUM_ORDERS; order++)
     {
       page_entry *p;
@@ -1286,18 +1591,12 @@
       for (p = G.pages[order]; p != NULL; p = p->next)
 	{
 	  if (p->context_depth > depth)
-	    p->context_depth = depth;
-
-	  /* If this page is now in the topmost context, and we'd
-	     saved its allocation state, restore it.  */
-	  else if (p->context_depth == depth && p->save_in_use_p)
-	    {
-	      ggc_recalculate_in_use_p (p);
-	      free (p->save_in_use_p);
-	      p->save_in_use_p = 0;
-	    }
+	    abort ();
+	  else if (p->context_depth == depth && save_in_use_p (p))
+	    abort ();
 	}
     }
+#endif
 }
 \f
 /* Unmark all objects.  */
@@ -1326,9 +1625,9 @@
 	     marks.  So, back them up first.  */
 	  if (p->context_depth < G.context_depth)
 	    {
-	      if (! p->save_in_use_p)
-		p->save_in_use_p = xmalloc (bitmap_size);
-	      memcpy (p->save_in_use_p, p->in_use_p, bitmap_size);
+	      if (! save_in_use_p (p))
+		save_in_use_p (p) = xmalloc (bitmap_size);
+	      memcpy (save_in_use_p (p), p->in_use_p, bitmap_size);
 	    }
 
 	  /* Reset reset the number of free objects and clear the
@@ -1555,6 +1854,73 @@
 		     ? (x) / 1024 \
 		     : (x) / (1024*1024))))
 #define LABEL(x) ((x) < 1024*10 ? ' ' : ((x) < 1024*1024*10 ? 'k' : 'M'))
+
+/* Move the PCH PTE entries just added to the end of by_depth, to the
+   front.  */
+
+static void
+move_ptes_to_front (count_old_page_tables, count_new_page_tables)
+     int count_old_page_tables;
+     int count_new_page_tables;
+{
+  unsigned i;
+
+  /* First, we swap the new entries to the front of the varrays.  */
+
+  ggc_varray_type new_by_depth;
+  ggc_varray_type new_save_in_use;
+  int c;
+
+  c = count_old_page_tables + count_new_page_tables;
+  /* Allow for at least 25% growth without resizing.  */
+  c = c + c/4;
+  c = MAX (c, INITIAL_PTE_COUNT);
+
+  GGC_VARRAY_GENERIC_PTRNGC_INIT (new_by_depth,
+				  c,
+				  "by_depth");
+  GGC_VARRAY_GENERIC_PTRNGC_INIT (new_save_in_use,
+			      c,
+			      "save_in_use");
+  GGC_VARRAY_ACTIVE_SIZE (new_by_depth) = count_old_page_tables
+    + count_new_page_tables;
+  GGC_VARRAY_ACTIVE_SIZE (new_save_in_use) = count_old_page_tables
+    + count_new_page_tables;
+
+  memcpy (&GGC_VARRAY_GENERIC_PTRNGC (new_by_depth, 0),
+	  &GGC_VARRAY_GENERIC_PTRNGC (G.by_depth, count_old_page_tables),
+	  count_new_page_tables * sizeof (void *));
+  memcpy (&GGC_VARRAY_GENERIC_PTRNGC (new_by_depth, count_new_page_tables),
+	  &GGC_VARRAY_GENERIC_PTRNGC (G.by_depth, 0),
+	  count_old_page_tables * sizeof (void *));
+  memcpy (&GGC_VARRAY_GENERIC_PTRNGC (new_save_in_use, 0),
+	  &GGC_VARRAY_GENERIC_PTRNGC (G.save_in_use, count_old_page_tables),
+	  count_new_page_tables * sizeof (void *));
+  memcpy (&GGC_VARRAY_GENERIC_PTRNGC (new_save_in_use, count_new_page_tables),
+	  &GGC_VARRAY_GENERIC_PTRNGC (G.save_in_use, 0),
+	  count_old_page_tables * sizeof (void *));
+
+  GGC_VARRAY_FREE (G.by_depth);
+  GGC_VARRAY_FREE (G.save_in_use);
+    
+  G.by_depth = new_by_depth;
+  G.save_in_use = new_save_in_use;
+
+  /* Now update all the index_by_depth fields.  */
+  for (i = GGC_VARRAY_ACTIVE_SIZE (G.by_depth); i > 0; --i)
+    {
+      page_entry *p = GGC_VARRAY_GENERIC_PTRNGC (G.by_depth, i-1);
+      p->index_by_depth = i-1;
+    }
+
+  /* And last, we update the depth pointers in G.depth.  The first
+     entry is already 0, and context 0 entries always start at index
+     0, so there is nothing to update in the first slot.  We need a
+     second slot, only if we have old ptes, and if we do, they start
+     at index count_new_page_tables.  */
+  if (count_old_page_tables)
+    GGC_VARRAY_PUSH_UINTNGC (G.depth, count_new_page_tables);
+}
 
 void
 ggc_print_statistics ()
diff -Nru gcc-3_3-branch/gcc/varray.c gcc33-test/gcc/varray.c
--- gcc-3_3-branch/gcc/varray.c	Fri Jan 31 22:27:31 2003
+++ gcc33-test/gcc/varray.c	Wed Feb 12 22:56:27 2003
@@ -27,34 +27,33 @@
 
 #define VARRAY_HDR_SIZE (sizeof (struct varray_head_tag) - sizeof (varray_data))
 
-static const size_t element_size[NUM_VARRAY_DATA] = {
-  sizeof (char),
-  sizeof (unsigned char),
-  sizeof (short),
-  sizeof (unsigned short),
-  sizeof (int),
-  sizeof (unsigned int),
-  sizeof (long),
-  sizeof (unsigned long),
-  sizeof (HOST_WIDE_INT),
-  sizeof (unsigned HOST_WIDE_INT),
-  sizeof (PTR),
-  sizeof (char *),
-  sizeof (struct rtx_def *),
-  sizeof (struct rtvec_def *),
-  sizeof (union tree_node *),
-  sizeof (struct bitmap_head_def *),
-  sizeof (struct reg_info_def *),
-  sizeof (struct const_equiv_data),
-  sizeof (struct basic_block_def *),
-  sizeof (struct elt_list *)
-};
+/* Do not add any more non-GC items here.  Please either remove or GC those items that
+   are not GCed.  */
 
-static const int uses_ggc[NUM_VARRAY_DATA] = {
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* unsigned HOST_WIDE_INT */
-  1, /* PTR */
-  1, 1, 1, 1, 1, /* bitmap_head_def */
-  0, 0, 0, 1
+static const struct {
+  size_t size;
+  int uses_ggc;
+} element[NUM_VARRAY_DATA] = {
+  { sizeof (char), 1 },
+  { sizeof (unsigned char), 1 },
+  { sizeof (short), 1 },
+  { sizeof (unsigned short), 1 },
+  { sizeof (int), 1 },
+  { sizeof (unsigned int), 1 },
+  { sizeof (long), 1 },
+  { sizeof (unsigned long), 1 },
+  { sizeof (HOST_WIDE_INT), 1 },
+  { sizeof (unsigned HOST_WIDE_INT), 1 },
+  { sizeof (PTR), 1 },
+  { sizeof (char *), 1 },
+  { sizeof (struct rtx_def *), 1 },
+  { sizeof (struct rtvec_def *), 1 },
+  { sizeof (union tree_node *), 1 },
+  { sizeof (struct bitmap_head_def *), 1 },
+  { sizeof (struct reg_info_def *), 0 },
+  { sizeof (struct const_equiv_data), 0 },
+  { sizeof (struct basic_block_def *), 0 },
+  { sizeof (struct elt_list *), 1 },
 };
 
 /* Allocate a virtual array with NUM_ELEMENT elements, each of which is
@@ -65,9 +64,9 @@
      enum varray_data_enum element_kind;
      const char *name;
 {
-  size_t data_size = num_elements * element_size[element_kind];
+  size_t data_size = num_elements * element[element_kind].size;
   varray_type ptr;
-  if (uses_ggc [element_kind])
+  if (element[element_kind].uses_ggc)
     ptr = (varray_type) ggc_alloc_cleared (VARRAY_HDR_SIZE + data_size);
   else
     ptr = (varray_type) xcalloc (VARRAY_HDR_SIZE + data_size, 1);
@@ -90,11 +89,11 @@
 
   if (n != old_elements)
     {
-      size_t elem_size = element_size[va->type];
+      size_t elem_size = element[va->type].size;
       size_t old_data_size = old_elements * elem_size;
       size_t data_size = n * elem_size;
 
-      if (uses_ggc[va->type])
+      if (element[va->type].uses_ggc)
 	va = (varray_type) ggc_realloc (va, VARRAY_HDR_SIZE + data_size);
       else
 	va = (varray_type) xrealloc ((char *) va, VARRAY_HDR_SIZE + data_size);
@@ -111,7 +110,7 @@
 varray_clear (va)
      varray_type va;
 {
-  size_t data_size = element_size[va->type] * va->num_elements;
+  size_t data_size = element[va->type].size * va->num_elements;
 
   memset (va->data.c, 0, data_size);
   va->elements_used = 0;
diff -Nru gcc-3_3-branch/gcc/varray.h gcc33-test/gcc/varray.h
--- gcc-3_3-branch/gcc/varray.h	Fri Jan 31 22:27:31 2003
+++ gcc33-test/gcc/varray.h	Wed Feb 12 22:56:27 2003
@@ -55,7 +55,7 @@
 };
 
 /* Enum indicating what the varray contains.  
-   If this is changed, `element_size' in varray.c needs to be updated.  */
+   If this is changed, `element' in varray.c needs to be updated.  */
 
 enum varray_data_enum {
   VARRAY_DATA_C,

[-- Attachment #3: Type: TEXT/plain, Size: 16084 bytes --]

--- gcc33/gcc.sum	Wed Feb 19 14:22:42 2003
+++ gcc33-sp1/gcc.sum	Wed Feb 19 10:35:33 2003
@@ -1,4 +1,4 @@
-Test Run By karel on Wed Feb 19 13:48:52 2003
+Test Run By karel on Wed Feb 19 10:02:04 2003
 Native configuration is i686-pc-linux-gnu
 
 		=== gcc tests ===
@@ -7,7 +7,7 @@
     unix
 
 Running target unix
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.c-torture/compile/compile.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.c-torture/compile/compile.exp ...
 PASS: gcc.c-torture/compile/20000105-1.c,  -O0  
 PASS: gcc.c-torture/compile/20000105-1.c,  -O1  
 PASS: gcc.c-torture/compile/20000105-1.c,  -O2  
@@ -3103,7 +3103,7 @@
 PASS: gcc.c-torture/compile/20030206-1.c,  -O3 -fomit-frame-pointer  
 PASS: gcc.c-torture/compile/20030206-1.c,  -O3 -g  
 PASS: gcc.c-torture/compile/20030206-1.c,  -Os  
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.c-torture/execute/execute.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.c-torture/execute/execute.exp ...
 PASS: gcc.c-torture/execute/20000112-1.c compilation,  -O0 
 PASS: gcc.c-torture/execute/20000112-1.c execution,  -O0 
 PASS: gcc.c-torture/execute/20000112-1.c compilation,  -O1 
@@ -11918,7 +11918,7 @@
 PASS: gcc.c-torture/execute/zerolen-2.c execution,  -O3 -g 
 PASS: gcc.c-torture/execute/zerolen-2.c compilation,  -Os 
 PASS: gcc.c-torture/execute/zerolen-2.c execution,  -Os 
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp ...
 PASS: gcc.c-torture/execute/ieee/20000320-1.c compilation,  -O0 
 PASS: gcc.c-torture/execute/ieee/20000320-1.c execution,  -O0 
 PASS: gcc.c-torture/execute/ieee/20000320-1.c compilation,  -O1 
@@ -12191,7 +12191,7 @@
 PASS: gcc.c-torture/execute/ieee/rbug.c execution,  -O3 -g 
 PASS: gcc.c-torture/execute/ieee/rbug.c compilation,  -Os 
 PASS: gcc.c-torture/execute/ieee/rbug.c execution,  -Os 
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.c-torture/unsorted/unsorted.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.c-torture/unsorted/unsorted.exp ...
 PASS: gcc.c-torture/unsorted/PYRBUG.c,  -O0  
 PASS: gcc.c-torture/unsorted/PYRBUG.c,  -O1  
 PASS: gcc.c-torture/unsorted/PYRBUG.c,  -O2  
@@ -13924,7 +13924,7 @@
 PASS: gcc.c-torture/unsorted/xzz.c,  -O3 -fomit-frame-pointer  
 PASS: gcc.c-torture/unsorted/xzz.c,  -O3 -g  
 PASS: gcc.c-torture/unsorted/xzz.c,  -Os  
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.dg/cpp/cpp.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.dg/cpp/cpp.exp ...
 PASS: gcc.dg/cpp/19921210-1.c (test for excess errors)
 PASS: gcc.dg/cpp/19930510-1.c invalid directive (test for errors, line 4)
 PASS: gcc.dg/cpp/19930510-1.c (test for excess errors)
@@ -14759,7 +14759,7 @@
 PASS: gcc.dg/cpp/widestr1.c wide string in #line (test for errors, line 7)
 PASS: gcc.dg/cpp/widestr1.c wide string in #include (test for errors, line 8)
 PASS: gcc.dg/cpp/widestr1.c (test for excess errors)
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.dg/cpp/trad/trad.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.dg/cpp/trad/trad.exp ...
 PASS: gcc.dg/cpp/trad/Wunused.c  (test for bogus messages, line 12)
 PASS: gcc.dg/cpp/trad/Wunused.c  (test for bogus messages, line 13)
 PASS: gcc.dg/cpp/trad/Wunused.c  (test for bogus messages, line 14)
@@ -14930,7 +14930,7 @@
 PASS: gcc.dg/cpp/trad/strify.c (test for excess errors)
 PASS: gcc.dg/cpp/trad/strify.c execution test
 PASS: gcc.dg/cpp/trad/uchar.c (test for excess errors)
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.dg/debug/debug.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.dg/debug/debug.exp ...
 PASS: gcc.dg/debug/20000503-1.c (test for excess errors)
 PASS: gcc.dg/debug/20000503-1.c (test for excess errors)
 PASS: gcc.dg/debug/20000503-1.c (test for excess errors)
@@ -15444,7 +15444,7 @@
 PASS: gcc.dg/debug/trivial.c execution test
 PASS: gcc.dg/debug/trivial.c (test for excess errors)
 PASS: gcc.dg/debug/trivial.c execution test
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.dg/dg.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.dg/dg.exp ...
 PASS: gcc.dg/20000108-1.c (test for excess errors)
 PASS: gcc.dg/20000108-1.c execution test
 PASS: gcc.dg/20000111-1.c (test for excess errors)
@@ -17559,24 +17559,24 @@
 PASS: gcc.dg/typespec-1.c unsigned long int long void (test for errors, line 918)
 PASS: gcc.dg/typespec-1.c unsigned long int long char (test for errors, line 919)
 PASS: gcc.dg/typespec-1.c unsigned long int long short (test for errors, line 920)
-FAIL: gcc.dg/typespec-1.c unsigned long int long int (test for errors, line 921)
-FAIL: gcc.dg/typespec-1.c unsigned long int long long (test for errors, line 922)
-FAIL: gcc.dg/typespec-1.c unsigned long int long float (test for errors, line 923)
-FAIL: gcc.dg/typespec-1.c unsigned long int long double (test for errors, line 924)
-FAIL: gcc.dg/typespec-1.c unsigned long int long signed (test for errors, line 925)
-FAIL: gcc.dg/typespec-1.c unsigned long int long unsigned (test for errors, line 926)
-FAIL: gcc.dg/typespec-1.c unsigned long int long _Bool (test for errors, line 927)
-FAIL: gcc.dg/typespec-1.c unsigned long long int void (test for errors, line 928)
-FAIL: gcc.dg/typespec-1.c unsigned long long int char (test for errors, line 929)
-FAIL: gcc.dg/typespec-1.c unsigned long long int short (test for errors, line 930)
-FAIL: gcc.dg/typespec-1.c unsigned long long int int (test for errors, line 931)
-FAIL: gcc.dg/typespec-1.c unsigned long long int long (test for errors, line 932)
-FAIL: gcc.dg/typespec-1.c unsigned long long int float (test for errors, line 933)
-FAIL: gcc.dg/typespec-1.c unsigned long long int double (test for errors, line 934)
-FAIL: gcc.dg/typespec-1.c unsigned long long int signed (test for errors, line 935)
-FAIL: gcc.dg/typespec-1.c unsigned long long int unsigned (test for errors, line 936)
-FAIL: gcc.dg/typespec-1.c unsigned long long int _Bool (test for errors, line 937)
-FAIL: gcc.dg/typespec-1.c (test for excess errors)
+PASS: gcc.dg/typespec-1.c unsigned long int long int (test for errors, line 921)
+PASS: gcc.dg/typespec-1.c unsigned long int long long (test for errors, line 922)
+PASS: gcc.dg/typespec-1.c unsigned long int long float (test for errors, line 923)
+PASS: gcc.dg/typespec-1.c unsigned long int long double (test for errors, line 924)
+PASS: gcc.dg/typespec-1.c unsigned long int long signed (test for errors, line 925)
+PASS: gcc.dg/typespec-1.c unsigned long int long unsigned (test for errors, line 926)
+PASS: gcc.dg/typespec-1.c unsigned long int long _Bool (test for errors, line 927)
+PASS: gcc.dg/typespec-1.c unsigned long long int void (test for errors, line 928)
+PASS: gcc.dg/typespec-1.c unsigned long long int char (test for errors, line 929)
+PASS: gcc.dg/typespec-1.c unsigned long long int short (test for errors, line 930)
+PASS: gcc.dg/typespec-1.c unsigned long long int int (test for errors, line 931)
+PASS: gcc.dg/typespec-1.c unsigned long long int long (test for errors, line 932)
+PASS: gcc.dg/typespec-1.c unsigned long long int float (test for errors, line 933)
+PASS: gcc.dg/typespec-1.c unsigned long long int double (test for errors, line 934)
+PASS: gcc.dg/typespec-1.c unsigned long long int signed (test for errors, line 935)
+PASS: gcc.dg/typespec-1.c unsigned long long int unsigned (test for errors, line 936)
+PASS: gcc.dg/typespec-1.c unsigned long long int _Bool (test for errors, line 937)
+PASS: gcc.dg/typespec-1.c (test for excess errors)
 PASS: gcc.dg/ultrasp1.c (test for excess errors)
 PASS: gcc.dg/ultrasp2.c (test for excess errors)
 PASS: gcc.dg/ultrasp3.c (test for excess errors)
@@ -17706,7 +17706,7 @@
 PASS: gcc.dg/wtr-union-init-3.c initialization of unions (test for warnings, line 48)
 PASS: gcc.dg/wtr-union-init-3.c initialization of unions (test for warnings, line 51)
 PASS: gcc.dg/wtr-union-init-3.c (test for excess errors)
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.dg/format/format.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.dg/format/format.exp ...
 PASS: gcc.dg/format/array-1.c wrong type with array (test for warnings, line 25)
 PASS: gcc.dg/format/array-1.c unterminated array (test for warnings, line 26)
 PASS: gcc.dg/format/array-1.c wrong type with array (test for warnings, line 29)
@@ -18121,8 +18121,8 @@
 PASS: gcc.dg/format/c90-printf-1.c %n with const (test for warnings, line 233)
 PASS: gcc.dg/format/c90-printf-1.c wide string (test for warnings, line 234)
 PASS: gcc.dg/format/c90-printf-1.c %n with NULL (test for warnings, line 235)
-FAIL: gcc.dg/format/c90-printf-1.c %s with NULL (test for warnings, line 236)
-FAIL: gcc.dg/format/c90-printf-1.c (test for excess errors)
+PASS: gcc.dg/format/c90-printf-1.c %s with NULL (test for warnings, line 236)
+PASS: gcc.dg/format/c90-printf-1.c (test for excess errors)
 PASS: gcc.dg/format/c90-printf-2.c %hh in C90 (test for warnings, line 15)
 PASS: gcc.dg/format/c90-printf-2.c %ll in C90 (test for warnings, line 16)
 PASS: gcc.dg/format/c90-printf-2.c %j in C90 (test for warnings, line 17)
@@ -20047,7 +20047,7 @@
 PASS: gcc.dg/format/z-1.c (test for excess errors)
 PASS: gcc.dg/format/zero-length-1.c (test for excess errors)
 PASS: gcc.dg/format/zero-length-1.c (test for excess errors)
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.dg/noncompile/noncompile.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.dg/noncompile/noncompile.exp ...
 PASS: gcc.dg/noncompile/20000901-1.c  (test for errors, line 1)
 PASS: gcc.dg/noncompile/20000901-1.c (test for excess errors)
 PASS: gcc.dg/noncompile/20000901-1.c  (test for errors, line 1)
@@ -20746,7 +20746,7 @@
 PASS: gcc.dg/noncompile/voidparam-1.c volatile void defn (test for errors, line 16)
 PASS: gcc.dg/noncompile/voidparam-1.c register void defn (test for errors, line 17)
 PASS: gcc.dg/noncompile/voidparam-1.c (test for excess errors)
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.dg/special/ecos.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.dg/special/ecos.exp ...
 PASS: gcc.dg/special/weak-1.c (test for excess errors)
 PASS: gcc.dg/special/weak-1.c execution test
 PASS: gcc.dg/special/weak-2.c (test for excess errors)
@@ -20759,12 +20759,12 @@
 PASS: gcc.dg/special/wkali-2.c execution test
 PASS: gcc.dg/special/gcsec-1.c (test for excess errors)
 PASS: gcc.dg/special/gcsec-1.c execution test
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.dg/special/mips-abi.exp ...
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.dg/special/special.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.dg/special/mips-abi.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.dg/special/special.exp ...
 PASS: gcc.dg/special/20000419-2.c not used warning (test for bogus messages, line 10)
 PASS: gcc.dg/special/20000419-2.c (test for excess errors)
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.dg/tls/tls.exp ...
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.dg/weak/weak.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.dg/tls/tls.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.dg/weak/weak.exp ...
 PASS: gcc.dg/weak/typeof-2.c (test for excess errors)
 PASS: gcc.dg/weak/typeof-2.c scan-assembler-not foo1
 PASS: gcc.dg/weak/typeof-2.c scan-assembler baz1
@@ -20843,9 +20843,9 @@
 PASS: gcc.dg/weak/weak-9.c scan-assembler notf2
 PASS: gcc.dg/weak/weak-9.c scan-assembler notf3
 PASS: gcc.dg/weak/weak-9.c scan-assembler notf4
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.misc-tests/acker1.exp ...
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.misc-tests/arm-isr.exp ...
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.misc-tests/bprob.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.misc-tests/acker1.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.misc-tests/arm-isr.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.misc-tests/bprob.exp ...
 PASS: gcc.misc-tests/bprob-1.c compilation,  -g  -fprofile-arcs
 PASS: gcc.misc-tests/bprob-1.c execution,    -g  -fprofile-arcs
 PASS: gcc.misc-tests/bprob-1.c compilation,  -g  -fbranch-probabilities
@@ -20902,9 +20902,9 @@
 PASS: gcc.misc-tests/bprob-2.c execution,    -Os  -fprofile-arcs
 PASS: gcc.misc-tests/bprob-2.c compilation,  -Os  -fbranch-probabilities
 PASS: gcc.misc-tests/bprob-2.c execution,    -Os  -fbranch-probabilities
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.misc-tests/dg-test.exp ...
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.misc-tests/dhry.exp ...
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.misc-tests/gcov.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.misc-tests/dg-test.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.misc-tests/dhry.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.misc-tests/gcov.exp ...
 PASS: gcc.misc-tests/gcov-1.c (test for excess errors)
 PASS: gcc.misc-tests/gcov-1.c execution test
 PASS: gcc.misc-tests/gcov-1.c gcov
@@ -20932,7 +20932,7 @@
 PASS: gcc.misc-tests/gcov-8.c (test for excess errors)
 PASS: gcc.misc-tests/gcov-8.c execution test
 PASS: gcc.misc-tests/gcov-8.c gcov
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.misc-tests/i386-prefetch.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.misc-tests/i386-prefetch.exp ...
 PASS: gcc.misc-tests/i386-pf-none-1.c (test for excess errors)
 PASS: gcc.misc-tests/i386-pf-none-1.c scan-assembler-not fetch
 PASS: gcc.misc-tests/i386-pf-none-1.c (test for excess errors)
@@ -21015,20 +21015,20 @@
 PASS: gcc.misc-tests/i386-pf-athlon-1.c scan-assembler prefetchw
 PASS: gcc.misc-tests/i386-pf-athlon-1.c scan-assembler prefetchnta
 PASS: gcc.misc-tests/i386-pf-athlon-1.c scan-assembler prefetcht
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.misc-tests/linkage.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.misc-tests/linkage.exp ...
 PASS: linkage.c
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.misc-tests/matrix1.exp ...
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.misc-tests/mg.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.misc-tests/matrix1.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.misc-tests/mg.exp ...
 PASS: gcc.misc-tests/mg.c
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.misc-tests/sieve.exp ...
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/gcc/testsuite/gcc.misc-tests/sort2.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.misc-tests/sieve.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/gcc/testsuite/gcc.misc-tests/sort2.exp ...
 
 		=== gcc Summary ===
 
-# of expected passes		20822
-# of unexpected failures	22
+# of expected passes		20842
+# of unexpected failures	2
 # of expected failures		68
 # of unsupported tests		76
-/home/karel/usr/src/cvs/gcc/obj/gcc/xgcc version 3.3 20030218 (prerelease)
+/home/karel/usr/src/cvs/gcc/obj-33sp1/gcc/xgcc version 3.3 20030218 (prerelease)
 
 

[-- Attachment #4: Type: TEXT/plain, Size: 13605 bytes --]

--- gcc33/libjava.sum	Wed Feb 19 13:48:29 2003
+++ gcc33-sp1/libjava.sum	Wed Feb 19 10:01:43 2003
@@ -1,4 +1,4 @@
-Test Run By karel on Wed Feb 19 13:18:46 2003
+Test Run By karel on Wed Feb 19 09:27:29 2003
 Native configuration is i686-pc-linux-gnu
 
 		=== libjava tests ===
@@ -7,7 +7,7 @@
     unix
 
 Running target unix
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.compile/compile.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.compile/compile.exp ...
 PASS: ArrayClass compilation from source
 PASS: ArrayClass byte compilation
 PASS: ArrayClass compilation from bytecode
@@ -506,76 +506,76 @@
 PASS: zeroexp -O compilation from source
 PASS: zeroexp byte compilation
 PASS: zeroexp -O compilation from bytecode
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.jacks/jacks.exp ...
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.jni/jni.exp ...
-PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.jni/calls.java
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.jacks/jacks.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.jni/jni.exp ...
+PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.jni/calls.java
 PASS: calls header generation
 PASS: calls.c compilation
 PASS: linking calls
 PASS: calls output
-PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.jni/cxxtest.java
+PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.jni/cxxtest.java
 PASS: cxxtest header generation
 PASS: cxxtest.c compilation
 PASS: linking cxxtest
 PASS: cxxtest output
-PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.jni/field.java
+PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.jni/field.java
 PASS: field header generation
 PASS: field.c compilation
 PASS: linking field
 PASS: field output
-PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.jni/final_method.java
+PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.jni/final_method.java
 PASS: final_method header generation
 PASS: final_method.c compilation
 PASS: linking final_method
 PASS: final_method output
-PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.jni/findclass.java
+PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.jni/findclass.java
 PASS: findclass header generation
 PASS: findclass.c compilation
 PASS: linking findclass
 PASS: findclass output
-PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.jni/invoke.java
+PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.jni/invoke.java
 PASS: invoke header generation
 PASS: invoke.c compilation
 PASS: linking invoke
 PASS: invoke output
-PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.jni/martin.java
+PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.jni/martin.java
 PASS: martin header generation
 PASS: martin.c compilation
 PASS: linking martin
 PASS: martin output
-PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.jni/noclass.java
+PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.jni/noclass.java
 PASS: noclass header generation
 PASS: noclass.c compilation
 PASS: linking noclass
 FAIL: noclass run
 UNTESTED: noclass output
-PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.jni/overload.java
+PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.jni/overload.java
 PASS: overload header generation
 PASS: overload.c compilation
 PASS: linking overload
 PASS: overload output
-PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.jni/register.java
+PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.jni/register.java
 PASS: register header generation
 PASS: register.c compilation
 PASS: linking register
 PASS: register output
-PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.jni/simple_int.java
+PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.jni/simple_int.java
 PASS: simple_int header generation
 PASS: simple_int.c compilation
 PASS: linking simple_int
 PASS: simple_int output
-PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.jni/throwit.java
+PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.jni/throwit.java
 PASS: throwit header generation
 PASS: throwit.c compilation
 PASS: linking throwit
 FAIL: throwit run
 UNTESTED: throwit output
-PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.jni/virtual.java
+PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.jni/virtual.java
 PASS: virtual header generation
 PASS: virtual.c compilation
 PASS: linking virtual
 PASS: virtual output
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.lang/lang.exp ...
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.lang/lang.exp ...
 PASS: ArrayStore compilation from source
 FAIL: ArrayStore execution - source compiled test
 UNTESTED: ArrayStore output - source compiled test
@@ -1458,8 +1458,9 @@
 FAIL: SyncTest execution - gij test
 UNTESTED: SyncTest output - gij test
 PASS: SyncTest -O compilation from bytecode
-PASS: SyncTest -O execution - bytecode->native test
-PASS: SyncTest -O output - bytecode->native test
+WARNING: program timed out.
+FAIL: SyncTest -O execution - bytecode->native test
+UNTESTED: SyncTest -O output - bytecode->native test
 PASS: Synch compilation from source
 PASS: Synch execution - source compiled test
 PASS: Synch output - source compiled test
@@ -1659,23 +1660,23 @@
 FAIL: Thread_Wait_Interrupt -O execution - bytecode->native test
 UNTESTED: Thread_Wait_Interrupt -O output - bytecode->native test
 PASS: Throw_1 compilation from source
-FAIL: Throw_1 execution - source compiled test
-UNTESTED: Throw_1 output - source compiled test
+PASS: Throw_1 execution - source compiled test
+PASS: Throw_1 output - source compiled test
 PASS: Throw_1 byte compilation
 FAIL: Throw_1 execution - gij test
 UNTESTED: Throw_1 output - gij test
 PASS: Throw_1 compilation from bytecode
-FAIL: Throw_1 execution - bytecode->native test
-UNTESTED: Throw_1 output - bytecode->native test
+PASS: Throw_1 execution - bytecode->native test
+PASS: Throw_1 output - bytecode->native test
 PASS: Throw_1 -O compilation from source
-FAIL: Throw_1 -O execution - source compiled test
-UNTESTED: Throw_1 -O output - source compiled test
+PASS: Throw_1 -O execution - source compiled test
+PASS: Throw_1 -O output - source compiled test
 PASS: Throw_1 byte compilation
 FAIL: Throw_1 execution - gij test
 UNTESTED: Throw_1 output - gij test
 PASS: Throw_1 -O compilation from bytecode
-FAIL: Throw_1 -O execution - bytecode->native test
-UNTESTED: Throw_1 -O output - bytecode->native test
+PASS: Throw_1 -O execution - bytecode->native test
+PASS: Throw_1 -O output - bytecode->native test
 PASS: Throw_2 compilation from source
 FAIL: Throw_2 execution - source compiled test
 UNTESTED: Throw_2 output - source compiled test
@@ -2433,23 +2434,23 @@
 PASS: instinit -O execution - bytecode->native test
 PASS: instinit -O output - bytecode->native test
 PASS: instinit2 compilation from source
-FAIL: instinit2 execution - source compiled test
-UNTESTED: instinit2 output - source compiled test
+PASS: instinit2 execution - source compiled test
+PASS: instinit2 output - source compiled test
 PASS: instinit2 byte compilation
 FAIL: instinit2 execution - gij test
 UNTESTED: instinit2 output - gij test
 PASS: instinit2 compilation from bytecode
-FAIL: instinit2 execution - bytecode->native test
-UNTESTED: instinit2 output - bytecode->native test
+PASS: instinit2 execution - bytecode->native test
+PASS: instinit2 output - bytecode->native test
 PASS: instinit2 -O compilation from source
-FAIL: instinit2 -O execution - source compiled test
-UNTESTED: instinit2 -O output - source compiled test
+PASS: instinit2 -O execution - source compiled test
+PASS: instinit2 -O output - source compiled test
 PASS: instinit2 byte compilation
 FAIL: instinit2 execution - gij test
 UNTESTED: instinit2 output - gij test
 PASS: instinit2 -O compilation from bytecode
-FAIL: instinit2 -O execution - bytecode->native test
-UNTESTED: instinit2 -O output - bytecode->native test
+PASS: instinit2 -O execution - bytecode->native test
+PASS: instinit2 -O output - bytecode->native test
 PASS: invoke_from_inner compilation from source
 PASS: invoke_from_inner execution - source compiled test
 PASS: invoke_from_inner output - source compiled test
@@ -2954,26 +2955,26 @@
 PASS: utilTest -O compilation from bytecode
 PASS: utilTest -O execution - bytecode->native test
 PASS: utilTest -O output - bytecode->native test
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.loader/loader.exp ...
-PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.loader/dummy.java
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.loader/loader.exp ...
+PASS: bytecompile /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.loader/dummy.java
 PASS: resource compilation: dummy.class
 PASS: TestEarlyGC compilation from source
-PASS: /home/karel/usr/src/cvs/gcc/obj/i686-pc-linux-gnu/libjava/testsuite/TestEarlyGC.exe execution - /home/karel/usr/src/cvs/gcc/obj/i686-pc-linux-gnu/libjava/testsuite/TestEarlyGC.exe
-PASS: /home/karel/usr/src/cvs/gcc/obj/i686-pc-linux-gnu/libjava/testsuite/TestEarlyGC.exe output - /home/karel/usr/src/cvs/gcc/obj/i686-pc-linux-gnu/libjava/testsuite/TestEarlyGC.exe
+PASS: /home/karel/usr/src/cvs/gcc/obj-33sp1/i686-pc-linux-gnu/libjava/testsuite/TestEarlyGC.exe execution - /home/karel/usr/src/cvs/gcc/obj-33sp1/i686-pc-linux-gnu/libjava/testsuite/TestEarlyGC.exe
+PASS: /home/karel/usr/src/cvs/gcc/obj-33sp1/i686-pc-linux-gnu/libjava/testsuite/TestEarlyGC.exe output - /home/karel/usr/src/cvs/gcc/obj-33sp1/i686-pc-linux-gnu/libjava/testsuite/TestEarlyGC.exe
 PASS: TestLeak compilation from source
-PASS: /home/karel/usr/src/cvs/gcc/obj/i686-pc-linux-gnu/libjava/testsuite/TestLeak.exe execution - /home/karel/usr/src/cvs/gcc/obj/i686-pc-linux-gnu/libjava/testsuite/TestLeak.exe
-PASS: /home/karel/usr/src/cvs/gcc/obj/i686-pc-linux-gnu/libjava/testsuite/TestLeak.exe output - /home/karel/usr/src/cvs/gcc/obj/i686-pc-linux-gnu/libjava/testsuite/TestLeak.exe
+PASS: /home/karel/usr/src/cvs/gcc/obj-33sp1/i686-pc-linux-gnu/libjava/testsuite/TestLeak.exe execution - /home/karel/usr/src/cvs/gcc/obj-33sp1/i686-pc-linux-gnu/libjava/testsuite/TestLeak.exe
+PASS: /home/karel/usr/src/cvs/gcc/obj-33sp1/i686-pc-linux-gnu/libjava/testsuite/TestLeak.exe output - /home/karel/usr/src/cvs/gcc/obj-33sp1/i686-pc-linux-gnu/libjava/testsuite/TestLeak.exe
 PASS: TestMultiple compilation from source
-PASS: /home/karel/usr/src/cvs/gcc/obj/i686-pc-linux-gnu/libjava/testsuite/TestMultiple.exe execution - /home/karel/usr/src/cvs/gcc/obj/i686-pc-linux-gnu/libjava/testsuite/TestMultiple.exe
-PASS: /home/karel/usr/src/cvs/gcc/obj/i686-pc-linux-gnu/libjava/testsuite/TestMultiple.exe output - /home/karel/usr/src/cvs/gcc/obj/i686-pc-linux-gnu/libjava/testsuite/TestMultiple.exe
+PASS: /home/karel/usr/src/cvs/gcc/obj-33sp1/i686-pc-linux-gnu/libjava/testsuite/TestMultiple.exe execution - /home/karel/usr/src/cvs/gcc/obj-33sp1/i686-pc-linux-gnu/libjava/testsuite/TestMultiple.exe
+PASS: /home/karel/usr/src/cvs/gcc/obj-33sp1/i686-pc-linux-gnu/libjava/testsuite/TestMultiple.exe output - /home/karel/usr/src/cvs/gcc/obj-33sp1/i686-pc-linux-gnu/libjava/testsuite/TestMultiple.exe
 PASS: TestParent compilation from source
-PASS: /home/karel/usr/src/cvs/gcc/obj/i686-pc-linux-gnu/libjava/testsuite/TestParent.exe execution - /home/karel/usr/src/cvs/gcc/obj/i686-pc-linux-gnu/libjava/testsuite/TestParent.exe
-PASS: /home/karel/usr/src/cvs/gcc/obj/i686-pc-linux-gnu/libjava/testsuite/TestParent.exe output - /home/karel/usr/src/cvs/gcc/obj/i686-pc-linux-gnu/libjava/testsuite/TestParent.exe
-Running /home/karel/usr/src/cvs/gcc/gcc-3_3-branch/libjava/testsuite/libjava.mauve/mauve.exp ...
+PASS: /home/karel/usr/src/cvs/gcc/obj-33sp1/i686-pc-linux-gnu/libjava/testsuite/TestParent.exe execution - /home/karel/usr/src/cvs/gcc/obj-33sp1/i686-pc-linux-gnu/libjava/testsuite/TestParent.exe
+PASS: /home/karel/usr/src/cvs/gcc/obj-33sp1/i686-pc-linux-gnu/libjava/testsuite/TestParent.exe output - /home/karel/usr/src/cvs/gcc/obj-33sp1/i686-pc-linux-gnu/libjava/testsuite/TestParent.exe
+Running /home/karel/usr/src/cvs/gcc/gcc33-test/libjava/testsuite/libjava.mauve/mauve.exp ...
 
 		=== libjava Summary ===
 
-# of expected passes		2623
-# of unexpected failures	154
+# of expected passes		2637
+# of unexpected failures	147
 # of expected failures		12
-# of untested testcases		166
+# of untested testcases		159

Re: Let's backport speedups from 3.4 to 3.3

[Karel Gardas]

On Wed, 12 Feb 2003, Mike Stump wrote:

> On Wednesday, February 12, 2003, at 02:09 PM, Karel Gardas wrote:
> > On Wed, 12 Feb 2003, Karel Gardas wrote:
> >> So I'm starting bootstrap...
> >
> > And bootstrap fails with:
> > /home/karel/usr/src/cvs/gcc/obj/gcc/../../gcc33-test/gcc/ggc-
> > page.c:1540:
> > undefined reference to `__builtin_prefetch'
>
> > So something wrong seems to be with this patch.
>
> Oh, yes, that needs to be protected or removed, I'll do this, it'll be
> in my next rev.  In the mean time, #if 0 it and you can continue.
> Those actually speed up the routine by 23%, so I do want to keep them
> in there in some form.
>

As I said, I've commented them out and succesfully bootstrap C/C++. Then I
make some tests with the same MICO sources like two/three days ago.

Result is that both version compile at the same speed. i.e. I've done two
tests. In the first standard 3.3 was faster (1-2%) in the second 3.3 with
your patch was faster (1-2%) - so IMHO that's normal noise...

Anything other which should I test?

Thanks,

Karel
--
Karel Gardas                  kgardas@objectsecurity.com
ObjectSecurity Ltd.           http://www.objectsecurity.com

Re: Let's backport speedups from 3.4 to 3.3

[Kaveh R. Ghazi]

 > From: Mike Stump <mstump@apple.com>
 > 
 > On Wednesday, February 12, 2003, at 08:15 AM, Kaveh R. Ghazi wrote:
 > > I've heard some mention that 3.4 is faster in some cases than 3.3.
 > >
 > > I know several speedup tweeks have been made since the branch was
 > > created.  Not all of them have been backported.
 > >
 > > If they're not too invasive, let's consider them for 3.3.  I'm willing
 > > to help by regtesting patches if people can point out safe candidates.
 > > Though I'd certainly appreciate assistance from others. :-)
 > 
 > Here are two safe patches.  Already OKed to move, they just await a 
 > regtest on 3.3.  Could you do that, and let me know they are in?  
 > Thanks.
 > 
 > http://gcc.gnu.org/ml/gcc-patches/2003-02/msg00563.html

I'll run the tests tonight.

--
Kaveh R. Ghazi			ghazi@caip.rutgers.edu

Re: Let's backport speedups from 3.4 to 3.3

[Mike Stump]

On Wednesday, February 12, 2003, at 02:09 PM, Karel Gardas wrote:
> On Wed, 12 Feb 2003, Karel Gardas wrote:
>> So I'm starting bootstrap...
>
> And bootstrap fails with:
> /home/karel/usr/src/cvs/gcc/obj/gcc/../../gcc33-test/gcc/ggc- 
> page.c:1540:
> undefined reference to `__builtin_prefetch'

> So something wrong seems to be with this patch.

Oh, yes, that needs to be protected or removed, I'll do this, it'll be  
in my next rev.  In the mean time, #if 0 it and you can continue.   
Those actually speed up the routine by 23%, so I do want to keep them  
in there in some form.

Thanks for the feedback.

Re: Let's backport speedups from 3.4 to 3.3

[Karel Gardas]

On Wed, 12 Feb 2003, Mike Stump wrote:

> On Wednesday, February 12, 2003, at 01:57 PM, Karel Gardas wrote:
> > So I'm starting bootstrap...
>
> It will fail an enable checking bootstrap due to the two prefetches.
> Those have to be commented out first, before it will pass.

Thanks. Done and bootstrap continue. I hope that it's perfectly safe to
just continue bootstrap instead of rm -rf */configure again.

> Also, bear in mind, this isn't on mainline yet.  I think it will be
> easiest to wait until it hits mainline before we backport to 3.3.
> Though, I am interested in regtesting results before it is checked in,
> so if you have the spare cycles...  Love to have the help.

Well, if it really _speedup_ gcc, then, what should I do for you?

Thanks,

Karel
--
Karel Gardas                  kgardas@objectsecurity.com
ObjectSecurity Ltd.           http://www.objectsecurity.com

Re: Let's backport speedups from 3.4 to 3.3

[Karel Gardas]

On Wed, 12 Feb 2003, Karel Gardas wrote:

> So I'm starting bootstrap...
>

And bootstrap fails with:

gcc -c   -g  -DIN_GCC   -W -Wall -Wwrite-strings -Wstrict-prototypes
-Wmissing-prototypes -Wtraditional -pedantic -Wno-long-long
-DHAVE_CONFIG_H    -I. -I. -I../../gcc33-test/gcc -I../../gcc33-test/gcc/.
-I../../gcc33-test/gcc/config -I../../gcc33-test/gcc/../include \
        ../../gcc33-test/gcc/config/i386/i386.c -o i386.o
../../gcc33-test/gcc/config/i386/i386.c: In function
`x86_function_profiler':
../../gcc33-test/gcc/config/i386/i386.c:14383: warning: unused parameter
`labelno'
rm -rf libbackend.a
ar rc libbackend.a alias.o bb-reorder.o bitmap.o builtins.o caller-save.o
calls.o cfg.o cfganal.o cfgbuild.o cfgcleanup.o cfglayout.o cfgloop.o
cfgrtl.o combine.o conflict.o convert.o cse.o cselib.o dbxout.o debug.o
df.o diagnostic.o doloop.o dominance.o dwarf2asm.o dwarf2out.o dwarfout.o
emit-rtl.o except.o explow.o expmed.o expr.o final.o flow.o fold-const.o
function.o gcse.o genrtl.o ggc-common.o global.o graph.o gtype-desc.o
haifa-sched.o hashtable.o hooks.o ifcvt.o insn-attrtab.o insn-emit.o
insn-extract.o insn-opinit.o insn-output.o insn-peep.o insn-recog.o
integrate.o intl.o jump.o  langhooks.o lcm.o lists.o local-alloc.o loop.o
mbchar.o optabs.o params.o predict.o print-rtl.o print-tree.o profile.o
ra.o ra-build.o ra-colorize.o ra-debug.o ra-rewrite.o real.o recog.o
reg-stack.o regclass.o regmove.o regrename.o reload.o reload1.o reorg.o
resource.o rtl.o rtlanal.o rtl-error.o sbitmap.o sched-deps.o sched-ebb.o
sched-rgn.o sched-vis.o sdbout.o sibcall.o simplify-rtx.o ssa.o ssa-ccp.o
ssa-dce.o stmt.o stor-layout.o stringpool.o timevar.o toplev.o tracer.o
tree.o tree-dump.o tree-inline.o unroll.o varasm.o varray.o version.o
vmsdbgout.o xcoffout.o et-forest.o ggc-page.o i386.o
ranlib libbackend.a
gcc   -g  -DIN_GCC   -W -Wall -Wwrite-strings -Wstrict-prototypes
-Wmissing-prototypes -Wtraditional -pedantic -Wno-long-long
-DHAVE_CONFIG_H  -o cc1 \
        c-parse.o c-lang.o c-pretty-print.o attribs.o c-errors.o c-lex.o
c-pragma.o c-decl.o c-typeck.o c-convert.o c-aux-info.o c-common.o
c-opts.o c-format.o c-semantics.o c-objc-common.o c-dump.o libcpp.a
main.o libbackend.a   ../libiberty/libiberty.a
libbackend.a(ggc-page.o): In function `ggc_pop_context':
/home/karel/usr/src/cvs/gcc/obj/gcc/../../gcc33-test/gcc/ggc-page.c:1539:
undefined reference to `__builtin_prefetch'
/home/karel/usr/src/cvs/gcc/obj/gcc/../../gcc33-test/gcc/ggc-page.c:1540:
undefined reference to `__builtin_prefetch'
collect2: ld returned 1 exit status
make[2]: *** [cc1] Error 1
make[2]: Leaving directory `/home/karel/usr/src/cvs/gcc/obj/gcc'
make[1]: *** [stage1_build] Error 2
make[1]: Leaving directory `/home/karel/usr/src/cvs/gcc/obj/gcc'
make: *** [bootstrap-lean] Error 2

So something wrong seems to be with this patch.

Thanks,

Karel
--
Karel Gardas                  kgardas@objectsecurity.com
ObjectSecurity Ltd.           http://www.objectsecurity.com

Re: Let's backport speedups from 3.4 to 3.3

[Mike Stump]

On Wednesday, February 12, 2003, at 01:57 PM, Karel Gardas wrote:
> So I'm starting bootstrap...

It will fail an enable checking bootstrap due to the two prefetches.  
Those have to be commented out first, before it will pass.
Also, bear in mind, this isn't on mainline yet.  I think it will be 
easiest to wait until it hits mainline before we backport to 3.3.
Though, I am interested in regtesting results before it is checked in, 
so if you have the spare cycles...  Love to have the help.

Re: Let's backport speedups from 3.4 to 3.3

[Mike Stump]

On Wednesday, February 12, 2003, at 08:15 AM, Kaveh R. Ghazi wrote:
> I've heard some mention that 3.4 is faster in some cases than 3.3.
>
> I know several speedup tweeks have been made since the branch was
> created.  Not all of them have been backported.
>
> If they're not too invasive, let's consider them for 3.3.  I'm willing
> to help by regtesting patches if people can point out safe candidates.
> Though I'd certainly appreciate assistance from others. :-)

Here are two safe patches.  Already OKed to move, they just await a 
regtest on 3.3.  Could you do that, and let me know they are in?  
Thanks.

http://gcc.gnu.org/ml/gcc-patches/2003-02/msg00563.html

I tried doing the regtest, but had some timeouts (bad, ick, coff) that 
wanted more attention.

Re: Let's backport speedups from 3.4 to 3.3

[Karel Gardas]

On Thu, 13 Feb 2003, Kaoru Fukui wrote:

> > Hunk #14 succeeded at 1507 with fuzz 2 (offset -31 lines).
> > Hunk #15 succeeded at 1574 (offset -31 lines).
> > Hunk #16 succeeded at 1608 (offset -32 lines).
> > Hunk #17 succeeded at 1835 with fuzz 2 (offset -241 lines).
> > Hunk #18 FAILED at 1910.
> > Hunk #19 FAILED at 1947.
> > Hunk #20 FAILED at 1981.
>
> no need,these are for pch
>

ACK. Now I have only these trhee fails:

thinkpad:~/cvs/gcc$ patch -p0 < /tmp/gcc33-patch2
patching file fixed/gcc/ggc-page.c
Hunk #2 succeeded at 238 (offset -12 lines).
Hunk #3 succeeded at 299 (offset -12 lines).
Hunk #4 succeeded at 348 (offset -12 lines).
Hunk #5 succeeded at 378 (offset -12 lines).
Hunk #6 succeeded at 400 (offset -12 lines).
Hunk #7 succeeded at 409 (offset -12 lines).
Hunk #8 succeeded at 937 (offset -12 lines).
Hunk #9 succeeded at 977 (offset -12 lines).
Hunk #10 succeeded at 1126 (offset -12 lines).
Hunk #11 succeeded at 1437 (offset -12 lines).
Hunk #12 succeeded at 1483 (offset -12 lines).
Hunk #13 succeeded at 1500 (offset -12 lines).
Hunk #14 succeeded at 1575 (offset -12 lines).
Hunk #15 succeeded at 1609 (offset -13 lines).
Hunk #16 succeeded at 1836 with fuzz 2 (offset -219 lines).
Hunk #17 FAILED at 1911.
Hunk #18 FAILED at 1948.
Hunk #19 FAILED at 1982.
3 out of 19 hunks FAILED -- saving rejects to file
fixed/gcc/ggc-page.c.rej
patching file fixed/gcc/varray.c
patching file fixed/gcc/varray.h
thinkpad:~/cvs/gcc$

So I'm starting bootstrap...

Thanks,

Karel
--
Karel Gardas                  kgardas@objectsecurity.com
ObjectSecurity Ltd.           http://www.objectsecurity.com

Re: Let's backport speedups from 3.4 to 3.3

[Kaoru Fukui]

> Sorry, but I'm not able to patch my todays gcc3.3 sources:
> 
> thinkpad:~/cvs/gcc/gcc33-test/gcc$ patch < /tmp/gcc33-patch
> patching file varray.c
> Hunk #1 succeeded at 27 (offset -2 lines).
> Hunk #2 succeeded at 64 (offset -2 lines).
> Hunk #3 succeeded at 89 (offset -2 lines).
> Hunk #4 succeeded at 110 (offset -2 lines).
> patching file varray.h
> Hunk #1 succeeded at 55 (offset -2 lines).
> patching file ggc-page.c
> Hunk #1 succeeded at 24 (offset -2 lines).
> Hunk #2 succeeded at 238 (offset -14 lines).
> Hunk #3 succeeded at 299 (offset -14 lines).
> Hunk #4 succeeded at 348 (offset -20 lines).
> Hunk #5 succeeded at 378 (offset -20 lines).
> Hunk #6 succeeded at 400 (offset -20 lines).
> Hunk #7 succeeded at 409 (offset -20 lines).
> Hunk #8 succeeded at 937 (offset -22 lines).
> Hunk #9 succeeded at 977 (offset -22 lines).
> Hunk #10 succeeded at 1126 (offset -22 lines).
> Hunk #11 succeeded at 1437 (offset -22 lines).
> Hunk #12 succeeded at 1483 (offset -22 lines).
> Hunk #13 FAILED at 1501.

fixable fail for looking the source.

> Hunk #14 succeeded at 1507 with fuzz 2 (offset -31 lines).
> Hunk #15 succeeded at 1574 (offset -31 lines).
> Hunk #16 succeeded at 1608 (offset -32 lines).
> Hunk #17 succeeded at 1835 with fuzz 2 (offset -241 lines).
> Hunk #18 FAILED at 1910.
> Hunk #19 FAILED at 1947.
> Hunk #20 FAILED at 1981.

no need,these are for pch

Kaoru

Re: Let's backport speedups from 3.4 to 3.3

[Kaoru Fukui]

On 12 Feb, Kaveh R. Ghazi wrote:
> I've heard some mention that 3.4 is faster in some cases than 3.3.
> 
> I know several speedup tweeks have been made since the branch was
> created.  Not all of them have been backported.
> 
> If they're not too invasive, let's consider them for 3.3.  I'm willing
> to help by regtesting patches if people can point out safe candidates.
> Though I'd certainly appreciate assistance from others. :-)
> 
> 		Thanks,
> 		--Kaveh
> --
> Kaveh R. Ghazi			ghazi@caip.rutgers.edu

http://gcc.gnu.org/ml/gcc-patches/2003-02/msg00377.html
http://gcc.gnu.org/ml/gcc-patches/2003-02/msg00560.htm
There is Mike's info.


I tried popcontext-fsf-2.diffs which is speedy, see below 

http://gcc.gnu.org/ml/gcc-patches/2003-02/msg00380.html
gcc-3.3 doesn't pch, so it needs to adjust.
Kaoru

Re: Let's backport speedups from 3.4 to 3.3

[Kaoru Fukui]

On 13 Feb, To: ghazi@caip.rutgers.edu wrote:
> On 12 Feb, Kaveh R. Ghazi wrote:
>> I've heard some mention that 3.4 is faster in some cases than 3.3.
>> 
>> I know several speedup tweeks have been made since the branch was
>> created.  Not all of them have been backported.
>> 
>> If they're not too invasive, let's consider them for 3.3.  I'm willing
>> to help by regtesting patches if people can point out safe candidates.
>> Though I'd certainly appreciate assistance from others. :-)
>> 
>> 		Thanks,
>> 		--Kaveh
>> --
>> Kaveh R. Ghazi			ghazi@caip.rutgers.edu
> 
> http://gcc.gnu.org/ml/gcc-patches/2003-02/msg00377.html
> http://gcc.gnu.org/ml/gcc-patches/2003-02/msg00560.htm
> There is Mike's info.
> 
> 
> I tried popcontext-fsf-2.diffs which is speedy, see below 
> 
> http://gcc.gnu.org/ml/gcc-patches/2003-02/msg00380.html
> gcc-3.3 doesn't pch, so it needs to adjust.

Sorry, it was that gcc-3.3 doesn't have pch
K

Re: Let's backport speedups from 3.4 to 3.3

[Karel Gardas]

On Wed, 12 Feb 2003, Kaveh R. Ghazi wrote:

> I've heard some mention that 3.4 is faster in some cases than 3.3.
>
> I know several speedup tweeks have been made since the branch was
> created.  Not all of them have been backported.
>
> If they're not too invasive, let's consider them for 3.3.  I'm willing
> to help by regtesting patches if people can point out safe candidates.
> Though I'd certainly appreciate assistance from others. :-)
>

I would like to volunteer too. I have simple i686-pc-linux-gnu, platform,
but I can give it a try on MICO code and verify that MICO is compiled
well, by using its testsuite...

Thanks,

Karel
--
Karel Gardas                  kgardas@objectsecurity.com
ObjectSecurity Ltd.           http://www.objectsecurity.com

Let's backport speedups from 3.4 to 3.3

[Kaveh R. Ghazi]

I've heard some mention that 3.4 is faster in some cases than 3.3.

I know several speedup tweeks have been made since the branch was
created.  Not all of them have been backported.

If they're not too invasive, let's consider them for 3.3.  I'm willing
to help by regtesting patches if people can point out safe candidates.
Though I'd certainly appreciate assistance from others. :-)

		Thanks,
		--Kaveh
--
Kaveh R. Ghazi			ghazi@caip.rutgers.edu