Make thread-witnesses limits and naming consistent

sim642 · sim642 · commit 7b3db36ec34f · 2023-04-11T09:51:35.000Z
diff --git a/thread-witnesses/mt/run.sh b/thread-witnesses/mt/run.sh
@@ -3,7 +3,7 @@
 shopt -s extglob
 
 MYBENCHDIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-RESULTSDIR=$MYBENCHDIR/../../../results/mt-900-2
+RESULTSDIR=$MYBENCHDIR/../../../results/mt
 OURTOOLPARALLEL=4
 VALIDATEPARALLEL=4
 
diff --git a/thread-witnesses/st-cross/run.sh b/thread-witnesses/st-cross/run.sh
@@ -4,7 +4,7 @@ shopt -s extglob
 
 MYBENCHDIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 AUTOACTIVEDIR=$MYBENCHDIR/../../../autoactive
-RESULTSDIR=$MYBENCHDIR/../../../results/st-cross-self-location
+RESULTSDIR=$MYBENCHDIR/../../../results/st-cross
 OURTOOLPARALLEL=4
 CPACHECKERPARALLEL=4
 VALIDATEPARALLEL=4
diff --git a/thread-witnesses/st-lit/ourtool-validate.xml b/thread-witnesses/st-lit/ourtool-validate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE benchmark PUBLIC "+//IDN sosy-lab.org//DTD BenchExec benchmark 1.9//EN" "https://www.sosy-lab.org/benchexec/benchmark-1.9.dtd">
-<benchmark tool="goblint" timelimit="60 s" hardtimelimit="64 s" memlimit="1 GB" cpuCores="1">
+<benchmark tool="goblint" timelimit="900 s" hardtimelimit="960 s" memlimit="6 GB" cpuCores="1">
 
   <resultfiles></resultfiles>
 
diff --git a/thread-witnesses/st-lit/ourtool.xml b/thread-witnesses/st-lit/ourtool.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE benchmark PUBLIC "+//IDN sosy-lab.org//DTD BenchExec benchmark 1.9//EN" "https://www.sosy-lab.org/benchexec/benchmark-1.9.dtd">
-<benchmark tool="goblint" timelimit="60 s" hardtimelimit="64 s" memlimit="1 GB" cpuCores="1">
+<benchmark tool="goblint" timelimit="900 s" hardtimelimit="960 s" memlimit="6 GB" cpuCores="1">
 
   <resultfiles>**.yml</resultfiles>
 
diff --git a/thread-witnesses/st-lit/run.sh b/thread-witnesses/st-lit/run.sh
@@ -3,11 +3,11 @@
 shopt -s extglob
 
 MYBENCHDIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-RESULTSDIR=$MYBENCHDIR/../../../results/st-lit-location
-OURTOOLPARALLEL=14
+RESULTSDIR=$MYBENCHDIR/../../../results/st-lit
+OURTOOLPARALLEL=4
 CPACHECKERPARALLEL=4
 ULTIMATEPARALLEL=4
-VALIDATEPARALLEL=14
+VALIDATEPARALLEL=4
 
 mkdir $RESULTSDIR
 
diff --git a/thread-witnesses/st-same/ourtool-validate.xml b/thread-witnesses/st-same/ourtool-validate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE benchmark PUBLIC "+//IDN sosy-lab.org//DTD BenchExec benchmark 1.9//EN" "https://www.sosy-lab.org/benchexec/benchmark-1.9.dtd">
-<benchmark tool="goblint" timelimit="60 s" hardtimelimit="64 s" memlimit="1 GB" cpuCores="1">
+<benchmark tool="goblint" timelimit="900 s" hardtimelimit="960 s" memlimit="6 GB" cpuCores="1">
 
   <resultfiles></resultfiles>
 
diff --git a/thread-witnesses/st-same/ourtool.xml b/thread-witnesses/st-same/ourtool.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE benchmark PUBLIC "+//IDN sosy-lab.org//DTD BenchExec benchmark 1.9//EN" "https://www.sosy-lab.org/benchexec/benchmark-1.9.dtd">
-<benchmark tool="goblint" timelimit="60 s" hardtimelimit="64 s" memlimit="1 GB" cpuCores="1">
+<benchmark tool="goblint" timelimit="900 s" hardtimelimit="960 s" memlimit="6 GB" cpuCores="1">
 
   <resultfiles>**.yml</resultfiles>
 
diff --git a/thread-witnesses/st-same/run.sh b/thread-witnesses/st-same/run.sh
@@ -4,8 +4,8 @@ shopt -s extglob
 
 MYBENCHDIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 RESULTSDIR=$MYBENCHDIR/../../../results/st-same
-OURTOOLPARALLEL=14
-VALIDATEPARALLEL=14
+OURTOOLPARALLEL=4
+VALIDATEPARALLEL=4
 
 mkdir $RESULTSDIR
 
