CbC/CbC_gcc: gcc/dse.c comparison

comparison gcc/dse.c @ 19:58ad6c70ea60

update gcc from 4.4.0 to 4.4.1.

author	kent@firefly.cr.ie.u-ryukyu.ac.jp
date	Thu, 24 Sep 2009 13:21:57 +0900
parents	a06113de4d67
children	855418dad1a3

comparison

equal deleted inserted replaced

-:33936f7f2835
+:58ad6c70ea60
 cselib_val *cse_base;
 /* This canonized mem.  */
 rtx mem;
-/* The result of get_addr on mem.  */
+/* Canonized MEM address for use by canon_true_dependence.  */
 rtx mem_addr;
 /* If this is non-zero, it is the alias set of a spill location.  */
 alias_set_type alias_set;
 /* A mem wrapped around the base pointer for the group in order to
 do read dependency.  */
 rtx base_mem;
-/* Canonized version of base_mem, most likely the same thing.  */
+/* Canonized version of base_mem's address.  */
-rtx canon_base_mem;
+rtx canon_base_addr;
 /* These two sets of two bitmaps are used to keep track of how many
 stores are actually referencing that position from this base.  We
 only do this for rtx bases as this will be used to assign
 positions in the bitmaps for the global problem.  Bit N is set in
 {
 *slot = gi = (group_info_t) pool_alloc (rtx_group_info_pool);
 gi->rtx_base = base;
 gi->id = rtx_group_next_id++;
 gi->base_mem = gen_rtx_MEM (QImode, base);
-gi->canon_base_mem = canon_rtx (gi->base_mem);
+gi->canon_base_addr = canon_rtx (base);
 gi->store1_n = BITMAP_ALLOC (NULL);
 gi->store1_p = BITMAP_ALLOC (NULL);
 gi->store2_n = BITMAP_ALLOC (NULL);
 gi->store2_p = BITMAP_ALLOC (NULL);
 gi->group_kill = BITMAP_ALLOC (NULL);
 local store group if so.  */
 static int
 record_store (rtx body, bb_info_t bb_info)
 {
-rtx mem, rhs, const_rhs;
+rtx mem, rhs, const_rhs, mem_addr;
 HOST_WIDE_INT offset = 0;
 HOST_WIDE_INT width = 0;
 alias_set_type spill_alias_set;
 insn_info_t insn_info = bb_info->last_insn;
 store_info_t store_info = NULL;
 /* Check to see if this stores causes some other stores to be
 dead.  */
 ptr = active_local_stores;
 last = NULL;
 redundant_reason = NULL;
+mem = canon_rtx (mem);
+/* For alias_set != 0 canon_true_dependence should be never called.  */
+if (spill_alias_set)
+mem_addr = NULL_RTX;
+else
+{
+if (group_id < 0)
+	mem_addr = base->val_rtx;
+else
+	{
+	  group_info_t group
+	    = VEC_index (group_info_t, rtx_group_vec, group_id);
+	  mem_addr = group->canon_base_addr;
+	}
+if (offset)
+	mem_addr = plus_constant (mem_addr, offset);
+}
 while (ptr)
 {
 insn_info_t next = ptr->next_local_store;
 store_info_t s_info = ptr->store_rec;
 	   keep it from being used to remove a load.  */
 	{
 	  if (canon_true_dependence (s_info->mem,
 				     GET_MODE (s_info->mem),
 				     s_info->mem_addr,
-				     mem, rtx_varies_p))
+				     mem, mem_addr, rtx_varies_p))
 	    {
 	      s_info->rhs = NULL;
 	      s_info->const_rhs = NULL;
 	    }
 	}
 /* An insn can be deleted if every position of every one of
 	 its s_infos is zero.  */
 if (any_positions_needed_p (s_info)
 	  || ptr->cannot_delete)
 	del = false;
 }
 /* Finish filling in the store_info.  */
 store_info->next = insn_info->store_rec;
 insn_info->store_rec = store_info;
