[GR-63732] Migrate polyglot isolate build to use common mx_sdk_vm_ng.py projects.

PullRequest: graal/20451

Author: tzezula

sdk/mx.sdk/mx_sdk_vm_impl.py

@@ -1986,47 +1986,6 @@ def getArchivableResults(self, use_relpath=True, single=False):
     def is_skipped(self):
         return _skip_libraries(self.native_image_config)
 
-class PolyglotIsolateLibrary(GraalVmLibrary):
-    """
-    A native image project dedicated to constructing a language polyglot isolate library.
-    Despite being built upon the component supertype, it operates independently of the component system
-    and native-image macros. Its configuration relies solely on the module path and META-INF/native-image
-    configuration files. Instances are instantiated by mx_truffle::register_polyglot_isolate_distributions
-    when a language dynamically registers a polyglot isolate distribution.
-    """
-    def __init__(self, target_suite, language, deps, build_args, **kw_args):
-        library_config = mx_sdk.LanguageLibraryConfig(
-            jar_distributions=deps,
-            build_args=[],
-            build_args_enterprise=build_args,
-            language=language,
-        )
-        super(PolyglotIsolateLibrary, self).__init__(None, f'{language}.isolate.image',
-                                                     list(deps), library_config, **kw_args)
-        self.suite = target_suite
-        self.dir = target_suite.dir
-
-
-    def getBuildTask(self, args):
-        svm_support = _get_svm_support()
-        assert svm_support.is_supported(), "Needs svm to build " + str(self)
-        if not self.is_skipped():
-            return PolyglotIsolateLibraryBuildTask(self, args, svm_support)
-        else:
-            return mx.NoOpTask(self, args)
-
-    def getArchivableResults(self, use_relpath=True, single=False):
-        for e in super(PolyglotIsolateLibrary, self).getArchivableResults(use_relpath=use_relpath, single=single):
-            yield e
-            if single:
-                return
-        output_dir = dirname(self.output_file())
-        resources_dir = join(output_dir, 'resources')
-        if exists(resources_dir):
-            yield resources_dir, 'resources'
-
-    def is_skipped(self):
-        return False
 
 class GraalVmMiscLauncher(GraalVmLauncher):  # pylint: disable=too-many-ancestors
     def __init__(self, component, native_image_config, stage1=False, **kw_args):
@@ -2481,33 +2440,6 @@ class GraalVmLibraryBuildTask(GraalVmSVMNativeImageBuildTask):
     pass
 
 
