From b1570930df659ff3ea6691f9ba8b84c8a189d85d Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 29 Sep 2020 12:01:26 +0200 Subject: [PATCH] move permute optimization to optimize-slp This moves optimizing permutes of SLP reductions to vect_optimize_slp, eliding the global slp_loads array. 2020-09-29 Richard Biener * tree-vect-slp.c (vect_analyze_slp): Move SLP reduction re-arrangement and SLP graph load gathering... (vect_optimize_slp): ... here. * tree-vectorizer.h (vec_info::slp_loads): Remove. --- gcc/tree-vect-slp.c | 19 ++++++++++--------- gcc/tree-vectorizer.h | 1 - 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c index c44fd396bf0..8de24802538 100644 --- a/gcc/tree-vect-slp.c +++ b/gcc/tree-vect-slp.c @@ -2486,8 +2486,15 @@ vect_analyze_slp (vec_info *vinfo, unsigned max_tree_size) vect_free_slp_tree ((*it).second); delete bst_map; + return opt_result::success (); +} + +void +vect_optimize_slp (vec_info *vinfo) +{ /* Optimize permutations in SLP reductions. */ slp_instance instance; + unsigned i; FOR_EACH_VEC_ELT (vinfo->slp_instances, i, instance) { slp_tree node = SLP_INSTANCE_TREE (instance); @@ -2500,20 +2507,14 @@ vect_analyze_slp (vec_info *vinfo, unsigned max_tree_size) } /* Gather all loads in the SLP graph. */ + auto_vec slp_loads; hash_set visited; FOR_EACH_VEC_ELT (vinfo->slp_instances, i, instance) - vect_gather_slp_loads (vinfo->slp_loads, SLP_INSTANCE_TREE (instance), + vect_gather_slp_loads (slp_loads, SLP_INSTANCE_TREE (instance), visited); - return opt_result::success (); -} - -void -vect_optimize_slp (vec_info *vinfo) -{ slp_tree node; - unsigned i; - FOR_EACH_VEC_ELT (vinfo->slp_loads, i, node) + FOR_EACH_VEC_ELT (slp_loads, i, node) { if (!SLP_TREE_LOAD_PERMUTATION (node).exists ()) continue; diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h index b7fa6bc8d2f..e62f1ccee8d 100644 --- a/gcc/tree-vectorizer.h +++ b/gcc/tree-vectorizer.h @@ -359,7 +359,6 @@ public: /* The SLP graph. */ auto_vec slp_instances; - auto_vec slp_loads; /* Maps base addresses to an innermost_loop_behavior that gives the maximum known alignment for that base. */ -- 2.30.2