s390.c: Include rtl-iter.h.

gcc/
	* config/s390/s390.c: Include rtl-iter.h.
	(check_dpu): Delete.
	(s390_loop_unroll_adjust): Only iterate over patterns.
	Use FOR_EACH_SUBRTX.

From-SVN: r216753

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b5dc7f2f6e74259938cfbb4a2758a19cc13b96d1..534542caaf07ea8f24ee54afe34c2fd0411e4a54 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-27  Richard Sandiford  <richard.sandiford@arm.com>
+
+       * config/s390/s390.c: Include rtl-iter.h.
+       (check_dpu): Delete.
+       (s390_loop_unroll_adjust): Only iterate over patterns.
+       Use FOR_EACH_SUBRTX.
+
 2014-10-27  Richard Sandiford  <richard.sandiford@arm.com>
 
        * config/spu/spu.c: Include rtl-iter.h

diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 1b108055354ce45198210c9ea6d354f12994cbbe..e8d7395873646425c3ac5aee6abda066a53e0b29 100644 (file)
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -81,6 +81,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-pass.h"
 #include "context.h"
 #include "builtins.h"
+#include "rtl-iter.h"
 
 /* Define the specific costs for a given cpu.  */
 
@@ -11756,19 +11757,6 @@ s390_sched_init (FILE *file ATTRIBUTE_UNUSED,
   s390_sched_state = 0;
 }
 
-/* This function checks the whole of insn X for memory references. The
-   function always returns zero because the framework it is called
-   from would stop recursively analyzing the insn upon a return value
-   other than zero. The real result of this function is updating
-   counter variable MEM_COUNT.  */
-static int
-check_dpu (rtx *x, unsigned *mem_count)
-{
-  if (*x != NULL_RTX && MEM_P (*x))
-    (*mem_count)++;
-  return 0;
-}
-
 /* This target hook implementation for TARGET_LOOP_UNROLL_ADJUST calculates
    a new number struct loop *loop should be unrolled if tuned for cpus with
    a built-in stride prefetcher.
@@ -11791,12 +11779,13 @@ s390_loop_unroll_adjust (unsigned nunroll, struct loop *loop)
 
   /* Count the number of memory references within the loop body.  */
   bbs = get_loop_body (loop);
+  subrtx_iterator::array_type array;
   for (i = 0; i < loop->num_nodes; i++)
-    {
-      for (insn = BB_HEAD (bbs[i]); insn != BB_END (bbs[i]); insn = NEXT_INSN (insn))
-       if (INSN_P (insn) && INSN_CODE (insn) != -1)
-            for_each_rtx_in_insn (&insn, (rtx_function) check_dpu, &mem_count);
-    }
+    FOR_BB_INSNS (bbs[i], insn)
+      if (INSN_P (insn) && INSN_CODE (insn) != -1)
+       FOR_EACH_SUBRTX (iter, array, PATTERN (insn), NONCONST)
+         if (MEM_P (*iter))
+           mem_count += 1;
   free (bbs);
 
   /* Prevent division by zero, and we do not need to adjust nunroll in this case.  */