-store_info->mem = canon_rtx (mem);
+store_info->mem = mem;
 store_info->alias_set = spill_alias_set;
-store_info->mem_addr = get_addr (XEXP (mem, 0));
+store_info->mem_addr = mem_addr;
 store_info->cse_base = base;
 if (width > HOST_BITS_PER_WIDE_INT)
 {
 store_info->is_large = true;
 store_info->positions_needed.large.count = 0;
 appropriate stores that may be active.  */
 static int
 check_mem_read_rtx (rtx *loc, void *data)
 {
-rtx mem = *loc;
+rtx mem = *loc, mem_addr;
 bb_info_t bb_info;
 insn_info_t insn_info;
 HOST_WIDE_INT offset = 0;
 HOST_WIDE_INT width = 0;
 alias_set_type spill_alias_set = 0;
 read_info->alias_set = spill_alias_set;
 read_info->begin = offset;
 read_info->end = offset + width;
 read_info->next = insn_info->read_rec;
 insn_info->read_rec = read_info;
+/* For alias_set != 0 canon_true_dependence should be never called.  */
+if (spill_alias_set)
+mem_addr = NULL_RTX;
+else
+{
+if (group_id < 0)
+	mem_addr = base->val_rtx;
+else
+	{
+	  group_info_t group
+	    = VEC_index (group_info_t, rtx_group_vec, group_id);
+	  mem_addr = group->canon_base_addr;
+	}
+if (offset)
+	mem_addr = plus_constant (mem_addr, offset);
+}
 /* We ignore the clobbers in store_info.  The is mildly aggressive,
 but there really should not be a clobber followed by a read.  */
 if (spill_alias_set)
 	       const base. */
 	    remove
 	      = canon_true_dependence (store_info->mem,
 				       GET_MODE (store_info->mem),
 				       store_info->mem_addr,
-				       mem, rtx_varies_p);
+				       mem, mem_addr, rtx_varies_p);
 	  else if (group_id == store_info->group_id)
 	    {
 	      /* This is a block mode load.  We may get lucky and
 		 canon_true_dependence may save the day.  */
 	      if (width == -1)
 		remove
 		  = canon_true_dependence (store_info->mem,
 					   GET_MODE (store_info->mem),
 					   store_info->mem_addr,
-					   mem, rtx_varies_p);
+					   mem, mem_addr, rtx_varies_p);
 	      /* If this read is just reading back something that we just
 		 stored, rewrite the read.  */
 	      else
 		{
 	  /* If this read is just reading back something that we just
 	     stored, rewrite the read.  */
 	  if (store_info->rhs
 	      && store_info->group_id == -1
 	      && store_info->cse_base == base
+	      && width != -1
 	      && offset >= store_info->begin
 	      && offset + width <= store_info->end
 	      && all_positions_needed_p (store_info,
 					 offset - store_info->begin, width)
 	      && replace_read (store_info, i_ptr,  read_info, insn_info, loc,
 	  if (!store_info->alias_set)
 	    remove = canon_true_dependence (store_info->mem,
 					    GET_MODE (store_info->mem),
 					    store_info->mem_addr,
-					    mem, rtx_varies_p);
+					    mem, mem_addr, rtx_varies_p);
 	  if (remove)
 	    {
 	      if (dump_file)
 		dump_insn_info ("removing from active", i_ptr);
 		     something else with a different constant
 		     base.  */
 		  if ((read_info->group_id < 0)
 		      && canon_true_dependence (group->base_mem,
 						QImode,
-						group->canon_base_mem,
+						group->canon_base_addr,
-						read_info->mem, rtx_varies_p))
+						read_info->mem, NULL_RTX,
+						rtx_varies_p))
 		    {
 		      if (kill)
 			bitmap_ior_into (kill, group->group_kill);
 		      bitmap_and_compl_into (gen, group->group_kill);
 		    }

Mercurial > hg > CbC > CbC_gcc

comparison gcc/dse.c @ 19:58ad6c70ea60