Merge pull request #5016 from Kaiepi/jvm-necromancy

[JVM] Tune Java in response to nqp's (de)serialization rewrite
rakudo · Oct 2, 2022 · 30a9d3a · 30a9d3a
2 parents cc7193d + a78033f
commit 30a9d3a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tools/templates/jvm/Makefile.in b/tools/templates/jvm/Makefile.in
@@ -4,7 +4,7 @@ JAR     = jar
 
 NQP_PREFIX  = @nqp_prefix@
 @bpv(NQP)@       = @shquot(@j_nqp@)@
-@bpv(NQP_RR)@    = $(JAVA) -Xss1m -Xms500m -Xmx3000m -cp @q(@nfp(./blib)@@cpsep@@nop($(BLD_NQP_JARS))@@cpsep@rakudo-runtime.jar@cpsep@@nop($(SYSROOT))@@abs2rel(@nqp_classpath@)@)@ nqp
+@bpv(NQP_RR)@    = $(JAVA) -XX:+AggressiveHeap -XX:+AllowParallelDefineClass -cp @q(@nfp(./blib)@@cpsep@@nop($(BLD_NQP_JARS))@@cpsep@rakudo-runtime.jar@cpsep@@nop($(SYSROOT))@@abs2rel(@nqp_classpath@)@)@ nqp
 @bpv(RUN_RAKUDO_SCRIPT)@ = rakudo-j-build
 @bpv(RUN_RAKUDO)@ = @shquot(@perl@)@ @bpm(RUN_RAKUDO_SCRIPT)@
 
@@ -48,7 +48,7 @@ RUNTIME_JAR = rakudo-runtime.jar
 $(RUNTIME_JAR): $(RUNTIME_JAVAS)
 	@echo(+++ Generating	$@)@
 	$(NOECHO)$(MKPATH) bin
-	$(NOECHO)$(JAVAC) --release 9 -cp @q($(BLD_NQP_JARS))@ -g -d bin -encoding UTF8 $(RUNTIME_JAVAS)
+	$(NOECHO)$(JAVAC) --release 9 -cp @q($(BLD_NQP_JARS))@ -g:none -d bin -encoding UTF8 $(RUNTIME_JAVAS)
 	$(NOECHO)$(JAR) cf0 rakudo-runtime.jar -C bin@slash@ .
 
 @bpm(RUN_RAKUDO_SCRIPT)@: @@nfp(@template(@backend_subdir@/rakudo-j-build.in)@)@@

diff --git a/tools/templates/jvm/rakudo-j-build.in b/tools/templates/jvm/rakudo-j-build.in
@@ -1,7 +1,7 @@
 $ENV{RAKUDO_HOME} = '@sq_escape(@base_dir@/gen/build_rakudo_home)@';
 
-@if(platform!=windows exec {'@java@'} ('@java@', '-Xss1m', '-Xms500m', '-Xmx3000m', '-cp', '@sq_escape(@classpath@)@', 'perl6', @ARGV);)@
-@if(platform==windows my $exit = system {'@java@'} ('@java@', '-Xss1m', '-Xms500m', '-Xmx3000m', '-cp', '@sq_escape(@classpath@)@', 'perl6', @ARGV);
+@if(platform!=windows exec {'@java@'} ('@java@', '-XX:+AggressiveHeap', '-XX:+AllowParallelDefineClass', '-cp', '@sq_escape(@classpath@)@', 'perl6', @ARGV);)@
+@if(platform==windows my $exit = system {'@java@'} ('@java@', '-XX:+AggressiveHeap', '-XX:+AllowParallelDefineClass', '-cp', '@sq_escape(@classpath@)@', 'perl6', @ARGV);
 if ($exit == -1) {
     print STDERR "Failed to execute: $!\n";
     exit(-2);