Always do ILP sched test for P2P.

2 files changed, 11 insertions, 6 deletions

diff --git a/rtss14/chains.py b/rtss14/chains.py
index fde75c3..f4bfdda 100644
--- a/rtss14/chains.py
+++ b/rtss14/chains.py
@@ -3746,8 +3746,6 @@ def getBlockingChainSolver(nce, ngpu, rho, polluters, worst_case, chunksz, gpu_x
             name = 'ce%d_g%d_r%d_p%d_w%d_chk%d' % key
             slvr = create_solver(name, in_template, out_template, incost, outcost, migcost)
             cached_solvers[key] = slvr
-    if slvr is not None:
-        print 'created solver for %s' % (str(key))
     return slvr
 
 #def TEST_getBlockingChainSolver(nce, ngpu, rho):
diff --git a/rtss14/rtss14.py b/rtss14/rtss14.py
index 8bc8324..9734cf8 100755
--- a/rtss14/rtss14.py
+++ b/rtss14/rtss14.py
@@ -647,13 +647,20 @@ def process_dp(_dp):
         ts = create_gpu_task_set(dp, overheads)
 
         # vvvvvvvvvvvvvvvv CHECK SCHEDULABILITY vvvvvvvvvvvvvvvv
-        is_sched, processed_ts = is_schedulable(ts, dp, overheads)
+        if thesolver is None:
+            is_sched, processed_ts = is_schedulable(ts, dp, overheads)
+        else:
+            ts_for_ilp = ts.copy()
+            is_sched, processed_ts = is_schedulable(ts, dp, overheads)
 
-        # try again with the blocking heuristic
-        if not is_sched and thesolver is not None:
             dp.solver = thesolver
-            is_sched, processed_ts = is_schedulable(ts, dp, overheads)
+            is_sched_ilp, processed_ts_ilp = is_schedulable(ts_for_ilp, dp, overheads)
             dp.solver = None
+
+            # pick ilp solution if it is better
+            if (not is_sched and is_sched_ilp) or (is_sched and is_sched_ilp and processed_ts.max_ptardiness() > processed_ts_ilp.max_ptardiness()):
+                is_sched = is_sched_ilp
+                processed_ts = processed_ts_ilp
         # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         avg_sched = update_mean(avg_sched, samples, is_sched)