[GR-71714] Make espresso-ni-jvm usable on Darwin

PullRequest: graal/22744

Author: lewurm

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

@@ -47,6 +47,10 @@
     stability=_espresso_stability,
 ))
 
+def _nfi_llvm_required():
+    # Linux needs nfi-llvm in JVM mode.  Darwin uses nfi-staticlib in JVM mode.
+    return not mx.is_darwin()
+
 def create_ni_standalone(base_standalone_name, register_distribution):
     espresso_suite = mx.suite('espresso')
     base_standalone = espresso_suite.dependency(base_standalone_name, fatalIfMissing=False)
@@ -66,7 +70,8 @@ def create_ni_standalone(base_standalone_name, register_distribution):
         else:
             idx = layout['languages/java/lib/'].index('dependency:espresso:ESPRESSO_JVM_STANDALONE_MOKAPOT_SUPPORT/*')
             if mx.is_darwin():
-                layout['languages/java/lib/'][idx] = f'dependency:espresso:{base_standalone_name}/languages/java/lib/fatpot/<lib:jvm>'
+                del layout['languages/java/lib/'][idx]
+                layout['languages/java/lib/fatpot/'] = [f'dependency:espresso:{base_standalone_name}/languages/java/lib/fatpot/<lib:jvm>']
             else:
                 layout['languages/java/lib/'][idx] = f'dependency:espresso:{base_standalone_name}/languages/java/lib/<lib:jvm>'
 
@@ -76,7 +81,7 @@ def create_ni_standalone(base_standalone_name, register_distribution):
             layout['bin/<exe:espresso>'] = f'dependency:espresso:{base_standalone}/bin/<exe:espresso>'
             layout['bin/<exe:java>'] = 'link:<exe:espresso>'
             layout['./'][0]['exclude'].append("bin/<exe:java>")
-            if not jvm_standalone_with_llvm():
+            if not jvm_standalone_with_llvm() and _nfi_llvm_required():
                 mx.warn(f"{ni_standalone_name} requires using nfi-llvm but it looks like ESPRESSO_LLVM_JAVA_HOME wasn't set.")
         layout['languages/java/lib/'].append("dependency:espresso-compiler-stub:ESPRESSO_GRAAL/*")
         layout['./'][0]['exclude'].remove('lib/static')
@@ -134,9 +139,12 @@ def _run_espresso_native_image_launcher(args, cwd=None, nonZeroIsFatal=True, out
         extra_args += [
             '--vm.Dcom.oracle.svm.driver.java.executable.override=' + espresso_launcher,
             '-J--java.GuestFieldOffsetStrategy=graal',
-            '-J--java.NativeBackend=nfi-llvm',
-            '--vm.-java.NativeBackend=nfi-llvm'
         ]
+        if _nfi_llvm_required():
+            extra_args += [
+                '-J--java.NativeBackend=nfi-llvm',
+                '--vm.-java.NativeBackend=nfi-llvm'
+            ]
     standalone_output = mx.distribution(standalone).get_output()
     if not exists(standalone_output):
         raise mx.abort(f"{standalone} doesn't seem to be built, please run `mx build --targets={standalone}`")

espresso/README.md

@@ -21,7 +21,7 @@ Espresso is a complete Java implementation which is kept up to date with the lat
 
 It features complete meta-circularity: it can run itself any amount of layers deep, preserving all the capabilities (Unsafe, JNI, Reflection...) of the base layer. Running HelloWorld on three nested layers of Espresso takes **~15 minutes**.  
 
-The development of Espresso happens mostly on HotSpot, but this configuration (Espresso on HotSpot) is only supported on Linux, see [Limitations](docs/hacking.md#limitations).
+The development of Espresso happens mostly on HotSpot, but this configuration (Espresso on HotSpot) is not equally supported on all platforms, see [Limitations](docs/hacking.md#limitations).
 
 ## Working on Espresso
 

espresso/ci/ci_common/common.jsonnet

@@ -137,6 +137,7 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
 
   linux_amd64_latest:                       graal_common.labsjdkLatest + self.espresso_jdkLatest_llvm + self.linux_amd64,
   linux_aarch64_latest:                     graal_common.labsjdkLatest                                + self.linux_aarch64,
+  darwin_aarch64_latest:                    graal_common.labsjdkLatest                                + self.darwin_aarch64,
 
   linux_amd64_graalvm21: self.espresso_jdk_21 + graal_common.graalvmee21 + self.espresso_jdk_21_llvm  + self.linux_amd64,
 
@@ -198,13 +199,14 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
   jdk25_monthly_darwin_aarch64  : self.monthly       + self.darwin_aarch64_25,
   jdk25_monthly_windows_amd64   : self.monthly       + self.windows_25,
 
-  jdkLatest_tier1_linux_amd64   : self.tier1         + self.linux_amd64_latest,
-  jdkLatest_tier2_linux_amd64   : self.tier2         + self.linux_amd64_latest,
-  jdkLatest_tier3_linux_amd64   : self.tier3         + self.linux_amd64_latest,
-  jdkLatest_daily_linux_amd64   : self.daily         + self.linux_amd64_latest,
-  jdkLatest_daily_linux_aarch64 : self.daily         + self.linux_aarch64_latest,
-  jdkLatest_weekly_linux_amd64  : self.weekly        + self.linux_amd64_latest,
-  jdkLatest_weekly_linux_aarch64: self.weekly        + self.linux_aarch64_latest,
+  jdkLatest_tier1_linux_amd64    : self.tier1         + self.linux_amd64_latest,
+  jdkLatest_tier2_linux_amd64    : self.tier2         + self.linux_amd64_latest,
+  jdkLatest_tier3_linux_amd64    : self.tier3         + self.linux_amd64_latest,
+  jdkLatest_daily_linux_amd64    : self.daily         + self.linux_amd64_latest,
+  jdkLatest_daily_linux_aarch64  : self.daily         + self.linux_aarch64_latest,
+  jdkLatest_daily_darwin_aarch64 : self.daily         + self.darwin_aarch64_latest,
+  jdkLatest_weekly_linux_amd64   : self.weekly        + self.linux_amd64_latest,
+  jdkLatest_weekly_linux_aarch64 : self.weekly        + self.linux_aarch64_latest,
 
   // shared snippets
   eclipse: graal_common.deps.eclipse,

espresso/mx.espresso/mx_espresso.py

@@ -694,7 +694,10 @@ def ldflags(self):
         assert not missing_libs, "missing libraries expected by the VM: " + str(missing_libs)
 
         static_lib_dir = os.path.join(get_java_home_dep().java_home, "lib", "static", platform)
-        ldf = []
+        # Allow graal-builder-jdk (built with `make graal-builder-image` in labsjdk repo) to work
+        if not exists(static_lib_dir):
+            static_lib_dir = os.path.join(get_java_home_dep().java_home, "lib")
+        flags = []
 
         for jdk_static_lib in os.listdir(static_lib_dir):
             if not jdk_static_lib.endswith('.a'):
@@ -703,9 +706,9 @@ def ldflags(self):
             if jdk_static_lib[3:-2] not in darwin_linked_in_libs:
                 continue
 
-            ldf.append(f'-Wl,-force_load,{os.path.join(static_lib_dir, jdk_static_lib)}')
+            flags.append(f'-Wl,-force_load,{os.path.join(static_lib_dir, jdk_static_lib)}')
 
-        return ldf + super(CustomLibJVMLinking, self).ldflags
+        return flags + super(CustomLibJVMLinking, self).ldflags
 
 
 def register_espresso_runtime_resource(java_home_dep, llvm_java_home_dep, register_project, register_distribution, suite, is_main):