eval: Fix indentation and simplify loops

Author: tzussman

eval/filesearch/run.sh

@@ -40,6 +40,7 @@ if ! "$BASE_DIR/utils/enable-mglru.sh"; then
 fi
 
 # MGLRU
+# TODO: Remove --policy-loader requirement when using --default-only
 python3 "$BENCH_PATH/bench_filesearch.py" \
 	--cpu 8 \
 	--policy-loader "$POLICY_PATH/cache_ext_mru.out" \

eval/get-scan/run.sh

@@ -42,8 +42,8 @@ python3 "$BENCH_PATH/bench_leveldb.py" \
 	--results-file "$RESULTS_PATH/get_scan_results.json" \
 	--leveldb-db "$DB_PATH" \
 	--fadvise-hints ",SEQUENTIAL,NOREUSE,DONTNEED" \
-        --iterations "$ITERATIONS" \
-        --bench-binary-dir "$YCSB_PATH/build" \
+	--iterations "$ITERATIONS" \
+	--bench-binary-dir "$YCSB_PATH/build" \
 	--benchmark mixed_get_scan
 
 # Enable MGLRU
@@ -53,14 +53,15 @@ if ! "$BASE_DIR/utils/enable-mglru.sh"; then
 fi
 
 # MGLRU
+# TODO: Remove --policy-loader requirement when using --default-only
 python3 "$BENCH_PATH/bench_leveldb.py" \
 	--cpu 8 \
 	--policy-loader "$POLICY_PATH/cache_ext_get_scan.out" \
 	--results-file "$RESULTS_PATH/get_scan_results_mglru.json" \
 	--leveldb-db "$DB_PATH" \
 	--fadvise-hints "" \
-        --iterations "$ITERATIONS" \
-        --bench-binary-dir "$YCSB_PATH/build" \
+	--iterations "$ITERATIONS" \
+	--bench-binary-dir "$YCSB_PATH/build" \
 	--benchmark mixed_get_scan \
 	--default-only
 

eval/isolation/run.sh

@@ -36,6 +36,8 @@ if ! "$BASE_DIR/utils/disable-mglru.sh"; then
 	exit 1
 fi
 
+# TODO: Convert the following to a loop
+
 python3 "$BENCH_PATH/bench_per_cgroup.py" \
 	--cpu 8 \
 	--search-path "$SEARCH_PATH" \

eval/twitter/run.sh

@@ -58,7 +58,7 @@ for POLICY in "${POLICIES[@]}"; do
 			--iterations "$ITERATIONS" \
 			--bench-binary-dir "$YCSB_PATH/build" \
 			--twitter-traces-dir "$DB_DIRS/twitter-traces" \
-			--benchmark twitter_cluster${CLUSTER}_bench
+			--benchmark "twitter_cluster${CLUSTER}_bench"
 	done
 done
 
@@ -71,20 +71,19 @@ fi
 # MGLRU
 # TODO: Get rid of the CLUSTER loop and pass a comma-separated list of benchmarks
 #	We already support this in the bench script.
-for POLICY in "${POLICIES[@]}"; do
-	for CLUSTER in "${CLUSTERS[@]}"; do
-		echo "Running policy: ${POLICY} on cluster ${CLUSTER}"
-		python3 "$BENCH_PATH/bench_twitter_trace.py" \
-			--cpu 8 \
-			--policy-loader ./${POLICY}.out \
-			--results-file "$RESULTS_PATH/twitter_traces_${CLUSTER}_results_mglru.json" \
-			--leveldb-db "$DB_DIRS/leveldb_twitter_cluster${CLUSTER}_db" \
-			--iterations "$ITERATIONS" \
-			--bench-binary-dir "$YCSB_PATH/build" \
-			--twitter-traces-dir "$DB_DIRS/twitter-traces" \
-			--benchmark twitter_cluster${CLUSTER}_bench \
-			--default-only
-	done
+# TODO: Remove --policy-loader requirement when using --default-only
+for CLUSTER in "${CLUSTERS[@]}"; do
+	echo "Running baseline MGLRU on cluster ${CLUSTER}"
+	python3 "$BENCH_PATH/bench_twitter_trace.py" \
+		--cpu 8 \
+		--policy-loader "$POLICY_PATH/${POLICIES[0]}.out" \
+		--results-file "$RESULTS_PATH/twitter_traces_${CLUSTER}_results_mglru.json" \
+		--leveldb-db "$DB_DIRS/leveldb_twitter_cluster${CLUSTER}_db" \
+		--iterations "$ITERATIONS" \
+		--bench-binary-dir "$YCSB_PATH/build" \
+		--twitter-traces-dir "$DB_DIRS/twitter-traces" \
+		--benchmark "twitter_cluster${CLUSTER}_bench" \
+		--default-only
 done
 
 # Disable MGLRU

eval/ycsb/run.sh

@@ -64,19 +64,18 @@ if ! "$BASE_DIR/utils/enable-mglru.sh"; then
 fi
 
 # MGLRU
-for POLICY in "${POLICIES[@]}"; do
-	echo "Running policy: ${POLICY}"
-	python3 "$BENCH_PATH/bench_leveldb.py" \
-		--cpu 8 \
-		--policy-loader "$POLICY_PATH/${POLICY}.out" \
-		--results-file "$RESULTS_PATH/ycsb_results_mglru.json" \
-		--leveldb-db "$DB_PATH" \
-		--fadvise-hints "" \
-		--iterations "$ITERATIONS" \
-		--bench-binary-dir "$YCSB_PATH/build" \
-		--benchmark ycsb_a,ycsb_b,ycsb_c,ycsb_d,ycsb_e,ycsb_f,uniform,uniform_read_write \
-		--default-only
-done
+# TODO: Remove --policy-loader requirement when using --default-only
+echo "Running baseline MGLRU"
+python3 "$BENCH_PATH/bench_leveldb.py" \
+	--cpu 8 \
+	--policy-loader "$POLICY_PATH/${POLICY}.out" \
+	--results-file "$RESULTS_PATH/ycsb_results_mglru.json" \
+	--leveldb-db "$DB_PATH" \
+	--fadvise-hints "" \
+	--iterations "$ITERATIONS" \
+	--bench-binary-dir "$YCSB_PATH/build" \
+	--benchmark ycsb_a,ycsb_b,ycsb_c,ycsb_d,ycsb_e,ycsb_f,uniform,uniform_read_write \
+	--default-only
 
 # Disable MGLRU
 if ! "$BASE_DIR/utils/disable-mglru.sh"; then