2014-01-15 Vladimir Makarov <vmakarov@redhat.com>

	PR rtl-optimization/59511
	* ira.c (ira_init_register_move_cost): Use memory costs for some
	cases of register move cost calculations.
	* lra-constraints.c (lra_constraints): Use REG_FREQ_FROM_BB
	instead of BB frequency.
	* lra-coalesce.c (move_freq_compare_func, lra_coalesce): Ditto.
	* lra-assigns.c (find_hard_regno_for): Ditto.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206636 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7ddff75..8fe6aca 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2014-01-15  Vladimir Makarov  <vmakarov@redhat.com>
+
+       PR rtl-optimization/59511
+       * ira.c (ira_init_register_move_cost): Use memory costs for some
+       cases of register move cost calculations.
+       * lra-constraints.c (lra_constraints): Use REG_FREQ_FROM_BB
+       instead of BB frequency.
+       * lra-coalesce.c (move_freq_compare_func, lra_coalesce): Ditto.
+       * lra-assigns.c (find_hard_regno_for): Ditto.
+
 2014-01-15  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/59822

diff --git a/gcc/ira.c b/gcc/ira.c
index cebacf5..41e05f4 100644 (file)
--- a/gcc/ira.c
+++ b/gcc/ira.c
@@ -1574,21 +1574,30 @@ ira_init_register_move_cost (enum machine_mode mode)
              && ira_may_move_out_cost[mode] == NULL);
   ira_assert (have_regs_of_mode[mode]);
   for (cl1 = 0; cl1 < N_REG_CLASSES; cl1++)
