+2016-04-24 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+
+ * print-rtl.c (print_rtx_insn_vec): New function.
+ * print-rtl.h: New prototype.
+ * store-motion.c (struct st_expr): Make avail_stores a vector.
+ (st_expr_entry): Adjust.
+ (free_st_expr_entry): Likewise.
+ (print_store_motion_mems): Likewise.
+ (find_moveable_store): Likewise.
+ (compute_store_table): Likewise.
+ (delete_store): Likewise.
+ (build_store_vectors): Likewise.
+
2016-04-24 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* reorg.c (try_merge_delay_insns): Make merged_insns a vector.
#include "tree-pass.h"
#include "dbgcnt.h"
#include "rtl-iter.h"
+#include "print-rtl.h"
/* This pass implements downward store motion.
As of May 1, 2009, the pass is not enabled by default on any target,
/* INSN list of stores that are locally anticipatable. */
rtx_insn_list *antic_stores;
/* INSN list of stores that are locally available. */
- rtx_insn_list *avail_stores;
+ vec<rtx_insn *> avail_stores;
/* Next in the list. */
struct st_expr * next;
/* Store ID in the dataflow bitmaps. */
ptr->pattern = x;
ptr->pattern_regs = NULL_RTX;
ptr->antic_stores = NULL;
- ptr->avail_stores = NULL;
+ ptr->avail_stores.create (0);
ptr->reaching_reg = NULL_RTX;
ptr->index = 0;
ptr->hash_index = hash;
free_st_expr_entry (struct st_expr * ptr)
{
free_INSN_LIST_list (& ptr->antic_stores);
- free_INSN_LIST_list (& ptr->avail_stores);
+ ptr->avail_stores.release ();
free (ptr);
}
fprintf (file, "\n AVAIL stores : ");
- if (ptr->avail_stores)
- print_rtl (file, ptr->avail_stores);
- else
- fprintf (file, "(nil)");
+ print_rtx_insn_vec (file, ptr->avail_stores);
fprintf (file, "\n\n");
}
it successfully before; if we failed before, do not bother to check
until we reach the insn that caused us to fail. */
check_available = 0;
- if (!ptr->avail_stores)
+ if (ptr->avail_stores.is_empty ())
check_available = 1;
else
{
- rtx_insn *tmp = ptr->avail_stores->insn ();
+ rtx_insn *tmp = ptr->avail_stores.last ();
if (BLOCK_FOR_INSN (tmp) != bb)
check_available = 1;
}
&LAST_AVAIL_CHECK_FAILURE (ptr));
}
if (!check_available)
- ptr->avail_stores = alloc_INSN_LIST (insn, ptr->avail_stores);
+ ptr->avail_stores.safe_push (insn);
}
/* Find available and anticipatable stores. */
ptr != NULL;
ptr = *prev_next_ptr_ptr)
{
- if (! ptr->avail_stores)
+ if (ptr->avail_stores.is_empty ())
{
*prev_next_ptr_ptr = ptr->next;
store_motion_mems_table->remove_elt_with_hash (ptr, ptr->hash_index);
reg = expr->reaching_reg;
- for (rtx_insn_list *i = expr->avail_stores; i; i = i->next ())
+ unsigned int len = expr->avail_stores.length ();
+ for (unsigned int i = len - 1; i < len; i--)
{
- rtx_insn *del = i->insn ();
+ rtx_insn *del = expr->avail_stores[i];
if (BLOCK_FOR_INSN (del) == bb)
{
/* We know there is only one since we deleted redundant
for (ptr = first_st_expr (); ptr != NULL; ptr = next_st_expr (ptr))
{
- for (st = ptr->avail_stores; st != NULL; st = st->next ())
+ unsigned int len = ptr->avail_stores.length ();
+ for (unsigned int i = len - 1; i < len; i--)
{
- insn = st->insn ();
+ insn = ptr->avail_stores[i];
bb = BLOCK_FOR_INSN (insn);
/* If we've already seen an available expression in this block,
rtx r = gen_reg_rtx_and_attrs (ptr->pattern);
if (dump_file)
fprintf (dump_file, "Removing redundant store:\n");
- replace_store_insn (r, st->insn (), bb, ptr);
+ replace_store_insn (r, insn, bb, ptr);
continue;
}
bitmap_set_bit (st_avloc[bb->index], ptr->index);