Skip to content

Commit 96ac55d

Browse files
chumerchumer
committed
[GR-44222] Truffle Unchained Refactoring Part 5.
PullRequest: graal/14940
2 parents f0703c8 + cd13000 commit 96ac55d

File tree

643 files changed

+20080
-11972
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

643 files changed

+20080
-11972
lines changed

‎compiler/mx.compiler/mx_compiler.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,11 @@ def _unittest_config_participant(config):
704704
# for the junit harness which uses reflection to find @Test methods. In addition, the
705705
# tests widely use JVMCI classes so JVMCI needs to also export all its packages to
706706
# ALL-UNNAMED.
707-
mainClassArgs.extend(['-JUnitOpenPackages', 'jdk.internal.vm.ci/*=jdk.internal.vm.compiler,ALL-UNNAMED'])
707+
708+
mainClassArgs.extend(['-JUnitOpenPackages', 'jdk.internal.vm.ci/*=org.graalvm.truffle.runtime,jdk.internal.vm.compiler,ALL-UNNAMED'])
709+
mainClassArgs.extend(['-JUnitOpenPackages', 'org.graalvm.truffle/*=ALL-UNNAMED'])
710+
mainClassArgs.extend(['-JUnitOpenPackages', 'org.graalvm.truffle.compiler/*=ALL-UNNAMED'])
711+
mainClassArgs.extend(['-JUnitOpenPackages', 'org.graalvm.truffle.runtime/*=ALL-UNNAMED'])
708712

709713
limited_modules = None
710714
for arg in vmArgs:
@@ -1294,7 +1298,6 @@ class GraalConfig:
12941298
def __init__(self):
12951299
self.jvmci_dists = []
12961300
self.jvmci_jars = []
1297-
self.jvmci_parent_dists = []
12981301
self.jvmci_parent_jars = []
12991302
self.boot_dists = []
13001303
self.boot_jars = []
@@ -1312,10 +1315,9 @@ def __init__(self):
13121315
self.boot_dists.append(d)
13131316
self.boot_jars.append(d.classpath_repr())
13141317

1315-
self.jvmci_parent_dists = [mx.distribution('truffle:TRUFFLE_API')]
1316-
self.jvmci_parent_jars = [jar.classpath_repr() for jar in self.jvmci_parent_dists]
1318+
self.jvmci_parent_jars = []
13171319

1318-
self.dists = self.jvmci_dists + self.jvmci_parent_dists + self.boot_dists
1320+
self.dists = self.jvmci_dists + self.boot_dists
13191321
self.jars = self.jvmci_jars + self.jvmci_parent_jars + self.boot_jars
13201322

13211323
self.dists_dict = {e.suite.name + ':' + e.name : e for e in self.dists}
@@ -1328,7 +1330,6 @@ def _jvmci_jars():
13281330
return [
13291331
'compiler:GRAAL',
13301332
'compiler:GRAAL_MANAGEMENT',
1331-
'compiler:GRAAL_TRUFFLE_JFR_IMPL',
13321333
]
13331334

13341335
# The community compiler component

‎compiler/mx.compiler/suite.py‎

Lines changed: 6 additions & 183 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
"sourceDirs" : ["src"],
164164
"dependencies" : [
165165
"sdk:GRAAL_SDK",
166-
"truffle:TRUFFLE_API",
166+
"truffle:TRUFFLE_COMPILER",
167167
],
168168
"requires" : [
169169
"jdk.internal.vm.ci",
@@ -192,11 +192,8 @@
192192
"org.graalvm.compiler.core.common.CompilerProfiler",
193193
"org.graalvm.compiler.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider",
194194
"org.graalvm.compiler.truffle.compiler.phases.inlining.InliningPolicyProvider",
195-
"org.graalvm.compiler.truffle.jfr.EventFactory.Provider",
196-
"org.graalvm.compiler.truffle.runtime.FloodControlHandler",
197195
],
198196
"annotationProcessors" : [
199-
"truffle:TRUFFLE_DSL_PROCESSOR",
200197
"GRAAL_PROCESSOR"
201198
],
202199
"checkPackagePrefix": "false",
@@ -209,7 +206,6 @@
209206
"org.graalvm.libgraal.jni",
210207
"org.graalvm.compiler.replacements",
211208
"org.graalvm.compiler.hotspot.test",
212-
"org.graalvm.nativebridge.processor.test",
213209
"org.graalvm.compiler.replacements.test",
214210
"org.graalvm.compiler.api.directives.test",
215211
"org.graalvm.compiler.test",
@@ -218,31 +214,10 @@
218214
"org.graalvm.compiler.loop.test",
219215
"org.graalvm.compiler.core.aarch64.test",
220216
"org.graalvm.compiler.jtt",
221-
"org.graalvm.compiler.truffle.options",
222-
"org.graalvm.compiler.truffle.jfr",
223-
"org.graalvm.compiler.truffle.jfr.impl",
224-
"org.graalvm.compiler.truffle.runtime",
225217
"org.graalvm.compiler.truffle.test",
226-
"org.graalvm.compiler.truffle.common.hotspot.libgraal",
227-
"org.graalvm.compiler.truffle.compiler.hotspot.libgraal",
228218
],
229219
},
230220

