Lower FloatingWordCastNode in Web Image

Author: patrick96

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/codegen/WebImageJSNodeLowerer.java

@@ -44,6 +44,7 @@
 import com.oracle.svm.core.classinitialization.EnsureClassInitializedNode;
 import com.oracle.svm.core.genscavenge.graal.nodes.FormatArrayNode;
 import com.oracle.svm.core.genscavenge.graal.nodes.FormatObjectNode;
+import com.oracle.svm.core.graal.nodes.FloatingWordCastNode;
 import com.oracle.svm.core.graal.nodes.LoweredDeadEndNode;
 import com.oracle.svm.core.graal.nodes.ReadCallerStackPointerNode;
 import com.oracle.svm.core.graal.nodes.ReadReturnAddressNode;
@@ -334,6 +335,8 @@ protected void dispatch(Node node) {
             lower(readIdentityHashCodeNode);
         } else if (node instanceof WriteIdentityHashCodeNode writeIdentityHashCodeNode) {
             lower(writeIdentityHashCodeNode);
+        } else if (node instanceof FloatingWordCastNode floatingWordCastNode) {
+            lower(floatingWordCastNode);
         } else {
             super.dispatch(node);
         }
@@ -968,6 +971,10 @@ protected void lower(WordCastNode node) {
         lowerValue(node.getInput());
     }
 