-class PolyglotIsolateLibraryBuildTask(GraalVmLibraryBuildTask):
-    """
-    A PolyglotIsolateLibrary build task building a language polyglot isolate library.
-    Despite being built upon the component supertype, it operates independently of the component system
-    and native-image macros. Its configuration relies solely on the module path and META-INF/native-image
-    configuration files.
-    """
-    def get_build_args(self):
-        project = self.subject
-        target = project.native_image_name[:-len(_lib_suffix)]
-        build_args = [
-            '-EJVMCI_VERSION_CHECK',  # Propagate this env var when running native image from mx
-            '--parallelism=' + str(self.parallelism),
-            '--shared',
-            '-o',
-            target,
-            '--features=com.oracle.svm.enterprise.truffle.PolyglotIsolateGuestFeature',
-            '-H:APIFunctionPrefix=truffle_isolate_',
-        ] + svm_experimental_options([
-            '-H:+IgnoreMaxHeapSizeWhileInVMOperation',
-            '-H:+CopyLanguageResources',
-            '-H:+GenerateBuildArtifactsFile',  # generate 'build-artifacts.json'
-        ]) + mx.get_runtime_jvm_args(self.subject.native_image_jar_distributions) + \
-        project.native_image_config.build_args + project.native_image_config.build_args_enterprise
-        return build_args
-
-
 class JmodModifier(mx.Project):
     def __init__(self, jmod_file, library_projects, jimage_project, **kw_args):
         """

sdk/mx.sdk/mx_sdk_vm_ng.py

@@ -201,8 +201,9 @@ def clean(self, forBuild=False):
         mx.rmtree(self.witness_file(), ignore_errors=True)
 
 class NativeImageProject(mx.Project, metaclass=ABCMeta):
-    def __init__(self, suite, name, deps, workingSets, theLicense=None, **kw_args):
+    def __init__(self, suite, name, deps, workingSets, theLicense=None, deliverable=None, **kw_args):
         super().__init__(suite, name, subDir=None, srcDirs=[], deps=deps, workingSets=workingSets, d=suite.dir, theLicense=theLicense, **kw_args)
+        self.deliverable = deliverable if deliverable else name
         if not hasattr(self, 'buildDependencies'):
             self.buildDependencies = []
         if not _external_bootstrap_graalvm and _has_stage1_components():
@@ -221,9 +222,8 @@ def output_file(self):
     def output_file_name(self):
         pass
 
-    @abstractmethod
     def base_file_name(self):
-        pass
+        return self.deliverable
 
     @abstractmethod
     def options_file_name(self):
@@ -294,9 +294,6 @@ def resolveDeps(self):
         if mx_sdk_vm_impl._force_bash_launchers(self.output_file_name(), build_by_default=True):
             self.ignore = "Skipped executable"
 
-    def base_file_name(self):
-        return self.name
-
     def output_file_name(self):
         return mx.exe_suffix(self.base_file_name())
 
@@ -307,6 +304,12 @@ def name_suffix(self):
         return mx.exe_suffix("")
 
 class NativeImageLibraryProject(NativeImageProject):
+
+    def __init__(self, suite, name, deps, workingSets, theLicense=None, deliverable=None, **kw_args):
+        if not deliverable:
+            deliverable = name[3:] if name.startswith('lib') else name
+        super().__init__(suite, name, deps, workingSets, theLicense, deliverable, **kw_args)
+
     def resolveDeps(self):
         super().resolveDeps()
         if mx_sdk_vm_impl._skip_libraries(self.output_file_name(), build_by_default=True):
@@ -324,12 +327,6 @@ def getArchivableResults(self, use_relpath=True, single=False):
                 if isfile(absolute_path) and e.endswith('.h'):
                     yield absolute_path, e
 
-    def base_file_name(self):
-        name = self.name
-        if name.startswith('lib'):
-            name = name[3:]
-        return name
-
     def output_file_name(self):
         return mx.add_lib_prefix(mx.add_lib_suffix(self.base_file_name()))
 

truffle/mx.truffle/mx_truffle.py

@@ -58,6 +58,7 @@
 import mx_sdk
 import mx_sdk_vm
 import mx_sdk_vm_impl
+import mx_sdk_vm_ng
 import mx_subst
 import mx_unittest
 import mx_jardistribution
@@ -1492,7 +1493,7 @@ def _qualname(distribution_name):
         if build_for_current_platform:
             # 2. Register a project building the isolate library
             isolate_deps = [language_pom_distribution, 'truffle-enterprise:TRUFFLE_ENTERPRISE']
-            build_library = mx_sdk_vm_impl.PolyglotIsolateLibrary(language_suite, language_id, isolate_deps, isolate_build_options)
+            build_library = PolyglotIsolateProject(language_suite, language_id, isolate_deps, isolate_build_options)
             register_project(build_library)
 
             # 3. Register layout distribution with isolate library and isolate resources
@@ -1509,9 +1510,9 @@ def _qualname(distribution_name):
                 deps=[],
                 layout={
                     f'{resource_base_folder}/': f'dependency:{build_library.name}',
-                    f'{resource_base_folder}/resources': {"source_type": "dependency",
+                    f'{resource_base_folder}/resources/': {"source_type": "dependency",
                                                           "dependency": f'{build_library.name}',
-                                                          "path": 'resources',
+                                                          "path": 'language_resources/resources/*',
                                                           "optional": True},
                 },
                 path=None,
@@ -1610,6 +1611,28 @@ def _qualname(distribution_name):
 mx.add_argument('--polyglot-isolates', action='store', help='Comma-separated list of languages for which the polyglot isolate library should be built. Setting the value to `true` builds all polyglot isolate libraries.')
 
 
+class PolyglotIsolateProject(mx_sdk_vm_ng.LanguageLibraryProject):
+    """
+    A language library project dedicated to construct a language polyglot isolate library.
+    Instances are created by register_polyglot_isolate_distributions when a language
+    dynamically registers a polyglot isolate distribution.
+    """
+    def __init__(self, language_suite, language_id, isolate_deps, isolate_build_options):
+        build_args = [
+            '--features=com.oracle.svm.enterprise.truffle.PolyglotIsolateGuestFeature',
+            '-H:APIFunctionPrefix=truffle_isolate_',
+            '-H:+CopyLanguageResources'
+        ] + isolate_build_options
+        super().__init__(language_suite, f'{language_id}.isolate', isolate_deps, ['Truffle'], None, f'{language_id}vm', **{'build_args': build_args})
+
+    def resolveDeps(self):
+        super().resolveDeps()
+        # The polyglot isolate build does not use the --native-images option; it uses its own --polyglot-isolates option.
+        # The parent NativeImageLibraryProject uses mx_sdk_vm_impl._skip_libraries which marks the project as ignored.
+        # We need to remove the ignore flag
+        delattr(self, 'ignore')
+
+
 class LibffiBuilderProject(mx.AbstractNativeProject, mx_native.NativeDependency):  # pylint: disable=too-many-ancestors
     """Project for building libffi from source.