fix bench

FormalLanguageConstrainedPathQuerying · May 6, 2024 · 7ec7b19 · 7ec7b19
1 parent e1cf245
commit 7ec7b19
Show file tree

Hide file tree

Showing 10 changed files with 819 additions and 892 deletions.
diff --git a/benchmarks/src/main/java/org/ucfs/Java.x b/benchmarks/src/main/java/org/ucfs/Java.x
@@ -54,9 +54,9 @@ Comment = {TraditionalComment} | {DocumentationComment}
 TraditionalComment   = "/*" [^*] ~"*/" | "/*" "*"+ "/"
 DocumentationComment = "/**" {CommentContent} "*"+ "/"
 CommentContent       = ( [^*] | \*+ [^/*] )*
-
 %%
 
+"//".*         { /* DO NOTHING */ }
 "boolean"      { return JavaToken.BOOLEAN; }
 "byte"         { return JavaToken.BYTE; }
 "short"        { return JavaToken.SHORT; }

diff --git a/benchmarks/src/main/java/org/ucfs/JavaLexer.java b/benchmarks/src/main/java/org/ucfs/JavaLexer.java
diff --git a/benchmarks/src/main/kotlin/org/Benchmarks.kt b/benchmarks/src/main/kotlin/org/Benchmarks.kt
@@ -42,7 +42,7 @@ fun <G : IInputGraph<Int, LinearInputLabel>> getTokenStream(input: String, input
     while (true) {
         token = lexer.yylex() as JavaToken
         if (token == JavaToken.EOF) break
-        inputGraph.addEdge(vertexId, LinearInputLabel(Term(token)), ++vertexId)
+        inputGraph.addEdge(vertexId, LinearInputLabel(token), ++vertexId)
     }
 
     return inputGraph

diff --git a/benchmarks/src/main/kotlin/org/Jmh.kt b/benchmarks/src/main/kotlin/org/Jmh.kt
diff --git a/benchmarks/src/main/kotlin/org/Main.kt b/benchmarks/src/main/kotlin/org/Main.kt
@@ -13,7 +13,25 @@ class Main {
 fun main(){
     val startState = Java8().rsm
     val srcText: String = """
-package junit;"""
+package junit.runner;
+
+/**
+ * This class defines the current version of JUnit
+ */
+public class Version {
+	private Version() {
+		// don't instantiate
+	}
+
+	public static String id() {
+		return "4.12-SNAPSHOT";
+	}
+	
+	public static void main(String[] args) {
+		System.out.println(id());
+	}
+}
+"""
     val tokens = getTokenStream(srcText)
     val gll = Gll.gll(
         startState,
@@ -24,5 +42,4 @@ package junit;"""
     val parseResult = gll.parse().first ?: throw Exception("File $srcText cant be parsed by online gll")
     writeSppfToDot(parseResult, "java7.dot")
 
-    //val efileContents = buildStringFromSppf(parseResult)
 }
diff --git a/benchmarks/src/main/kotlin/org/OnlineGllBench.kt b/benchmarks/src/main/kotlin/org/OnlineGllBench.kt
@@ -3,6 +3,8 @@ package org
 import kotlinx.benchmark.*
 import org.openjdk.jmh.annotations.Threads
 import org.ucfs.Java8
+import org.ucfs.input.LinearInput
+import org.ucfs.input.LinearInputLabel
 import org.ucfs.parser.Gll
 import org.ucfs.sppf.buildStringFromSppf
 
@@ -22,23 +24,23 @@ class OnlineGllBench {
     lateinit var fileContents: String
 
     val startState = Java8().rsm
+    lateinit var tokens: LinearInput<Int, LinearInputLabel>
 
     @Setup
     fun prepare() {
-        val srcText: String = OnlineGllBench::class.java.classLoader
+        fileContents = OnlineGllBench::class.java.classLoader
             .getResource(fileName)?.readText() ?: throw Exception("File $fileName does not exists")
+        tokens = getTokenStream(fileContents)
         val gll = Gll.gll(
             startState,
-            getTokenStream(srcText)
+            tokens
         )
-        val parseResult = gll.parse().first ?: throw Exception("File $fileName cant be parsed by online gll")
-        fileContents = buildStringFromSppf(parseResult)
+        gll.parse().first ?: throw Exception("File $fileName cant be parsed by online gll")
     }
 
     @Benchmark
     fun measureGll(blackhole: Blackhole) {
-        val inputGraph = getTokenStream(fileContents)
-        val gll = Gll.gll(startState, inputGraph)
+        val gll = Gll.gll(startState, getTokenStream(fileContents))
         blackhole.consume(gll.parse())
     }
 }
diff --git a/benchmarks/src/main/java/org/ucfs/Java8.kt → benchmarks/src/main/kotlin/org/ucfs/Java8.kt b/benchmarks/src/main/java/org/ucfs/Java8.kt → benchmarks/src/main/kotlin/org/ucfs/Java8.kt
diff --git a/solver/src/main/kotlin/org/ucfs/descriptors/Descriptor.kt b/solver/src/main/kotlin/org/ucfs/descriptors/Descriptor.kt
@@ -46,6 +46,10 @@ open class Descriptor<VertexType>(
 
         return true
     }
+
+    override fun toString(): String {
+        return "Descriptor(${rsmState.nonterminal}, inputPosition=$inputPosition)"
+    }
 }
 
 
diff --git a/solver/src/main/kotlin/org/ucfs/input/IInputGraph.kt b/solver/src/main/kotlin/org/ucfs/input/IInputGraph.kt
@@ -13,6 +13,10 @@ import org.ucfs.sppf.node.SppfNode
  * @param LabelType - type of label on edges in input graph
  */
 interface IInputGraph<VertexType, LabelType : ILabel> {
+    fun log(msg: String) {
+       // println(msg)
+    }
+
     /**
      * Collection of all vertices in graph
      */
@@ -123,14 +127,18 @@ interface IInputGraph<VertexType, LabelType : ILabel> {
         val inputPosition = descriptor.inputPosition
         val terminalEdges = rsmState.terminalEdges
         val nonterminalEdges = rsmState.nonterminalEdges
-
+        log("\n$descriptor")
         for (inputEdge in ctx.input.getEdges(inputPosition)) {
             if (inputEdge.label.terminal == null) {
+                log("Epsilon terminal")
                 handleTerminalOrEpsilonEdge(descriptor, sppfNode, null, descriptor.rsmState, inputEdge.head, 0)
                 continue
             }
+            log("Compare terminal: current ${inputEdge.label.terminal}$")
             for ((edgeTerminal, targetStates) in terminalEdges) {
+                log("edgeTerminal ${edgeTerminal}$")
                 if (inputEdge.label.terminal == edgeTerminal) {
+                    log("EQUALS!")
                     for (target in targetStates) {
                         handleTerminalOrEpsilonEdge(descriptor, sppfNode, edgeTerminal, target, inputEdge.head, 0)
                     }

diff --git a/solver/src/main/kotlin/org/ucfs/parser/IGll.kt b/solver/src/main/kotlin/org/ucfs/parser/IGll.kt
@@ -100,7 +100,11 @@ interface IGll<VertexType, LabelType : ILabel> {
         inputPosition: VertexType,
     ): GssNode<VertexType> {
         val newNode =
-            getOrCreateGssNode(nonterminal, inputPosition, weight = gssNode.minWeightOfLeftPart + (sppfNode?.weight ?: 0))
+            getOrCreateGssNode(
+                nonterminal,
+                inputPosition,
+                weight = gssNode.minWeightOfLeftPart + (sppfNode?.weight ?: 0)
+            )
 
         if (newNode.addEdge(rsmState, sppfNode, gssNode)) {
             if (ctx.poppedGssNodes.containsKey(newNode)) {