diff options
| -rw-r--r-- | mppa_k1c/InstructionScheduler.ml | 9 | ||||
| -rw-r--r-- | mppa_k1c/PostpassSchedulingOracle.ml | 1 | ||||
| -rw-r--r-- | test/monniaux/complex/Makefile | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/mppa_k1c/InstructionScheduler.ml b/mppa_k1c/InstructionScheduler.ml index 4f289780..73e73e15 100644 --- a/mppa_k1c/InstructionScheduler.ml +++ b/mppa_k1c/InstructionScheduler.ml @@ -1094,11 +1094,14 @@ let ilp_read_solution mapper channel = times;; let ilp_solver = ref "ilp_solver" - + +let problem_nr = ref 0 + let ilp_scheduler pb_type problem = try - let filename_in = "problem.lp" - and filename_out = "problem.sol" in + let filename_in = Printf.sprintf "problem%05d.lp" !problem_nr + and filename_out = Printf.sprintf "problem%05d.sol" !problem_nr in + incr problem_nr; let opb_problem = open_out filename_in in let mapper = ilp_print_problem opb_problem problem pb_type in close_out opb_problem; diff --git a/mppa_k1c/PostpassSchedulingOracle.ml b/mppa_k1c/PostpassSchedulingOracle.ml index 7b632144..20e10bf0 100644 --- a/mppa_k1c/PostpassSchedulingOracle.ml +++ b/mppa_k1c/PostpassSchedulingOracle.ml @@ -685,6 +685,7 @@ let print_bb oc bb = let do_schedule bb = let problem = build_problem bb + (* can also use cascaded_scheduler *) in let solution = validated_scheduler list_scheduler problem in match solution with | None -> failwith "Could not find a valid schedule" diff --git a/test/monniaux/complex/Makefile b/test/monniaux/complex/Makefile index 1c701783..c92f5211 100644 --- a/test/monniaux/complex/Makefile +++ b/test/monniaux/complex/Makefile @@ -10,3 +10,8 @@ complex_mat.gcc.host.s complex_mat.ccomp.host.s complex_mat.gcc.k1c.s complex_ma complex_mat.gcc.host complex_mat.ccomp.host : ../clock.gcc.host.o complex_mat.gcc.k1c complex_mat.ccomp.k1c : ../clock.gcc.k1c.o + +clean: + -rm -f *.o *.s *.k1c + +.PHONY: clean |