1 files changed, 67 insertions, 10 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 44f85a366574..6da36f50240d 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -41,6 +41,32 @@ typedef enum {
         PRECISE_SIGNALS,        /* budget signals are triggered with hrtimers */
 } budget_signal_policy_t;
 
+typedef enum
+{
+        /* simple - all observations counted */
+        SIMPLE_AVG = 1,
+        SIMPLE_EWMA,
+
+        /* control chart, brute - std deviation fully calculated */
+        CC_BRUTE_AVG,
+        CC_BRUTE_EWMA,
+
+        /* control chart, moving range - std deviation est. from moving range */
+        CC_MR_AVG,
+        CC_MR_EWMA,
+} predictor_type;
+
+typedef struct predictor
+{
+        predictor_type type;
+        uint16_t window_size;
+
+        uint8_t sigmas;
+        uint16_t alpha_num;
+        uint16_t alpha_denom;
+} predictor_t;
+
+
 /* We use the common priority interpretation "lower index == higher priority",
  * which is commonly used in fixed-priority schedulability analysis papers.
  * So, a numerically lower priority value implies higher scheduling priority,
@@ -180,23 +206,48 @@ typedef enum gpu_migration_dist
         MIG_LAST = MIG_NONE
 } gpu_migration_dist_t;
 
-typedef struct feedback_est{
-        fp_t 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];
+typedef struct obs_history
+{
+        uint16_t window_size;
         uint16_t count;
         uint16_t idx;
+        uint16_t ridx;
+        
+        lt_t last_observed;
+        lt_t *observations;
+        lt_t *range;
+} obs_history_t;
+
+typedef struct avg_est {
+        uint8_t sigmas;
+
+        obs_history_t history;
+
         lt_t sum;
+        lt_t rsum;
+
         lt_t std;
-        lt_t avg;
+        lt_t center_line;
 } avg_est_t;
 
+
+typedef struct ewma_est {
+        uint8_t sigmas;
+        uint16_t alpha_num;
+        uint16_t alpha_denom;
+
+        obs_history_t history;
+        
+        lt_t rsum;
+
+        lt_t std;
+        lt_t center_line;
+} ewma_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.
@@ -243,7 +294,13 @@ struct rt_param {
         long unsigned int                       held_gpus;  // bitmap of held GPUs.
 
 #ifdef CONFIG_LITMUS_AFFINITY_LOCKING
-        avg_est_t gpu_migration_est[MIG_LAST+1];
+//      avg_est_t gpu_migration_est[MIG_LAST+1];
+        predictor_type  prediction_mode;
+        union
+        {
+                avg_est_t gpu_avg_est[MIG_LAST+1];
+                ewma_est_t gpu_ewma_est[MIG_LAST+1];
+        };
 
         gpu_migration_dist_t    gpu_migration;
         int                             last_gpu;