i386.c (ix86_loop_memcount): Delete.

gcc/
	* config/i386/i386.c (ix86_loop_memcount): Delete.
	(ix86_loop_unroll_adjust): Use FOR_EACH_SUBRTX.

From-SVN: r216761

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index aed92bb3deadb436fe2a87d9685cf483767c1022..2c7550a87fd8208115677e82c49fd0a69e995b59 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-27  Richard Sandiford  <richard.sandiford@arm.com>
+
+       * config/i386/i386.c (ix86_loop_memcount): Delete.
+       (ix86_loop_unroll_adjust): Use FOR_EACH_SUBRTX.
+
 2014-10-27  Richard Sandiford  <richard.sandiford@arm.com>
 
        * config/i386/i386.c (find_constant_1): Delete.

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 7855a4b153a61825b1241631fd6f1824169c73ab..6ffafa9d86610a8c41276805644a7c1334f2e44e 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -47412,29 +47412,6 @@ ix86_simd_clone_usable (struct cgraph_node *node)
     }
 }
 
-/* This function gives out the number of memory references.
-   This value determines the unrolling factor for
-   bdver3 and bdver4 architectures. */
-
-static int
-ix86_loop_memcount (rtx *x, unsigned *mem_count)
-{
-  if (*x != NULL_RTX && MEM_P (*x))
-   {
-     enum machine_mode mode;
-     unsigned int n_words;
-
-     mode = GET_MODE (*x);
-     n_words = GET_MODE_SIZE (mode) / UNITS_PER_WORD;
-
-    if (n_words > 4)
-       (*mem_count)+=2;
-    else
-       (*mem_count)+=1;
-   }
-  return 0;
-}
-
 /* This function adjusts the unroll factor based on
    the hardware capabilities. For ex, bdver3 has
    a loop buffer which makes unrolling of smaller
@@ -47453,15 +47430,25 @@ ix86_loop_unroll_adjust (unsigned nunroll, struct loop *loop)
   if (!TARGET_ADJUST_UNROLL)
      return nunroll;
 
-  /* Count the number of memory references within the loop body.  */
+  /* Count the number of memory references within the loop body.
+     This value determines the unrolling factor for bdver3 and bdver4
+     architectures. */
+  subrtx_iterator::array_type array;
   bbs = get_loop_body (loop);
   for (i = 0; i < loop->num_nodes; i++)
-    {
-      for (insn = BB_HEAD (bbs[i]); insn != BB_END (bbs[i]); insn = NEXT_INSN (insn))
-        if (NONDEBUG_INSN_P (insn))
-            for_each_rtx_in_insn (&insn, (rtx_function) ix86_loop_memcount,
-                                 &mem_count);
-    }
+    FOR_BB_INSNS (bbs[i], insn)
+      if (NONDEBUG_INSN_P (insn))
+       FOR_EACH_SUBRTX (iter, array, insn, NONCONST)
+         if (const_rtx x = *iter)
+           if (MEM_P (x))
+             {
+               enum machine_mode mode = GET_MODE (x);
+               unsigned int n_words = GET_MODE_SIZE (mode) / UNITS_PER_WORD;
+               if (n_words > 4)
+                 mem_count += 2;
+               else
+                 mem_count += 1;
+             }
   free (bbs);
 
   if (mem_count && mem_count <=32)