1 files changed, 28 insertions, 10 deletions

diff --git a/litmus/gpu_affinity.c b/litmus/gpu_affinity.c
index 70a86bdd9aec..9762be1a085e 100644
--- a/litmus/gpu_affinity.c
+++ b/litmus/gpu_affinity.c
@@ -5,25 +5,32 @@
 #include <litmus/litmus.h>
 #include <litmus/gpu_affinity.h>
 
+#include <litmus/sched_trace.h>
+
 #define OBSERVATION_CAP 2*1e9
 
-static void update_estimate(feedback_est_t* fb, fp_t a, fp_t b, lt_t observed)
+static fp_t update_estimate(feedback_est_t* fb, fp_t a, fp_t b, lt_t observed)
 {
+        fp_t relative_err;
         fp_t err, new;
         fp_t actual = _integer_to_fp(observed);
 
         err = _sub(actual, fb->est);
         new = _add(_mul(a, err), _mul(b, fb->accum_err));
 
+        relative_err = _div(err, actual);
+
         fb->est = new;
         fb->accum_err = _add(fb->accum_err, err);
+
+        return relative_err;
 }
 
 void update_gpu_estimate(struct task_struct *t, lt_t observed)
 {
         feedback_est_t *fb = &(tsk_rt(t)->gpu_migration_est[tsk_rt(t)->gpu_migration]);
 
-        WARN_ON(tsk_rt(t)->gpu_migration > MIG_LAST);
+        BUG_ON(tsk_rt(t)->gpu_migration > MIG_LAST);
 
         if(unlikely(fb->est.val == 0)) {
                 // kludge-- cap observed values to prevent whacky estimations.
@@ -40,18 +47,29 @@ void update_gpu_estimate(struct task_struct *t, lt_t observed)
                 fb->accum_err = _div(fb->est, _integer_to_fp(2));  // ...seems to work.
         }
         else {
-                update_estimate(fb,
-                                                tsk_rt(t)->gpu_fb_param_a,
-                                                tsk_rt(t)->gpu_fb_param_b,
-                                                observed);
-
-                if(_fp_to_integer(fb->est) <= 0) {
-                        // TODO: talk to Jonathan about how well this works.
-                        // Maybe we should average the observed and est instead?
+                fp_t rel_err = update_estimate(fb,
+                                                                           tsk_rt(t)->gpu_fb_param_a[tsk_rt(t)->gpu_migration],
+                                                                           tsk_rt(t)->gpu_fb_param_b[tsk_rt(t)->gpu_migration],
+                                                                           observed);
+
+                if(unlikely(_fp_to_integer(fb->est) <= 0)) {
                         TRACE_TASK(t, "Invalid estimate. Patching.\n");
                         fb->est = _integer_to_fp(observed);
                         fb->accum_err = _div(fb->est, _integer_to_fp(2));  // ...seems to work.
                 }
+                else {
+//                      struct migration_info mig_info;
+
+                        sched_trace_prediction_err(t,
+                                                                           &(tsk_rt(t)->gpu_migration),
+                                                                           &rel_err);
+
+//                      mig_info.observed = observed;
+//                      mig_info.estimated = get_gpu_estimate(t, tsk_rt(t)->gpu_migration);
+//                      mig_info.distance = tsk_rt(t)->gpu_migration;
+//
+//                      sched_trace_migration(t, &mig_info);
+                }
         }
 
         TRACE_TASK(t, "GPU est update after (dist = %d, obs = %llu): %d.%d\n",