231-
"jdk.internal.vm.compiler.truffle.jfr" : {
232-
"subDir" : "src",
233-
"sourceDirs" : ["src"],
234-
"dependencies" : [
235-
"jdk.internal.vm.compiler",
236-
],
237-
"requires" : [
238-
"jdk.jfr"
239-
],
240-
"checkPackagePrefix": "false",
241-
"checkstyle" : "jdk.internal.vm.compiler",
242-
"javaCompliance" : "17+",
243-
"jacoco" : "exclude",
244-
},
245-
246221
"jdk.internal.vm.compiler.processor" : {
247222
"subDir" : "src",
248223
"sourceDirs" : ["src"],
@@ -265,14 +240,15 @@
265240
"JAVA_ALLOCATION_INSTRUMENTER",
266241
"truffle:TRUFFLE_SL_TEST",
267242
"truffle:TRUFFLE_TEST",
243+
"truffle:TRUFFLE_RUNTIME",
268244
],
269245
"requires" : [
270246
"jdk.unsupported",
271247
"java.compiler",
272248
"java.logging",
273249
"java.instrument",
274250
"java.management",
275-
"jdk.jfr"
251+
"jdk.jfr",
276252
],
277253
"requiresConcealed" : {
278254
"java.base" : [
@@ -306,39 +282,6 @@
306282
"jacoco" : "exclude",
307283
},
308284

309-
"org.graalvm.nativebridge.processor" : {
310-
"subDir" : "src",
311-
"sourceDirs" : ["src"],
312-
"dependencies" : [
313-
"jdk.internal.vm.compiler.processor",
314-
],
315-
"requires" : [
316-
"java.compiler"
317-
],
318-
"annotationProcessors" : [
319-
],
320-
"checkstyle" : "jdk.internal.vm.compiler",
321-
"javaCompliance" : "17+",
322-
"workingSets" : "API,Graal",
323-
},
324-
325-
"org.graalvm.nativebridge.processor.test" : {
326-
"subDir" : "src",
327-
"sourceDirs" : ["src"],
328-
"dependencies" : [
329-
"jdk.internal.vm.compiler",
330-
"mx:JUNIT",
331-
],
332-
"annotationProcessors" : [
333-
"GRAAL_NATIVEBRIDGE_PROCESSOR",
334-
],
335-
"checkstyle" : "jdk.internal.vm.compiler",
336-
"javaCompliance" : "17+",
337-
"workingSets" : "Graal,Test",
338-
"jacoco" : "exclude",
339-
"testProject" : True,
340-
},
341-
342285
"org.graalvm.compiler.management" : {
343286
"subDir" : "src",
344287
"sourceDirs" : ["src"],
@@ -436,56 +379,6 @@
436379

437380
# ------------- GraalTruffle -------------
438381

439-
"org.graalvm.compiler.truffle.compiler.hotspot.libgraal" : {
440-
"subDir" : "src",
441-
"sourceDirs" : ["src"],
442-
"dependencies" : [
443-
"jdk.internal.vm.compiler",
444-
],
445-
"requiresConcealed" : {
446-
"jdk.internal.vm.ci" : [
447-
"jdk.vm.ci.meta",
448-
"jdk.vm.ci.code",
449-
"jdk.vm.ci.runtime",
450-
"jdk.vm.ci.hotspot",
451-
],
452-
},
453-
"jacoco" : "exclude", # GR-13965
454-
"checkstyle" : "jdk.internal.vm.compiler",
455-
"javaCompliance" : "17+",
456-
"annotationProcessors" : [
457-
"GRAAL_PROCESSOR",
458-
],
459-
},
460-
461-
"org.graalvm.compiler.truffle.libgraal.truffleattach" : {
462-
"subDir" : "src",
463-
"native" : "shared_lib",
464-
"deliverable" : "truffleattach",
465-
"use_jdk_headers" : True,
466-
"buildDependencies" : [
467-
],
468-
"os_arch" : {
469-
"windows" : {
470-
"<others>" : {
471-
"cflags" : ["--std=c++11"]
472-
}
473-
},
474-
"linux" : {
475-
"<others>" : {
476-
"cflags" : ["--std=c++11", "-g", "-Wall", "-Werror", "-D_GNU_SOURCE"],
477-
"ldlibs" : ["-ldl"],
478-
},
479-
},
480-
"<others>" : {
481-
"<others>" : {
482-
"cflags" : ["--std=c++11", "-g", "-Wall", "-Werror"],
483-
"ldlibs" : ["-ldl"],
484-
},
485-
},
486-
},
487-
},
488-
489382
"org.graalvm.compiler.truffle.test.jdk21" : {
490383
"subDir" : "src",
491384
"sourceDirs" : ["src"],
@@ -552,14 +445,15 @@
552445
"subDir" : "src",
553446
"dependencies" : [
554447
"jdk.internal.vm.compiler.test",
555-
"org.graalvm.nativebridge.processor.test",
556448
"org.graalvm.compiler.hotspot.jdk20.test",
557449
"org.graalvm.compiler.hotspot.jdk21.test",
558450
],
559451
"distDependencies" : [
560452
"GRAAL",
561453
"truffle:TRUFFLE_SL_TEST",
562454
"truffle:TRUFFLE_TEST",
455+
"truffle:TRUFFLE_COMPILER",
456+
"truffle:TRUFFLE_RUNTIME",
563457
"regex:TREGEX"
564458
],
565459
"exclude" : [
@@ -570,34 +464,6 @@
570464
"maven": False,
571465
},
572466

573-
"GRAAL_TRUFFLE_JFR_IMPL" : {
574-
# This distribution defines a module.
575-
"moduleInfo" : {
576-
"name" : "jdk.internal.vm.compiler.truffle.jfr",
577-
},
578-
"subDir" : "src",
579-
"dependencies" : [
580-
"jdk.internal.vm.compiler.truffle.jfr",
581-
],
582-
"distDependencies" : [
583-
"GRAAL",
584-
],
585-
"maven": False,
586-
},
587-
588-
"GRAAL_TRUFFLE_COMPILER_LIBGRAAL": {
589-
"subDir" : "src",
590-
"dependencies" : [
591-
"org.graalvm.compiler.truffle.compiler.hotspot.libgraal",
592-
],
593-
594-
"distDependencies" : [
595-
"GRAAL",
596-
],
597-
"maven": False,
598-
"javaCompliance" : "17+",
599-
},
600-
601467
"GRAAL_PROCESSOR" : {
602468
"subDir": "src",
603469
"dependencies" : [
@@ -606,15 +472,6 @@
606472
"maven": False,
607473
},
608474

609-
"GRAAL_NATIVEBRIDGE_PROCESSOR" : {
610-
"subDir" : "src",
611-
"dependencies" : [
612-
"org.graalvm.nativebridge.processor"
613-
],
614-
"distDependencies" : ["GRAAL_PROCESSOR"],
615-
"maven": False,
616-
},
617-
618475
"GRAAL" : {
619476
# This distribution defines a module.
620477
"moduleInfo" : {
@@ -632,12 +489,9 @@
632489
"org.graalvm.compiler.options to org.graalvm.nativeimage.driver,org.graalvm.nativeimage.junitsupport",
633490
"org.graalvm.compiler.phases.common to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure",
634491
"org.graalvm.compiler.serviceprovider to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.diagnostics",
635-
"org.graalvm.compiler.truffle.jfr to jdk.internal.vm.compiler.truffle.jfr",
636492
"org.graalvm.util.json to org.graalvm.nativeimage.librarysupport,org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure,org.graalvm.nativeimage.driver",
637493
],
638494
"uses" : [
639-
"com.oracle.truffle.api.impl.TruffleLocator",
640-
"com.oracle.truffle.api.object.LayoutFactory",
641495
"org.graalvm.compiler.code.DisassemblerProvider",
642496
"org.graalvm.compiler.core.match.MatchStatementSet",
643497
"org.graalvm.compiler.debug.DebugHandlersFactory",
@@ -651,10 +505,6 @@
651505
"org.graalvm.compiler.serviceprovider.JMXService",
652506
"org.graalvm.compiler.truffle.compiler.hotspot.TruffleCallBoundaryInstrumentationFactory",
653507
"org.graalvm.compiler.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider",
654-
"org.graalvm.compiler.truffle.runtime.LoopNodeFactory",
655-
"org.graalvm.compiler.truffle.runtime.TruffleTypes",
656-
"org.graalvm.compiler.truffle.runtime.EngineCacheSupport",
657-
"org.graalvm.home.HomeFinder",
658508
],
659509
},
660510
"subDir" : "src",
@@ -663,7 +513,7 @@
663513
],
664514
"distDependencies" : [
665515
"sdk:GRAAL_SDK",
666-
"truffle:TRUFFLE_API"
516+
"truffle:TRUFFLE_COMPILER",
667517
],
668518
"allowsJavadocWarnings": True,
669519
"description": "The GraalVM compiler and the Graal-truffle optimizer.",
@@ -740,33 +590,6 @@
740590
},
741591
},
742592

743-
"TRUFFLE_LIBGRAAL_TRUFFLEATTACH" : {
744-
"native" : True,
745-
"platformDependent" : True,
746-
"platforms" : [
747-
"linux-amd64",
748-
"linux-aarch64",
749-
"darwin-amd64",
750-
"darwin-aarch64",
751-
"windows-amd64",
752-
],
753-
"layout" : {
754-
"bin/" : "dependency:org.graalvm.compiler.truffle.libgraal.truffleattach",
755-
},
756-
"description" : "Contains a library to attach Truffle runtime to jvmci runtime.",
757-
"maven": True,
758-
},
759-
760-
"TRUFFLE_LIBGRAAL_TRUFFLEATTACH_GRAALVM_SUPPORT" : {
761-
"native" : True,
762-
"platformDependent" : True,
763-
"layout" : {
764-
"./" : ["dependency:org.graalvm.compiler.truffle.libgraal.truffleattach"],
765-
},
766-
"description" : "Truffle attach library support distribution for the GraalVM",
767-
"maven" : False,
768-
},
769-
770593
"GRAAL_PROFDIFF": {
771594
"subDir" : "src",
772595
"dependencies" : [

‎compiler/src/jdk.internal.vm.compiler.processor/src/META-INF/services/javax.annotation.processing.Processor‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ org.graalvm.compiler.replacements.processor.ReplacementsAnnotationProcessor
22
org.graalvm.compiler.nodeinfo.processor.GraphNodeProcessor
33
org.graalvm.compiler.lir.processor.IntrinsicStubProcessor
44
org.graalvm.compiler.lir.processor.StubPortProcessor
5-
org.graalvm.compiler.truffle.compiler.hotspot.libgraal.processor.TruffleFromLibGraalProcessor
65
org.graalvm.compiler.core.match.processor.MatchProcessor
76
org.graalvm.compiler.options.processor.OptionProcessor
87
org.graalvm.compiler.serviceprovider.processor.ServiceProviderProcessor

‎compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyBailoutUsage.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ private static String getPackageName(Class<?> c) {
5252
getPackageName(PermanentBailoutException.class),
5353
"jdk.vm.ci",
5454

55-
// Allows GraalTruffleRuntime.handleAnnotationFailure to throw
56-
// a BailoutException since the org.graalvm.compiler.truffle.runtime
55+
// Allows OptimizedTruffleRuntime.handleAnnotationFailure to throw
56+
// a BailoutException since the com.oracle.truffle.runtime
5757
// project can not see the PermanentBailoutException or
5858
// RetryableBailoutException types.
59-
"org.graalvm.compiler.truffle.runtime"
59+
"com.oracle.truffle.runtime"
6060
};
6161
} catch (Throwable t) {
6262
throw new GraalError(t);

‎compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifySystemPropertyUsage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ protected void verify(StructuredGraph graph, CoreProviders context) {
8888
// The main method in JVMCIVersionCheck is only called from the shell
8989
return;
9090
} else if (packageName.startsWith("com.oracle.truffle") || packageName.startsWith("org.graalvm.polyglot") ||
91-
packageName.startsWith("org.graalvm.home") || packageName.equals("org.graalvm.compiler.truffle.runtime.hotspot")) {
91+
packageName.startsWith("org.graalvm.home") || packageName.equals("com.oracle.truffle.runtime.hotspot")) {
9292
// Truffle, SDK and Truffle runtime do not depend on JVMCI so they cannot use
9393
// Services.getSavedProperties()
9494
return;

‎compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyUnsafeAccess.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ protected void verify(StructuredGraph graph, CoreProviders context) {
6262
caller.getName().equals("initUnsafe")) {
6363
// This is the blessed way access Unsafe in Graal and JVMCI
6464
return;
65-
} else if (packageName.startsWith("com.oracle.truffle") || packageName.startsWith("org.graalvm.compiler.truffle.runtime")) {
66-
// Truffle and GraalTruffleRuntime do not depend on Graal and so cannot use
65+
} else if (packageName.startsWith("com.oracle.truffle") || packageName.startsWith("com.oracle.truffle.runtime")) {
66+
// Truffle and OptimizedTruffleRuntime do not depend on Graal and so cannot use
6767
// GraalUnsafeAccess
6868
return;
6969
}

0 commit comments

Comments
 (0)