Move declarations, assign types, renaming.

1. Move declarations near the assignment/usage.
2. Assign type to members which were void*.
3. Rename scop->context to scop::param_context, and scop::ctx to
scop::isl_context

No functional changes intended. Passes regtest and bootstrap.

gcc/ChangeLog:

2015-10-05  Aditya Kumar  <aditya.k7@samsung.com>

        * graphite-dependences.c (scop_get_reads): Renamed scop->context to scop->param_context.
        (scop_get_must_writes): Same.
        (scop_get_may_writes): Same.
        (scop_get_original_schedule): Same.
        (scop_get_transformed_schedule): Same.
        (subtract_commutative_associative_deps): Same.
        * graphite-isl-ast-to-gimple.c (add_parameters_to_ivs_params): Same.
        (generate_isl_context): Same.
        (generate_isl_schedule): Same.
        (scop_to_isl_ast): Same.
        (graphite_regenerate_ast_isl): Same.
        * graphite-optimize-isl.c (scop_get_domains): Same.
        (optimize_isl): Renamed scop->context to scop->param_context.
        * graphite-poly.c (new_poly_bb): Change the type of argument to gimple_poly_bb_p.
        (new_scop): Renamed scop->context to scop->param_context.
        (free_scop): Same.
        (print_scop_context): Same.
        * graphite-poly.h (new_poly_dr): Change the type of argument from void* to data_reference_p.
        (struct poly_bb): Change the type of black_box to gimple_poly_bb_p.
        (new_poly_bb): Change the type of argument from void* to gimple_poly_bb_p.
        (pbb_set_black_box): Same.
        (struct scop): Rename context to param_context, ctx to isl_context.
        * graphite-scop-detection.c (scop_detection::build_scop_bbs_1): Move declarations closer to assignment.
        (find_params_in_bb): Same.
        (find_scop_parameters): Same.
        * graphite-sese-to-poly.c (unsigned ssa_name_version_typesize): Global to be used for statement IDs.
        (isl_id_for_pbb): Use ssa_name_version_typesize.
        (simple_copy_phi_p): Move declarations closer to assignment.
        (build_pbb_scattering_polyhedrons): Same.
        (build_scop_scattering): Same.
        (isl_id_for_ssa_name): Same.
        (extract_affine_name): Same.
        (extract_affine_int): Same.
        (extract_affine): Same.
        (set_scop_parameter_dim): Use renamed member.
        (build_loop_iteration_domains): Same.
        (add_param_constraints): Same.
        (build_scop_iteration_domain): Same.
        (pdr_add_data_dimensions): Same.
        (build_poly_dr): Same.
        (build_scop_drs): Move declarations closer to assignment.
        (analyze_drs_in_stmts): Same.
        (insert_out_of_ssa_copy): Same.
        (insert_out_of_ssa_copy_on_edge): Same.
        (propagate_expr_outside_region): Same.
        (rewrite_phi_out_of_ssa): Same.
        (rewrite_degenerate_phi): Same.
        (rewrite_reductions_out_of_ssa): Same.
        (rewrite_cross_bb_scalar_dependence): Same.
        (handle_scalar_deps_crossing_scop_limits): Same.
        (rewrite_cross_bb_scalar_deps): Same.
        * graphite.c (graphite_transform_loops): Use renamed member.

From-SVN: r228528

1 files changed, 6 insertions, 6 deletions

diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c
index ce1a18f..5d6a669 100644
--- a/gcc/graphite-poly.c
+++ b/gcc/graphite-poly.c
@@ -137,7 +137,7 @@ apply_poly_transforms (scop_p scop)
 
 void
 new_poly_dr (poly_bb_p pbb, int dr_base_object_set,
-	     enum poly_dr_type type, void *cdr, graphite_dim_t nb_subscripts,
+	     enum poly_dr_type type, data_reference_p cdr, graphite_dim_t nb_subscripts,
 	     isl_map *acc, isl_set *subscript_sizes)
 {
   static int id = 0;
@@ -168,7 +168,7 @@ free_poly_dr (poly_dr_p pdr)
 /* Create a new polyhedral black box.  */
 
 poly_bb_p
-new_poly_bb (scop_p scop, void *black_box)
+new_poly_bb (scop_p scop, gimple_poly_bb_p black_box)
 {
   poly_bb_p pbb = XNEW (struct poly_bb);
 
@@ -325,7 +325,7 @@ new_scop (edge entry, edge exit)
   sese region = new_sese (entry, exit);
   scop_p scop = XNEW (struct scop);
 
-  scop->context = NULL;
+  scop->param_context = NULL;
   scop->must_raw = NULL;
   scop->may_raw = NULL;
   scop->must_raw_no_source = NULL;
@@ -361,7 +361,7 @@ free_scop (scop_p scop)
 
   SCOP_BBS (scop).release ();
 
-  isl_set_free (scop->context);
+  isl_set_free (scop->param_context);
   isl_union_map_free (scop->must_raw);
   isl_union_map_free (scop->may_raw);
   isl_union_map_free (scop->must_raw_no_source);
@@ -620,8 +620,8 @@ print_scop_context (FILE *file, scop_p scop, int verbosity)
   if (verbosity > 0)
     fprintf (file, "# Context (\n");
 
-  if (scop->context)
-    print_isl_set (file, scop->context);
+  if (scop->param_context)
+    print_isl_set (file, scop->param_context);
 
   if (verbosity > 0)
     fprintf (file, "# )\n");