[equation ordering] comments added
This commit is contained in:
parent
fef64987de
commit
30f9c71294
@ -147,6 +147,7 @@ let pass_if_removal verbose debug =
|
|||||||
node_pass aux_if_removal
|
node_pass aux_if_removal
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(** [pass_linearization_reset] makes sure that all reset constructs in the program
|
(** [pass_linearization_reset] makes sure that all reset constructs in the program
|
||||||
* are applied to functions.
|
* are applied to functions.
|
||||||
* This is required, since the reset construct is translated into resetting the
|
* This is required, since the reset construct is translated into resetting the
|
||||||
@ -215,6 +216,7 @@ let pass_linearization_reset verbose debug =
|
|||||||
node_pass node_lin
|
node_pass node_lin
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(** [pass_linearization_pre] makes sure that all pre constructs in the program
|
(** [pass_linearization_pre] makes sure that all pre constructs in the program
|
||||||
* are applied to variables.
|
* are applied to variables.
|
||||||
* This is required, since the pre construct is translated into a variable in
|
* This is required, since the pre construct is translated into a variable in
|
||||||
@ -623,28 +625,45 @@ let rec tpl debug ((pat, exp): t_equation) =
|
|||||||
| ETuple (_, []) -> []
|
| ETuple (_, []) -> []
|
||||||
| _ -> [(pat, exp)]
|
| _ -> [(pat, exp)]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
(** [pass_eq_reordering] orders the equation such that an equation should not
|
||||||
|
* appear before all equations defining the variables it depends on are. *)
|
||||||
let pass_eq_reordering verbose debug ast =
|
let pass_eq_reordering verbose debug ast =
|
||||||
|
(** [pick_equations] takes a list of equations and initialized variables.
|
||||||
|
* it either returns:
|
||||||
|
* - a list of equations in a correct order
|
||||||
|
* - nothing *)
|
||||||
let rec pick_equations init_vars eqs remaining_equations =
|
let rec pick_equations init_vars eqs remaining_equations =
|
||||||
match remaining_equations with
|
match remaining_equations with
|
||||||
| [] -> Some eqs
|
| [] -> (* There are no equations left to order: we are done. *) Some eqs
|
||||||
| _ ->
|
| _ ->
|
||||||
begin
|
begin
|
||||||
|
(** The filter below provides the equations whose dependencies have
|
||||||
|
* already been defined *)
|
||||||
match List.filter
|
match List.filter
|
||||||
(fun (patt, expr) ->
|
(fun (patt, expr) ->
|
||||||
List.for_all
|
List.for_all
|
||||||
(fun v -> List.mem v init_vars)
|
(fun v -> List.mem v init_vars)
|
||||||
(vars_of_expr expr))
|
(vars_of_expr expr))
|
||||||
remaining_equations with
|
remaining_equations with
|
||||||
| [] -> raise (PassExn "[equation ordering] The equations cannot be ordered.")
|
| [] -> (** There are remaining equations to order, but none whose all
|
||||||
| h :: t ->
|
* dependencies have already been defined yet.*)
|
||||||
let init_vars =
|
raise (PassExn "[equation ordering] The equations cannot be ordered.")
|
||||||
|
| h :: t -> (** [h :: t] is a list of equations whose dependencies have
|
||||||
|
* all already been defined. *)
|
||||||
|
let init_vars = (* new set of initialized variables *)
|
||||||
List.fold_left
|
List.fold_left
|
||||||
(fun acc vs ->
|
(fun acc vs ->
|
||||||
acc @ (vars_of_patt (fst vs))) init_vars (h :: t) in
|
(vars_of_patt (fst vs)) @ acc) init_vars (h :: t) in
|
||||||
|
(** The filter below removes the equation of [h :: t] to those to
|
||||||
|
* the list of equations be ordered *)
|
||||||
pick_equations init_vars (eqs @ (h :: t))
|
pick_equations init_vars (eqs @ (h :: t))
|
||||||
(List.filter (fun eq -> List.for_all (fun e -> eq <> e) (h :: t)) remaining_equations)
|
(List.filter
|
||||||
|
(fun eq -> List.for_all (fun e -> eq <> e) (h :: t)) remaining_equations)
|
||||||
end
|
end
|
||||||
in
|
in
|
||||||
|
(* main function of the (node-)pass. *)
|
||||||
let node_eq_reorganising (node: t_node): t_node option =
|
let node_eq_reorganising (node: t_node): t_node option =
|
||||||
let init_vars = List.map name_of_var (snd node.n_inputs) in
|
let init_vars = List.map name_of_var (snd node.n_inputs) in
|
||||||
try
|
try
|
||||||
@ -655,8 +674,11 @@ let pass_eq_reordering verbose debug ast =
|
|||||||
end
|
end
|
||||||
with PassExn err -> (verbose err; None)
|
with PassExn err -> (verbose err; None)
|
||||||
in
|
in
|
||||||
|
(** iterate the pass over the nodes of the program. *)
|
||||||
node_pass node_eq_reorganising ast
|
node_pass node_eq_reorganising ast
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
let pass_typing verbose debug ast =
|
let pass_typing verbose debug ast =
|
||||||
let htbl = Hashtbl.create (List.length ast) in
|
let htbl = Hashtbl.create (List.length ast) in
|
||||||
let () = debug "[typing verification]" in
|
let () = debug "[typing verification]" in
|
||||||
|
Loading…
Reference in New Issue
Block a user