diff options
Diffstat (limited to 'gcc/ira-conflicts.c')
| -rw-r--r-- | gcc/ira-conflicts.c | 459 |
1 files changed, 276 insertions, 183 deletions
diff --git a/gcc/ira-conflicts.c b/gcc/ira-conflicts.c index 9e9927a9059..0ce1bbc0a8f 100644 --- a/gcc/ira-conflicts.c +++ b/gcc/ira-conflicts.c @@ -32,6 +32,7 @@ along with GCC; see the file COPYING3. If not see #include "basic-block.h" #include "insn-config.h" #include "recog.h" +#include "diagnostic-core.h" #include "toplev.h" #include "params.h" #include "df.h" @@ -47,19 +48,47 @@ along with GCC; see the file COPYING3. If not see allocno's conflict (can't go in the same hardware register). Some arrays will be used as conflict bit vector of the - corresponding allocnos see function build_allocno_conflicts. */ + corresponding allocnos see function build_object_conflicts. */ static IRA_INT_TYPE **conflicts; -/* Macro to test a conflict of A1 and A2 in `conflicts'. */ -#define CONFLICT_ALLOCNO_P(A1, A2) \ - (ALLOCNO_MIN (A1) <= ALLOCNO_CONFLICT_ID (A2) \ - && ALLOCNO_CONFLICT_ID (A2) <= ALLOCNO_MAX (A1) \ - && TEST_MINMAX_SET_BIT (conflicts[ALLOCNO_NUM (A1)], \ - ALLOCNO_CONFLICT_ID (A2), \ - ALLOCNO_MIN (A1), \ - ALLOCNO_MAX (A1))) +/* Macro to test a conflict of C1 and C2 in `conflicts'. */ +#define OBJECTS_CONFLICT_P(C1, C2) \ + (OBJECT_MIN (C1) <= OBJECT_CONFLICT_ID (C2) \ + && OBJECT_CONFLICT_ID (C2) <= OBJECT_MAX (C1) \ + && TEST_MINMAX_SET_BIT (conflicts[OBJECT_CONFLICT_ID (C1)], \ + OBJECT_CONFLICT_ID (C2), \ + OBJECT_MIN (C1), OBJECT_MAX (C1))) +/* Record a conflict between objects OBJ1 and OBJ2. If necessary, + canonicalize the conflict by recording it for lower-order subobjects + of the corresponding allocnos. */ +static void +record_object_conflict (ira_object_t obj1, ira_object_t obj2) +{ + ira_allocno_t a1 = OBJECT_ALLOCNO (obj1); + ira_allocno_t a2 = OBJECT_ALLOCNO (obj2); + int w1 = OBJECT_SUBWORD (obj1); + int w2 = OBJECT_SUBWORD (obj2); + int id1, id2; + + /* Canonicalize the conflict. If two identically-numbered words + conflict, always record this as a conflict between words 0. That + is the only information we need, and it is easier to test for if + it is collected in each allocno's lowest-order object. */ + if (w1 == w2 && w1 > 0) + { + obj1 = ALLOCNO_OBJECT (a1, 0); + obj2 = ALLOCNO_OBJECT (a2, 0); + } + id1 = OBJECT_CONFLICT_ID (obj1); + id2 = OBJECT_CONFLICT_ID (obj2); + + SET_MINMAX_SET_BIT (conflicts[id1], id2, OBJECT_MIN (obj1), + OBJECT_MAX (obj1)); + SET_MINMAX_SET_BIT (conflicts[id2], id1, OBJECT_MIN (obj2), + OBJECT_MAX (obj2)); +} /* Build allocno conflict table by processing allocno live ranges. Return true if the table was built. The table is not built if it @@ -67,100 +96,118 @@ static IRA_INT_TYPE **conflicts; static bool build_conflict_bit_table (void) { - int i, num, id, allocated_words_num, conflict_bit_vec_words_num; + int i; unsigned int j; enum reg_class cover_class; - ira_allocno_t allocno, live_a; + int object_set_words, allocated_words_num, conflict_bit_vec_words_num; live_range_t r; + ira_allocno_t allocno; ira_allocno_iterator ai; - sparseset allocnos_live; - int allocno_set_words; + sparseset objects_live; + ira_object_t obj; + ira_allocno_object_iterator aoi; - allocno_set_words = (ira_allocnos_num + IRA_INT_BITS - 1) / IRA_INT_BITS; allocated_words_num = 0; FOR_EACH_ALLOCNO (allocno, ai) - { - if (ALLOCNO_MAX (allocno) < ALLOCNO_MIN (allocno)) + FOR_EACH_ALLOCNO_OBJECT (allocno, obj, aoi) + { + if (OBJECT_MAX (obj) < OBJECT_MIN (obj)) continue; - conflict_bit_vec_words_num - = ((ALLOCNO_MAX (allocno) - ALLOCNO_MIN (allocno) + IRA_INT_BITS) - / IRA_INT_BITS); - allocated_words_num += conflict_bit_vec_words_num; - if ((unsigned long long) allocated_words_num * sizeof (IRA_INT_TYPE) - > (unsigned long long) IRA_MAX_CONFLICT_TABLE_SIZE * 1024 * 1024) - { - if (internal_flag_ira_verbose > 0 && ira_dump_file != NULL) - fprintf - (ira_dump_file, - "+++Conflict table will be too big(>%dMB) -- don't use it\n", - IRA_MAX_CONFLICT_TABLE_SIZE); - return false; - } - } - allocnos_live = sparseset_alloc (ira_allocnos_num); + conflict_bit_vec_words_num + = ((OBJECT_MAX (obj) - OBJECT_MIN (obj) + IRA_INT_BITS) + / IRA_INT_BITS); + allocated_words_num += conflict_bit_vec_words_num; + if ((unsigned long long) allocated_words_num * sizeof (IRA_INT_TYPE) + > (unsigned long long) IRA_MAX_CONFLICT_TABLE_SIZE * 1024 * 1024) + { + if (internal_flag_ira_verbose > 0 && ira_dump_file != NULL) + fprintf + (ira_dump_file, + "+++Conflict table will be too big(>%dMB) -- don't use it\n", + IRA_MAX_CONFLICT_TABLE_SIZE); + return false; + } + } + conflicts = (IRA_INT_TYPE **) ira_allocate (sizeof (IRA_INT_TYPE *) - * ira_allocnos_num); + * ira_objects_num); allocated_words_num = 0; FOR_EACH_ALLOCNO (allocno, ai) - { - num = ALLOCNO_NUM (allocno); - if (ALLOCNO_MAX (allocno) < ALLOCNO_MIN (allocno)) - { - conflicts[num] = NULL; - continue; - } - conflict_bit_vec_words_num - = ((ALLOCNO_MAX (allocno) - ALLOCNO_MIN (allocno) + IRA_INT_BITS) - / IRA_INT_BITS); - allocated_words_num += conflict_bit_vec_words_num; - conflicts[num] - = (IRA_INT_TYPE *) ira_allocate (sizeof (IRA_INT_TYPE) - * conflict_bit_vec_words_num); - memset (conflicts[num], 0, - sizeof (IRA_INT_TYPE) * conflict_bit_vec_words_num); - } + FOR_EACH_ALLOCNO_OBJECT (allocno, obj, aoi) + { + int id = OBJECT_CONFLICT_ID (obj); + if (OBJECT_MAX (obj) < OBJECT_MIN (obj)) + { + conflicts[id] = NULL; + continue; + } + conflict_bit_vec_words_num + = ((OBJECT_MAX (obj) - OBJECT_MIN (obj) + IRA_INT_BITS) + / IRA_INT_BITS); + allocated_words_num += conflict_bit_vec_words_num; + conflicts[id] + = (IRA_INT_TYPE *) ira_allocate (sizeof (IRA_INT_TYPE) + * conflict_bit_vec_words_num); + memset (conflicts[id], 0, + sizeof (IRA_INT_TYPE) * conflict_bit_vec_words_num); + } + + object_set_words = (ira_objects_num + IRA_INT_BITS - 1) / IRA_INT_BITS; if (internal_flag_ira_verbose > 0 && ira_dump_file != NULL) fprintf (ira_dump_file, "+++Allocating %ld bytes for conflict table (uncompressed size %ld)\n", (long) allocated_words_num * sizeof (IRA_INT_TYPE), - (long) allocno_set_words * ira_allocnos_num * sizeof (IRA_INT_TYPE)); + (long) object_set_words * ira_objects_num * sizeof (IRA_INT_TYPE)); + + objects_live = sparseset_alloc (ira_objects_num); for (i = 0; i < ira_max_point; i++) { for (r = ira_start_point_ranges[i]; r != NULL; r = r->start_next) { - allocno = r->allocno; - num = ALLOCNO_NUM (allocno); - id = ALLOCNO_CONFLICT_ID (allocno); + ira_object_t obj = r->object; + ira_allocno_t allocno = OBJECT_ALLOCNO (obj); + int id = OBJECT_CONFLICT_ID (obj); + + gcc_assert (id < ira_objects_num); + cover_class = ALLOCNO_COVER_CLASS (allocno); - sparseset_set_bit (allocnos_live, num); - EXECUTE_IF_SET_IN_SPARSESET (allocnos_live, j) + sparseset_set_bit (objects_live, id); + EXECUTE_IF_SET_IN_SPARSESET (objects_live, j) { - live_a = ira_allocnos[j]; - if (ira_reg_classes_intersect_p - [cover_class][ALLOCNO_COVER_CLASS (live_a)] + ira_object_t live_obj = ira_object_id_map[j]; + ira_allocno_t live_a = OBJECT_ALLOCNO (live_obj); + enum reg_class live_cover_class = ALLOCNO_COVER_CLASS (live_a); + + if (ira_reg_classes_intersect_p[cover_class][live_cover_class] /* Don't set up conflict for the allocno with itself. */ - && num != (int) j) + && live_a != allocno) { - SET_MINMAX_SET_BIT (conflicts[num], - ALLOCNO_CONFLICT_ID (live_a), - ALLOCNO_MIN (allocno), - ALLOCNO_MAX (allocno)); - SET_MINMAX_SET_BIT (conflicts[j], id, - ALLOCNO_MIN (live_a), - ALLOCNO_MAX (live_a)); + record_object_conflict (obj, live_obj); } } } for (r = ira_finish_point_ranges[i]; r != NULL; r = r->finish_next) - sparseset_clear_bit (allocnos_live, ALLOCNO_NUM (r->allocno)); + sparseset_clear_bit (objects_live, OBJECT_CONFLICT_ID (r->object)); } - sparseset_free (allocnos_live); + sparseset_free (objects_live); return true; } - +/* Return true iff allocnos A1 and A2 cannot be allocated to the same + register due to conflicts. */ + +static bool +allocnos_conflict_for_copy_p (ira_allocno_t a1, ira_allocno_t a2) +{ + /* Due to the fact that we canonicalize conflicts (see + record_object_conflict), we only need to test for conflicts of + the lowest order words. */ + ira_object_t obj1 = ALLOCNO_OBJECT (a1, 0); + ira_object_t obj2 = ALLOCNO_OBJECT (a2, 0); + return OBJECTS_CONFLICT_P (obj1, obj2); +} /* Return TRUE if the operand constraint STR is commutative. */ static bool @@ -365,19 +412,21 @@ process_regs_for_copy (rtx reg1, rtx reg2, bool constraint_p, allocno_preferenced_hard_regno = REGNO (reg2) + offset2 - offset1; a = ira_curr_regno_allocno_map[REGNO (reg1)]; } - else if (!CONFLICT_ALLOCNO_P (ira_curr_regno_allocno_map[REGNO (reg1)], - ira_curr_regno_allocno_map[REGNO (reg2)]) - && offset1 == offset2) + else { - cp = ira_add_allocno_copy (ira_curr_regno_allocno_map[REGNO (reg1)], - ira_curr_regno_allocno_map[REGNO (reg2)], - freq, constraint_p, insn, - ira_curr_loop_tree_node); - bitmap_set_bit (ira_curr_loop_tree_node->local_copies, cp->num); - return true; + ira_allocno_t a1 = ira_curr_regno_allocno_map[REGNO (reg1)]; + ira_allocno_t a2 = ira_curr_regno_allocno_map[REGNO (reg2)]; + if (!allocnos_conflict_for_copy_p (a1, a2) && offset1 == offset2) + { + cp = ira_add_allocno_copy (a1, a2, freq, constraint_p, insn, + ira_curr_loop_tree_node); + bitmap_set_bit (ira_curr_loop_tree_node->local_copies, cp->num); + return true; + } + else + return false; } - else - return false; + if (! IN_RANGE (allocno_preferenced_hard_regno, 0, FIRST_PSEUDO_REGISTER - 1)) /* Can not be tied. */ return false; @@ -447,7 +496,7 @@ add_insn_allocno_copies (rtx insn) const char *str; bool commut_p, bound_p[MAX_RECOG_OPERANDS]; int i, j, n, freq; - + freq = REG_FREQ_FROM_BB (BLOCK_FOR_INSN (insn)); if (freq == 0) freq = 1; @@ -540,79 +589,91 @@ propagate_copies (void) parent_a1 = ira_parent_or_cap_allocno (a1); parent_a2 = ira_parent_or_cap_allocno (a2); ira_assert (parent_a1 != NULL && parent_a2 != NULL); - if (! CONFLICT_ALLOCNO_P (parent_a1, parent_a2)) + if (! allocnos_conflict_for_copy_p (parent_a1, parent_a2)) ira_add_allocno_copy (parent_a1, parent_a2, cp->freq, cp->constraint_p, cp->insn, cp->loop_tree_node); } } /* Array used to collect all conflict allocnos for given allocno. */ -static ira_allocno_t *collected_conflict_allocnos; +static ira_object_t *collected_conflict_objects; /* Build conflict vectors or bit conflict vectors (whatever is more - profitable) for allocno A from the conflict table and propagate the - conflicts to upper level allocno. */ + profitable) for object OBJ from the conflict table. */ static void -build_allocno_conflicts (ira_allocno_t a) +build_object_conflicts (ira_object_t obj) { int i, px, parent_num; - int conflict_bit_vec_words_num; - ira_allocno_t parent_a, another_a, another_parent_a; - ira_allocno_t *vec; - IRA_INT_TYPE *allocno_conflicts; + ira_allocno_t parent_a, another_parent_a; + ira_object_t parent_obj; + ira_allocno_t a = OBJECT_ALLOCNO (obj); + IRA_INT_TYPE *object_conflicts; minmax_set_iterator asi; - allocno_conflicts = conflicts[ALLOCNO_NUM (a)]; + object_conflicts = conflicts[OBJECT_CONFLICT_ID (obj)]; px = 0; - FOR_EACH_BIT_IN_MINMAX_SET (allocno_conflicts, - ALLOCNO_MIN (a), ALLOCNO_MAX (a), i, asi) + FOR_EACH_BIT_IN_MINMAX_SET (object_conflicts, + OBJECT_MIN (obj), OBJECT_MAX (obj), i, asi) { - another_a = ira_conflict_id_allocno_map[i]; + ira_object_t another_obj = ira_object_id_map[i]; + ira_allocno_t another_a = OBJECT_ALLOCNO (obj); ira_assert (ira_reg_classes_intersect_p [ALLOCNO_COVER_CLASS (a)][ALLOCNO_COVER_CLASS (another_a)]); - collected_conflict_allocnos[px++] = another_a; + collected_conflict_objects[px++] = another_obj; } - if (ira_conflict_vector_profitable_p (a, px)) + if (ira_conflict_vector_profitable_p (obj, px)) { - ira_allocate_allocno_conflict_vec (a, px); - vec = (ira_allocno_t*) ALLOCNO_CONFLICT_ALLOCNO_ARRAY (a); - memcpy (vec, collected_conflict_allocnos, sizeof (ira_allocno_t) * px); + ira_object_t *vec; + ira_allocate_conflict_vec (obj, px); + vec = OBJECT_CONFLICT_VEC (obj); + memcpy (vec, collected_conflict_objects, sizeof (ira_object_t) * px); vec[px] = NULL; - ALLOCNO_CONFLICT_ALLOCNOS_NUM (a) = px; + OBJECT_NUM_CONFLICTS (obj) = px; } else { - ALLOCNO_CONFLICT_ALLOCNO_ARRAY (a) = conflicts[ALLOCNO_NUM (a)]; - if (ALLOCNO_MAX (a) < ALLOCNO_MIN (a)) + int conflict_bit_vec_words_num; + OBJECT_CONFLICT_ARRAY (obj) = object_conflicts; + if (OBJECT_MAX (obj) < OBJECT_MIN (obj)) conflict_bit_vec_words_num = 0; else conflict_bit_vec_words_num - = ((ALLOCNO_MAX (a) - ALLOCNO_MIN (a) + IRA_INT_BITS) + = ((OBJECT_MAX (obj) - OBJECT_MIN (obj) + IRA_INT_BITS) / IRA_INT_BITS); - ALLOCNO_CONFLICT_ALLOCNO_ARRAY_SIZE (a) + OBJECT_CONFLICT_ARRAY_SIZE (obj) = conflict_bit_vec_words_num * sizeof (IRA_INT_TYPE); } + parent_a = ira_parent_or_cap_allocno (a); if (parent_a == NULL) return; ira_assert (ALLOCNO_COVER_CLASS (a) == ALLOCNO_COVER_CLASS (parent_a)); - parent_num = ALLOCNO_NUM (parent_a); - FOR_EACH_BIT_IN_MINMAX_SET (allocno_conflicts, - ALLOCNO_MIN (a), ALLOCNO_MAX (a), i, asi) + ira_assert (ALLOCNO_NUM_OBJECTS (a) == ALLOCNO_NUM_OBJECTS (parent_a)); + parent_obj = ALLOCNO_OBJECT (parent_a, OBJECT_SUBWORD (obj)); + parent_num = OBJECT_CONFLICT_ID (parent_obj); + FOR_EACH_BIT_IN_MINMAX_SET (object_conflicts, + OBJECT_MIN (obj), OBJECT_MAX (obj), i, asi) { - another_a = ira_conflict_id_allocno_map[i]; + ira_object_t another_obj = ira_object_id_map[i]; + ira_allocno_t another_a = OBJECT_ALLOCNO (another_obj); + int another_word = OBJECT_SUBWORD (another_obj); + ira_assert (ira_reg_classes_intersect_p [ALLOCNO_COVER_CLASS (a)][ALLOCNO_COVER_CLASS (another_a)]); + another_parent_a = ira_parent_or_cap_allocno (another_a); if (another_parent_a == NULL) continue; ira_assert (ALLOCNO_NUM (another_parent_a) >= 0); ira_assert (ALLOCNO_COVER_CLASS (another_a) == ALLOCNO_COVER_CLASS (another_parent_a)); + ira_assert (ALLOCNO_NUM_OBJECTS (another_a) + == ALLOCNO_NUM_OBJECTS (another_parent_a)); SET_MINMAX_SET_BIT (conflicts[parent_num], - ALLOCNO_CONFLICT_ID (another_parent_a), - ALLOCNO_MIN (parent_a), - ALLOCNO_MAX (parent_a)); + OBJECT_CONFLICT_ID (ALLOCNO_OBJECT (another_parent_a, + another_word)), + OBJECT_MIN (parent_obj), + OBJECT_MAX (parent_obj)); } } @@ -624,19 +685,28 @@ build_conflicts (void) int i; ira_allocno_t a, cap; - collected_conflict_allocnos - = (ira_allocno_t *) ira_allocate (sizeof (ira_allocno_t) - * ira_allocnos_num); + collected_conflict_objects + = (ira_object_t *) ira_allocate (sizeof (ira_object_t) + * ira_objects_num); for (i = max_reg_num () - 1; i >= FIRST_PSEUDO_REGISTER; i--) for (a = ira_regno_allocno_map[i]; a != NULL; a = ALLOCNO_NEXT_REGNO_ALLOCNO (a)) { - build_allocno_conflicts (a); - for (cap = ALLOCNO_CAP (a); cap != NULL; cap = ALLOCNO_CAP (cap)) - build_allocno_conflicts (cap); + int j, nregs = ALLOCNO_NUM_OBJECTS (a); + for (j = 0; j < nregs; j++) + { + ira_object_t obj = ALLOCNO_OBJECT (a, j); + build_object_conflicts (obj); + for (cap = ALLOCNO_CAP (a); cap != NULL; cap = ALLOCNO_CAP (cap)) + { + ira_object_t cap_obj = ALLOCNO_OBJECT (cap, j); + gcc_assert (ALLOCNO_NUM_OBJECTS (cap) == ALLOCNO_NUM_OBJECTS (a)); + build_object_conflicts (cap_obj); + } + } } - ira_free (collected_conflict_allocnos); + ira_free (collected_conflict_objects); } @@ -674,9 +744,8 @@ static void print_allocno_conflicts (FILE * file, bool reg_p, ira_allocno_t a) { HARD_REG_SET conflicting_hard_regs; - ira_allocno_t conflict_a; - ira_allocno_conflict_iterator aci; basic_block bb; + int n, i; if (reg_p) fprintf (file, ";; r%d", ALLOCNO_REGNO (a)); @@ -689,38 +758,54 @@ print_allocno_conflicts (FILE * file, bool reg_p, ira_allocno_t a) fprintf (file, "l%d", ALLOCNO_LOOP_TREE_NODE (a)->loop->num); putc (')', file); } + fputs (" conflicts:", file); - if (ALLOCNO_CONFLICT_ALLOCNO_ARRAY (a) != NULL) - FOR_EACH_ALLOCNO_CONFLICT (a, conflict_a, aci) - { - if (reg_p) - fprintf (file, " r%d,", ALLOCNO_REGNO (conflict_a)); - else - { - fprintf (file, " a%d(r%d,", ALLOCNO_NUM (conflict_a), - ALLOCNO_REGNO (conflict_a)); - if ((bb = ALLOCNO_LOOP_TREE_NODE (conflict_a)->bb) != NULL) - fprintf (file, "b%d)", bb->index); - else - fprintf (file, "l%d)", - ALLOCNO_LOOP_TREE_NODE (conflict_a)->loop->num); - } - } - COPY_HARD_REG_SET (conflicting_hard_regs, - ALLOCNO_TOTAL_CONFLICT_HARD_REGS (a)); - AND_COMPL_HARD_REG_SET (conflicting_hard_regs, ira_no_alloc_regs); - AND_HARD_REG_SET (conflicting_hard_regs, - reg_class_contents[ALLOCNO_COVER_CLASS (a)]); - print_hard_reg_set (file, "\n;; total conflict hard regs:", - conflicting_hard_regs); - COPY_HARD_REG_SET (conflicting_hard_regs, - ALLOCNO_CONFLICT_HARD_REGS (a)); - AND_COMPL_HARD_REG_SET (conflicting_hard_regs, ira_no_alloc_regs); - AND_HARD_REG_SET (conflicting_hard_regs, - reg_class_contents[ALLOCNO_COVER_CLASS (a)]); - print_hard_reg_set (file, ";; conflict hard regs:", - conflicting_hard_regs); - putc ('\n', file); + n = ALLOCNO_NUM_OBJECTS (a); + for (i = 0; i < n; i++) + { + ira_object_t obj = ALLOCNO_OBJECT (a, i); + ira_object_t conflict_obj; + ira_object_conflict_iterator oci; + + if (OBJECT_CONFLICT_ARRAY (obj) == NULL) + continue; + if (n > 1) + fprintf (file, "\n;; subobject %d:", i); + FOR_EACH_OBJECT_CONFLICT (obj, conflict_obj, oci) + { + ira_allocno_t conflict_a = OBJECT_ALLOCNO (conflict_obj); + if (reg_p) + fprintf (file, " r%d,", ALLOCNO_REGNO (conflict_a)); + else + { + fprintf (file, " a%d(r%d", ALLOCNO_NUM (conflict_a), + ALLOCNO_REGNO (conflict_a)); + if (ALLOCNO_NUM_OBJECTS (conflict_a) > 1) + fprintf (file, ",w%d", OBJECT_SUBWORD (conflict_obj)); + if ((bb = ALLOCNO_LOOP_TREE_NODE (conflict_a)->bb) != NULL) + fprintf (file, ",b%d", bb->index); + else + fprintf (file, ",l%d", + ALLOCNO_LOOP_TREE_NODE (conflict_a)->loop->num); + putc (')', file); + } + } + COPY_HARD_REG_SET (conflicting_hard_regs, OBJECT_TOTAL_CONFLICT_HARD_REGS (obj)); + AND_COMPL_HARD_REG_SET (conflicting_hard_regs, ira_no_alloc_regs); + AND_HARD_REG_SET (conflicting_hard_regs, + reg_class_contents[ALLOCNO_COVER_CLASS (a)]); + print_hard_reg_set (file, "\n;; total conflict hard regs:", + conflicting_hard_regs); + + COPY_HARD_REG_SET (conflicting_hard_regs, OBJECT_CONFLICT_HARD_REGS (obj)); + AND_COMPL_HARD_REG_SET (conflicting_hard_regs, ira_no_alloc_regs); + AND_HARD_REG_SET (conflicting_hard_regs, + reg_class_contents[ALLOCNO_COVER_CLASS (a)]); + print_hard_reg_set (file, ";; conflict hard regs:", + conflicting_hard_regs); + putc ('\n', file); + } + } /* Print information about allocno or only regno (if REG_P) conflicts @@ -759,19 +844,22 @@ ira_build_conflicts (void) ira_conflicts_p = build_conflict_bit_table (); if (ira_conflicts_p) { + ira_object_t obj; + ira_object_iterator oi; + build_conflicts (); ira_traverse_loop_tree (true, ira_loop_tree_root, NULL, add_copies); /* We need finished conflict table for the subsequent call. */ if (flag_ira_region == IRA_REGION_ALL || flag_ira_region == IRA_REGION_MIXED) propagate_copies (); + /* Now we can free memory for the conflict table (see function - build_allocno_conflicts for details). */ - FOR_EACH_ALLOCNO (a, ai) + build_object_conflicts for details). */ + FOR_EACH_OBJECT (obj, oi) { - if (ALLOCNO_CONFLICT_ALLOCNO_ARRAY (a) - != conflicts[ALLOCNO_NUM (a)]) - ira_free (conflicts[ALLOCNO_NUM (a)]); + if (OBJECT_CONFLICT_ARRAY (obj) != conflicts[OBJECT_CONFLICT_ID (obj)]) + ira_free (conflicts[OBJECT_CONFLICT_ID (obj)]); } ira_free (conflicts); } @@ -787,33 +875,38 @@ ira_build_conflicts (void) } FOR_EACH_ALLOCNO (a, ai) { - reg_attrs *attrs; - tree decl; - - if ((! flag_caller_saves && ALLOCNO_CALLS_CROSSED_NUM (a) != 0) - /* For debugging purposes don't put user defined variables in - callee-clobbered registers. */ - || (optimize == 0 - && (attrs = REG_ATTRS (regno_reg_rtx [ALLOCNO_REGNO (a)])) != NULL - && (decl = attrs->decl) != NULL - && VAR_OR_FUNCTION_DECL_P (decl) - && ! DECL_ARTIFICIAL (decl))) - { - IOR_HARD_REG_SET (ALLOCNO_TOTAL_CONFLICT_HARD_REGS (a), - call_used_reg_set); - IOR_HARD_REG_SET (ALLOCNO_CONFLICT_HARD_REGS (a), - call_used_reg_set); - } - else if (ALLOCNO_CALLS_CROSSED_NUM (a) != 0) + int i, n = ALLOCNO_NUM_OBJECTS (a); + for (i = 0; i < n; i++) { - IOR_HARD_REG_SET (ALLOCNO_TOTAL_CONFLICT_HARD_REGS (a), - no_caller_save_reg_set); - IOR_HARD_REG_SET (ALLOCNO_TOTAL_CONFLICT_HARD_REGS (a), - temp_hard_reg_set); - IOR_HARD_REG_SET (ALLOCNO_CONFLICT_HARD_REGS (a), - no_caller_save_reg_set); - IOR_HARD_REG_SET (ALLOCNO_CONFLICT_HARD_REGS (a), - temp_hard_reg_set); + ira_object_t obj = ALLOCNO_OBJECT (a, i); + reg_attrs *attrs = REG_ATTRS (regno_reg_rtx [ALLOCNO_REGNO (a)]); + tree decl; + + if ((! flag_caller_saves && ALLOCNO_CALLS_CROSSED_NUM (a) != 0) + /* For debugging purposes don't put user defined variables in + callee-clobbered registers. */ + || (optimize == 0 + && attrs != NULL + && (decl = attrs->decl) != NULL + && VAR_OR_FUNCTION_DECL_P (decl) + && ! DECL_ARTIFICIAL (decl))) + { + IOR_HARD_REG_SET (OBJECT_TOTAL_CONFLICT_HARD_REGS (obj), + call_used_reg_set); + IOR_HARD_REG_SET (OBJECT_CONFLICT_HARD_REGS (obj), + call_used_reg_set); + } + else if (ALLOCNO_CALLS_CROSSED_NUM (a) != 0) + { + IOR_HARD_REG_SET (OBJECT_TOTAL_CONFLICT_HARD_REGS (obj), + no_caller_save_reg_set); + IOR_HARD_REG_SET (OBJECT_TOTAL_CONFLICT_HARD_REGS (obj), + temp_hard_reg_set); + IOR_HARD_REG_SET (OBJECT_CONFLICT_HARD_REGS (obj), + no_caller_save_reg_set); + IOR_HARD_REG_SET (OBJECT_CONFLICT_HARD_REGS (obj), + temp_hard_reg_set); + } } } if (optimize && ira_conflicts_p |