fix a bug in sieve

Author: 1a1a11a

libCacheSim/cache/eviction/priv/Sieve.c

@@ -225,26 +225,11 @@ static void Sieve_evict(cache_t *cache, const request_t *req) {
   /* if we have run one full around or first eviction */
   cache_obj_t *obj = params->pointer == NULL ? params->q_tail : params->pointer;
 
-  while (obj->myclock.freq > 0) {
-    obj->myclock.freq -= 1;
+  while (obj->sieve.freq > 0) {
+    obj->sieve.freq -= 1;
     obj = obj->queue.prev == NULL ? params->q_tail : obj->queue.prev;
   }
 
-  /* find the first untouched */
-  // while ((obj != NULL && obj->sieve.freq > 0)) {
-  //   obj->sieve.freq -= 1;
-  //   obj = obj->queue.prev;
-  // }
-
-  // /* if we have finished one around, start from the tail */
-  // if (obj == NULL) {
-  //   obj = params->q_tail;
-  //   while (obj != NULL && obj->sieve.freq > 0) {
-  //     obj->sieve.freq -= 1;
-  //     obj = obj->queue.prev;
-  //   }
-  // }
-
   params->pointer = obj->queue.prev;
   remove_obj_from_list(&params->q_head, &params->q_tail, obj);
   cache_evict_base(cache, obj, true);

test/test_evictionAlgo.c

@@ -496,10 +496,10 @@ static void test_S3FIFO(gconstpointer user_data) {
 }
 
 static void test_Sieve(gconstpointer user_data) {
-  uint64_t miss_cnt_true[] = {93403, 89386, 84387, 84025,
-                              72498, 72228, 72182, 72140};
-  uint64_t miss_byte_true[] = {4213112832, 4052646400, 3829170176, 3807412736,
-                               3093146112, 3079525888, 3079210496, 3077547520};
+  uint64_t miss_cnt_true[] = {91699, 86720, 78578, 76707,
+                              69945, 66221, 64445, 64376};
+  uint64_t miss_byte_true[] = {4158632960, 3917211648, 3536227840, 3455379968,
+                               3035580416, 2801699328, 2699456000, 2696345600};
 
   reader_t *reader = (reader_t *)user_data;
   common_cache_params_t cc_params = {