Drop dependency on truffle-enterprise

hpi-swa · Jan 23, 2025 · b00b7f6 · b00b7f6 · TruffleSqueak-Bot · Jan 23, 2025
1 parent c0b5986
commit b00b7f6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 64 deletions.
diff --git a/mx.trufflesqueak/mx_trufflesqueak.py b/mx.trufflesqueak/mx_trufflesqueak.py
@@ -15,7 +15,6 @@
 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
@@ -195,23 +194,18 @@ 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=dist_names)
+            + mx.get_runtime_jvm_args(
+                names=[
+                    "TRUFFLESQUEAK",
+                    "TRUFFLESQUEAK_LAUNCHER",
+                    "truffle:TRUFFLE_NFI_LIBFFI",
+                    "truffle:TRUFFLE_RUNTIME",
+                ]
+            )
             + [
                 "-o",
                 os.path.splitext(output_file)[0],

diff --git a/mx.trufflesqueak/suite.py b/mx.trufflesqueak/suite.py
@@ -33,12 +33,6 @@
         "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
     # ==========================================================================
@@ -108,25 +102,6 @@
                 "<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
@@ -273,39 +248,16 @@
             "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_ENTERPRISE_PLACEHOLDER",
-            ],
-            "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",
+            "description": "TruffleSqueak virtual machine",
             "maven": {
                 "groupId": "de.hpi.swa.trufflesqueak",
-                "artifactId": "smalltalk-community",
+                "artifactId": "smalltalk",
                 "tag": ["default", "public"],
             },
             "license": ["MIT"],
Benchmark Name	Min	Geomean	Median	Mean	Max	Total (ms)	Total (min)
Bounce	517	591	529.07	518	528.7	105813	1.76
CD	575	596	581.21	577	581.17	116242	1.94
DeltaBlue	260	405	346.46	349	345.87	69292	1.15
Havlak	1266	1328	1300.02	1301	1299.97	260004	4.33
Json	362	381	366.51	363	366.47	73302	1.22
List	366	441	368.94	367	368.86	73788	1.23
Mandelbrot	129	154	130.87	130	130.82	26174	0.44
NBody	245	264	248.93	246	248.88	49786	0.83
Permute	232	259	241.75	244.5	241.64	48349	0.81
Queens	220	252	226.25	229	226.17	45250	0.75
Richards	1048	1070	1055.22	1055	1055.21	211045	3.52
Sieve	176	210	177.32	176	177.27	35464	0.59
Storage	192	214	196.56	193	196.47	39311	0.66
Towers	235	259	243.31	243	243.28	48661	0.81
	5823	6424	6012.41	5991.5	6010.78	1202481	20.04
Benchmark Name	Min	Geomean	Median	Mean	Max	Total (ms)	Total (min)
Bounce	515	531	518.87	516	518.84	103774	1.73
CD	582	630	588.05	584	588.01	117611	1.96
DeltaBlue	280	405	360.34	362	359.91	72068	1.2
Havlak	1253	1317	1285.36	1286	1285.3	257071	4.28
Json	375	394	379.98	377	379.93	75996	1.27
List	368	428	370.08	369	370.02	74015	1.23
Mandelbrot	130	155	131.01	130	130.96	26201	0.44
NBody	244	261	248.57	246	248.52	49714	0.83
Permute	231	244	234.26	232	234.22	46851	0.78
Queens	221	252	223.19	222	223.13	44638	0.74
Richards	1058	1140	1081.56	1074.5	1081.38	216312	3.61
Sieve	179	198	180.25	180	180.22	36049	0.6
Storage	192	208	195.58	192	195.51	39116	0.65
Towers	225	293	227.55	226	227.45	45510	0.76
	5853	6456	6024.63	5996.5	6023.41	1204926	20.08
Benchmark Name	Min	Geomean	Median	Mean	Max	Total (ms)	Total (min)
Bounce	521	536	525.51	522	525.48	105101	1.75
CD	645	666	651.61	647	651.57	130321	2.17
DeltaBlue	270	398	350.61	351	350.37	70121	1.17
Havlak	1265	1328	1301.66	1303	1301.6	260332	4.34
Json	365	389	369.74	366	369.69	73948	1.23
List	369	419	371.25	370	371.2	74250	1.24
Mandelbrot	130	148	131.58	130	131.53	26316	0.44
NBody	245	270	249.7	246	249.64	49940	0.83
Permute	233	247	236.01	234	235.97	47202	0.79
Queens	220	251	222.39	221	222.34	44478	0.74
Richards	1061	1084	1068.71	1068	1068.7	213742	3.56
Sieve	176	196	176.97	176	176.94	35393	0.59
Storage	192	207	196.44	193	196.37	39288	0.65
Towers	236	297	238.46	237	238.38	47691	0.79
	5928	6436	6090.62	6064	6089.79	1218123	20.3
Benchmark Name	Min	Geomean	Median	Mean	Max	Total (ms)	Total (min)
Bounce	516	535	520.18	517	520.15	104036	1.73
CD	649	668	655.98	651	655.95	131196	2.19
DeltaBlue	259	400	351	351	350.65	70199	1.17
Havlak	1254	1321	1294.28	1298	1294.2	258855	4.31
Json	382	399	386.73	384	386.68	77345	1.29
List	370	432	373.76	373	373.71	74752	1.25
Mandelbrot	130	156	131.23	130	131.17	26245	0.44
NBody	245	265	249.3	246	249.24	49860	0.83
Permute	231	246	234.05	232	234	46809	0.78
Queens	219	256	222.04	220	221.95	44407	0.74
Richards	1079	1137	1085.55	1082.5	1085.53	217109	3.62
Sieve	176	191	177.04	176	177.02	35407	0.59
Storage	193	210	197.53	194	197.45	39505	0.66
Towers	226	250	228.64	227	228.6	45728	0.76
	5929	6466	6107.27	6081.5	6106.29	1221453	20.36