[GR-70300] ConditionalNode.canonical: accept null smallestCompareWidth.

PullRequest: graal/22299

Author: gilles-duboscq

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ConditionalNode.java

@@ -126,10 +126,13 @@ public ValueNode canonical(CanonicalizerTool tool) {
             return result;
         }
 
-        if (tool != null && stamp instanceof IntegerStamp integerStamp && integerStamp.getBits() >= tool.getLowerer().smallestCompareWidth()) {
-            ValueNode minMaxSynonym = MinMaxNode.fromConditional(condition, trueValue, falseValue, view);
-            if (minMaxSynonym != null) {
-                return minMaxSynonym;
+        if (tool != null && stamp instanceof IntegerStamp integerStamp) {
+            Integer smallestCompareWidth = tool.smallestCompareWidth();
+            if (smallestCompareWidth != null && integerStamp.getBits() >= smallestCompareWidth) {
+                ValueNode minMaxSynonym = MinMaxNode.fromConditional(condition, trueValue, falseValue, view);
+                if (minMaxSynonym != null) {
+                    return minMaxSynonym;
+                }
             }
         }
 

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/MinMaxNode.java

@@ -300,8 +300,9 @@ private static boolean equalOrOffBy1(Signedness signedness, ValueNode a, ValueNo
      */
     protected static ValueNode maybeExtendForCompare(ValueNode value, LoweringProvider lowerer, Signedness signedness) {
         Stamp fromStamp = value.stamp(NodeView.DEFAULT);
-        if (fromStamp instanceof PrimitiveStamp && PrimitiveStamp.getBits(fromStamp) < lowerer.smallestCompareWidth()) {
-            Stamp toStamp = IntegerStamp.create(lowerer.smallestCompareWidth());
+        Integer smallestCompareWidth = lowerer.smallestCompareWidth();
+        if (fromStamp instanceof PrimitiveStamp && smallestCompareWidth != null && PrimitiveStamp.getBits(fromStamp) < smallestCompareWidth) {
+            Stamp toStamp = IntegerStamp.create(smallestCompareWidth);
             boolean zeroExtend = (signedness == Signedness.UNSIGNED);
             return IntegerConvertNode.convert(value, toStamp, zeroExtend, NodeView.DEFAULT);
         }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/LoweringProvider.java

@@ -53,7 +53,9 @@ public interface LoweringProvider {
     ValueNode reconstructArrayIndex(JavaKind elementKind, AddressNode address);
 
     /**
-     * Indicates the smallest width for comparing an integer value on the target platform.
+     * Indicates the smallest width for comparing an integer value on the target platform. Returns
+     * {@code null} when this information is not available. This can be the case when this lowering
+     * provider is being used in a platform independent context (e.g., canonicalization).
      */
     Integer smallestCompareWidth();
 

espresso-compiler-stub/mx.espresso-compiler-stub/mx_espresso_compiler_stub.py

@@ -27,7 +27,7 @@
 import mx_sdk_vm
 import mx_gate
 
-from mx_espresso import _espresso_stability, _has_native_espresso_standalone, _send_sigquit, get_java_home_dep, _jdk_lib_dir, jvm_standalone_with_llvm
+from mx_espresso import _espresso_stability, _send_sigquit, get_java_home_dep, _jdk_lib_dir, jvm_standalone_with_llvm
 from mx_sdk_vm_ng import _find_native_image_command, ThinLauncherProject  # pylint: disable=unused-import
 from mx_sdk_vm_impl import get_final_graalvm_distribution, has_component, graalvm_skip_archive
 
@@ -113,7 +113,7 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
     native = create_ni_standalone('ESPRESSO_NATIVE_STANDALONE', register_distribution)
     jvm = create_ni_standalone('ESPRESSO_JVM_STANDALONE', register_distribution)
     if not (native or jvm):
-        raise mx.abort("Couldn't create any Espresso native-image standalone")
+        mx.warn("Couldn't create any Espresso native-image standalone")
 
 def _run_espresso_native_image_launcher(args, cwd=None, nonZeroIsFatal=True, out=None, err=None, timeout=None, mode=None):
     extra_args = ['-J--vm.' + arg for arg in mx_gate.get_jacoco_agent_args() or []]
@@ -139,10 +139,16 @@ def _run_espresso_native_image_launcher(args, cwd=None, nonZeroIsFatal=True, out
     return mx.run([native_image_command] + extra_args + args, cwd=cwd, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, timeout=timeout, on_timeout=_send_sigquit)
 
 def _detect_espresso_native_image_mode():
-    if _has_native_espresso_standalone() and exists(mx.distribution('ESPRESSO_NI_NATIVE_STANDALONE').get_output()):
+    native_dist = mx.distribution('ESPRESSO_NI_NATIVE_STANDALONE', fatalIfMissing=False)
+    jvm_dist = mx.distribution('ESPRESSO_JVM_NATIVE_STANDALONE', fatalIfMissing=False)
+    if native_dist and exists(native_dist.get_output()):
         return 'native'
-    else:
+    elif jvm_dist and exists(jvm_dist.get_output()):
         return 'jvm'
+    elif jvm_dist or native_dist:
+        raise mx.abort("No espresso Native Image Standalone is built")
+    else:
+        raise mx.abort("No espresso Native Image Standalone is available (see warnings above)")
 
 def _run_espresso_native_image_jvm_launcher(args, cwd=None, nonZeroIsFatal=True, out=None, err=None, timeout=None):
     return _run_espresso_native_image_launcher(args, cwd, nonZeroIsFatal, out, err, timeout, mode='jvm')

espresso-compiler-stub/src/com.oracle.truffle.espresso.graal/src/com/oracle/truffle/espresso/graal/DummyLoweringProvider.java

@@ -35,6 +35,17 @@
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.JavaKind;
 
+/**
+ * Lowering provider used as the "host" lowering provider when running the native image generator on
+ * espresso.
+ * <p>
+ * It is used as part of {code
+ * com.oracle.svm.hosted.substitute.AutomaticUnsafeTransformationSupport} while parsing methods and
+ * canonicalizing graphs. This dummy version tries to provide as neutral answers as possible.
+ * <p>
+ * See also {@code com.oracle.graal.pointsto.util.GraalAccess} for how the native image generator
+ * accesses the "host" providers.
+ */
 public final class DummyLoweringProvider implements LoweringProvider {
     private final TargetDescription target;
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/ByteFormattingUtil.java

@@ -25,8 +25,13 @@
 package com.oracle.svm.core.util;
 
 public class ByteFormattingUtil {
-    // "123.12KiB".length() = 9, holds as long as it's not >= 1000GiB
+    /**
+     * {@code "123.12KiB".length() = 9} almost always holds as long as the value is not >= 1000GiB
+     * and {@link String#format} floating point rounding does not bump the whole part to 4 digits
+     * (e.g. {@code String.format("%.2f", 999.995D) == "1000.00"}).
+     */
     private static final int MAX_WIDTH = 9;
+
     public static final String RIGHT_ALIGNED_FORMAT = "%" + MAX_WIDTH + "s";
 
     private enum Unit {
@@ -61,9 +66,6 @@ public static String bytesToHumanGB(long bytes) {
     }
 
     private static String toHuman(long value, Unit unit) {
-        long scaled = value / unit.value;
-        String string = "%.2f%s".formatted((double) scaled, unit.toString());
-        assert string.length() <= MAX_WIDTH || value >= 1000L * Unit.GiB.value : value;
-        return string;
+        return "%.2f%s".formatted((double) value / (double) unit.value, unit.toString());
     }
 }