-    if (contains_reg_of_mode[cl1][mode])
-      for (cl2 = 0; cl2 < N_REG_CLASSES; cl2++)
-       {
-         int cost;
-         if (!contains_reg_of_mode[cl2][mode])
-           cost = 65535;
-         else
-           {
-             cost = register_move_cost (mode, (enum reg_class) cl1,
-                                        (enum reg_class) cl2);
-             ira_assert (cost < 65535);
-           }
-         all_match &= (last_move_cost[cl1][cl2] == cost);
-         last_move_cost[cl1][cl2] = cost;
-       }
+    for (cl2 = 0; cl2 < N_REG_CLASSES; cl2++)
+      {
+       int cost;
+       if (!contains_reg_of_mode[cl1][mode]
+           || !contains_reg_of_mode[cl2][mode])
+         {
+           if ((ira_reg_class_max_nregs[cl1][mode]
+                > ira_class_hard_regs_num[cl1])
+               || (ira_reg_class_max_nregs[cl2][mode]
+                   > ira_class_hard_regs_num[cl2]))
+             cost = 65535;
+           else
+             cost = (ira_memory_move_cost[mode][cl1][0]
+                     + ira_memory_move_cost[mode][cl2][1]);
+         }
+       else
+         {
+           cost = register_move_cost (mode, (enum reg_class) cl1,
+                                      (enum reg_class) cl2);
+           ira_assert (cost < 65535);
+         }
+       all_match &= (last_move_cost[cl1][cl2] == cost);
+       last_move_cost[cl1][cl2] = cost;
+      }
   if (all_match && last_mode_for_init_move_cost != -1)
     {
       ira_register_move_cost[mode]
@@ -1604,58 +1613,51 @@ ira_init_register_move_cost (enum machine_mode mode)
   ira_may_move_in_cost[mode] = XNEWVEC (move_table, N_REG_CLASSES);
   ira_may_move_out_cost[mode] = XNEWVEC (move_table, N_REG_CLASSES);
   for (cl1 = 0; cl1 < N_REG_CLASSES; cl1++)
-    if (contains_reg_of_mode[cl1][mode])
-      for (cl2 = 0; cl2 < N_REG_CLASSES; cl2++)
-       {
-         int cost;
-         enum reg_class *p1, *p2;
-
-         if (last_move_cost[cl1][cl2] == 65535)
-           {
-             ira_register_move_cost[mode][cl1][cl2] = 65535;
-             ira_may_move_in_cost[mode][cl1][cl2] = 65535;
-             ira_may_move_out_cost[mode][cl1][cl2] = 65535;
-           }
-         else
-           {
-             cost = last_move_cost[cl1][cl2];
-
-             for (p2 = &reg_class_subclasses[cl2][0];
-                  *p2 != LIM_REG_CLASSES; p2++)
-               if (ira_class_hard_regs_num[*p2] > 0
-                   && (ira_reg_class_max_nregs[*p2][mode]
-                       <= ira_class_hard_regs_num[*p2]))
-                 cost = MAX (cost, ira_register_move_cost[mode][cl1][*p2]);
-
-             for (p1 = &reg_class_subclasses[cl1][0];
-                  *p1 != LIM_REG_CLASSES; p1++)
-               if (ira_class_hard_regs_num[*p1] > 0
-                   && (ira_reg_class_max_nregs[*p1][mode]
-                       <= ira_class_hard_regs_num[*p1]))
-                 cost = MAX (cost, ira_register_move_cost[mode][*p1][cl2]);
-
-             ira_assert (cost <= 65535);
-             ira_register_move_cost[mode][cl1][cl2] = cost;
-
-             if (ira_class_subset_p[cl1][cl2])
-               ira_may_move_in_cost[mode][cl1][cl2] = 0;
-             else
-               ira_may_move_in_cost[mode][cl1][cl2] = cost;
-
-             if (ira_class_subset_p[cl2][cl1])
-               ira_may_move_out_cost[mode][cl1][cl2] = 0;
-             else
-               ira_may_move_out_cost[mode][cl1][cl2] = cost;
-           }
-       }
-    else
-      for (cl2 = 0; cl2 < N_REG_CLASSES; cl2++)
-       {
-         ira_register_move_cost[mode][cl1][cl2] = 65535;
-         ira_may_move_in_cost[mode][cl1][cl2] = 65535;
-         ira_may_move_out_cost[mode][cl1][cl2] = 65535;
-       }
+    for (cl2 = 0; cl2 < N_REG_CLASSES; cl2++)
+      {
+       int cost;
+       enum reg_class *p1, *p2;
+       
+       if (last_move_cost[cl1][cl2] == 65535)
+         {
+           ira_register_move_cost[mode][cl1][cl2] = 65535;
+           ira_may_move_in_cost[mode][cl1][cl2] = 65535;
+           ira_may_move_out_cost[mode][cl1][cl2] = 65535;
+         }
+       else
+         {
+           cost = last_move_cost[cl1][cl2];
+           
+           for (p2 = &reg_class_subclasses[cl2][0];
+                *p2 != LIM_REG_CLASSES; p2++)
+             if (ira_class_hard_regs_num[*p2] > 0
+                 && (ira_reg_class_max_nregs[*p2][mode]
+                     <= ira_class_hard_regs_num[*p2]))
+               cost = MAX (cost, ira_register_move_cost[mode][cl1][*p2]);
+           
+           for (p1 = &reg_class_subclasses[cl1][0];
+                *p1 != LIM_REG_CLASSES; p1++)
+             if (ira_class_hard_regs_num[*p1] > 0
+                 && (ira_reg_class_max_nregs[*p1][mode]
+                     <= ira_class_hard_regs_num[*p1]))
+               cost = MAX (cost, ira_register_move_cost[mode][*p1][cl2]);
+           
+           ira_assert (cost <= 65535);
+           ira_register_move_cost[mode][cl1][cl2] = cost;
+           
+           if (ira_class_subset_p[cl1][cl2])
+             ira_may_move_in_cost[mode][cl1][cl2] = 0;
+           else
+             ira_may_move_in_cost[mode][cl1][cl2] = cost;
+           
+           if (ira_class_subset_p[cl2][cl1])
+             ira_may_move_out_cost[mode][cl1][cl2] = 0;
+           else
+             ira_may_move_out_cost[mode][cl1][cl2] = cost;
+         }
+      }
 }
