Merge branch 'master' of https://github.com/gradual-verification/gvc0

gradual-verification · Aug 5, 2023 · 928ec50 · 928ec50
2 parents 25e36f3 + 40b26e6
commit 928ec50
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/large-scale-benchmark.yml b/.github/workflows/large-scale-benchmark.yml
@@ -20,4 +20,4 @@ jobs:
       - name: Assembly
         run: sbt assembly
       - name: Execution
-        run: export VERSION=evaluation-1-26-23 && java -Xss30M -Xmx12G -jar target/scala-2.12/gvc0-assembly-0.1.0-SNAPSHOT.jar --config=./data/config/nuc.xml --execute --nickname=${{ runner.name }} --db-url=${{ secrets.DB_URL }} --db-user=${{ secrets.DB_USER }} --db-pass=${{ secrets.DB_PASSWORD }} --version="$VERSION"
+        run: export VERSION=evaluation-08-01-23 && java -Xss30M -Xmx12G -jar target/scala-2.12/gvc0-assembly-0.1.0-SNAPSHOT.jar --config=./data/config/nuc.xml --execute --nickname=${{ runner.name }} --db-url=${{ secrets.DB_URL }} --db-user=${{ secrets.DB_USER }} --db-pass=${{ secrets.DB_PASSWORD }} --version="$VERSION"
diff --git a/data/config/nuc.xml b/data/config/nuc.xml
@@ -3,20 +3,24 @@
     <hardware>i5-4250U</hardware>
     <nickname>Intel NUC i5-4250U</nickname>
     <source-dir>./src/test/resources/quant-study/</source-dir>
-    <version>evaluation-1-26-23</version>
+    <version>evaluation-08-01-23</version>
     <quantity>16</quantity>
     <workload>
         <by-program>
             <p>
-                <match>avlja,bst,composite,list</match>
+                <match>avlja,bst,list,minprique,stack-list</match>
                 <stress>
-                    <list>32</list>
+                    <list>8,16,32</list>
+                </stress>
+            </p>
+            <p>
+                <match>composite</match>
+                <stress>
+                    <list>4,8,16</list>
                 </stress>
             </p>
         </by-program>
         <iterations>100</iterations>
     </workload>
-    <profiling-dir>./profiling-results</profiling-dir>
     <save-errored-perms>./errored</save-errored-perms>
-    <only-gradual/>
 </benchmark>
diff --git a/src/test/scala/permutation/PermutationSpec.scala b/src/test/scala/permutation/PermutationSpec.scala
@@ -8,6 +8,7 @@ import gvc.transformer.IR.{Method, Predicate}
 import org.scalatest.Outcome
 import org.scalatest.funsuite.FixtureAnyFunSuite
 
+import java.io.{File, FileWriter}
 import java.nio.file.Files
 import scala.collection.mutable
 
@@ -150,9 +151,7 @@ class PermutationSpec extends FixtureAnyFunSuite {
           for (labelIndex <- sampleToPermute.indices) {
             labelPermutation.addLabel(sampleToPermute(labelIndex))
           }
-
           val top = selector.visit(labelPermutation)
-
           val topPrinted = IRPrinter.print(top, includeSpecs = true)
           assert(topPrinted.diff(baseline).isEmpty)
         }