Re: [PATCH 1/2] [Refactoring graphite] Move declarations, assign types, renaming.

["H.J. Lu" <hjl dot tools at gmail dot com>]

On Tue, Oct 6, 2015 at 9:34 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Mon, Oct 5, 2015 at 7:53 PM, Aditya Kumar <hiraditya@msn.com> wrote:
>> 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.
>>
>>
>
> It breaks bootstrap with isl-0.14:
>
> /export/gnu/import/git/sources/gcc/gcc/graphite-optimize-isl.c: In
> function âbool optimize_isl(scop_p)â:
> /export/gnu/import/git/sources/gcc/gcc/graphite-optimize-isl.c:333:40:
> error: âstruct scopâ has no member named âctxâ
>    isl_options_set_schedule_fuse (scop->ctx, ISL_SCHEDULE_FUSE_MIN);
>                                         ^
> Makefile:1077: recipe for target 'graphite-optimize-isl.o' failed
> make[3]: *** [graphite-optimize-isl.o] Error 1
> make[3]: *** Waiting for unfinished jobs....
>
>

I am testing this patch.

-- 
H.J.
---
iff --git a/gcc/graphite-optimize-isl.c b/gcc/graphite-optimize-isl.c
index 3fe3133..2bae417 100644
--- a/gcc/graphite-optimize-isl.c
+++ b/gcc/graphite-optimize-isl.c
@@ -330,7 +330,7 @@ optimize_isl (scop_p scop)
   /* ISL-0.15 or later.  */
   isl_options_set_schedule_serialize_sccs (scop->isl_context, 1);
 #else
-  isl_options_set_schedule_fuse (scop->ctx, ISL_SCHEDULE_FUSE_MIN);
+  isl_options_set_schedule_fuse (scop->isl_context, ISL_SCHEDULE_FUSE_MIN);
 #endif

 #ifdef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE