common/autoconf/boot-jdk.m4
changeset 39187 9decd6e374e2
parent 38843 2b141e8e916f
child 39189 bae461399d89
equal deleted inserted replaced
39184:3aa52182b3ad 39187:9decd6e374e2
   357 
   357 
   358   AC_MSG_CHECKING([flags for boot jdk java command for big workloads])
   358   AC_MSG_CHECKING([flags for boot jdk java command for big workloads])
   359 
   359 
   360   # Starting amount of heap memory.
   360   # Starting amount of heap memory.
   361   ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
   361   ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
   362 
   362   BOOTCYCLE_JVM_ARGS_BIG=-Xms64M
   363   # Maximum amount of heap memory.
   363 
   364   # Maximum stack size.
   364   # Maximum amount of heap memory and stack size.
   365   JVM_MAX_HEAP=`expr $MEMORY_SIZE / 2`
   365   JVM_HEAP_LIMIT_32="1100"
       
   366   # Running a 64 bit JVM allows for and requires a bigger heap
       
   367   JVM_HEAP_LIMIT_64="1600"
       
   368   STACK_SIZE_32=768
       
   369   STACK_SIZE_64=1536
       
   370   JVM_HEAP_LIMIT_GLOBAL=`expr $MEMORY_SIZE / 2`
       
   371   if test "$JVM_HEAP_LIMIT_GLOBAL" -lt "$JVM_HEAP_LIMIT_32"; then
       
   372     JVM_HEAP_LIMIT_32=$JVM_HEAP_LIMIT_GLOBAL
       
   373   fi
       
   374   if test "$JVM_HEAP_LIMIT_GLOBAL" -lt "$JVM_HEAP_LIMIT_64"; then
       
   375     JVM_HEAP_LIMIT_64=$JVM_HEAP_LIMIT_GLOBAL
       
   376   fi
       
   377   if test "$JVM_HEAP_LIMIT_GLOBAL" -lt "512"; then
       
   378     JVM_HEAP_LIMIT_32=512
       
   379     JVM_HEAP_LIMIT_64=512
       
   380   fi
       
   381 
   366   if test "x$BOOT_JDK_BITS" = "x32"; then
   382   if test "x$BOOT_JDK_BITS" = "x32"; then
   367     if test "$JVM_MAX_HEAP" -gt "1100"; then
   383     STACK_SIZE=$STACK_SIZE_32
   368       JVM_MAX_HEAP=1100
   384     JVM_MAX_HEAP=$JVM_HEAP_LIMIT_32
   369     elif test "$JVM_MAX_HEAP" -lt "512"; then
       
   370       JVM_MAX_HEAP=512
       
   371     fi
       
   372     STACK_SIZE=768
       
   373   else
   385   else
   374     # Running a 64 bit JVM allows for and requires a bigger heap
   386     STACK_SIZE=$STACK_SIZE_64
   375     if test "$JVM_MAX_HEAP" -gt "1600"; then
   387     JVM_MAX_HEAP=$JVM_HEAP_LIMIT_64
   376       JVM_MAX_HEAP=1600
       
   377     elif test "$JVM_MAX_HEAP" -lt "512"; then
       
   378       JVM_MAX_HEAP=512
       
   379     fi
       
   380     STACK_SIZE=1536
       
   381   fi
   388   fi
   382   ADD_JVM_ARG_IF_OK([-Xmx${JVM_MAX_HEAP}M],boot_jdk_jvmargs_big,[$JAVA])
   389   ADD_JVM_ARG_IF_OK([-Xmx${JVM_MAX_HEAP}M],boot_jdk_jvmargs_big,[$JAVA])
   383   ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA])
   390   ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA])
   384 
   391 
   385   AC_MSG_RESULT([$boot_jdk_jvmargs_big])
   392   AC_MSG_RESULT([$boot_jdk_jvmargs_big])
   386 
   393 
   387   JAVA_FLAGS_BIG=$boot_jdk_jvmargs_big
   394   JAVA_FLAGS_BIG=$boot_jdk_jvmargs_big
   388   AC_SUBST(JAVA_FLAGS_BIG)
   395   AC_SUBST(JAVA_FLAGS_BIG)
       
   396 
       
   397   if test "x$OPENJDK_TARGET_CPU_BITS" = "x32"; then
       
   398     BOOTCYCLE_MAX_HEAP=$JVM_HEAP_LIMIT_32
       
   399     BOOTCYCLE_STACK_SIZE=$STACK_SIZE_32
       
   400   else
       
   401     BOOTCYCLE_MAX_HEAP=$JVM_HEAP_LIMIT_64
       
   402     BOOTCYCLE_STACK_SIZE=$STACK_SIZE_64
       
   403   fi
       
   404   BOOTCYCLE_JVM_ARGS_BIG="$BOOTCYCLE_JVM_ARGS_BIG -Xmx${BOOTCYCLE_MAX_HEAP}M"
       
   405   BOOTCYCLE_JVM_ARGS_BIG="$BOOTCYCLE_JVM_ARGS_BIG -XX:ThreadStackSize=$BOOTCYCLE_STACK_SIZE"
       
   406   AC_MSG_CHECKING([flags for bootcycle boot jdk java command for big workloads])
       
   407   AC_MSG_RESULT([$BOOTCYCLE_JVM_ARGS_BIG])
       
   408   AC_SUBST(BOOTCYCLE_JVM_ARGS_BIG)
   389 
   409 
   390   # By default, the main javac compilations use big
   410   # By default, the main javac compilations use big
   391   JAVA_FLAGS_JAVAC="$JAVA_FLAGS_BIG"
   411   JAVA_FLAGS_JAVAC="$JAVA_FLAGS_BIG"
   392   AC_SUBST(JAVA_FLAGS_JAVAC)
   412   AC_SUBST(JAVA_FLAGS_JAVAC)
   393 
   413