/src/scheduling.ml - Diff - LustreC

« Previous | Next »

Revision 3b2bd83d

Added by Teme Kahsai about 8 years ago

ID 3b2bd83dd8430b75d8e1a736103754c18fe9901a
Parent a1daa793
Child 323c5b19

updating to onera version 30f766a:2016-12-04

     type schedule_report =
+    {
       (* the scheduled node *)
       node : node_desc;
       (* a schedule computed wrt the dependency graph *)
       schedule : ident list list;
       (* the set of unused variables (no output or mem depends on them) *)
       unused_vars : ISet.t;
       (* the table mapping each local var to its in-degree *)
       fanin_table : (ident, int) Hashtbl.t;
       (* the dependency graph *)
       dep_graph   : IdentDepGraph.t;
       (* the table mapping each assignment to a reusable variable *)
       reuse_table : (ident, var_decl) Hashtbl.t
       (*reuse_table : (ident, var_decl) Hashtbl.t*)
+    }
     (* Topological sort with a priority for variables belonging in the same equation lhs.
-...
        if vdecl.var_orig then v :: res else res) vl []
     let schedule_node n =
       let node_vars = get_node_vars n in
       (* let node_vars = get_node_vars n in *)
       try
         let eq_equiv = ExprDep.node_eq_equiv n in
         let eq_equiv v1 v2 =
-...
           with Not_found -> false in
         let n', g = global_dependency n in
         Log.report ~level:5
           (fun fmt ->
     	Format.fprintf fmt
     	  "dependency graph for node %s: %a"
     	  n'.node_id
     	  pp_dep_graph g
           );
         (* TODO X: extend the graph with inputs (adapt the causality analysis to deal with inputs
          compute: coi predecessors of outputs
-...
         let sort = topological_sort eq_equiv g in
         let unused = Liveness.compute_unused_variables n gg in
         let fanin = Liveness.compute_fanin n gg in
         { node = n'; schedule = sort; unused_vars = unused; fanin_table = fanin; dep_graph = gg; }
         let (disjoint, reuse) =
           if !Options.optimization >= 3
           then
     	let disjoint = Disjunction.clock_disjoint_map node_vars in
     	(disjoint,
     	 Liveness.compute_reuse_policy n sort disjoint gg)
           else
     	(Hashtbl.create 1,
     	 Hashtbl.create 1) in
       with (Causality.Error err) as exc ->
         match err with
         | DataCycle vl ->
            let vl = filter_original n vl in
            Causality.pp_error Format.err_formatter err;
            raise exc
         | _ -> raise exc
     let compute_node_reuse_table report =
       let disjoint = Disjunction.clock_disjoint_map (get_node_vars report.node) in
       let reuse = Liveness.compute_reuse_policy report.node report.schedule disjoint report.dep_graph in
     (*
         if !Options.print_reuse
         then
           begin
-...
     	      Liveness.pp_reuse_policy reuse
     	  );
           end;
         n', { schedule = sort; unused_vars = unused; fanin_table = fanin; reuse_table = reuse }
       with (Causality.Cycle vl) as exc ->
         let vl = filter_original n vl in
         pp_error Format.err_formatter vl;
         raise exc
     *)
         reuse
     let schedule_prog prog =
       List.fold_right (
         fun top_decl (accu_prog, sch_map)  ->
           match top_decl.top_decl_desc with
     	| Node nd ->
     	  let nd', report = schedule_node nd in
     	  {top_decl with top_decl_desc = Node nd'}::accu_prog,
     	  let report = schedule_node nd in
     	  {top_decl with top_decl_desc = Node report.node}::accu_prog,
     	  IMap.add nd.node_id report sch_map
     	| _ -> top_decl::accu_prog, sch_map
+        )
         prog
         ([],IMap.empty)
     let compute_prog_reuse_table report =
       IMap.map compute_node_reuse_table report
     (* removes inlined local variables from schedule report,
        which are now useless *)
     let remove_node_inlined_locals locals report =
       let is_inlined v = IMap.exists (fun l _ -> v = l) locals in
       let schedule' =
         List.fold_right (fun heads q -> let heads' = List.filter (fun v -> not (is_inlined v)) heads
     				    in if heads' = [] then q else heads'::q)
           report.schedule [] in
       begin
         IMap.iter (fun v _ -> Hashtbl.remove report.fanin_table v) locals;
         IMap.iter (fun v _ -> let iv = ExprDep.mk_instance_var v
     			  in Liveness.replace_in_dep_graph v iv report.dep_graph) locals;
         { report with schedule = schedule' }
       end
     let remove_prog_inlined_locals removed reuse =
       IMap.mapi (fun id -> remove_node_inlined_locals (IMap.find id removed)) reuse
     let pp_eq_schedule fmt vl =
       match vl with
-...
     let pp_fanin_table fmt node_schs =
       IMap.iter
         (fun nd report ->
           Format.fprintf fmt "%s : %a" nd Liveness.pp_fanin report.fanin_table)
           Format.fprintf fmt "%s: %a" nd Liveness.pp_fanin report.fanin_table)
         node_schs
     let pp_dep_graph fmt node_schs =
       IMap.iter
         (fun nd report ->
           Format.fprintf fmt "%s dependency graph: %a" nd pp_dep_graph report.dep_graph)
         node_schs
     let pp_warning_unused fmt node_schs =
-...
     	 (fun u ->
     	   let vu = get_node_var u nd in
     	   if vu.var_orig
     	   then Format.fprintf fmt "Warning: variable '%s' seems unused@.%a@." u Location.pp_loc vu.var_loc)
     	   then Format.fprintf fmt "  Warning: variable '%s' seems unused@,  %a@,@," u Location.pp_loc vu.var_loc)
     	 unused
+       )
        node_schs
     (* Local Variables: *)
     (* compile-command:"make -C .." *)
     (* End: *)

Also available in: Unified diff

Project

General

Profile

CristalCaveGem » LustreC

Revision 3b2bd83d

Added by Teme Kahsai about 8 years ago