From abb63867b296b3803e1616a41667cae734303ce0 Mon Sep 17 00:00:00 2001 From: Fabio Niephaus Date: Wed, 26 Apr 2023 08:15:49 +0200 Subject: [PATCH] Drop `Xmx` flag from `native-image.properties`. --- sulong/mx.sulong/native-image.properties | 2 -- .../repo/19.3.0.0/r/jre/languages/R/native-image.properties | 3 +-- .../1.0.0.0/jre/languages/python/native-image.properties | 2 +- .../1.0.1.0/jre/languages/python/native-image.properties | 2 +- .../1.1.0.0/jre/languages/python/native-image.properties | 2 +- .../repo/r/1.0.1.0/jre/languages/R/native-image.properties | 3 +-- .../repo/r/1.1.0.0/jre/languages/R/native-image.properties | 3 +-- wasm/mx.wasm/native-image.properties | 2 -- 8 files changed, 6 insertions(+), 13 deletions(-) diff --git a/sulong/mx.sulong/native-image.properties b/sulong/mx.sulong/native-image.properties index 1048550c5fbfd..ba9ba63cb4179 100644 --- a/sulong/mx.sulong/native-image.properties +++ b/sulong/mx.sulong/native-image.properties @@ -3,8 +3,6 @@ Requires = language:nfi -JavaArgs = -Xmx3G - Args = -H:MaxRuntimeCompileMethods=10000 \ -H:+AddAllCharsets \ --initialize-at-build-time=com.oracle.truffle.llvm,org.antlr.v4.runtime diff --git a/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/19.3.0.0/r/jre/languages/R/native-image.properties b/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/19.3.0.0/r/jre/languages/R/native-image.properties index cd825365b6b00..0909c669d51cf 100644 --- a/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/19.3.0.0/r/jre/languages/R/native-image.properties +++ b/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/19.3.0.0/r/jre/languages/R/native-image.properties @@ -14,8 +14,7 @@ JavaArgs = \ -Dfastr.internal.usenativeeventloop=false \ -Dfastr.internal.defaultdownloadmethod=wget \ -Dfastr.internal.ignorejvmargs=true \ - -Dfastr.use.remote.grid.awt.device=true \ - -Xmx6G + -Dfastr.use.remote.grid.awt.device=true LauncherClass = com.oracle.truffle.r.launcher.RMain LauncherClassPath = lib/graalvm/launcher-common.jar:languages/R/fastr-launcher.jar diff --git a/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/python/1.0.0.0/jre/languages/python/native-image.properties b/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/python/1.0.0.0/jre/languages/python/native-image.properties index f320cd166f594..ef2b563247111 100644 --- a/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/python/1.0.0.0/jre/languages/python/native-image.properties +++ b/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/python/1.0.0.0/jre/languages/python/native-image.properties @@ -8,7 +8,7 @@ Requires = tool:regex language:llvm LauncherClass = com.oracle.graal.python.shell.GraalPythonMain LauncherClassPath = lib/graalvm/launcher-common.jar:lib/graalvm/graalpython-launcher.jar -JavaArgs = -Xmx4G -Dpolyglot.image-build-time.PreinitializeContexts=python +JavaArgs = -Dpolyglot.image-build-time.PreinitializeContexts=python Args = -H:MaxRuntimeCompileMethods=7000 \ -H:SubstitutionResources=com/oracle/graal/python/aot/substitutions.json diff --git a/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/python/1.0.1.0/jre/languages/python/native-image.properties b/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/python/1.0.1.0/jre/languages/python/native-image.properties index f320cd166f594..ef2b563247111 100644 --- a/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/python/1.0.1.0/jre/languages/python/native-image.properties +++ b/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/python/1.0.1.0/jre/languages/python/native-image.properties @@ -8,7 +8,7 @@ Requires = tool:regex language:llvm LauncherClass = com.oracle.graal.python.shell.GraalPythonMain LauncherClassPath = lib/graalvm/launcher-common.jar:lib/graalvm/graalpython-launcher.jar -JavaArgs = -Xmx4G -Dpolyglot.image-build-time.PreinitializeContexts=python +JavaArgs = -Dpolyglot.image-build-time.PreinitializeContexts=python Args = -H:MaxRuntimeCompileMethods=7000 \ -H:SubstitutionResources=com/oracle/graal/python/aot/substitutions.json diff --git a/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/python/1.1.0.0/jre/languages/python/native-image.properties b/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/python/1.1.0.0/jre/languages/python/native-image.properties index f320cd166f594..ef2b563247111 100644 --- a/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/python/1.1.0.0/jre/languages/python/native-image.properties +++ b/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/python/1.1.0.0/jre/languages/python/native-image.properties @@ -8,7 +8,7 @@ Requires = tool:regex language:llvm LauncherClass = com.oracle.graal.python.shell.GraalPythonMain LauncherClassPath = lib/graalvm/launcher-common.jar:lib/graalvm/graalpython-launcher.jar -JavaArgs = -Xmx4G -Dpolyglot.image-build-time.PreinitializeContexts=python +JavaArgs = -Dpolyglot.image-build-time.PreinitializeContexts=python Args = -H:MaxRuntimeCompileMethods=7000 \ -H:SubstitutionResources=com/oracle/graal/python/aot/substitutions.json diff --git a/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/r/1.0.1.0/jre/languages/R/native-image.properties b/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/r/1.0.1.0/jre/languages/R/native-image.properties index cd825365b6b00..0909c669d51cf 100644 --- a/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/r/1.0.1.0/jre/languages/R/native-image.properties +++ b/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/r/1.0.1.0/jre/languages/R/native-image.properties @@ -14,8 +14,7 @@ JavaArgs = \ -Dfastr.internal.usenativeeventloop=false \ -Dfastr.internal.defaultdownloadmethod=wget \ -Dfastr.internal.ignorejvmargs=true \ - -Dfastr.use.remote.grid.awt.device=true \ - -Xmx6G + -Dfastr.use.remote.grid.awt.device=true LauncherClass = com.oracle.truffle.r.launcher.RMain LauncherClassPath = lib/graalvm/launcher-common.jar:languages/R/fastr-launcher.jar diff --git a/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/r/1.1.0.0/jre/languages/R/native-image.properties b/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/r/1.1.0.0/jre/languages/R/native-image.properties index cd825365b6b00..0909c669d51cf 100644 --- a/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/r/1.1.0.0/jre/languages/R/native-image.properties +++ b/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/repo/r/1.1.0.0/jre/languages/R/native-image.properties @@ -14,8 +14,7 @@ JavaArgs = \ -Dfastr.internal.usenativeeventloop=false \ -Dfastr.internal.defaultdownloadmethod=wget \ -Dfastr.internal.ignorejvmargs=true \ - -Dfastr.use.remote.grid.awt.device=true \ - -Xmx6G + -Dfastr.use.remote.grid.awt.device=true LauncherClass = com.oracle.truffle.r.launcher.RMain LauncherClassPath = lib/graalvm/launcher-common.jar:languages/R/fastr-launcher.jar diff --git a/wasm/mx.wasm/native-image.properties b/wasm/mx.wasm/native-image.properties index 616dcb8d33a24..fe9e6b7ec71be 100644 --- a/wasm/mx.wasm/native-image.properties +++ b/wasm/mx.wasm/native-image.properties @@ -1,6 +1,4 @@ # This file contains native-image arguments needed to build graal-wasm -JavaArgs = -Xmx6G - Args = -H:MaxRuntimeCompileMethods=2000 \ --initialize-at-build-time=org.graalvm.wasm \ No newline at end of file