From 28d0cd4a72da812bfcbf49d296abef9c10d7a3c6 Mon Sep 17 00:00:00 2001 From: rguenth Date: Thu, 26 Apr 2018 07:30:55 +0000 Subject: [PATCH] 2018-04-26 Richard Biener * tree-vect-data-refs.c (vect_get_data_access_cost): Get prologue cost vector and pass it to vect_get_load_cost. (vect_get_peeling_costs_all_drs): Likewise. (vect_peeling_hash_get_lowest_cost): Likewise. (vect_enhance_data_refs_alignment): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@259668 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 8 ++++++++ gcc/tree-vect-data-refs.c | 19 ++++++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d3834b074f6..61324440b06 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,13 @@ 2018-04-26 Richard Biener + * tree-vect-data-refs.c (vect_get_data_access_cost): Get + prologue cost vector and pass it to vect_get_load_cost. + (vect_get_peeling_costs_all_drs): Likewise. + (vect_peeling_hash_get_lowest_cost): Likewise. + (vect_enhance_data_refs_alignment): Likewise. + +2018-04-26 Richard Biener + PR middle-end/85450 * tree-cfg.c (verify_gimple_assign_unary): Restore proper checking of integer<->pointer conversions. diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c index 9aabcc18ff9..df362b0e1c5 100644 --- a/gcc/tree-vect-data-refs.c +++ b/gcc/tree-vect-data-refs.c @@ -1253,7 +1253,8 @@ static void vect_get_data_access_cost (struct data_reference *dr, unsigned int *inside_cost, unsigned int *outside_cost, - stmt_vector_for_cost *body_cost_vec) + stmt_vector_for_cost *body_cost_vec, + stmt_vector_for_cost *prologue_cost_vec) { gimple *stmt = DR_STMT (dr); stmt_vec_info stmt_info = vinfo_for_stmt (stmt); @@ -1267,7 +1268,7 @@ vect_get_data_access_cost (struct data_reference *dr, if (DR_IS_READ (dr)) vect_get_load_cost (dr, ncopies, true, inside_cost, outside_cost, - NULL, body_cost_vec, false); + prologue_cost_vec, body_cost_vec, false); else vect_get_store_cost (dr, ncopies, inside_cost, body_cost_vec); @@ -1376,6 +1377,7 @@ vect_get_peeling_costs_all_drs (vec datarefs, unsigned int *inside_cost, unsigned int *outside_cost, stmt_vector_for_cost *body_cost_vec, + stmt_vector_for_cost *prologue_cost_vec, unsigned int npeel, bool unknown_misalignment) { @@ -1410,7 +1412,7 @@ vect_get_peeling_costs_all_drs (vec datarefs, else vect_update_misalignment_for_peel (dr, dr0, npeel); vect_get_data_access_cost (dr, inside_cost, outside_cost, - body_cost_vec); + body_cost_vec, prologue_cost_vec); SET_DR_MISALIGNMENT (dr, save_misalignment); } } @@ -1437,7 +1439,8 @@ vect_peeling_hash_get_lowest_cost (_vect_peel_info **slot, vect_get_peeling_costs_all_drs (LOOP_VINFO_DATAREFS (loop_vinfo), elem->dr, &inside_cost, &outside_cost, - &body_cost_vec, elem->npeel, false); + &body_cost_vec, &prologue_cost_vec, + elem->npeel, false); body_cost_vec.release (); @@ -1867,7 +1870,7 @@ vect_enhance_data_refs_alignment (loop_vec_info loop_vinfo) vect_get_peeling_costs_all_drs (datarefs, dr0, &load_inside_cost, &load_outside_cost, - &dummy, estimated_npeels, true); + &dummy, &dummy, estimated_npeels, true); dummy.release (); if (first_store) @@ -1876,7 +1879,8 @@ vect_enhance_data_refs_alignment (loop_vec_info loop_vinfo) vect_get_peeling_costs_all_drs (datarefs, first_store, &store_inside_cost, &store_outside_cost, - &dummy, estimated_npeels, true); + &dummy, &dummy, + estimated_npeels, true); dummy.release (); } else @@ -1965,7 +1969,8 @@ vect_enhance_data_refs_alignment (loop_vec_info loop_vinfo) stmt_vector_for_cost dummy; dummy.create (2); vect_get_peeling_costs_all_drs (datarefs, NULL, &nopeel_inside_cost, - &nopeel_outside_cost, &dummy, 0, false); + &nopeel_outside_cost, &dummy, &dummy, + 0, false); dummy.release (); /* Add epilogue costs. As we do not peel for alignment here, no prologue -- 2.11.4.GIT