From d37fc3aa4aae5adf437a4d0b6370dc24759e5689 Mon Sep 17 00:00:00 2001 From: Aditya Kumar Date: Wed, 21 Oct 2015 18:53:17 +0000 Subject: Refactoring sese.h and graphite-poly.h Rename scop->region to scop->scop_info Removed conversion constructors for sese_l and dr_info. Removed macros. No functional changed intended. Passes regtest and bootstrap. gcc/ChangeLog: 2015-19-10 Aditya Kumar * graphite-poly.h (struct dr_info): Removed conversion constructor. (struct scop): Renamed scop::region to scop::scop_info (scop_set_region): Same. (SCOP_REGION): Removed (SCOP_CONTEXT): Removed. (POLY_SCOP_P): Removed. * graphite-isl-ast-to-gimple.c (translate_isl_ast_node_user): Rename scop->region to scop->scop_info. (add_parameters_to_ivs_params): Same. (graphite_regenerate_ast_isl): Same. * graphite-poly.c (new_scop): Same. (free_scop): Same. (print_scop_params): Same. * graphite-scop-detection.c (scop_detection::remove_subscops): Same. (scop_detection::remove_intersecting_scops): Use pointer to sese_l. (dot_all_scops_1): Rename scop->region to scop->scop_info. (scop_detection::nb_pbbs_in_loops): Same. (find_scop_parameters): Same. (try_generate_gimple_bb): Same. (gather_bbs::before_dom_children): Same. (gather_bbs::after_dom_children): Same. (build_scops): Same. * graphite-sese-to-poly.c (build_scop_scattering): Same. (extract_affine_chrec): Same. (extract_affine): Same. (set_scop_parameter_dim): Same. (build_loop_iteration_domains): Same. (create_pw_aff_from_tree): Same. (add_param_constraints): Same. (build_scop_iteration_domain): Same. (build_scop_drs): Same. (analyze_drs_in_stmts): Same. (insert_out_of_ssa_copy_on_edge): Same. (rewrite_close_phi_out_of_ssa):Same. (rewrite_reductions_out_of_ssa):Same. (handle_scalar_deps_crossing_scop_limits):Same. (rewrite_cross_bb_scalar_deps):Same. (rewrite_cross_bb_scalar_deps_out_of_ssa):Same. (build_poly_scop):Same. (build_alias_set): Use pointer to dr_info. * graphite.c (print_graphite_scop_statistics): (graphite_transform_loops): * sese.h (struct sese_l): Remove conversion constructor. From-SVN: r229135 --- gcc/graphite-poly.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'gcc/graphite-poly.h') diff --git a/gcc/graphite-poly.h b/gcc/graphite-poly.h index 63fdb3b..721e914 100644 --- a/gcc/graphite-poly.h +++ b/gcc/graphite-poly.h @@ -387,12 +387,6 @@ struct dr_info dr_info (data_reference_p dr, int alias_set, poly_bb_p pbb) : dr (dr), alias_set (alias_set), pbb (pbb) {} - /* A simpler constructor to be able to push these objects in a vec. */ - dr_info (int i) : dr (NULL), alias_set (-1), pbb (NULL) - { - gcc_assert (i == 0); - } - /* Assignment operator, to be able to iterate over a vec of these objects. */ const dr_info & operator= (const dr_info &p) @@ -409,7 +403,7 @@ struct dr_info struct scop { /* A SCOP is defined as a SESE region. */ - sese_info_p region; + sese_info_p scop_info; /* Number of parameters in SCoP. */ graphite_dim_t nb_params; @@ -453,10 +447,6 @@ struct scop bool poly_scop_p; }; -#define SCOP_REGION(S) (S->region) -#define SCOP_CONTEXT(S) (NULL) -#define POLY_SCOP_P(S) (S->poly_scop_p) - extern scop_p new_scop (edge, edge); extern void free_scop (scop_p); extern gimple_poly_bb_p new_gimple_poly_bb (basic_block, vec); @@ -471,7 +461,7 @@ extern bool apply_poly_transforms (scop_p); static inline void scop_set_region (scop_p scop, sese_info_p region) { - scop->region = region; + scop->scop_info = region; } /* Returns the number of parameters for SCOP. */ -- cgit v1.1