diff options
| author | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-04 13:09:05 +0100 |
|---|---|---|
| committer | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-04 13:09:05 +0100 |
| commit | 906d9a5356fe7b90fc14a9c0d6a0d65abb7e80a8 (patch) | |
| tree | 3bc66c64240ee0b2cda71c1879169ff01e5cfc58 /sched | |
| parent | 39df9f197b987e0a2c564276d5b65a97f1fb2700 (diff) | |
| download | SystDigit-Projet-906d9a5356fe7b90fc14a9c0d6a0d65abb7e80a8.tar.gz SystDigit-Projet-906d9a5356fe7b90fc14a9c0d6a0d65abb7e80a8.zip | |
Document programs ; better time support in monitor.
Diffstat (limited to 'sched')
| -rw-r--r-- | sched/Makefile | 7 | ||||
| -rw-r--r-- | sched/simplify.ml | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sched/Makefile b/sched/Makefile index 460b639..4d36b96 100644 --- a/sched/Makefile +++ b/sched/Makefile @@ -1,10 +1,11 @@ IN=graph.ml main.ml netlist_ast.ml netlist_dumb.ml netlist_lexer.mll netlist.ml netlist_parser.mly netlist_printer.ml scheduler.ml simplify.ml -all: main.native +all: sched -main.native: $(IN) +sched: $(IN) ocamlbuild -libs unix main.native + mv main.native sched clean: + rm sched rm -rf _build - rm main.native diff --git a/sched/simplify.ml b/sched/simplify.ml index 86c4790..ef2f0dc 100644 --- a/sched/simplify.ml +++ b/sched/simplify.ml @@ -328,9 +328,8 @@ let topo_sort p = let rec simplify_with steps p = let pp, use = List.fold_left (fun (x, u) (f, n) -> - print_string n; let xx, uu = f x in - print_string (if uu then " *\n" else "\n"); + print_endline (if uu then n ^ " *" else n); (xx, u || uu)) (p, false) steps in if use then simplify_with steps pp else pp @@ -338,6 +337,8 @@ let rec simplify_with steps p = let simplify p = let p = simplify_with [ topo_sort, "topo_sort"; + ] p in + let p = simplify_with [ cascade_slices, "cascade_slices"; pass_concat, "pass_concat"; select_to_id, "select_to_id"; |