Merge branch 'topic/fix_benchmark' into 'master'

Fix the LKQL benchmark module Closes #400 See merge request eng/libadalang/langkit-query-language!370
AdaCore · Jan 6, 2025 · 4865ec4 · 4865ec4
2 parents 73fd852 + 50c0741
commit 4865ec4
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 96 deletions.
diff --git a/.../benchmarks/src/test/java/com/adacore/lkql_jit/benchmarks/ListComprehensionBenchmark.java b/.../benchmarks/src/test/java/com/adacore/lkql_jit/benchmarks/ListComprehensionBenchmark.java
@@ -31,14 +31,14 @@ public class ListComprehensionBenchmark extends TruffleBenchmark {
     /** The source for the LKQL list comprehension value. */
     private static final String lkqlSource =
             """
-    val generator = %s
+    val generator = [%s]
     val result = [x * 2 for x in generator].to_list
     """;
 
     /** The fibonacci function in JS */
     private static final String jsSource =
             """
-    var generator = %s;
+    var generator = [%s];
     var result = generator.map(x => x * 2);
     """;
 
@@ -55,7 +55,9 @@ public void setup() {
         for (int i = 0; i < size; i++) {
             this.generator[i] = i;
         }
-        final String generatorLiteral = Arrays.toString(this.generator);
+        final String generatorLiteral =
+                String.join(
+                        ",\n", Arrays.stream(this.generator).mapToObj(Integer::toString).toList());
         this.lkqlListComp = lkqlSource.formatted(generatorLiteral);
         this.jsListComp = jsSource.formatted(generatorLiteral);
     }

diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLContext.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLContext.java
@@ -246,8 +246,14 @@ public void patchContext(TruffleLanguage.Env newEnv) {
     public LKQLOptions getOptions() {
         if (this.options == null) {
             final var optionsSource = this.env.getOptions().get(LKQLLanguage.options);
-            final var jsonObject = new JSONObject(new JSONTokener(optionsSource));
-            this.options = LKQLOptions.fromJson(jsonObject);
+
+            // If the "lkql.options" value is empty, get default options.
+            if (!optionsSource.isBlank()) {
+                final var jsonObject = new JSONObject(new JSONTokener(optionsSource));
+                this.options = LKQLOptions.fromJson(jsonObject);
+            } else {
+                this.options = LKQLOptions.getDefault();
+            }
         }
         return this.options;
     }

diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLLanguage.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLLanguage.java
@@ -91,7 +91,7 @@ public final class LKQLLanguage extends TruffleLanguage<LKQLContext> {
             help = "Options for the LKQL engine as a JSON object",
             category = OptionCategory.INTERNAL,
             stability = OptionStability.STABLE)
-    static final OptionKey<String> options = new OptionKey<>("{}");
+    static final OptionKey<String> options = new OptionKey<>("");
 
     Liblkqllang.AnalysisContext lkqlAnalysisContext;
 

diff --git a/lkql_jit/options/src/main/java/com/adacore/lkql_jit/options/LKQLOptions.java b/lkql_jit/options/src/main/java/com/adacore/lkql_jit/options/LKQLOptions.java
@@ -122,6 +122,11 @@ public static LKQLOptions fromJson(JSONObject jsonLKQLOptions) {
                 AutoFixMode.valueOf(jsonLKQLOptions.getString("autoFixMode")));
     }
 
+    /** Get a default options instance. */
+    public static LKQLOptions getDefault() {
+        return new Builder().build();
+    }
+
     // ----- Instance methods -----
 
     /** Serialize the LKQL options to a JSON object. */

diff --git a/testsuite/tests/interop/function/Main.java b/testsuite/tests/interop/function/Main.java
@@ -13,15 +13,7 @@ private static void print(String messageName, Object value) {
     }
 
     public static void main(String[] args) {
-        Context context = Context
-            .newBuilder("lkql")
-            .option(
-                "lkql.options", new LKQLOptions.Builder()
-                    .projectFile("default_project/default.gpr")
-                    .build()
-                    .toJson()
-                    .toString()
-            ).build();
+        Context context = Context.newBuilder("lkql").build();
         Value executable = context.parse("lkql", LKQL_SOURCE);
 
         Value namespace = executable.execute(false);

diff --git a/testsuite/tests/interop/iterator/Main.java b/testsuite/tests/interop/iterator/Main.java
@@ -8,15 +8,7 @@ private static void print(String messageName, Object value) {
     }
 
     public static void main(String[] args) {
-        Context context = Context
-            .newBuilder("lkql")
-            .option(
-                "lkql.options", new LKQLOptions.Builder()
-                    .projectFile("default_project/default.gpr")
-                    .build()
-                    .toJson()
-                    .toString()
-            ).build();
+        Context context = Context.newBuilder("lkql").build();
         Value executable = context.parse("lkql", "val list = [1, \"Hello\", [1, 2]]");
 
         Value namespace = executable.execute(false);

diff --git a/testsuite/tests/interop/list/Main.java b/testsuite/tests/interop/list/Main.java
@@ -14,15 +14,7 @@ private static void print(String messageName, Object value) {
     }
 
     public static void main(String[] args) {
-        Context context = Context
-            .newBuilder("lkql")
-            .option(
-                "lkql.options", new LKQLOptions.Builder()
-                    .projectFile("default_project/default.gpr")
-                    .build()
-                    .toJson()
-                    .toString()
-            ).build();
+        Context context = Context.newBuilder("lkql").build();
         Value executable = context.parse("lkql", LKQL_SOURCE);
 
         Value namespace = executable.execute(false);

diff --git a/testsuite/tests/interop/list_comp/Main.java b/testsuite/tests/interop/list_comp/Main.java
@@ -14,15 +14,7 @@ private static void print(String messageName, Object value) {
     }
 
     public static void main(String[] args) {
-        Context context = Context
-            .newBuilder("lkql")
-            .option(
-                "lkql.options", new LKQLOptions.Builder()
-                    .projectFile("default_project/default.gpr")
-                    .build()
-                    .toJson()
-                    .toString()
-            ).build();
+        Context context = Context.newBuilder("lkql").build();
         Value executable = context.parse("lkql", LKQL_SOURCE);
 
         Value namespace = executable.execute(false);

diff --git a/testsuite/tests/interop/namespace/Main.java b/testsuite/tests/interop/namespace/Main.java
@@ -13,15 +13,7 @@ private static void print(String messageName, Object value) {
     }
 
     public static void main(String[] args) {
-        Context context = Context
-            .newBuilder("lkql")
-            .option(
-                "lkql.options", new LKQLOptions.Builder()
-                    .projectFile("default_project/default.gpr")
-                    .build()
-                    .toJson()
-                    .toString()
-            ).build();
+        Context context = Context.newBuilder("lkql").build();
         Value executable = context.parse("lkql", LKQL_SOURCE);
 
         Value namespace = executable.execute(false);

diff --git a/testsuite/tests/interop/null/Main.java b/testsuite/tests/interop/null/Main.java
@@ -13,15 +13,7 @@ private static void print(String messageName, Object value) {
     }
 
     public static void main(String[] args) {
-        Context context = Context
-            .newBuilder("lkql")
-            .option(
-                "lkql.options", new LKQLOptions.Builder()
-                    .projectFile("default_project/default.gpr")
-                    .build()
-                    .toJson()
-                    .toString()
-            ).build();
+        Context context = Context.newBuilder("lkql").build();
         Value executable = context.parse("lkql", LKQL_SOURCE);
 
         Value namespace = executable.execute(false);

diff --git a/testsuite/tests/interop/object/Main.java b/testsuite/tests/interop/object/Main.java
@@ -13,15 +13,7 @@ private static void print(String messageName, Object value) {
     }
 
     public static void main(String[] args) {
-        Context context = Context
-            .newBuilder("lkql")
-            .option(
-                "lkql.options", new LKQLOptions.Builder()
-                    .projectFile("default_project/default.gpr")
-                    .build()
-                    .toJson()
-                    .toString()
-            ).build();
+        Context context = Context.newBuilder("lkql").build();
         Value executable = context.parse("lkql", LKQL_SOURCE);
 
         Value namespace = executable.execute(false);

diff --git a/testsuite/tests/interop/pattern/Main.java b/testsuite/tests/interop/pattern/Main.java
@@ -13,15 +13,7 @@ private static void print(String messageName, Object value) {
     }
 
     public static void main(String[] args) {
-        Context context = Context
-            .newBuilder("lkql")
-            .option(
-                "lkql.options", new LKQLOptions.Builder()
-                    .projectFile("default_project/default.gpr")
-                    .build()
-                    .toJson()
-                    .toString()
-            ).build();
+        Context context = Context.newBuilder("lkql").build();
         Value executable = context.parse("lkql", LKQL_SOURCE);
 
         Value namespace = executable.execute(false);

diff --git a/testsuite/tests/interop/tuple/Main.java b/testsuite/tests/interop/tuple/Main.java
@@ -13,15 +13,7 @@ private static void print(String messageName, Object value) {
     }
 
     public static void main(String[] args) {
-        Context context = Context
-            .newBuilder("lkql")
-            .option(
-                "lkql.options", new LKQLOptions.Builder()
-                    .projectFile("default_project/default.gpr")
-                    .build()
-                    .toJson()
-                    .toString()
-            ).build();
+        Context context = Context.newBuilder("lkql").build();
         Value executable = context.parse("lkql", LKQL_SOURCE);
 
         Value namespace = executable.execute(false);

diff --git a/testsuite/tests/interop/unit/Main.java b/testsuite/tests/interop/unit/Main.java
@@ -13,15 +13,7 @@ private static void print(String messageName, Object value) {
     }
 
     public static void main(String[] args) {
-        Context context = Context
-            .newBuilder("lkql")
-            .option(
-                "lkql.options", new LKQLOptions.Builder()
-                    .projectFile("default_project/default.gpr")
-                    .build()
-                    .toJson()
-                    .toString()
-            ).build();
+        Context context = Context.newBuilder("lkql").build();
         Value executable = context.parse("lkql", LKQL_SOURCE);
 
         Value namespace = executable.execute(false);