Revert "Drop dependency on truffle-enterprise"

This reverts commit b00b7f6.
hpi-swa · Feb 11, 2025 · 7826755 · 7826755 · TruffleSqueak-Bot · Feb 11, 2025
1 parent d381b5e
commit 7826755
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 10 deletions.
diff --git a/mx.trufflesqueak/mx_trufflesqueak.py b/mx.trufflesqueak/mx_trufflesqueak.py
@@ -15,6 +15,7 @@
 import mx_sdk
 import mx_sdk_vm
 import mx_sdk_vm_impl
+import mx_truffle
 
 # re-export custom mx project classes so they can be used from suite.py
 from mx_cmake import CMakeNinjaProject  # pylint: disable=unused-import
@@ -194,18 +195,23 @@ def patched_native_image(self, build_args, output_file, out=None, err=None):
                 ),
             )
         build_args.remove("--macro:smalltalkvm-library")
+        dist_names = (
+            [
+                "TRUFFLESQUEAK",
+                "TRUFFLESQUEAK_LAUNCHER",
+                "TRUFFLE_NFI_LIBFFI",
+                "SDK-NATIVEBRIDGE",
+            ]
+            + (["TRUFFLE-ENTERPRISE"] if is_oracle_graalvm else [])
+            + mx_truffle.resolve_truffle_dist_names(
+                use_optimized_runtime=True, use_enterprise=True
+            )
+        )
         selected_gc = "G1" if is_oracle_graalvm and mx.is_linux() else "serial"
         build_command = (
             [native_image_bin]
             + build_args
-            + mx.get_runtime_jvm_args(
-                names=[
-                    "TRUFFLESQUEAK",
-                    "TRUFFLESQUEAK_LAUNCHER",
-                    "truffle:TRUFFLE_NFI_LIBFFI",
-                    "truffle:TRUFFLE_RUNTIME",
-                ]
-            )
+            + mx.get_runtime_jvm_args(names=dist_names)
             + [
                 "-o",
                 os.path.splitext(output_file)[0],

diff --git a/mx.trufflesqueak/suite.py b/mx.trufflesqueak/suite.py
@@ -33,6 +33,12 @@
         "read": "https://github.com/hpi-swa/trufflesqueak.git",
         "write": "[email protected]:hpi-swa/trufflesqueak.git",
     },
+    "licenses": {
+        "GFTC": {
+            "name": "GraalVM Free Terms and Conditions (GFTC) including License for Early Adopter Versions",
+            "url": "https://www.oracle.com/downloads/licenses/graal-free-license.html",
+        },
+    },
     # ==========================================================================
     #  DEPENDENCIES
     # ==========================================================================
@@ -102,6 +108,25 @@
                 "<others>": {"<others>": {"optional": True}},
             },
         },
+        "TRUFFLE-ENTERPRISE": {
+            "digest": "sha512:ce4cefe6706110cf352271c58d519cfed5bc73d419f1946ff03f0064a80d1a64e633cd4a1f6aa93c3e732b422ff69c132ae73767972526dbf4063cae7cc9df60",
+            "maven": {
+                "groupId": "org.graalvm.truffle",
+                "artifactId": "truffle-enterprise",
+                "version": "24.1.2",
+            },
+            "useModulePath": True,
+            "licence": "GFTC",
+        },
+        "SDK-NATIVEBRIDGE": {
+            "digest": "sha512:1e25b3b58ae01ef929ad71c9c1bb01376258919384810634e23a483836f53e9e77f1c5317c6220fee6bc3e7f5f36359c2ce84e5287c8335208431c675fa0925a",
+            "maven": {
+                "groupId": "org.graalvm.sdk",
+                "artifactId": "nativebridge",
+                "version": "24.1.2",
+            },
+            "useModulePath": True,
+        },
     },
     # ==========================================================================
     #  PROJECTS
@@ -248,18 +273,41 @@
             "noMavenJavadoc": True,
             "license": ["MIT"],
         },
+        "TRUFFLE_ENTERPRISE_PLACEHOLDER": {
+            "maven": {
+                "groupId": "org.graalvm.truffle",
+                "artifactId": "truffle-enterprise",
+            },
+            "testDistribution": True,  # ensure it does not get 'maven-deploy'ed
+            "noMavenJavadoc": True,
+            "license": ["GFTC"],
+        },
         "SMALLTALK": {
             "type": "pom",
             "runtimeDependencies": [
                 "TRUFFLESQUEAK",
-                "truffle:TRUFFLE_RUNTIME",
+                "TRUFFLE_ENTERPRISE_PLACEHOLDER",
             ],
-            "description": "TruffleSqueak virtual machine",
+            "description": "TruffleSqueak virtual machine for Oracle GraalVM",
             "maven": {
                 "groupId": "de.hpi.swa.trufflesqueak",
                 "artifactId": "smalltalk",
                 "tag": ["default", "public"],
             },
+            "license": ["MIT", "GFTC"],
+        },
+        "SMALLTALK_COMMUNITY": {
+            "type": "pom",
+            "runtimeDependencies": [
+                "TRUFFLESQUEAK",
+                "truffle:TRUFFLE_RUNTIME",
+            ],
+            "description": "TruffleSqueak virtual machine for GraalVM CE",
+            "maven": {
+                "groupId": "de.hpi.swa.trufflesqueak",
+                "artifactId": "smalltalk-community",
+                "tag": ["default", "public"],
+            },
             "license": ["MIT"],
         },
         "TRUFFLESQUEAK_HOME": {
Benchmark Name	Min	Geomean	Median	Mean	Max	Total (ms)	Total (min)
Bounce	523	539	527.47	524	527.44	105493	1.76
CD	525	551	531.19	527	531.14	106238	1.77
DeltaBlue	285	421	367.51	369	367.2	73502	1.23
Havlak	1210	1270	1242.22	1243	1242.17	248444	4.14
Json	329	350	333.05	330	333	66610	1.11
List	318	350	321.68	319	321.61	64336	1.07
Mandelbrot	129	146	130.61	130	130.58	26122	0.44
NBody	245	265	250.49	248	250.43	50098	0.83
Permute	155	173	156.38	156	156.35	31276	0.52
Queens	213	245	216.05	214	215.98	43209	0.72
Richards	1249	1267	1254.5	1251	1254.49	250900	4.18
Sieve	170	203	171.29	170	171.25	34257	0.57
Storage	139	151	141.85	140	141.8	28371	0.47
Towers	175	205	177.98	177	177.9	35596	0.59
	5665	6136	5822.26	5798	5821.35	1164452	19.41
Benchmark Name	Min	Geomean	Median	Mean	Max	Total (ms)	Total (min)
Bounce	523	539	527.11	524	527.08	105421	1.76
CD	530	548	536.34	532	536.3	107267	1.79
DeltaBlue	269	392	345.26	346	344.9	69052	1.15
Havlak	1130	1194	1158.87	1159	1158.82	231774	3.86
Json	311	327	315.29	313	315.25	63058	1.05
List	318	352	320.5	319	320.46	64100	1.07
Mandelbrot	129	158	130.72	130	130.67	26143	0.44
NBody	245	264	249.55	246	249.5	49910	0.83
Permute	155	179	156.55	156	156.52	31310	0.52
Queens	217	251	219.91	218	219.84	43981	0.73
Richards	1242	1265	1248.76	1251	1248.74	249751	4.16
Sieve	170	204	171.35	170	171.31	34270	0.57
Storage	137	151	139.47	137	139.39	27893	0.46
Towers	180	212	182.07	181	182.01	36414	0.61
	5556	6036	5701.72	5682	5700.79	1140344	19.01