Skip to content

Commit a48d4c1

Browse files
committed
[GR-46482] Force libgraal page size on AArch64 to 64K.
PullRequest: graal/14723
2 parents 3154dc2 + c96e941 commit a48d4c1

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

compiler/mx.compiler/suite.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -600,16 +600,13 @@
600600
"""* to com.oracle.graal.graal_enterprise,org.graalvm.nativeimage.pointsto,org.graalvm.nativeimage.builder,org.graalvm.nativeimage.llvm,com.oracle.svm.svm_enterprise,com.oracle.svm_enterprise.ml_dataset,org.graalvm.nativeimage.base,
601601
org.graalvm.extraimage.builder,com.oracle.svm.extraimage_enterprise""",
602602
"org.graalvm.compiler.java to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure",
603-
"org.graalvm.compiler.core.common to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.objectfile",
604-
"org.graalvm.compiler.debug to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.objectfile",
605-
"org.graalvm.compiler.hotspot to jdk.internal.vm.compiler.management",
603+
"org.graalvm.compiler.core.common to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.objectfile",
604+
"org.graalvm.compiler.debug to org.graalvm.nativeimage.objectfile",
606605
"org.graalvm.compiler.nodes.graphbuilderconf to org.graalvm.nativeimage.driver,org.graalvm.nativeimage.librarysupport",
607-
"org.graalvm.compiler.options to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.junitsupport",
606+
"org.graalvm.compiler.options to org.graalvm.nativeimage.driver,org.graalvm.nativeimage.junitsupport",
608607
"org.graalvm.compiler.phases.common to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure",
609608
"org.graalvm.compiler.serviceprovider to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.diagnostics",
610609
"org.graalvm.compiler.truffle.jfr to jdk.internal.vm.compiler.truffle.jfr",
611-
"org.graalvm.libgraal to jdk.internal.vm.compiler.management",
612-
"org.graalvm.util to jdk.internal.vm.compiler.management",
613610
"org.graalvm.util.json to org.graalvm.nativeimage.librarysupport,org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure,org.graalvm.nativeimage.driver",
614611
],
615612
"uses" : [

substratevm/mx.substratevm/mx_substratevm.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1155,7 +1155,10 @@ def _native_image_launcher_extra_jvm_args():
11551155
# No VM-internal threads may be spawned for libgraal and the reference handling is executed manually.
11561156
'-H:-AllowVMInternalThreads',
11571157
'-R:-AutomaticReferenceHandling',
1158-
]
1158+
] + ([
1159+
# Force page size to support libgraal on AArch64 machines with a page size up to 64K.
1160+
'-H:PageSize=64K'
1161+
] if mx.get_arch() == 'aarch64' else [])
11591162

11601163
libgraal = mx_sdk_vm.GraalVmJreComponent(
11611164
suite=suite,

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointActions.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private CEntryPointActions() {
5353
* context before returning.
5454
*
5555
* @param params initialization parameters.
56-
* @return 0 on success, otherwise non-zero.
56+
* @return 0 on success, otherwise non-zero (see {@link CEntryPointErrors})
5757
*/
5858
public static native int enterCreateIsolate(CEntryPointCreateIsolateParameters params);
5959

@@ -69,7 +69,7 @@ private CEntryPointActions() {
6969
* for the newly attached thread is created. If the parameter is set to false, a
7070
* later call to one of the {@link PlatformThreads#ensureCurrentAssigned} methods
7171
* early after the prologue must be used to do the initialization manually.
72-
* @return 0 on success, otherwise non-zero.
72+
* @return 0 on success, otherwise non-zero (see {@link CEntryPointErrors})
7373
*/
7474
public static native int enterAttachThread(Isolate isolate, boolean startedByIsolate, boolean ensureJavaThread);
7575

@@ -81,7 +81,7 @@ private CEntryPointActions() {
8181
* {@link #enterAttachThread}).
8282
*
8383
* @param thread existing context for the current thread.
84-
* @return 0 on success, otherwise non-zero.
84+
* @return 0 on success, otherwise non-zero (see {@link CEntryPointErrors})
8585
*/
8686
public static native int enter(IsolateThread thread);
8787

@@ -90,7 +90,7 @@ private CEntryPointActions() {
9090
* isolate.
9191
*
9292
* @param isolate isolate in which a context for the current thread exists.
93-
* @return 0 on success, otherwise non-zero.
93+
* @return 0 on success, otherwise non-zero (see {@link CEntryPointErrors})
9494
*/
9595
public static native int enterByIsolate(Isolate isolate);
9696

@@ -101,29 +101,29 @@ private CEntryPointActions() {
101101
* segfault handler, execution must not resume normally.
102102
*
103103
* @param isolate isolate in which a context for the current thread exists.
104-
* @return 0 on success, otherwise non-zero.
104+
* @return 0 on success, otherwise non-zero (see {@link CEntryPointErrors})
105105
*/
106106
public static native int enterAttachThreadFromCrashHandler(Isolate isolate);
107107

108108
/**
109109
* Leaves the current thread's current context.
110110
*
111-
* @return 0 on success, otherwise non-zero.
111+
* @return 0 on success, otherwise non-zero (see {@link CEntryPointErrors})
112112
*/
113113
public static native int leave();
114114

115115
/**
116116
* Leaves the current thread's current context, then discards that context.
117117
*
118-
* @return 0 on success, otherwise non-zero.
118+
* @return 0 on success, otherwise non-zero (see {@link CEntryPointErrors})
119119
*/
120120
public static native int leaveDetachThread();
121121

122122
/**
123123
* Leaves the current thread's current context, then waits for all attached threads in the
124124
* context's isolate to detach and discards that isolate entirely.
125125
*
126-
* @return 0 on success, otherwise non-zero.
126+
* @return 0 on success, otherwise non-zero (see {@link CEntryPointErrors})
127127
*/
128128
public static native int leaveTearDownIsolate();
129129

0 commit comments

Comments
 (0)