From 1ca2825020930c89e130854fcc3c9781410480c3 Mon Sep 17 00:00:00 2001 From: rguenth Date: Fri, 15 Jan 2016 11:49:43 +0000 Subject: [PATCH] 2016-01-15 Richard Biener PR tree-optimization/68961 * tree-vect-slp.c (vect_analyze_slp_cost_1): Consider cost of invariants in stores again. * gcc.dg/vect/costmodel/x86_64/costmodel-pr68961.c: New testcase. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232415 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ .../gcc.dg/vect/costmodel/x86_64/costmodel-pr68961.c | 15 +++++++++++++++ gcc/tree-vect-slp.c | 16 +++++++++------- 4 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-pr68961.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e0da4441ea8..500ba65c7f1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-01-15 Richard Biener + + PR tree-optimization/68961 + * tree-vect-slp.c (vect_analyze_slp_cost_1): Consider cost + of invariants in stores again. + 2016-01-15 Sebastian Huber * config/arm/t-rtems: Add cortex-m7/fpv5-d16 multilib. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 456edf205c7..f8d58ce8706 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-01-15 Richard Biener + + PR tree-optimization/68961 + * gcc.dg/vect/costmodel/x86_64/costmodel-pr68961.c: New testcase. + 2016-01-15 Ilya Enkovich * gcc.target/i386/pr65105-5.c: New test. diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-pr68961.c b/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-pr68961.c new file mode 100644 index 00000000000..a88b14874b7 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-pr68961.c @@ -0,0 +1,15 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-fdump-tree-slp-details" } */ + +struct x { double d[2]; }; + +struct x +pack (double a, double aa) +{ + struct x u; + u.d[0] = a; + u.d[1] = aa; + return u; +} + +/* { dg-final { scan-tree-dump-times "vectorization is not profitable" 1 "slp2" } } */ diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c index 161655a084f..fe422f858fe 100644 --- a/gcc/tree-vect-slp.c +++ b/gcc/tree-vect-slp.c @@ -1453,18 +1453,20 @@ vect_analyze_slp_cost_1 (slp_instance instance, slp_tree node, /* Record the cost for the vector loads. */ vect_model_load_cost (stmt_info, ncopies_for_cost, false, node, prologue_cost_vec, body_cost_vec); + return; } - return; } - - record_stmt_cost (body_cost_vec, ncopies_for_cost, vector_stmt, - stmt_info, 0, vect_body); - if (SLP_TREE_TWO_OPERATORS (node)) + else { record_stmt_cost (body_cost_vec, ncopies_for_cost, vector_stmt, stmt_info, 0, vect_body); - record_stmt_cost (body_cost_vec, ncopies_for_cost, vec_perm, - stmt_info, 0, vect_body); + if (SLP_TREE_TWO_OPERATORS (node)) + { + record_stmt_cost (body_cost_vec, ncopies_for_cost, vector_stmt, + stmt_info, 0, vect_body); + record_stmt_cost (body_cost_vec, ncopies_for_cost, vec_perm, + stmt_info, 0, vect_body); + } } /* Push SLP node def-type to stmts. */ -- 2.11.4.GIT