+    protected void lower(FloatingWordCastNode node) {
+        lowerValue(node.getInput());
+    }
+
     @Override
     protected void lower(InstanceOfNode node) {
         CodeBuffer masm = codeGenTool.getCodeBuffer();

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/options/WebImageOptions.java

@@ -126,7 +126,7 @@ public static final class DebugOptions {
         public static final HostedOptionKey<Boolean> RuntimeDebugChecks = new HostedOptionKey<>(false);
 
         @Option(help = "Enable verification phases.")//
-        public static final OptionKey<Boolean> VerificationPhases = new OptionKey<>(false);
+        public static final HostedOptionKey<Boolean> VerificationPhases = new HostedOptionKey<>(false);
 
         @Option(help = "Dump type control graph, a graph of dependencies between types, methods, and inspected objects.")//
         public static final OptionKey<Boolean> DumpTypeControlGraph = new OptionKey<>(false);

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/wasm/codegen/WebImageWasmLMNodeLowerer.java

@@ -429,40 +429,6 @@ private Instruction lowerReadReservedRegister(Register register) {
         }
     }
 
-    private Instruction lowerWordCast(WordCastNode n) {
-        ValueNode input = n.getInput();
-        Instruction value = lowerExpression(input);
-
-        int inputBits = util.typeForNode(input).asPrimitive().getBitCount();
-        int outputBits = util.typeForNode(n).asPrimitive().getBitCount();
-
-        /*
-         * TODO GR-42105 word types are 64-bit while objects are 32-bits. Add 32-bit architecture,
-         * then we can probably save both the wrap and extend operations.
-         */
-        if (inputBits == outputBits) {
-            return value;
-        } else if (inputBits == 32 && outputBits == 64) {
-            return Unary.Op.I64ExtendI32U.create(value);
-        } else if (inputBits == 64 && outputBits == 32) {
-            return Unary.Op.I32Wrap64.create(value);
-        } else {
-            throw GraalError.unimplemented(n + ", inputBits=" + inputBits + ", outputBits=" + outputBits); // ExcludeFromJacocoGeneratedReport
-        }
-    }
-
-    private Instruction lowerFloatingWordCast(FloatingWordCastNode n) {
-        ValueNode input = n.getInput();
-
-        Instruction value = lowerExpression(input);
-        /*
-         * TODO GR-42105 the input is a 64-bit word type, add architecture to ensure word type is 32
-         * bit and we don't need to i32.wrap64 instruction.
-         */
-        assert input.getStackKind().getBitCount() == 64 : input.getStackKind();
-        return Unary.Op.I32Wrap64.create(value);
-    }
-
     private Instruction lowerWasmAddressBase(WasmAddressNode n) {
         ValueNode baseNode = n.getBase();
 

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/wasm/codegen/WebImageWasmNodeLowerer.java

@@ -39,6 +39,7 @@
 import java.util.Objects;
 import java.util.Set;
 
+import com.oracle.svm.core.graal.nodes.FloatingWordCastNode;
 import com.oracle.svm.core.graal.nodes.ReadExceptionObjectNode;
 import com.oracle.svm.core.meta.SubstrateMethodPointerConstant;
 import com.oracle.svm.core.snippets.SnippetRuntime;
@@ -1144,6 +1145,35 @@ protected Instruction lowerReadException(@SuppressWarnings("unused") ReadExcepti
         return exceptionObjectVariable.getter();
     }
 
+    protected Instruction lowerWordCast(WordCastNode n) {
+        return lowerWordCast(n, n.getInput());
+    }
+
+    protected Instruction lowerFloatingWordCast(FloatingWordCastNode n) {
+        return lowerWordCast(n, n.getInput());
+    }
+
+    protected Instruction lowerWordCast(ValueNode castNode, ValueNode input) {
+        Instruction value = lowerExpression(input);
+
+        int inputBits = util.typeForNode(input).asPrimitive().getBitCount();
+        int outputBits = util.typeForNode(castNode).asPrimitive().getBitCount();
+
+        /*
+         * TODO GR-42105 word types are 64-bit while objects are 32-bits. Add 32-bit architecture,
+         * then we can probably save both the wrap and extend operations.
+         */
+        if (inputBits == outputBits) {
+            return value;
+        } else if (inputBits == 32 && outputBits == 64) {
+            return Unary.Op.I64ExtendI32U.create(value);
+        } else if (inputBits == 64 && outputBits == 32) {
+            return Unary.Op.I32Wrap64.create(value);
+        } else {
+            throw GraalError.unimplemented(castNode + ", inputBits=" + inputBits + ", outputBits=" + outputBits); // ExcludeFromJacocoGeneratedReport
+        }
+    }
+
     // region Unsupported operations
     private static void genUnreachable(Object comment) {
         GraalError.shouldNotReachHere(String.valueOf(comment));

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/wasmgc/codegen/WebImageWasmGCNodeLowerer.java

@@ -32,6 +32,7 @@
 
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
 import com.oracle.graal.pointsto.results.StrengthenGraphs;
+import com.oracle.svm.core.graal.nodes.FloatingWordCastNode;
 import com.oracle.svm.core.graal.nodes.LoweredDeadEndNode;
 import com.oracle.svm.core.graal.nodes.ReadExceptionObjectNode;
 import com.oracle.svm.core.hub.DynamicHub;
@@ -45,6 +46,7 @@
 import com.oracle.svm.hosted.webimage.js.JSBody;
 import com.oracle.svm.hosted.webimage.js.JSBodyNode;
 import com.oracle.svm.hosted.webimage.js.JSBodyWithExceptionNode;
+import com.oracle.svm.hosted.webimage.options.WebImageOptions;
 import com.oracle.svm.hosted.webimage.wasm.WasmJSCounterparts;
 import com.oracle.svm.hosted.webimage.wasm.WebImageWasmOptions;
 import com.oracle.svm.hosted.webimage.wasm.ast.Instruction;
@@ -283,11 +285,14 @@ protected Instruction dispatch(ValueNode n, WasmIRWalker.Requirements reqs) {
             case JSBodyNode jsBody -> lowerJSBody(jsBody);
             case JSBodyWithExceptionNode jsBody -> lowerJSBody(jsBody);
             case WordCastNode wordCast -> lowerWordCast(wordCast);
+            case FloatingWordCastNode wordCast -> lowerFloatingWordCast(wordCast);
             default -> {
                 assert !isForbiddenNode(n) : reportForbiddenNode(n);
+                if (WebImageOptions.DebugOptions.VerificationPhases.getValue()) {
+                    throw GraalError.shouldNotReachHere("Tried to lower unknown node: " + n);
+                }
                 // TODO GR-47009 Stop generating stub code.
                 yield getStub(n);
-                // throw GraalError.shouldNotReachHere("Tried to lower unknown node: " + n);
             }
         };
     }
@@ -1078,7 +1083,8 @@ private <T extends FixedNode & JSBody> Instruction lowerJSBody(T jsBody) {
         return returnValue;
     }
 
-    private Instruction lowerWordCast(WordCastNode n) {
+    @Override
+    protected Instruction lowerWordCast(WordCastNode n) {
         // TODO GR-60168 Eliminate WordCastNodes completely. They are fundamentally not supportable
         // under WasmGC
         logError("This method should never be reached and cannot be supported.");