[gcc(refs/users/rguenth/heads/vect-force-slp)] Handle non-grouped SLP stores

[Richard Biener <rguenth@gcc.gnu.org>]

https://gcc.gnu.org/g:c34b76b91c66a993b432c107172f3217ac7d9078

commit c34b76b91c66a993b432c107172f3217ac7d9078
Author: Richard Biener <rguenther@suse.de>
Date:   Wed Oct 4 14:32:39 2023 +0200

    Handle non-grouped SLP stores
    
    The following adjusts vectorizable_store to properly handle
    non-grouped SLP stores to update vec_num.
    
            * tree-vect-stmts.cc (vectorizable_store): Always set
            vec_num for SLP.

Diff:
---
 gcc/tree-vect-stmts.cc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gcc/tree-vect-stmts.cc b/gcc/tree-vect-stmts.cc
index 527c333544d3..5fac67467021 100644
--- a/gcc/tree-vect-stmts.cc
+++ b/gcc/tree-vect-stmts.cc
@@ -8480,10 +8480,12 @@ vectorizable_store (vec_info *vinfo,
       return vectorizable_scan_store (vinfo, stmt_info, gsi, vec_stmt, ncopies);
     }
 
-  if (grouped_store)
+  if (grouped_store || slp)
     {
       /* FORNOW */
-      gcc_assert (!loop || !nested_in_vect_loop_p (loop, stmt_info));
+      gcc_assert (!grouped_store
+		  || !loop
+		  || !nested_in_vect_loop_p (loop, stmt_info));
 
       if (slp)
         {
@@ -8492,8 +8494,9 @@ vectorizable_store (vec_info *vinfo,
              group.  */
           vec_num = SLP_TREE_NUMBER_OF_VEC_STMTS (slp_node);
 	  first_stmt_info = SLP_TREE_SCALAR_STMTS (slp_node)[0];
-	  gcc_assert (DR_GROUP_FIRST_ELEMENT (first_stmt_info)
-		      == first_stmt_info);
+	  gcc_assert (!STMT_VINFO_GROUPED_ACCESS (first_stmt_info)
+		      || (DR_GROUP_FIRST_ELEMENT (first_stmt_info)
+			  == first_stmt_info));
 	  first_dr_info = STMT_VINFO_DR_INFO (first_stmt_info);
 	  op = vect_get_store_rhs (first_stmt_info);
         }