Pass a loop_vec_info to vect_maybe_permute_loop_masks

2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vect-loop-manip.c (vect_maybe_permute_loop_masks): Take
	a loop_vec_info.
	(vect_set_loop_condition_masked): Update call accordingly.

From-SVN: r277232

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d5b25ce94647c828798e64717323d4ccd9830f0a..9c07777f93e860b1327197928697fb3f1dc5b6ce 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
+
+       * tree-vect-loop-manip.c (vect_maybe_permute_loop_masks): Take
+       a loop_vec_info.
+       (vect_set_loop_condition_masked): Update call accordingly.
+
 2019-10-21  Richard Sandiford  <richard.sandiford@arm.com>
 
        * tree-vectorizer.h (supportable_narrowing_operation): Take a vec_info.

diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c
index a2902267c62889a63af09d121a631e6d8c6f69d5..1f1f26f231d115b7bbdfedc7bd1037b750aaa431 100644 (file)
--- a/gcc/tree-vect-loop-manip.c
+++ b/gcc/tree-vect-loop-manip.c
@@ -317,7 +317,8 @@ interleave_supported_p (vec_perm_indices *indices, tree vectype,
    latter.  Return true on success, adding any new statements to SEQ.  */
 
 static bool
-vect_maybe_permute_loop_masks (gimple_seq *seq, rgroup_masks *dest_rgm,
+vect_maybe_permute_loop_masks (loop_vec_info, gimple_seq *seq,
+                              rgroup_masks *dest_rgm,
                               rgroup_masks *src_rgm)
 {
   tree src_masktype = src_rgm->mask_type;
@@ -689,7 +690,8 @@ vect_set_loop_condition_masked (class loop *loop, loop_vec_info loop_vinfo,
          {
            rgroup_masks *half_rgm = &(*masks)[nmasks / 2 - 1];
            if (!half_rgm->masks.is_empty ()
-               && vect_maybe_permute_loop_masks (&header_seq, rgm, half_rgm))
+               && vect_maybe_permute_loop_masks (loop_vinfo, &header_seq,
+                                                 rgm, half_rgm))
              continue;
          }