Avoid &LOOP_VINFO_MASKS for bb vectorisation (PR 84634)

We were computing &LOOP_VINFO_MASKS even for bb vectorisation,
which is UB.

2018-03-02  Richard Sandiford  <richard.sandiford@linaro.org>

gcc/
	PR tree-optimization/84634
	* tree-vect-stmts.c (vectorizable_store, vectorizable_load): Replace
	masks and masked_loop_p with a single loop_masks, making sure it's
	null for bb vectorization.

From-SVN: r258131

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index affd19a94bcda1e0b00a1d7319fa1b29c3c8e16b..4cadd4d2ca82a444b9c834c810b8df96518b51a7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2018-03-02  Richard Sandiford  <richard.sandiford@linaro.org>
+
+       PR tree-optimization/84634
+       * tree-vect-stmts.c (vectorizable_store, vectorizable_load): Replace
+       masks and masked_loop_p with a single loop_masks, making sure it's
+       null for bb vectorization.
+
 2018-03-02  Richard Sandiford  <richard.sandiford@linaro.org>
 
        * tree-vect-data-refs.c (vect_analyze_data_ref_dependence)

diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index a98e0e5e2593bb4a46a1d338f8750c8bbbb004bb..7cdabe1106bed343611f1f8560759318a7686840 100644 (file)
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -6703,13 +6703,16 @@ vectorizable_store (gimple *stmt, gimple_stmt_iterator *gsi, gimple **vec_stmt,
 
   alignment_support_scheme = vect_supportable_dr_alignment (first_dr, false);
   gcc_assert (alignment_support_scheme);
-  bool masked_loop_p = (loop_vinfo && LOOP_VINFO_FULLY_MASKED_P (loop_vinfo));
+  vec_loop_masks *loop_masks
+    = (loop_vinfo && LOOP_VINFO_FULLY_MASKED_P (loop_vinfo)
+       ? &LOOP_VINFO_MASKS (loop_vinfo)
+       : NULL);
   /* Targets with store-lane instructions must not require explicit
      realignment.  vect_supportable_dr_alignment always returns either
      dr_aligned or dr_unaligned_supported for masked operations.  */
   gcc_assert ((memory_access_type != VMAT_LOAD_STORE_LANES
               && !mask
-              && !masked_loop_p)
+              && !loop_masks)
              || alignment_support_scheme == dr_aligned
              || alignment_support_scheme == dr_unaligned_supported);
 
