Add Bytecode DSL

Co-authored-by: Christian Humer <[email protected]>
Co-authored-by: Nikola Bebić <[email protected]>

Author: 3 people

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/host/HostInliningPhase.java

@@ -512,7 +512,7 @@ private List<CallTree> exploreGraph(InliningPhaseContext context, CallTree calle
                  */
                 boolean forceShallowInline = context.isBytecodeSwitch && (caller.forceShallowInline || caller.parent == null) && isBytecodeInterpreterSwitch(context.env, invoke.getTargetMethod());
 
-                double frequency = context.isFrequencyCutoffEnabled() ? block.getRelativeFrequency() : 1.0d;
+                double frequency = (!forceShallowInline && context.isFrequencyCutoffEnabled()) ? block.getRelativeFrequency() : 1.0d;
                 CallTree callee = new CallTree(caller, invoke, deoptimized, unwind, inInterpreter, forceShallowInline, frequency);
                 children.add(callee);
 
@@ -953,10 +953,6 @@ private boolean shouldInline(InliningPhaseContext context, CallTree call) {
             /*
              * Always force inline bytecode switches into bytecode switches.
              */
-            if (call.frequency <= context.minimumFrequency) {
-                call.reason = "frequency < minimumFrequency";
-                return false;
-            }
             return true;
         }
 

tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/InspectorMessageTransportTest.java

@@ -35,7 +35,10 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.PolyglotException;
@@ -46,8 +49,16 @@
 /**
  * Tests the use of {@link MessageTransport} with the Inspector.
  */
+@RunWith(Parameterized.class)
 public class InspectorMessageTransportTest extends EnginesGCedTest {
 
+    @Parameters(name = "useBytecode={0}")
+    public static List<Boolean> getParameters() {
+        return List.of(false, true);
+    }
+
+    @Parameter(0) public Boolean useBytecode;
+
     private static final String PORT = "54367";
     private static final Pattern URI_PATTERN = Pattern.compile("ws://.*:" + PORT + "/[\\dA-Za-z_\\-]+");
     private static final String[] INITIAL_MESSAGES = {
@@ -97,6 +108,10 @@ public void inspectorEndpointRaceTest() {
         inspectorEndpointTest(null, rc);
     }
 
+    private Context.Builder newContextBuilder() {
+        return Context.newBuilder().allowExperimentalOptions(true).option("sl.UseBytecode", Boolean.toString(useBytecode));
+    }
+
     private void inspectorEndpointTest(String path) {
         inspectorEndpointTest(path, null);
     }
@@ -105,7 +120,7 @@ private void inspectorEndpointTest(String path, RaceControl rc) {
         Session session = new Session(rc);
         DebuggerEndpoint endpoint = new DebuggerEndpoint(path, rc);
         try (Engine engine = endpoint.onOpen(session)) {
-            Context context = Context.newBuilder().engine(engine).build();
+            Context context = newContextBuilder().engine(engine).build();
             Value result = context.eval("sl", "function main() {\n  x = 1;\n  return x;\n}");
             Assert.assertEquals("Result", "1", result.toString());
 
@@ -140,7 +155,7 @@ public void inspectorReconnectTest() throws IOException, InterruptedException {
         DebuggerEndpoint endpoint = new DebuggerEndpoint("simplePath" + SecureInspectorPathGenerator.getToken(), null);
         try (Engine engine = endpoint.onOpen(session)) {
 
-            try (Context context = Context.newBuilder().engine(engine).build()) {
+            try (Context context = newContextBuilder().engine(engine).build()) {
                 Value result = context.eval("sl", "function main() {\n  x = 1;\n  return x;\n}");
                 Assert.assertEquals("Result", "1", result.toString());
 
@@ -174,7 +189,7 @@ public void inspectorClosedTest() throws IOException, InterruptedException {
         DebuggerEndpoint endpoint = new DebuggerEndpoint("simplePath" + SecureInspectorPathGenerator.getToken(), null);
         endpoint.setOpenCountLimit(1);
         try (Engine engine = endpoint.onOpen(session)) {
-            try (Context context = Context.newBuilder().engine(engine).build()) {
+            try (Context context = newContextBuilder().engine(engine).build()) {
                 Value result = context.eval("sl", "function main() {\n  x = 1;\n  return x;\n}");
                 Assert.assertEquals("Result", "1", result.toString());
 
@@ -185,7 +200,7 @@ public void inspectorClosedTest() throws IOException, InterruptedException {
                 Assert.assertEquals("Result", "2", result.toString());
             }
             try (Engine engine2 = endpoint.onOpen(session)) {
-                try (Context context = Context.newBuilder().engine(engine2).build()) {
+                try (Context context = newContextBuilder().engine(engine2).build()) {
                     Value result = context.eval("sl", "function main() {\n  x = 3;\n  debugger;  return x;\n}");
                     Assert.assertEquals("Result", "3", result.toString());
                 }
@@ -209,7 +224,7 @@ public void inspectorCloseAfterDisposeTest() {
         DebuggerEndpoint endpoint = new DebuggerEndpoint("simplePath" + SecureInspectorPathGenerator.getToken(), null);
         MessageEndpoint peerEndpoint;
         try (Engine engine = endpoint.onOpen(session)) {
-            try (Context context = Context.newBuilder().engine(engine).build()) {
+            try (Context context = newContextBuilder().engine(engine).build()) {
                 context.eval("sl", "function main() {\n  x = 1;\n  return x;\n}");
                 peerEndpoint = endpoint.peer;
             }
@@ -245,7 +260,7 @@ public void inspectorTimeoutTest() {
         Session session = new Session(true);
         DebuggerEndpoint endpoint = new DebuggerEndpoint("simplePath" + SecureInspectorPathGenerator.getToken(), null);
         try (Engine engine = endpoint.onOpen(session, Engine.newBuilder().option("inspect.SuspensionTimeout", "1s"))) {
-            try (Context context = Context.newBuilder().engine(engine).build()) {
+            try (Context context = newContextBuilder().engine(engine).build()) {
                 context.eval("sl", "function main() {\n  x = 1;\n  return x;\n}");
             }
         }
@@ -427,7 +442,7 @@ public Engine onOpen(final Session session, Engine.Builder engineBuilder) {
 
         public Context onOpenContext(final Session session) {
             assert this != null;
-            Context.Builder contextBuilder = Context.newBuilder().serverTransport(new EndpointMessageTransport(session)).option("inspect", PORT);
+            Context.Builder contextBuilder = newContextBuilder().serverTransport(new EndpointMessageTransport(session)).option("inspect", PORT);
             if (path != null) {
                 contextBuilder.option("inspect.Path", path);
             }

tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/InspectorObjectTest.java

@@ -27,6 +27,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.ServerSocket;
+import java.util.List;
 
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Instrument;
@@ -36,14 +37,26 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
 
 import com.oracle.truffle.api.interop.TruffleObject;
 
 /**
  * Test of the provided inspector TruffleObject.
  */
+@RunWith(Parameterized.class)
 public class InspectorObjectTest {
 
+    @Parameters(name = "useBytecode={0}")
+    public static List<Boolean> getParameters() {
+        return List.of(false, true);
+    }
+
+    @Parameter(0) public Boolean useBytecode;
+
     private static final String NL = System.lineSeparator();
 
     private ByteArrayOutputStream out;
@@ -54,7 +67,7 @@ public class InspectorObjectTest {
     @Before
     public void setUp() {
         out = new ByteArrayOutputStream();
-        context = Context.newBuilder().out(out).err(out).build();
+        context = Context.newBuilder().out(out).err(out).option("sl.UseBytecode", Boolean.toString(useBytecode)).build();
         Instrument inspect = context.getEngine().getInstruments().get("inspect");
         inspector = inspect.lookup(TruffleObject.class);
         try (ServerSocket testSocket = new ServerSocket(0)) {

tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/MultiEngineTest.java

@@ -53,6 +53,10 @@
 import org.graalvm.shadowed.org.json.JSONArray;
 import org.graalvm.shadowed.org.json.JSONObject;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
 
 import com.oracle.truffle.tools.utils.java_websocket.client.WebSocketClient;
 import com.oracle.truffle.tools.utils.java_websocket.handshake.ServerHandshake;
@@ -65,7 +69,14 @@
 /**
  * Test handling of multiple engines by the Inspector.
  */
+@RunWith(Parameterized.class)
 public class MultiEngineTest extends EnginesGCedTest {
+    @Parameters(name = "useBytecode={0}")
+    public static List<Boolean> getParameters() {
+        return List.of(false, true);
+    }
+
+    @Parameter(0) public Boolean useBytecode;
 
     private static final String[] INITIAL_MESSAGES = {
                     "{\"id\":1,\"method\":\"Runtime.enable\"}",
@@ -281,7 +292,7 @@ private String runEngine(Source src, AtomicInteger port, OutputStream out, Count
     private String runEngine(Source src, AtomicInteger port, String path, OutputStream out, CountDownLatch isUp) {
         try (Engine e = Engine.newBuilder().option("inspect", Integer.toString(port.get())).option("inspect.Path", path).err(out).build()) {
             addEngineReference(e);
-            Context c = Context.newBuilder().engine(e).allowAllAccess(true).build();
+            Context c = Context.newBuilder().engine(e).option("sl.UseBytecode", Boolean.toString(useBytecode)).allowAllAccess(true).build();
             if (port.get() == 0) {
                 port.set(InspectorAddressTest.parseWSPort(out.toString()));
             }

tools/src/com.oracle.truffle.tools.dap.test/src/com/oracle/truffle/tools/dap/test/DAPTester.java

@@ -33,6 +33,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -78,9 +79,13 @@ public static DAPTester start(boolean suspend, Consumer<Context> prolog) throws
     }
 
     public static DAPTester start(boolean suspend, Consumer<Context> prolog, List<URI> sourcePath) throws IOException {
+        return start(suspend, prolog, sourcePath, Collections.emptyMap());
+    }
+
+    public static DAPTester start(boolean suspend, Consumer<Context> prolog, List<URI> sourcePath, Map<String, String> options) throws IOException {
         final ProxyOutputStream err = new ProxyOutputStream(System.err);
         Engine engine = Engine.newBuilder().err(err).build();
-        Context context = Context.newBuilder().engine(engine).allowAllAccess(true).build();
+        Context context = Context.newBuilder().engine(engine).options(options).allowAllAccess(true).build();
         Runnable runProlog;
         if (prolog != null) {
             runProlog = () -> prolog.accept(context);