fix name

1a1a11a · May 30, 2024 · 49a4377 · 49a4377
1 parent e44714e
commit 49a4377
Show file tree

Hide file tree

Showing 26 changed files with 106 additions and 106 deletions.
diff --git a/fig/datav2/miss_ratio_algo_box_0.pdf b/fig/datav2/miss_ratio_algo_box_0.pdf
diff --git a/fig/datav2/miss_ratio_algo_box_0.png b/fig/datav2/miss_ratio_algo_box_0.png
diff --git a/fig/datav2/miss_ratio_algo_box_4.pdf b/fig/datav2/miss_ratio_algo_box_4.pdf
diff --git a/fig/datav2/miss_ratio_algo_box_4.png b/fig/datav2/miss_ratio_algo_box_4.png
diff --git a/fig/datav2/miss_ratio_corr_box_0.pdf b/fig/datav2/miss_ratio_corr_box_0.pdf
diff --git a/fig/datav2/miss_ratio_corr_box_4.pdf b/fig/datav2/miss_ratio_corr_box_4.pdf
diff --git a/fig/datav2/miss_ratio_corr_box_5.pdf b/fig/datav2/miss_ratio_corr_box_5.pdf
diff --git a/fig/datav2/miss_ratio_corr_box_6.pdf b/fig/datav2/miss_ratio_corr_box_6.pdf
diff --git a/fig/datav2/miss_ratio_corr_box_7.pdf b/fig/datav2/miss_ratio_corr_box_7.pdf
diff --git a/fig/datav2/w106_vscsi1.vscsitrace.pdf b/fig/datav2/w106_vscsi1.vscsitrace.pdf
diff --git a/fig/metadatav2/miss_ratio_algo_box_0.pdf b/fig/metadatav2/miss_ratio_algo_box_0.pdf
diff --git a/fig/metadatav2/miss_ratio_algo_box_0.png b/fig/metadatav2/miss_ratio_algo_box_0.png
diff --git a/fig/metadatav2/miss_ratio_algo_box_4.pdf b/fig/metadatav2/miss_ratio_algo_box_4.pdf
diff --git a/fig/metadatav2/miss_ratio_algo_box_4.png b/fig/metadatav2/miss_ratio_algo_box_4.png
diff --git a/fig/metadatav2/miss_ratio_corr_box_0.pdf b/fig/metadatav2/miss_ratio_corr_box_0.pdf
diff --git a/fig/metadatav2/miss_ratio_corr_box_4.pdf b/fig/metadatav2/miss_ratio_corr_box_4.pdf
diff --git a/fig/metadatav2/miss_ratio_corr_box_5.pdf b/fig/metadatav2/miss_ratio_corr_box_5.pdf
diff --git a/fig/metadatav2/miss_ratio_corr_box_6.pdf b/fig/metadatav2/miss_ratio_corr_box_6.pdf
diff --git a/fig/metadatav2/miss_ratio_corr_box_7.pdf b/fig/metadatav2/miss_ratio_corr_box_7.pdf
diff --git a/libCacheSim/bin/cachesim/cache_init.h b/libCacheSim/bin/cachesim/cache_init.h
@@ -131,8 +131,8 @@ static inline cache_t *create_cache(const char *trace_path,
  cache = QDLP_init(cc_params, eviction_params);
  } else if (strcasecmp(eviction_algo, "sieve") == 0) {
  cache = Sieve_init(cc_params, eviction_params);
- } else if (strcasecmp(eviction_algo, "Cloud2QPlus") == 0) {
- cache = Cloud2QPlus_init(cc_params, eviction_params);
+ } else if (strcasecmp(eviction_algo, "Clock2QPlus") == 0) {
+ cache = Clock2QPlus_init(cc_params, eviction_params);
 #ifdef ENABLE_GLCACHE
  } else if (strcasecmp(eviction_algo, "GLCache") == 0 ||
  strcasecmp(eviction_algo, "gl-cache") == 0) {

diff --git a/libCacheSim/cache/eviction/CMakeLists.txt b/libCacheSim/cache/eviction/CMakeLists.txt
@@ -38,7 +38,7 @@ set(sourceC
  other/S3LRU.c
 
  Sieve.c
- Cloud2QPlus.c
+ Clock2QPlus.c
 )
 
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/priv")

diff --git a/libCacheSim/cache/eviction/Cloud2QPlus.c → libCacheSim/cache/eviction/Clock2QPlus.c b/libCacheSim/cache/eviction/Cloud2QPlus.c → libCacheSim/cache/eviction/Clock2QPlus.c
diff --git a/libCacheSim/include/libCacheSim/cacheObj.h b/libCacheSim/include/libCacheSim/cacheObj.h
@@ -121,7 +121,7 @@ typedef struct {
  int64_t insertion_time; // measured in number of objects inserted
  int64_t freq;
  int32_t main_insert_freq;
-} Cloud2QPlus_obj_metadata_t;
+} Clock2QPlus_obj_metadata_t;
 
 typedef struct {
  int32_t freq;
@@ -180,7 +180,7 @@ typedef struct cache_obj {
  LIRS_obj_metadata_t LIRS;
  S3FIFO_obj_metadata_t S3FIFO;
  S3FIFO_obj_metadata_t S3FIFOv2;
- Cloud2QPlus_obj_metadata_t Cloud2QPlus;
+ Clock2QPlus_obj_metadata_t Clock2QPlus;
  myclock_obj_params_t myclock;
  Sieve_obj_params_t sieve;
 

diff --git a/libCacheSim/include/libCacheSim/evictionAlgo.h b/libCacheSim/include/libCacheSim/evictionAlgo.h
@@ -165,7 +165,7 @@ cache_t *FIFO_Belady_init(const common_cache_params_t ccache_params,
 cache_t *Sieve_init(const common_cache_params_t ccache_params,
  const char *cache_specific_params);
 
-cache_t *Cloud2QPlus_init(const common_cache_params_t ccache_params,
+cache_t *Clock2QPlus_init(const common_cache_params_t ccache_params,
  const char *cache_specific_params);
 
 #ifdef ENABLE_LRB

diff --git a/scripts/plot/plot_mr_red_box.py b/scripts/plot/plot_mr_red_box.py
@@ -22,12 +22,12 @@ def update_algo_name(algo_name):
  "WTinyLFU-w0.01-SLRU": "TinyLFU",
  "S3FIFO-0.1000-2": "S3FIFO",
  "S3FIFOv2-0.1000-2": "S3FIFO",
- "Cloud2QPlus-0.1000-2-0.50": "Cloud2Q+0.5",
- "Cloud2QPlus-0.1000-2-0.00": "Cloud2Q+",
- "Cloud2QPlus2-0.1000-2-0.00": "Cloud2Q+2",
- "Cloud2QPlus2-0.1000-2-0.50": "Cloud2Q+2",
- "Cloud2QPlus4-0.1000-2-0.00": "Cloud2Q+",
- "Cloud2QPlus4-0.1000-2-0.50": "Cloud2Q+",
+ "Cloud2QPlus-0.1000-2-0.50": "Clock2Q+0.5",
+ "Cloud2QPlus-0.1000-2-0.00": "Clock2Q+",
+ "Cloud2QPlus2-0.1000-2-0.00": "Clock2Q+2",
+ "Cloud2QPlus2-0.1000-2-0.50": "Clock2Q+2",
+ "Cloud2QPlus4-0.1000-2-0.00": "Clock2Q+",
+ "Cloud2QPlus4-0.1000-2-0.50": "Clock2Q+",
  }
 
  return name_dict.get(algo_name, algo_name)
@@ -79,13 +79,14 @@ def plot_box_algo(datapath, size_idx=0, metric="miss_ratio"):
 
  algo_list = [
  # "S3FIFO-0.1000-2",
+ "Cloud2QPlus4-0.1000-2-0.50",
  "S3FIFOv2-0.1000-2",
  # "Cloud2QPlus-0.1000-2-0.50",
  # "Cloud2QPlus-0.1000-2-0.00",
  # "Cloud2QPlus2-0.1000-2-0.00",
  # "Cloud2QPlus2-0.1000-2-0.50",
  # "Cloud2QPlus4-0.1000-2-0.00",
- "Cloud2QPlus4-0.1000-2-0.50",
+ # "Cloud2QPlus4-0.1000-2-0.50",
  "LIRS",
  "TwoQ",
  "ARC",

diff --git a/scripts/plot/script.sh b/scripts/plot/script.sh
@@ -3,72 +3,71 @@ for f in /disk/cphy_vscsi/w*; do
  for algo in fifo lru arc lirs twoQ tinylfu sieve; do 
  echo ./bin/cachesim $f vscsi ${algo} 0 --ignore-obj-size 1 >> task; 
  done 
- echo ./bin/cachesim $f vscsi s3fifo,cloud2QPlus 0 --ignore-obj-size 1 -e "move-to-main-threshold=2" >> task; 
+ echo ./bin/cachesim $f vscsi s3fifo,Clock2QPlus 0 --ignore-obj-size 1 -e "move-to-main-threshold=2" >> task; 
  for ignore_perc in 0 0.01 0.05 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1; do 
- echo ./bin/cachesim $f vscsi cloud2QPlus 0 --ignore-obj-size 1 -e "move-to-main-threshold=2,corr-window-ratio=${ignore_perc}" >> task; 
+ echo ./bin/cachesim $f vscsi Clock2QPlus 0 --ignore-obj-size 1 -e "move-to-main-threshold=2,corr-window-ratio=${ignore_perc}" >> task; 
  done
 done
 
-./bin/cachesim $f vscsi cloud2QPlus 0 --ignore-obj-size 1 -e "move-to-main-threshold=2,corr-window-ratio=1"
+./bin/cachesim $f vscsi Clock2QPlus 0 --ignore-obj-size 1 -e "move-to-main-threshold=2,corr-window-ratio=1"
 ./bin/cachesim $f vscsi twoQ 0 --ignore-obj-size 1 &
 
 for f in ../anonymized106/w*; do 
  echo ./cachesim $f vscsi S3FIFOv2 0 --ignore-obj-size 1 -e "move-to-main-threshold=2" >> task
- # echo ./cachesim $f vscsi cloud2QPlus 0 --ignore-obj-size 1 -e "move-to-main-threshold=2" >> task
- # echo ./cachesim $f vscsi cloud2QPlus 0 --ignore-obj-size 1 >> task
+ # echo ./cachesim $f vscsi Clock2QPlus 0 --ignore-obj-size 1 -e "move-to-main-threshold=2" >> task
+ # echo ./cachesim $f vscsi Clock2QPlus 0 --ignore-obj-size 1 >> task
 
  for ignore_perc in 0 0.01 0.05 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1; do 
- echo ./cachesim $f vscsi cloud2QPlus 0 --ignore-obj-size 1 -e "move-to-main-threshold=2,corr-window-ratio=${ignore_perc}" >> task; 
+ echo ./cachesim $f vscsi Clock2QPlus 0 --ignore-obj-size 1 -e "move-to-main-threshold=2,corr-window-ratio=${ignore_perc}" >> task; 
  done
 done
 
 for ignore_perc in 0 0.01 0.05 0.1 0.2 0.4 0.6 0.8 0.9 1; do 
- ./cachesim $f oracleGeneral cloud2QPlus 0 --ignore-obj-size 1 -e "move-to-main-threshold=2,corr-window-ratio=${ignore_perc}";
+ ./cachesim $f oracleGeneral Clock2QPlus 0 --ignore-obj-size 1 -e "move-to-main-threshold=2,corr-window-ratio=${ignore_perc}";
 done
 
 f=anonymized106/w100_vscsi1.vscsitrace
-./bin/cachesim $f vscsi cloud2QPlus 0 --ignore-obj-size 1 -e "move-to-main-threshold=2,corr-window-ratio=1"
-./bin/cachesim $f vscsi S3FIFOv2,cloud2QPlus 0 --ignore-obj-size 1 
+./bin/cachesim $f vscsi Clock2QPlus 0 --ignore-obj-size 1 -e "move-to-main-threshold=2,corr-window-ratio=1"
+./bin/cachesim $f vscsi S3FIFOv2,Clock2QPlus 0 --ignore-obj-size 1 
 
 f=/users/juncheng/data/wiki_2019t.oracleGeneral.sample10.zst
-./bin/cachesim $f oracleGeneral cloud2QPlus 0 --ignore-obj-size 1 -e "move-to-main-threshold=2,corr-window-ratio=1" &
-./bin/cachesim $f oracleGeneral S3FIFO,2Q,S3FIFOv2,cloud2QPlus 0 --ignore-obj-size 1 
+./bin/cachesim $f oracleGeneral S3FIFO,S3FIFOv2,Clock2QPlus 0 --ignore-obj-size 1 &
 
 
 rm -r bin4/result2; cp -r bin4/result bin4/result2
-sed -i "s/Cloud2QPlus/Cloud2QPlus4/g" bin4/result2/*
+sed -i "s/Clock2QPlus/Clock2QPlus4/g" bin4/result2/*
 rm -rf /disk/result; cp -r result_data /disk/result; for f in bin4/result2/*; do fn=$(basename $f); cat $f >> /disk/result/${fn}; done
 
 rm -r bin_metadata/result2; cp -r bin_metadata/result bin_metadata/result2
-sed -i "s/Cloud2QPlus/Cloud2QPlus4/g" bin_metadata/result2/*
+sed -i "s/Clock2QPlus/Clock2QPlus4/g" bin_metadata/result2/*
 rm -rf /disk/result; cp -r result_metadata /disk/result; for f in bin_metadata/result2/*; do fn=$(basename $f); cat $f >> /disk/result/${fn}; done
 
 
 
 
 for i in `seq 80 106`; do 
- ./bin/cachesim anonymized106/w${i}_vscsi1.vscsitrace vscsi s3fifo,cloud2qplus 0.2,0.4,0.6,0.8,0.9999 --ignore-obj-size 1
+ ./bin/cachesim anonymized106/w${i}_vscsi1.vscsitrace vscsi s3fifo,Clock2qplus 0.2,0.4,0.6,0.8,0.9999 --ignore-obj-size 1
 done
 
-./bin/cachesim anonymized106/w106_vscsi1.vscsitrace vscsi s3fifo,cloud2qplus 0.2,0.4,0.6,0.8 --ignore-obj-size 1
+./bin/cachesim anonymized106/w106_vscsi1.vscsitrace vscsi s3fifo,Clock2qplus 0.2,0.4,0.6,0.8 --ignore-obj-size 1
 
 for f in /disk/data/*; do 
- ./bin/cachesim $f oracleGeneral s3fifo,cloud2qplus 0.01,0.1,0.2,0.4,0.6,0.8,0.9999 --ignore-obj-size 1 &
+ ./bin/cachesim $f oracleGeneral s3fifo,Clock2qplus 0.01,0.1,0.2,0.4,0.6,0.8,0.9999 --ignore-obj-size 1 &
 done
 
 
 for f in _build/anonymized106/w4*; do 
- python3 scripts/plot_mrc_size.py --tracepath $f --algos fifo,lru,cloud2qplus,s3fifo --trace-format vscsi --sizes 0.001,0.002,0.005,0.01,0.02,0.05,0.1,0.15,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,0.99 --ignore-obj-size
+ python3 scripts/plot_mrc_size.py --tracepath $f --algos fifo,lru,Clock2qplus,s3fifo --trace-format vscsi --sizes 0.001,0.002,0.005,0.01,0.02,0.05,0.1,0.15,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,0.99 --ignore-obj-size
 done
-python3 scripts/plot_mrc_size.py --tracepath _build/anonymized106/w106_vscsi1.vscsitrace --algos fifo,lru,cloud2qplus,s3fifo --trace-format vscsi --sizes 0.001,0.002,0.005,0.01,0.02,0.05,0.1,0.15,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,0.99 --ignore-obj-size
+python3 scripts/plot_mrc_size.py --tracepath _build/anonymized106/w106_vscsi1.vscsitrace --algos fifo,lru,Clock2qplus,s3fifo --trace-format vscsi --sizes 0.001,0.002,0.005,0.01,0.02,0.05,0.1,0.15,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,0.99 --ignore-obj-size
 
 
 for f in /disk/data/sample/other/*; do 
- python3 scripts/plot_mrc_size.py --tracepath $f --algos fifo,lru,cloud2qplus,s3fifo --trace-format oracleGeneral --sizes 0.001,0.002,0.005,0.01,0.02,0.05,0.1,0.15,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,0.99 --ignore-obj-size
+ python3 scripts/plot_mrc_size.py --tracepath $f --algos fifo,lru,Clock2qplus,s3fifo --trace-format oracleGeneral --sizes 0.001,0.002,0.005,0.01,0.02,0.05,0.1,0.15,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,0.99 --ignore-obj-size
 done
 
 for f in /disk/data/msr/*; do 
- python3 scripts/plot_mrc_size.py --tracepath $f --algos fifo,lru,cloud2qplus,s3fifo --trace-format oracleGeneral --sizes 0.001,0.002,0.005,0.01,0.02,0.05,0.1,0.15,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,0.99 --ignore-obj-size
+ python3 scripts/plot_mrc_size.py --tracepath $f --algos fifo,lru,Clock2qplus,s3fifo --trace-format oracleGeneral --sizes 0.001,0.002,0.005,0.01,0.02,0.05,0.1,0.15,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,0.99 --ignore-obj-size
 done