Replace uses of iterators over length of SLP_TREE_SCALAR_STMTS and
SLP_TREE_SCALAR_OPS with for-each loops when the .length () was just being used
as an index.
This is because we are trying to get rid of the notion of the number of scalar
statement or ops determining the number of lanes in the SLP tree and such
iterators are confusing.
i.e. it was a numbered for each.
Bootstrapped Regtested on aarch64-none-linux-gnu,
arm-none-linux-gnueabihf, x86_64-pc-linux-gnu
-m32, -m64 and no issues.
Pushed.
Thanks,
Tamar
gcc/ChangeLog:
* tree-vect-data-refs.cc (vect_slp_analyze_store_dependences,
vect_slp_analyze_load_dependences,
vect_slp_analyze_instance_dependence): Use for-each over for with len.
* tree-vect-slp.cc (vect_mark_slp_stmts_relevant,
,vect_find_last_scalar_stmt_in_slp, vect_find_first_scalar_stmt_in_slp,
vect_build_slp_store_interleaving, vect_analyze_slp,
vect_slp_prune_covered_roots, vect_bb_partition_graph_r,
vect_remove_slp_scalar_calls): Likewise.
---
diff --git a/gcc/tree-vect-data-refs.cc b/gcc/tree-vect-data-refs.cc
index
ab850de024bf41ea7635ce7381bcc6acd8fe0c28..80f7539614c2437d888611098b32467b894bacb0
100644
--- a/gcc/tree-vect-data-refs.cc
+++ b/gcc/tree-vect-data-refs.cc
@@ -1037,10 +1037,10 @@ vect_slp_analyze_store_dependences (vec_info *vinfo,
slp_tree node)
stmt_vec_info last_access_info = vect_find_last_scalar_stmt_in_slp (node);
gcc_assert (DR_IS_WRITE (STMT_VINFO_DATA_REF (last_access_info)));
- for (unsigned k = 0; k < SLP_TREE_SCALAR_STMTS (node).length (); ++k)
+ for (auto stmt_vinfo : SLP_TREE_SCALAR_STMTS (node))
{
stmt_vec_info access_info
- = vect_orig_stmt (SLP_TREE_SCALAR_STMTS (node)[k]);
+ = vect_orig_stmt (stmt_vinfo);
if (access_info == last_access_info)
continue;
data_reference *dr_a = STMT_VINFO_DATA_REF (access_info);
@@ -1103,12 +1103,12 @@ vect_slp_analyze_load_dependences (vec_info *vinfo,
slp_tree node,
stmt_vec_info first_access_info = vect_find_first_scalar_stmt_in_slp (node);
gcc_assert (DR_IS_READ (STMT_VINFO_DATA_REF (first_access_info)));
- for (unsigned k = 0; k < SLP_TREE_SCALAR_STMTS (node).length (); ++k)
+ for (auto stmt_vinfo : SLP_TREE_SCALAR_STMTS (node))
{
- if (! SLP_TREE_SCALAR_STMTS (node)[k])
+ if (! stmt_vinfo)
continue;
stmt_vec_info access_info
- = vect_orig_stmt (SLP_TREE_SCALAR_STMTS (node)[k]);
+ = vect_orig_stmt (stmt_vinfo);
if (access_info == first_access_info)
continue;
data_reference *dr_a = STMT_VINFO_DATA_REF (access_info);
@@ -1245,8 +1245,8 @@ vect_slp_analyze_instance_dependence (vec_info *vinfo,
slp_instance instance)
/* Mark stores in this instance and remember the last one. */
last_store_info = vect_find_last_scalar_stmt_in_slp (store);
- for (unsigned k = 0; k < SLP_TREE_SCALAR_STMTS (store).length (); ++k)
- gimple_set_visited (SLP_TREE_SCALAR_STMTS (store)[k]->stmt, true);
+ for (auto stmt_vinfo : SLP_TREE_SCALAR_STMTS (store))
+ gimple_set_visited (STMT_VINFO_STMT (stmt_vinfo), true);
}
bool res = true;
@@ -1265,8 +1265,8 @@ vect_slp_analyze_instance_dependence (vec_info *vinfo,
slp_instance instance)
/* Unset the visited flag. */
if (store)
- for (unsigned k = 0; k < SLP_TREE_SCALAR_STMTS (store).length (); ++k)
- gimple_set_visited (SLP_TREE_SCALAR_STMTS (store)[k]->stmt, false);
+ for (auto stmt_vinfo : SLP_TREE_SCALAR_STMTS (store))
+ gimple_set_visited (STMT_VINFO_STMT (stmt_vinfo), false);
/* If this is a SLP instance with a store check if there's a dependent
load that cannot be forwarded from a previous iteration of a loop
diff --git a/gcc/tree-vect-slp.cc b/gcc/tree-vect-slp.cc
index
2250f6f74a1ae63b0b9e42559955c0ab77ff3135..514bc0c5c654cc392ab5a47ea6b08b65fe7786fe
100644
--- a/gcc/tree-vect-slp.cc
+++ b/gcc/tree-vect-slp.cc
@@ -3601,17 +3601,13 @@ vect_bb_slp_mark_stmts_vectorized (bb_vec_info vinfo)
static void
vect_mark_slp_stmts_relevant (slp_tree node, hash_set<slp_tree> &visited)
{
- int i;
- stmt_vec_info stmt_info;
- slp_tree child;
-
if (SLP_TREE_DEF_TYPE (node) != vect_internal_def)
return;
if (visited.add (node))
return;
- FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_STMTS (node), i, stmt_info)
+ for (auto stmt_info : SLP_TREE_SCALAR_STMTS (node))
if (stmt_info)
{
gcc_assert (!STMT_VINFO_RELEVANT (stmt_info)
@@ -3619,7 +3615,7 @@ vect_mark_slp_stmts_relevant (slp_tree node,
hash_set<slp_tree> &visited)
STMT_VINFO_RELEVANT (stmt_info) = vect_used_in_scope;
}
- FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), i, child)
+ for (auto child: SLP_TREE_CHILDREN (node))
if (child)
vect_mark_slp_stmts_relevant (child, visited);
}
@@ -3665,9 +3661,7 @@ stmt_vec_info
vect_find_last_scalar_stmt_in_slp (slp_tree node)
{
stmt_vec_info last = NULL;
- stmt_vec_info stmt_vinfo;
-
- for (int i = 0; SLP_TREE_SCALAR_STMTS (node).iterate (i, &stmt_vinfo); i++)
+ for (auto stmt_vinfo : SLP_TREE_SCALAR_STMTS (node))
if (stmt_vinfo)
{
stmt_vinfo = vect_orig_stmt (stmt_vinfo);
@@ -3683,9 +3677,8 @@ stmt_vec_info
vect_find_first_scalar_stmt_in_slp (slp_tree node)
{
stmt_vec_info first = NULL;
- stmt_vec_info stmt_vinfo;
- for (int i = 0; SLP_TREE_SCALAR_STMTS (node).iterate (i, &stmt_vinfo); i++)
+ for (auto stmt_vinfo : SLP_TREE_SCALAR_STMTS (node))
if (stmt_vinfo)
{
stmt_vinfo = vect_orig_stmt (stmt_vinfo);
@@ -4025,7 +4018,7 @@ vect_build_slp_store_interleaving (vec<slp_tree>
&rhs_nodes,
.quick_push (SLP_TREE_CHILDREN (rhs_nodes[j])[l]);
SLP_TREE_CHILDREN (rhs_nodes[j])[l]->refcnt++;
for (unsigned k = 0;
- k < SLP_TREE_SCALAR_STMTS (rhs_nodes[j]).length (); ++k)
+ k < SLP_TREE_LANES (rhs_nodes[j]); ++k)
{
/* ??? We should populate SLP_TREE_SCALAR_STMTS
or SLP_TREE_SCALAR_OPS but then we might have
@@ -6087,9 +6080,7 @@ vect_analyze_slp (vec_info *vinfo, unsigned max_tree_size,
{
if (!SLP_TREE_LOAD_PERMUTATION (load_node).exists ())
continue;
- unsigned k;
- stmt_vec_info load_info;
- FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_STMTS (load_node), k, load_info)
+ for (unsigned k = 0; k < SLP_TREE_LANES (load_node); k++)
if (SLP_TREE_LOAD_PERMUTATION (load_node)[k] != k)
{
loads_permuted = true;
@@ -9194,14 +9185,11 @@ vect_slp_prune_covered_roots (slp_tree node,
hash_set<stmt_vec_info> &roots,
|| visited.add (node))
return;
- stmt_vec_info stmt;
- unsigned i;
- FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_STMTS (node), i, stmt)
+ for (auto stmt : SLP_TREE_SCALAR_STMTS (node))
if (stmt)
roots.remove (vect_orig_stmt (stmt));
- slp_tree child;
- FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), i, child)
+ for (auto child : SLP_TREE_CHILDREN (node))
if (child)
vect_slp_prune_covered_roots (child, roots, visited);
}
@@ -9411,10 +9399,7 @@ vect_bb_partition_graph_r (bb_vec_info bb_vinfo,
hash_map<slp_tree, slp_instance> &node_to_instance,
hash_map<slp_instance, slp_instance>
&instance_leader)
{
- stmt_vec_info stmt_info;
- unsigned i;
-
- FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_STMTS (node), i, stmt_info)
+ for (auto stmt_info : SLP_TREE_SCALAR_STMTS (node))
if (stmt_info)
vect_map_to_instance (instance, stmt_info, stmt_to_instance,
instance_leader);
@@ -9423,8 +9408,7 @@ vect_bb_partition_graph_r (bb_vec_info bb_vinfo,
instance_leader))
return;
- slp_tree child;
- FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), i, child)
+ for (auto child : SLP_TREE_CHILDREN (node))
if (child && SLP_TREE_DEF_TYPE (child) == vect_internal_def)
vect_bb_partition_graph_r (bb_vinfo, instance, child, stmt_to_instance,
node_to_instance, instance_leader);
@@ -12057,10 +12041,7 @@ vect_remove_slp_scalar_calls (vec_info *vinfo,
{
gimple *new_stmt;
gimple_stmt_iterator gsi;
- int i;
- slp_tree child;
tree lhs;
- stmt_vec_info stmt_info;
if (!node || SLP_TREE_DEF_TYPE (node) != vect_internal_def)
return;
@@ -12068,10 +12049,10 @@ vect_remove_slp_scalar_calls (vec_info *vinfo,
if (visited.add (node))
return;
- FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), i, child)
+ for (auto child : SLP_TREE_CHILDREN (node))
vect_remove_slp_scalar_calls (vinfo, child, visited);
- FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_STMTS (node), i, stmt_info)
+ for (auto stmt_info : SLP_TREE_SCALAR_STMTS (node))
{
if (!stmt_info)
continue;
--
diff --git a/gcc/tree-vect-data-refs.cc b/gcc/tree-vect-data-refs.cc
index ab850de024bf41ea7635ce7381bcc6acd8fe0c28..80f7539614c2437d888611098b32467b894bacb0 100644
--- a/gcc/tree-vect-data-refs.cc
+++ b/gcc/tree-vect-data-refs.cc
@@ -1037,10 +1037,10 @@ vect_slp_analyze_store_dependences (vec_info *vinfo, slp_tree node)
stmt_vec_info last_access_info = vect_find_last_scalar_stmt_in_slp (node);
gcc_assert (DR_IS_WRITE (STMT_VINFO_DATA_REF (last_access_info)));
- for (unsigned k = 0; k < SLP_TREE_SCALAR_STMTS (node).length (); ++k)
+ for (auto stmt_vinfo : SLP_TREE_SCALAR_STMTS (node))
{
stmt_vec_info access_info
- = vect_orig_stmt (SLP_TREE_SCALAR_STMTS (node)[k]);
+ = vect_orig_stmt (stmt_vinfo);
if (access_info == last_access_info)
continue;
data_reference *dr_a = STMT_VINFO_DATA_REF (access_info);
@@ -1103,12 +1103,12 @@ vect_slp_analyze_load_dependences (vec_info *vinfo, slp_tree node,
stmt_vec_info first_access_info = vect_find_first_scalar_stmt_in_slp (node);
gcc_assert (DR_IS_READ (STMT_VINFO_DATA_REF (first_access_info)));
- for (unsigned k = 0; k < SLP_TREE_SCALAR_STMTS (node).length (); ++k)
+ for (auto stmt_vinfo : SLP_TREE_SCALAR_STMTS (node))
{
- if (! SLP_TREE_SCALAR_STMTS (node)[k])
+ if (! stmt_vinfo)
continue;
stmt_vec_info access_info
- = vect_orig_stmt (SLP_TREE_SCALAR_STMTS (node)[k]);
+ = vect_orig_stmt (stmt_vinfo);
if (access_info == first_access_info)
continue;
data_reference *dr_a = STMT_VINFO_DATA_REF (access_info);
@@ -1245,8 +1245,8 @@ vect_slp_analyze_instance_dependence (vec_info *vinfo, slp_instance instance)
/* Mark stores in this instance and remember the last one. */
last_store_info = vect_find_last_scalar_stmt_in_slp (store);
- for (unsigned k = 0; k < SLP_TREE_SCALAR_STMTS (store).length (); ++k)
- gimple_set_visited (SLP_TREE_SCALAR_STMTS (store)[k]->stmt, true);
+ for (auto stmt_vinfo : SLP_TREE_SCALAR_STMTS (store))
+ gimple_set_visited (STMT_VINFO_STMT (stmt_vinfo), true);
}
bool res = true;
@@ -1265,8 +1265,8 @@ vect_slp_analyze_instance_dependence (vec_info *vinfo, slp_instance instance)
/* Unset the visited flag. */
if (store)
- for (unsigned k = 0; k < SLP_TREE_SCALAR_STMTS (store).length (); ++k)
- gimple_set_visited (SLP_TREE_SCALAR_STMTS (store)[k]->stmt, false);
+ for (auto stmt_vinfo : SLP_TREE_SCALAR_STMTS (store))
+ gimple_set_visited (STMT_VINFO_STMT (stmt_vinfo), false);
/* If this is a SLP instance with a store check if there's a dependent
load that cannot be forwarded from a previous iteration of a loop
diff --git a/gcc/tree-vect-slp.cc b/gcc/tree-vect-slp.cc
index 2250f6f74a1ae63b0b9e42559955c0ab77ff3135..514bc0c5c654cc392ab5a47ea6b08b65fe7786fe 100644
--- a/gcc/tree-vect-slp.cc
+++ b/gcc/tree-vect-slp.cc
@@ -3601,17 +3601,13 @@ vect_bb_slp_mark_stmts_vectorized (bb_vec_info vinfo)
static void
vect_mark_slp_stmts_relevant (slp_tree node, hash_set<slp_tree> &visited)
{
- int i;
- stmt_vec_info stmt_info;
- slp_tree child;
-
if (SLP_TREE_DEF_TYPE (node) != vect_internal_def)
return;
if (visited.add (node))
return;
- FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_STMTS (node), i, stmt_info)
+ for (auto stmt_info : SLP_TREE_SCALAR_STMTS (node))
if (stmt_info)
{
gcc_assert (!STMT_VINFO_RELEVANT (stmt_info)
@@ -3619,7 +3615,7 @@ vect_mark_slp_stmts_relevant (slp_tree node, hash_set<slp_tree> &visited)
STMT_VINFO_RELEVANT (stmt_info) = vect_used_in_scope;
}
- FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), i, child)
+ for (auto child: SLP_TREE_CHILDREN (node))
if (child)
vect_mark_slp_stmts_relevant (child, visited);
}
@@ -3665,9 +3661,7 @@ stmt_vec_info
vect_find_last_scalar_stmt_in_slp (slp_tree node)
{
stmt_vec_info last = NULL;
- stmt_vec_info stmt_vinfo;
-
- for (int i = 0; SLP_TREE_SCALAR_STMTS (node).iterate (i, &stmt_vinfo); i++)
+ for (auto stmt_vinfo : SLP_TREE_SCALAR_STMTS (node))
if (stmt_vinfo)
{
stmt_vinfo = vect_orig_stmt (stmt_vinfo);
@@ -3683,9 +3677,8 @@ stmt_vec_info
vect_find_first_scalar_stmt_in_slp (slp_tree node)
{
stmt_vec_info first = NULL;
- stmt_vec_info stmt_vinfo;
- for (int i = 0; SLP_TREE_SCALAR_STMTS (node).iterate (i, &stmt_vinfo); i++)
+ for (auto stmt_vinfo : SLP_TREE_SCALAR_STMTS (node))
if (stmt_vinfo)
{
stmt_vinfo = vect_orig_stmt (stmt_vinfo);
@@ -4025,7 +4018,7 @@ vect_build_slp_store_interleaving (vec<slp_tree> &rhs_nodes,
.quick_push (SLP_TREE_CHILDREN (rhs_nodes[j])[l]);
SLP_TREE_CHILDREN (rhs_nodes[j])[l]->refcnt++;
for (unsigned k = 0;
- k < SLP_TREE_SCALAR_STMTS (rhs_nodes[j]).length (); ++k)
+ k < SLP_TREE_LANES (rhs_nodes[j]); ++k)
{
/* ??? We should populate SLP_TREE_SCALAR_STMTS
or SLP_TREE_SCALAR_OPS but then we might have
@@ -6087,9 +6080,7 @@ vect_analyze_slp (vec_info *vinfo, unsigned max_tree_size,
{
if (!SLP_TREE_LOAD_PERMUTATION (load_node).exists ())
continue;
- unsigned k;
- stmt_vec_info load_info;
- FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_STMTS (load_node), k, load_info)
+ for (unsigned k = 0; k < SLP_TREE_LANES (load_node); k++)
if (SLP_TREE_LOAD_PERMUTATION (load_node)[k] != k)
{
loads_permuted = true;
@@ -9194,14 +9185,11 @@ vect_slp_prune_covered_roots (slp_tree node, hash_set<stmt_vec_info> &roots,
|| visited.add (node))
return;
- stmt_vec_info stmt;
- unsigned i;
- FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_STMTS (node), i, stmt)
+ for (auto stmt : SLP_TREE_SCALAR_STMTS (node))
if (stmt)
roots.remove (vect_orig_stmt (stmt));
- slp_tree child;
- FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), i, child)
+ for (auto child : SLP_TREE_CHILDREN (node))
if (child)
vect_slp_prune_covered_roots (child, roots, visited);
}
@@ -9411,10 +9399,7 @@ vect_bb_partition_graph_r (bb_vec_info bb_vinfo,
hash_map<slp_tree, slp_instance> &node_to_instance,
hash_map<slp_instance, slp_instance> &instance_leader)
{
- stmt_vec_info stmt_info;
- unsigned i;
-
- FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_STMTS (node), i, stmt_info)
+ for (auto stmt_info : SLP_TREE_SCALAR_STMTS (node))
if (stmt_info)
vect_map_to_instance (instance, stmt_info, stmt_to_instance,
instance_leader);
@@ -9423,8 +9408,7 @@ vect_bb_partition_graph_r (bb_vec_info bb_vinfo,
instance_leader))
return;
- slp_tree child;
- FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), i, child)
+ for (auto child : SLP_TREE_CHILDREN (node))
if (child && SLP_TREE_DEF_TYPE (child) == vect_internal_def)
vect_bb_partition_graph_r (bb_vinfo, instance, child, stmt_to_instance,
node_to_instance, instance_leader);
@@ -12057,10 +12041,7 @@ vect_remove_slp_scalar_calls (vec_info *vinfo,
{
gimple *new_stmt;
gimple_stmt_iterator gsi;
- int i;
- slp_tree child;
tree lhs;
- stmt_vec_info stmt_info;
if (!node || SLP_TREE_DEF_TYPE (node) != vect_internal_def)
return;
@@ -12068,10 +12049,10 @@ vect_remove_slp_scalar_calls (vec_info *vinfo,
if (visited.add (node))
return;
- FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), i, child)
+ for (auto child : SLP_TREE_CHILDREN (node))
vect_remove_slp_scalar_calls (vinfo, child, visited);
- FOR_EACH_VEC_ELT (SLP_TREE_SCALAR_STMTS (node), i, stmt_info)
+ for (auto stmt_info : SLP_TREE_SCALAR_STMTS (node))
{
if (!stmt_info)
continue;
