Improve primitive logging

- Log missing primitives on fine level and enable during testing - Log failed primitives on finer level - Ignore marker primitives (19, 198, 199)
hpi-swa · Oct 24, 2021 · 8fc5486 · 8fc5486
1 parent d6d116e
commit 8fc5486
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/....hpi.swa.trufflesqueak.test/src/de/hpi/swa/trufflesqueak/test/AbstractSqueakTestCase.java b/....hpi.swa.trufflesqueak.test/src/de/hpi/swa/trufflesqueak/test/AbstractSqueakTestCase.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017-2021 Software Architecture Group, Hasso Plattner Institute
+ * Copyright (c) 2021 Oracle and/or its affiliates
  *
  * Licensed under the MIT License.
  */
@@ -135,6 +136,8 @@ protected static SqueakImage loadImageContext(final String imagePath) {
             contextBuilder.option("log." + SqueakLanguageConfig.ID + ".level", logLevel);
             contextBuilder.logHandler(LogHandlerAccessor.createLogHandler(System.getProperty("log.mode", "out")));
         }
+        contextBuilder.option(// Log missing primitives
+                        "log." + SqueakLanguageConfig.ID + ".primitives.level", "FINE");
         context = contextBuilder.build();
         context.initialize(SqueakLanguageConfig.ID);
         context.enter();

diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/model/CompiledCodeObject.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/model/CompiledCodeObject.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017-2021 Software Architecture Group, Hasso Plattner Institute
+ * Copyright (c) 2021 Oracle and/or its affiliates
  *
  * Licensed under the MIT License.
  */
@@ -452,11 +453,11 @@ public boolean isQuickPushPrimitive() {
     }
 
     public boolean isUnwindMarked() {
-        return hasPrimitive() && primitiveIndex() == 198;
+        return hasPrimitive() && primitiveIndex() == PrimitiveNodeFactory.PRIMITIVE_ENSURE_MARKER_INDEX;
     }
 
     public boolean isExceptionHandlerMarked() {
-        return hasPrimitive() && primitiveIndex() == 199;
+        return hasPrimitive() && primitiveIndex() == PrimitiveNodeFactory.PRIMITIVE_ON_DO_MARKER_INDEX;
     }
 
     public CompiledCodeObject shallowCopy() {

diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/ExecuteBytecodeNode.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/ExecuteBytecodeNode.java
@@ -6,8 +6,6 @@
  */
 package de.hpi.swa.trufflesqueak.nodes;
 
-import java.util.function.Supplier;
-
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
@@ -53,13 +51,14 @@ public ExecuteBytecodeNode(final CompiledCodeObject code) {
         if (code.hasPrimitive()) {
             primitiveNode = PrimitiveNodeFactory.forIndex(code, false, code.primitiveIndex(), false);
             if (primitiveNode == null) {
-                final Supplier<String> messageSupplier;
-                if (code.primitiveIndex() == PrimitiveNodeFactory.PRIMITIVE_EXTERNAL_CALL_INDEX) {
-                    messageSupplier = () -> "Named primitive not found for " + code;
-                } else {
-                    messageSupplier = () -> "Primitive #" + code.primitiveIndex() + " not found for " + code;
+                final int primitiveIndex = code.primitiveIndex();
+                if (primitiveIndex == PrimitiveNodeFactory.PRIMITIVE_EXTERNAL_CALL_INDEX) {
+                    LogUtils.PRIMITIVES.fine(() -> "Named primitive not found for " + code);
+                } else if (primitiveIndex != PrimitiveNodeFactory.PRIMITIVE_SIMULATION_GUARD_INDEX &&
+                                primitiveIndex != PrimitiveNodeFactory.PRIMITIVE_ENSURE_MARKER_INDEX &&
+                                primitiveIndex != PrimitiveNodeFactory.PRIMITIVE_ON_DO_MARKER_INDEX) {
+                    LogUtils.PRIMITIVES.fine(() -> "Primitive #" + code.primitiveIndex() + " not found for " + code);
                 }
-                LogUtils.PRIMITIVES.warning(messageSupplier);
             }
         }
     }
@@ -74,7 +73,7 @@ public Object execute(final VirtualFrame frame, final int startPC) {
                 } catch (final PrimitiveFailed e) {
                     /* getHandlePrimitiveFailedNode() also acts as a BranchProfile. */
                     getHandlePrimitiveFailedNode().executeHandle(frame, e.getReasonCode());
-                    LogUtils.PRIMITIVES.fine(() -> primitiveNode.getClass().getSimpleName() + " failed (arguments: " +
+                    LogUtils.PRIMITIVES.finer(() -> primitiveNode.getClass().getSimpleName() + " failed (arguments: " +
                                     ArrayUtils.toJoinedString(", ", FrameAccess.getReceiverAndArguments(frame)) + ")");
                     /* continue with fallback code. */
                 }

diff --git a/...swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/primitives/PrimitiveNodeFactory.java b/...swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/primitives/PrimitiveNodeFactory.java
@@ -62,7 +62,10 @@
 import de.hpi.swa.trufflesqueak.util.OS;
 
 public final class PrimitiveNodeFactory {
+    public static final int PRIMITIVE_SIMULATION_GUARD_INDEX = 19;
     public static final int PRIMITIVE_EXTERNAL_CALL_INDEX = 117;
+    public static final int PRIMITIVE_ENSURE_MARKER_INDEX = 198;
+    public static final int PRIMITIVE_ON_DO_MARKER_INDEX = 199;
     public static final int PRIMITIVE_LOAD_INST_VAR_LOWER_INDEX = 264;
     public static final int PRIMITIVE_LOAD_INST_VAR_UPPER_INDEX = 520;
     private static final int MAX_PRIMITIVE_INDEX = 575;