From 90adca707b77e247ec9cdcbedbb9c9cbf5786c6b Mon Sep 17 00:00:00 2001
From: Reiner Jung <reiner.jung@email.uni-kiel.de>
Date: Wed, 22 Jun 2022 16:06:22 +0200
Subject: [PATCH] Fixed RECURSION_DEPTH
---
bin/2012-msept/run-benchmark-cycle-async.sh | 6 +++---
bin/2012-msept/run-benchmark-cycle-sync.sh | 6 +++---
bin/2012-msept/run-benchmark-recursive-jmx.sh | 10 +++++-----
bin/2012-msept/run-benchmark-recursive-linear.sh | 10 +++++-----
bin/2012-msept/run-benchmark-recursive.sh | 10 +++++-----
bin/2012-msept/run-cycle-experiment-singlethreaded.sh | 4 ++--
bin/2012-msept/run-cycle.sh | 4 ++--
7 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/bin/2012-msept/run-benchmark-cycle-async.sh b/bin/2012-msept/run-benchmark-cycle-async.sh
index 2f31176..03f3445 100644
--- a/bin/2012-msept/run-benchmark-cycle-async.sh
+++ b/bin/2012-msept/run-benchmark-cycle-async.sh
@@ -46,7 +46,7 @@ echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
-echo "MAXRECURSIONDEPTH=${MAXRECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}configuration.txt
sync
## Execute Benchmark
@@ -54,8 +54,8 @@ sync
for ((i=1;i<=${NUM_LOOPS};i+=1)); do
echo "## Starting iteration ${i}/${NUM_LOOPS}"
- for ((j=1;j<=${MAXRECURSIONDEPTH};j+=1)); do
- echo "# Starting recursion ${i}.${j}/${MAXRECURSIONDEPTH}"
+ for ((j=1;j<=${RECURSION_DEPTH};j+=1)); do
+ echo "# Starting recursion ${i}.${j}/${RECURSION_DEPTH}"
# 1 No instrumentation
echo " # ${i}.1 No instrumentation"
diff --git a/bin/2012-msept/run-benchmark-cycle-sync.sh b/bin/2012-msept/run-benchmark-cycle-sync.sh
index b99d846..73ff771 100644
--- a/bin/2012-msept/run-benchmark-cycle-sync.sh
+++ b/bin/2012-msept/run-benchmark-cycle-sync.sh
@@ -46,7 +46,7 @@ echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
-echo "MAXRECURSIONDEPTH=${MAXRECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}configuration.txt
sync
## Execute Benchmark
@@ -54,8 +54,8 @@ sync
for ((i=1;i<=${NUM_LOOPS};i+=1)); do
echo "## Starting iteration ${i}/${NUM_LOOPS}"
- for ((j=1;j<=${MAXRECURSIONDEPTH};j+=1)); do
- echo "# Starting recursion ${i}.${j}/${MAXRECURSIONDEPTH}"
+ for ((j=1;j<=${RECURSION_DEPTH};j+=1)); do
+ echo "# Starting recursion ${i}.${j}/${RECURSION_DEPTH}"
# # 1 No instrumentation
# echo " # ${i}.1 No instrumentation"
diff --git a/bin/2012-msept/run-benchmark-recursive-jmx.sh b/bin/2012-msept/run-benchmark-recursive-jmx.sh
index fe30806..e3c3b0d 100644
--- a/bin/2012-msept/run-benchmark-recursive-jmx.sh
+++ b/bin/2012-msept/run-benchmark-recursive-jmx.sh
@@ -11,11 +11,11 @@ BASE_DIR=
SLEEP_TIME=30 ## 30
NUM_LOOPS=10 ## 10
THREADS=1 ## 1
-MAXRECURSIONDEPTH=10 ## 10
+RECURSION_DEPTH=10 ## 10
TOTALCALLS=2000000 ## 2000000
METHODTIME=500000 ## 500000
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 2 \* ${MAXRECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 2 \* ${NUM_LOOPS} \* ${MAXRECURSIONDEPTH}`
+TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 2 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 2 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH}`
echo "Experiment will take circa ${TIME} seconds."
# determine correct classpath separator
@@ -61,7 +61,7 @@ echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
-echo "MAXRECURSIONDEPTH=${MAXRECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}configuration.txt
sync
## Execute Benchmark
@@ -69,8 +69,8 @@ sync
for ((i=1;i<=${NUM_LOOPS};i+=1)); do
echo "## Starting iteration ${i}/${NUM_LOOPS}"
- for ((j=1;j<=${MAXRECURSIONDEPTH};j+=1)); do
- echo "# Starting recursion ${i}.${j}/${MAXRECURSIONDEPTH}"
+ for ((j=1;j<=${RECURSION_DEPTH};j+=1)); do
+ echo "# Starting recursion ${i}.${j}/${RECURSION_DEPTH}"
# 1 No logging
echo " # ${i}.1 No logging (null writer)"
diff --git a/bin/2012-msept/run-benchmark-recursive-linear.sh b/bin/2012-msept/run-benchmark-recursive-linear.sh
index cf89a5d..a7f4b3d 100644
--- a/bin/2012-msept/run-benchmark-recursive-linear.sh
+++ b/bin/2012-msept/run-benchmark-recursive-linear.sh
@@ -11,11 +11,11 @@ BASE_DIR=
SLEEP_TIME=30 ## 30
NUM_LOOPS=10 ## 10
THREADS=1 ## 1
-MAXRECURSIONDEPTH=10 ## 10
+RECURSION_DEPTH=10 ## 10
TOTALCALLS=2000000 ## 2000000
METHODTIME=500000 ## 500000
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${MAXRECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${MAXRECURSIONDEPTH}`
+TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH}`
echo "Experiment will take circa ${TIME} seconds."
# determine correct classpath separator
@@ -62,7 +62,7 @@ echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
-echo "MAXRECURSIONDEPTH=${MAXRECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}configuration.txt
sync
## Execute Benchmark
@@ -70,9 +70,9 @@ sync
for ((i=1;i<=${NUM_LOOPS};i+=1)); do
echo "## Starting iteration ${i}/${NUM_LOOPS}"
- for ((j=1;j<=${MAXRECURSIONDEPTH};j+=1)); do
+ for ((j=1;j<=${RECURSION_DEPTH};j+=1)); do
RECDEPTH=$[2**($j-1)]
- echo "# Starting recursion ${i}.${j}/${MAXRECURSIONDEPTH}"
+ echo "# Starting recursion ${i}.${j}/${RECURSION_DEPTH}"
# 1 No instrumentation
echo " # ${i}.1 No instrumentation"
diff --git a/bin/2012-msept/run-benchmark-recursive.sh b/bin/2012-msept/run-benchmark-recursive.sh
index 288f389..8073e98 100644
--- a/bin/2012-msept/run-benchmark-recursive.sh
+++ b/bin/2012-msept/run-benchmark-recursive.sh
@@ -11,11 +11,11 @@ BASE_DIR=
SLEEP_TIME=30 ## 30
NUM_LOOPS=10 ## 10
THREADS=1 ## 1
-MAXRECURSIONDEPTH=10 ## 10
+RECURSION_DEPTH=10 ## 10
TOTALCALLS=2000000 ## 2000000
METHODTIME=500000 ## 500000
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${MAXRECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${MAXRECURSIONDEPTH}`
+TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH}`
echo "Experiment will take circa ${TIME} seconds."
# determine correct classpath separator
@@ -62,7 +62,7 @@ echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
-echo "MAXRECURSIONDEPTH=${MAXRECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}configuration.txt
sync
## Execute Benchmark
@@ -70,8 +70,8 @@ sync
for ((i=1;i<=${NUM_LOOPS};i+=1)); do
echo "## Starting iteration ${i}/${NUM_LOOPS}"
- for ((j=1;j<=${MAXRECURSIONDEPTH};j+=1)); do
- echo "# Starting recursion ${i}.${j}/${MAXRECURSIONDEPTH}"
+ for ((j=1;j<=${RECURSION_DEPTH};j+=1)); do
+ echo "# Starting recursion ${i}.${j}/${RECURSION_DEPTH}"
# 1 No instrumentation
echo " # ${i}.1 No instrumentation"
diff --git a/bin/2012-msept/run-cycle-experiment-singlethreaded.sh b/bin/2012-msept/run-cycle-experiment-singlethreaded.sh
index 44e7c45..1f29e29 100644
--- a/bin/2012-msept/run-cycle-experiment-singlethreaded.sh
+++ b/bin/2012-msept/run-cycle-experiment-singlethreaded.sh
@@ -5,11 +5,11 @@ SUDOCMD="pfexec"
SLEEP_TIME=30 ## 30
NUM_LOOPS=10 ## 10
THREADS=1 ## 1
-MAXRECURSIONDEPTH=1 ## 10
+RECURSION_DEPTH=1 ## 10
TOTALCALLS=2000000 ## 200000
METHODTIME=500000 ## 500000
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${MAXRECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${MAXRECURSIONDEPTH}`
+TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH}`
echo "Each experiment will take circa ${TIME} seconds."
diff --git a/bin/2012-msept/run-cycle.sh b/bin/2012-msept/run-cycle.sh
index 6b05cde..85cf852 100644
--- a/bin/2012-msept/run-cycle.sh
+++ b/bin/2012-msept/run-cycle.sh
@@ -4,11 +4,11 @@ SUDOCMD="pfexec"
SLEEP_TIME=30 ## 30
NUM_LOOPS=10 ## 10
-MAXRECURSIONDEPTH=1 ## 10
+RECURSION_DEPTH=1 ## 10
TOTALCALLS=2000000 ## 2000000
METHODTIME=500000 ## 500000
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${MAXRECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${MAXRECURSIONDEPTH}`
+TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH}`
echo "Each experiment will take circa ${TIME} seconds."
${SUDOCMD} psrset -c -F 0 1 2 3 # one chip no hyperthreading
--
GitLab