Implement basic module substitutions

.github/workflows/main.yml

@@ -5,10 +5,12 @@ on:
     paths-ignore:
       - '.travis.yml'
       - '.github/workflows/quarkus.yml'
+      - '**.md'
   pull_request:
     paths-ignore:
       - '.travis.yml'
       - '.github/workflows/quarkus.yml'
+      - '**.md'
   workflow_dispatch: []
 
 env:

ci.jsonnet

@@ -9,10 +9,19 @@ local espresso = import 'espresso/ci.jsonnet';
 
 # Sulong
 local sulong = import 'sulong/ci.jsonnet';
+
+# Add a guard to `build` that prevents it from running in the gate
+# for a PR that only touches *.md flles.
+local add_markdown_guard(build) = build + {
+  guard+: {
+    excludes+: ["**.md"]
+  }
+};
+
 {
   # ensure that entries in common.jsonnet can be resolved
   _checkCommon: (import 'common.jsonnet'),
   ci_resources:: (import 'ci-resources.libsonnet'),
   specVersion: "2",
-  builds: compiler.builds + wasm.builds + espresso.builds + sulong.builds
+  builds: [add_markdown_guard(b) for b in (compiler.builds + wasm.builds + espresso.builds + sulong.builds)]
 }

compiler/ci_common/benchmark-suites.libsonnet

@@ -28,7 +28,7 @@
 
   // suite definitions
   // *****************
