Add support for wasm polybench benchmark configuration

Author: farquet

truffle/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java

@@ -104,6 +104,7 @@ public void parseBenchSpecificDefaults(Value benchmark) throws InvalidObjectExce
     private void parseBenchSpecificSummary(Value benchmark) throws InvalidObjectException {
         if (!benchmark.hasMember("summary")) {
             // No 'summary' member provided in the benchmark
+            summary = parseFallbackBenchSpecificSummary(benchmark);
             return;
         }
         Value summaryMember = benchmark.getMember("summary");
@@ -131,6 +132,17 @@ private void parseBenchSpecificSummary(Value benchmark) throws InvalidObjectExce
         }
     }
 
+    private Summary parseFallbackBenchSpecificSummary(Value benchmark) {
+        if (benchmark.hasMember(OutlierRemovalAverageSummary.class.getSimpleName())) {
+            double lowerThreshold = benchmark.getMember(OutlierRemovalAverageSummary.class.getSimpleName() + "LowerThreshold").execute().asDouble();
+            double upperThreshold = benchmark.getMember(OutlierRemovalAverageSummary.class.getSimpleName() + "UpperThreshold").execute().asDouble();
+            return new OutlierRemovalAverageSummary(lowerThreshold, upperThreshold);
+        } else if (benchmark.hasMember(AverageSummary.class.getSimpleName())) {
+            return new AverageSummary();
+        }
+        return null;
+    }
+
     @Override
     public String toString() {
         String config = "metric:            " + metric.name() + " (" + metric.unit() + ")" + "\n" +

truffle/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java

@@ -394,6 +394,9 @@ private EvalResult evalSource(Context context) {
             } finally {
                 config.metric.afterLoad(config);
             }
+            if (language.equals("wasm")) {
+                result = result.newInstance();
+            }
             return new EvalResult(language, source.getName(), source.hasBytes(), source.getLength(), result);
         }
     }
@@ -475,6 +478,9 @@ private void runHarness(Context.Builder contextBuilder, boolean evalSourceOnly,
             log("::: Bench specific options :::");
             if (evalResult.value instanceof Value) {
                 Value value = (Value) evalResult.value;
+                if (evalResult.languageId.equals("wasm")) {
+                    value = value.getMember("exports");
+                }
                 config.parseBenchSpecificDefaults(value);
                 config.metric.parseBenchSpecificOptions(value);
             }
@@ -556,7 +562,7 @@ private Workload lookup(Context context, String languageId, Object evalSource, S
         // language-specific lookup
         switch (languageId) {
             case "wasm":
-                result = evalSourceValue.newInstance().getMember("exports").getMember(memberName);
+                result = evalSourceValue.getMember("exports").getMember(memberName);
                 break;
             case "java":
                 // Espresso doesn't provide methods as executable values.