@@ -6783,7 +6786,6 @@ vectorizable_store (gimple *stmt, gimple_stmt_iterator *gsi, gimple **vec_stmt,
 
   prev_stmt_info = NULL;
   tree vec_mask = NULL_TREE;
-  vec_loop_masks *masks = &LOOP_VINFO_MASKS (loop_vinfo);
   for (j = 0; j < ncopies; j++)
     {
 
@@ -6900,8 +6902,9 @@ vectorizable_store (gimple *stmt, gimple_stmt_iterator *gsi, gimple **vec_stmt,
            }
 
          tree final_mask = NULL;
-         if (masked_loop_p)
-           final_mask = vect_get_loop_mask (gsi, masks, ncopies, vectype, j);
+         if (loop_masks)
+           final_mask = vect_get_loop_mask (gsi, loop_masks, ncopies,
+                                            vectype, j);
          if (vec_mask)
            final_mask = prepare_load_store_mask (mask_vectype, final_mask,
                                                  vec_mask, gsi);
@@ -6949,8 +6952,9 @@ vectorizable_store (gimple *stmt, gimple_stmt_iterator *gsi, gimple **vec_stmt,
              unsigned align, misalign;
 
              tree final_mask = NULL_TREE;
-             if (masked_loop_p)
-               final_mask = vect_get_loop_mask (gsi, masks, vec_num * ncopies,
+             if (loop_masks)
+               final_mask = vect_get_loop_mask (gsi, loop_masks,
+                                                vec_num * ncopies,
                                                 vectype, vec_num * j + i);
              if (vec_mask)
                final_mask = prepare_load_store_mask (mask_vectype, final_mask,
@@ -6960,7 +6964,7 @@ vectorizable_store (gimple *stmt, gimple_stmt_iterator *gsi, gimple **vec_stmt,
                {
                  tree scale = size_int (gs_info.scale);
                  gcall *call;
-                 if (masked_loop_p)
+                 if (loop_masks)
                    call = gimple_build_call_internal
                      (IFN_MASK_SCATTER_STORE, 5, dataref_ptr, vec_offset,
                       scale, vec_oprnd, final_mask);
@@ -7790,13 +7794,16 @@ vectorizable_load (gimple *stmt, gimple_stmt_iterator *gsi, gimple **vec_stmt,
 
   alignment_support_scheme = vect_supportable_dr_alignment (first_dr, false);
   gcc_assert (alignment_support_scheme);
-  bool masked_loop_p = (loop_vinfo && LOOP_VINFO_FULLY_MASKED_P (loop_vinfo));
+  vec_loop_masks *loop_masks
+    = (loop_vinfo && LOOP_VINFO_FULLY_MASKED_P (loop_vinfo)
+       ? &LOOP_VINFO_MASKS (loop_vinfo)
+       : NULL);
   /* Targets with store-lane instructions must not require explicit
      realignment.  vect_supportable_dr_alignment always returns either
      dr_aligned or dr_unaligned_supported for masked operations.  */
   gcc_assert ((memory_access_type != VMAT_LOAD_STORE_LANES
               && !mask
-              && !masked_loop_p)
+              && !loop_masks)
              || alignment_support_scheme == dr_aligned
              || alignment_support_scheme == dr_unaligned_supported);
 
@@ -7956,7 +7963,6 @@ vectorizable_load (gimple *stmt, gimple_stmt_iterator *gsi, gimple **vec_stmt,
   tree vec_mask = NULL_TREE;
   prev_stmt_info = NULL;
   poly_uint64 group_elt = 0;
-  vec_loop_masks *masks = &LOOP_VINFO_MASKS (loop_vinfo);
   for (j = 0; j < ncopies; j++)
     {
       /* 1. Create the vector or array pointer update chain.  */
@@ -8037,8 +8043,9 @@ vectorizable_load (gimple *stmt, gimple_stmt_iterator *gsi, gimple **vec_stmt,
          vec_array = create_vector_array (vectype, vec_num);
 
          tree final_mask = NULL_TREE;
-         if (masked_loop_p)
-           final_mask = vect_get_loop_mask (gsi, masks, ncopies, vectype, j);
+         if (loop_masks)
+           final_mask = vect_get_loop_mask (gsi, loop_masks, ncopies,
+                                            vectype, j);
          if (vec_mask)
            final_mask = prepare_load_store_mask (mask_vectype, final_mask,
                                                  vec_mask, gsi);
@@ -8083,9 +8090,10 @@ vectorizable_load (gimple *stmt, gimple_stmt_iterator *gsi, gimple **vec_stmt,
          for (i = 0; i < vec_num; i++)
            {
              tree final_mask = NULL_TREE;
-             if (masked_loop_p
+             if (loop_masks
                  && memory_access_type != VMAT_INVARIANT)
-               final_mask = vect_get_loop_mask (gsi, masks, vec_num * ncopies,
+               final_mask = vect_get_loop_mask (gsi, loop_masks,
+                                                vec_num * ncopies,
                                                 vectype, vec_num * j + i);
              if (vec_mask)
                final_mask = prepare_load_store_mask (mask_vectype, final_mask,
@@ -8107,7 +8115,7 @@ vectorizable_load (gimple *stmt, gimple_stmt_iterator *gsi, gimple **vec_stmt,
                      {
                        tree scale = size_int (gs_info.scale);
                        gcall *call;
-                       if (masked_loop_p)
+                       if (loop_masks)
                          call = gimple_build_call_internal
                            (IFN_MASK_GATHER_LOAD, 4, dataref_ptr,
                             vec_offset, scale, final_mask);