-  awfy: cc.compiler_benchmark + c.heap.default + {
+  awfy: cc.compiler_benchmark + c.heap.small + {
     suite:: "awfy",
     run+: [
       c.hwlocIfNuma(self.is_numa, $.mx_benchmark + ["awfy:*"] + $.bench_arguments, node=self.numa_nodes[0])

compiler/ci_common/gate.hocon

@@ -3,11 +3,11 @@ gateCmd : ["mx", "--strict-compliance"] ${gateCmdSuffix}
 
 graalWeekly: ${graal-weekly-notifications} {
   targets: ["weekly"]
-  timelimit: "45:00"
+  timelimit: "1:30:00"
 }
 graalDaily: ${graal-weekly-notifications} {
   targets: ["daily"]
-  timelimit: "45:00"
+  timelimit: "1:30:00"
 }
 gateTest : {
   environment : {

compiler/mx.compiler/mx_compiler.py

@@ -694,6 +694,9 @@ def _unittest_config_participant(config):
     if _get_XX_option_value(vmArgs, 'TypeProfileWidth', None) is None:
         vmArgs.append('-XX:TypeProfileWidth=8')
 
+    # TODO: GR-31197, this should be removed.
+    vmArgs.append('-Dpolyglot.engine.DynamicCompilationThresholds=false')
+    vmArgs.append('-Dpolyglot.engine.AllowExperimentalOptions=true')
     return (vmArgs, mainClass, mainClassArgs)
 
 mx_unittest.add_config_participant(_unittest_config_participant)

compiler/mx.compiler/suite.py

@@ -1785,6 +1785,11 @@
       "dependencies" : [
         "org.graalvm.compiler.truffle.test",
       ],
+      "requiresConcealed" : {
+        "jdk.internal.vm.ci" : [
+          "jdk.vm.ci.meta",
+        ],
+      },
       "annotationProcessors" : [
         "GRAAL_PROCESSOR",
         "truffle:TRUFFLE_DSL_PROCESSOR"

compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/PhasePlan.java

@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.core.common.util;
+
+import java.util.Formatter;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * An ordered list of compiler phases.
+ *
+ * @param <T> the type of a phase in the plan
+ */
+public interface PhasePlan<T> {
+
+    /**
+     * Gets an unmodifiable view on the phases in this plan.
+     */
+    List<T> getPhases();
+
+    /**
+     * Gets a name for a phase in the plan.
+     *
+     * This should be in the format of a qualified Java class name.
+     */
+    default String getPhaseName(T phase) {
+        return phase.getClass().getName();
+    }
+
+    /**
+     * Utility for formatting a plan as a string.
+     */
+    final class Printer {
+        private static final String CONNECTING_INDENT = "\u2502   "; // "| "
+        private static final String EMPTY_INDENT = "    ";
+        private static final String CHILD = "\u251c\u2500\u2500 "; // "|-- "
+        private static final String LAST_CHILD = "\u2514\u2500\u2500 "; // "`-- "
+
+        final Map<String, String> abbreviations = new HashMap<>();
+
+        /**
+         * Prints {@code plan} to {@code buf}.
+         *
+         * @return {@code buf}
+         */
+        public <T> Formatter printTo(PhasePlan<T> plan, Formatter buf) {
+            return printPlan(Printer.CHILD, Printer.LAST_CHILD, plan, buf);
+        }
+
+        /**
+         * Prints {@code plan} to a string and returns it.
+         */
+        public <T> String toString(PhasePlan<T> plan) {
+            return printPlan(Printer.CHILD, Printer.LAST_CHILD, plan, new Formatter()).toString();
+        }
+
+        @SuppressWarnings("unchecked")
+        private <T> Formatter printPlan(String indent, String indentLast, PhasePlan<T> plan, Formatter buf) {
+            for (Iterator<T> iter = plan.getPhases().iterator(); iter.hasNext();) {
+                T phase = iter.next();
+                String className = plan.getPhaseName(phase);
+                boolean hasNext = iter.hasNext();
+                buf.format("%s%s%n", hasNext ? indent : indentLast, abbreviate(className));
+                if (phase instanceof PhasePlan) {
+                    PhasePlan<T> subPlan = (PhasePlan<T>) phase;
+                    String prefix = hasNext ? CONNECTING_INDENT : EMPTY_INDENT;
+                    printPlan(prefix + indent, prefix + indentLast, subPlan, buf);
+                }
+            }
+            return buf;
+        }
+
+        private static int firstCapitalAfterPeriod(String s) {
+            for (int i = 1; i < s.length(); i++) {
+                if (s.charAt(i - 1) == '.' && Character.isUpperCase(s.charAt(i))) {
+                    return i;
+                }
+            }
+            return 0;
+        }
+
+        private String abbreviate(String className) {
+            String abbreviation = abbreviations.get(className);
+            if (abbreviation == null) {
+                int simpleClassNameStart = firstCapitalAfterPeriod(className);
+                String simpleClassName = className.substring(simpleClassNameStart);
+                String packageName = simpleClassNameStart != 0 ? className.substring(0, simpleClassNameStart - 1) : "";
+                if (abbreviations.values().contains(simpleClassName)) {
+                    abbreviation = simpleClassName + " [" + packageName + "]";
+                } else {
+                    abbreviation = simpleClassName;
+                }
+                abbreviations.put(className, abbreviation);
+            }
+            return abbreviation;
+        }
+    }
+}

compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/AbsCanonicalizationTest.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.core.test;
+
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.calc.AbsNode;
+import org.graalvm.compiler.nodes.calc.NegateNode;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class AbsCanonicalizationTest extends GraalCompilerTest {
+    public static double absReference(double x) {
+        return Math.abs(x);
+    }
+
+    public static double absAbs(double x) {
+        return Math.abs(Math.abs(x));
+    }
+
+    public static double absNegate(double x) {
+        return Math.abs(-x);
+    }
+
+    @Test
+    public void testAbsNegate() {
+        StructuredGraph graph = parseEager("absNegate", StructuredGraph.AllowAssumptions.YES);
+        createInliningPhase().apply(graph, getDefaultHighTierContext());
+        createCanonicalizerPhase().apply(graph, getProviders());
+
+        StructuredGraph referenceGraph = parseEager("absReference", StructuredGraph.AllowAssumptions.YES);
+        assertEquals(referenceGraph, graph);
+        Assert.assertEquals(0, graph.getNodes().filter(NegateNode.class).count());
+
+        testAgainstExpected(graph.method(), new Result(absNegate(-Double.MAX_VALUE), null), (Object) null, Double.MAX_VALUE);
+        testAgainstExpected(graph.method(), new Result(absNegate(0d), null), (Object) null, 0d);
+        testAgainstExpected(graph.method(), new Result(absNegate(Double.MAX_VALUE), null), (Object) null, Double.MAX_VALUE);
+    }
+
+    @Test
+    public void testAbsAbs() {
+        StructuredGraph graph = parseEager("absAbs", StructuredGraph.AllowAssumptions.YES);
+        createInliningPhase().apply(graph, getDefaultHighTierContext());
+        createCanonicalizerPhase().apply(graph, getProviders());
+
+        StructuredGraph referenceGraph = parseEager("absReference", StructuredGraph.AllowAssumptions.YES);
+        assertEquals(referenceGraph, graph);
+        Assert.assertEquals(1, graph.getNodes().filter(AbsNode.class).count());
+
+        testAgainstExpected(graph.method(), new Result(absAbs(-Double.MAX_VALUE), null), (Object) null, Double.MAX_VALUE);
+        testAgainstExpected(graph.method(), new Result(absAbs(0d), null), (Object) null, 0d);
+        testAgainstExpected(graph.method(), new Result(absAbs(Double.MAX_VALUE), null), (Object) null, Double.MAX_VALUE);
+    }
+}

compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DynamicConstantTest.java

@@ -30,7 +30,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.graalvm.compiler.java.BytecodeParser.BytecodeParserError;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.junit.Assume;
 import org.junit.Test;
@@ -40,6 +39,7 @@
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Type;
 
+import jdk.vm.ci.meta.ConstantPool;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 /**
@@ -240,20 +240,30 @@ protected byte[] generateClass(String internalClassName) {
     @SuppressWarnings("try")
     @Test
     public void test() throws Throwable {
+        boolean jvmciCompatibilityChecked = false;
         for (TestGenerator e : generators.values()) {
             Class<?> testClass = getClass(e.className);
             ResolvedJavaMethod run = getResolvedJavaMethod(testClass, "run");
-            try {
-                Result actual = executeActual(run, null);
-                if (VERBOSE) {
-                    System.out.println(run.format("%H.%n(%p)") + " -> " + actual);
-                }
-            } catch (BytecodeParserError err) {
-                Throwable cause = err.getCause();
-                Assume.assumeFalse("running on JVMCI that does not support CONSTANT_Dynamic", String.valueOf(cause).contains("Unknown JvmConstant tag 17"));
-                throw err;
+            if (!jvmciCompatibilityChecked) {
+                checkJVMCICompatibility(run);
+                jvmciCompatibilityChecked = true;
+            }
+            Result actual = executeActual(run, null);
+            if (VERBOSE) {
+                System.out.println(run.format("%H.%n(%p)") + " -> " + actual);
             }
             test(run, null);
         }
     }
+
+    private static void checkJVMCICompatibility(ResolvedJavaMethod run) {
+        ConstantPool cp = run.getConstantPool();
+        for (int i = 0; i < cp.length(); i++) {
+            try {
+                cp.lookupConstant(i);
+            } catch (Throwable t) {
+                Assume.assumeFalse("running on JVMCI that does not support CONSTANT_Dynamic", String.valueOf(t).contains("Unknown JvmConstant tag 17"));
+            }
+        }
+    }
 }