+
 \f
 
 /* This is called once during compiler work.  It sets up

diff --git a/gcc/lra-assigns.c b/gcc/lra-assigns.c
index 596fc6b..268edcc 100644 (file)
--- a/gcc/lra-assigns.c
+++ b/gcc/lra-assigns.c
@@ -612,7 +612,9 @@ find_hard_regno_for (int regno, int *cost, int try_only_hard_regno)
                && ! df_regs_ever_live_p (hard_regno + j))
              /* It needs save restore.  */
              hard_regno_costs[hard_regno]
-               += 2 * ENTRY_BLOCK_PTR_FOR_FN (cfun)->next_bb->frequency + 1;
+               += (2
+                   * REG_FREQ_FROM_BB (ENTRY_BLOCK_PTR_FOR_FN (cfun)->next_bb)
+                   + 1);
          priority = targetm.register_priority (hard_regno);
          if (best_hard_regno < 0 || hard_regno_costs[hard_regno] < best_cost
              || (hard_regno_costs[hard_regno] == best_cost

diff --git a/gcc/lra-coalesce.c b/gcc/lra-coalesce.c
index 431b3e2..350977c 100644 (file)
--- a/gcc/lra-coalesce.c
+++ b/gcc/lra-coalesce.c
@@ -79,8 +79,8 @@ move_freq_compare_func (const void *v1p, const void *v2p)
   rtx mv2 = *(const rtx *) v2p;
   int pri1, pri2;
 
-  pri1 = BLOCK_FOR_INSN (mv1)->frequency;
-  pri2 = BLOCK_FOR_INSN (mv2)->frequency;
+  pri1 = REG_FREQ_FROM_BB (BLOCK_FOR_INSN (mv1));
+  pri2 = REG_FREQ_FROM_BB (BLOCK_FOR_INSN (mv2));
   if (pri2 - pri1)
     return pri2 - pri1;
 
@@ -277,7 +277,7 @@ lra_coalesce (void)
            fprintf
              (lra_dump_file, "      Coalescing move %i:r%d-r%d (freq=%d)\n",
               INSN_UID (mv), sregno, dregno,
-              BLOCK_FOR_INSN (mv)->frequency);
+              REG_FREQ_FROM_BB (BLOCK_FOR_INSN (mv)));
          /* We updated involved_insns_bitmap when doing the merge.  */
        }
       else if (!(lra_intersected_live_ranges_p
@@ -291,7 +291,7 @@ lra_coalesce (void)
               "  Coalescing move %i:r%d(%d)-r%d(%d) (freq=%d)\n",
               INSN_UID (mv), sregno, ORIGINAL_REGNO (SET_SRC (set)),
               dregno, ORIGINAL_REGNO (SET_DEST (set)),
-              BLOCK_FOR_INSN (mv)->frequency);
+              REG_FREQ_FROM_BB (BLOCK_FOR_INSN (mv)));
          bitmap_ior_into (&involved_insns_bitmap,
                           &lra_reg_info[sregno].insn_bitmap);
          bitmap_ior_into (&involved_insns_bitmap,
@@ -316,7 +316,8 @@ lra_coalesce (void)
                /* Coalesced move.  */
                if (lra_dump_file != NULL)
                  fprintf (lra_dump_file, "      Removing move %i (freq=%d)\n",
-                        INSN_UID (insn), BLOCK_FOR_INSN (insn)->frequency);
+                          INSN_UID (insn),
+                          REG_FREQ_FROM_BB (BLOCK_FOR_INSN (insn)));
                lra_set_insn_deleted (insn);
              }
          }

diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index 1401884..07815fe 100644 (file)
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -4077,7 +4077,7 @@ lra_constraints (bool first_p)
                      fprintf (lra_dump_file,
                               "      Removing equiv init insn %i (freq=%d)\n",
                               INSN_UID (curr_insn),
-                              BLOCK_FOR_INSN (curr_insn)->frequency);
+                              REG_FREQ_FROM_BB (BLOCK_FOR_INSN (curr_insn)));
                      dump_insn_slim (lra_dump_file, curr_insn);
                    }
                  if (contains_reg_p (x, true, false))