2 files changed, 20 insertions, 10 deletions

diff --git a/include/litmus/gpu_affinity.h b/include/litmus/gpu_affinity.h
index 6b3fb8b28745..d64a15cbf2a5 100644
--- a/include/litmus/gpu_affinity.h
+++ b/include/litmus/gpu_affinity.h
@@ -31,17 +31,18 @@ static inline lt_t get_gpu_time(struct task_struct* t)
 
 static inline lt_t get_gpu_estimate(struct task_struct* t, gpu_migration_dist_t dist)
 {
-        int i;
-        fpbuf_t temp = _fp_to_integer(t->rt_param.gpu_migration_est[dist].est);
-        lt_t val = (temp >= 0) ? temp : 0;  // never allow negative estimates...
+//      int i;
+//      fpbuf_t temp = _fp_to_integer(t->rt_param.gpu_migration_est[dist].est);
+//      lt_t val = (temp >= 0) ? temp : 0;  // never allow negative estimates...
+        lt_t val = t->rt_param.gpu_migration_est[dist].avg;
 
-        WARN_ON(temp < 0);
+//      WARN_ON(temp < 0);
 
         // lower-bound a distant migration to be at least equal to the level
         // below it.
-        for(i = dist-1; (val == 0) && (i >= MIG_LOCAL); --i) {
-                val = _fp_to_integer(t->rt_param.gpu_migration_est[i].est);
-        }
+//      for(i = dist-1; (val == 0) && (i >= MIG_LOCAL); --i) {
+//              val = _fp_to_integer(t->rt_param.gpu_migration_est[i].est);
+//      }
 
         return ((val > 0) ? val : dist+1);
 }
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 0198884eab86..a441badd30cc 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -144,6 +144,17 @@ typedef struct feedback_est{
         fp_t accum_err;
 } feedback_est_t;
 
+
+#define AVG_EST_WINDOW_SIZE 20
+
+typedef struct avg_est{
+        lt_t history[AVG_EST_WINDOW_SIZE];
+        uint16_t count;
+        uint16_t idx;
+        lt_t sum;
+        lt_t avg;
+} avg_est_t;
+
 /*      RT task parameters for scheduling extensions
  *      These parameters are inherited during clone and therefore must
  *      be explicitly set up before the task set is launched.
@@ -190,12 +201,10 @@ struct rt_param {
         long unsigned int                       held_gpus;  // bitmap of held GPUs.
 
 #ifdef CONFIG_LITMUS_AFFINITY_LOCKING
-        fp_t    gpu_fb_param_a[MIG_LAST+1];
-        fp_t    gpu_fb_param_b[MIG_LAST+1];
+        avg_est_t gpu_migration_est[MIG_LAST+1];
 
         gpu_migration_dist_t    gpu_migration;
         int                             last_gpu;
-        feedback_est_t  gpu_migration_est[MIG_LAST+1]; // local, near, med, far
 
         lt_t accum_gpu_time;
         lt_t gpu_time_stamp;