jdk8-mips64-public: comparison common/autoconf/generated-configure.sh

-:0adf9c626bb1
+:907a926d3c96
 USE_PRECOMPILED_HEADER
 SJAVAC_SERVER_DIR
 ENABLE_SJAVAC
 SJAVAC_SERVER_CORES
 SJAVAC_SERVER_JAVA
+JOBS
 MEMORY_SIZE
-CONCURRENT_BUILD_JOBS
 NUM_CORES
 SALIB_NAME
 HOTSPOT_MAKE_ARGS
 FIXPATH
 LIBCXX
 with_alsa_lib
 with_zlib
 with_stdc__lib
 with_num_cores
 with_memory_size
+with_jobs
 with_sjavac_server_java
 with_sjavac_server_cores
 enable_sjavac
 enable_precompiled_headers
 enable_ccache
 fallback
 --with-num-cores        number of cores in the build system, e.g.
 --with-num-cores=8 [probed]
 --with-memory-size      memory (in MB) available in the build system, e.g.
 --with-memory-size=1024 [probed]
+--with-jobs             number of parallel jobs to let make run [calculated
+based on cores and memory]
 --with-sjavac-server-java
 use this java binary for running the sjavac
 background server [Boot JDK java]
 --with-sjavac-server-cores
 use at most this number of concurrent threads on the
 #
 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # definitions. It is replaced with custom functionality when building
 # custom sources.
 #CUSTOM_AUTOCONF_INCLUDE
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1361452590
+DATE_WHEN_GENERATED=1362411827
 ###############################################################################
 #
 # Initialization / Boot-strapping
 #
 # not the result.
 #
 ###############################################################################
 # How many cores do we have on this build system?
 # Check whether --with-num-cores was given.
 if test "${with_num_cores+set}" = set; then :
 withval=$with_num_cores;
 fi
 if test "x$with_num_cores" = x; then
 # The number of cores were not specified, try to probe them.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for number of cores" >&5
 $as_echo_n "checking for number of cores... " >&6; }
 NUM_CORES=1
 # On windows, look in the env
 NUM_CORES=$NUMBER_OF_PROCESSORS
 FOUND_CORES=yes
 fi
-# For c/c++ code we run twice as many concurrent build
-# jobs than we have cores, otherwise we will stall on io.
-CONCURRENT_BUILD_JOBS=`expr $NUM_CORES \* 2`
 if test "x$FOUND_CORES" = xyes; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NUM_CORES" >&5
 $as_echo "$NUM_CORES" >&6; }
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not detect number of cores, defaulting to 1" >&5
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This will disable all parallelism from build!" >&5
 $as_echo "$as_me: WARNING: This will disable all parallelism from build!" >&2;}
 fi
 else
 NUM_CORES=$with_num_cores
-CONCURRENT_BUILD_JOBS=`expr $NUM_CORES \* 2`
+fi
-fi
+# How much memory do we have on this build system?
-# How much memory do we have on this build system?
 # Check whether --with-memory-size was given.
 if test "${with_memory_size+set}" = set; then :
 withval=$with_memory_size;
 fi
 if test "x$with_memory_size" = x; then
 # The memory size was not specified, try to probe it.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for memory size" >&5
 $as_echo_n "checking for memory size... " >&6; }
 # Default to 1024 MB
 $as_echo "could not detect memory size, defaulting to 1024 MB" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This might seriously impact build performance!" >&5
 $as_echo "$as_me: WARNING: This might seriously impact build performance!" >&2;}
 fi
 else
 MEMORY_SIZE=$with_memory_size
 fi
+# Provide a decent default number of parallel jobs for make depending on
+# number of cores, amount of memory and machine architecture.
+# Check whether --with-jobs was given.
+if test "${with_jobs+set}" = set; then :
+withval=$with_jobs;
+fi
+if test "x$with_jobs" = x; then
+# Number of jobs was not specified, calculate.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for appropriate number of jobs to run in parallel" >&5
+$as_echo_n "checking for appropriate number of jobs to run in parallel... " >&6; }
+# Approximate memory in GB, rounding up a bit.
+memory_gb=`expr $MEMORY_SIZE / 1100`
+# Pick the lowest of memory in gb and number of cores.
+if test "$memory_gb" -lt "$NUM_CORES"; then
+JOBS="$memory_gb"
+else
+JOBS="$NUM_CORES"
+# On bigger machines, leave some room for other processes to run
+if test "$JOBS" -gt "4"; then
+JOBS=`expr $JOBS '*' 90 / 100`
+fi
+fi
+# Cap number of jobs to 16
+if test "$JOBS" -gt "16"; then
+JOBS=16
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $JOBS" >&5
+$as_echo "$JOBS" >&6; }
+else
+JOBS=$with_jobs
+fi
 # Setup smart javac (after cores and memory have been setup)
 printf "* C Compiler:     $CC_VENDOR version $CC_VERSION (at $CC)\n"
 printf "* C++ Compiler:   $CXX_VENDOR version $CXX_VERSION (at $CXX)\n"
 printf "\n"
 printf "Build performance summary:\n"
-printf "* Cores to use:   $NUM_CORES\n"
+printf "* Cores to use:   $JOBS\n"
 printf "* Memory limit:   $MEMORY_SIZE MB\n"
 printf "* ccache status:  $CCACHE_STATUS\n"
 printf "\n"
 if test "x$CCACHE_HELP_MSG" != x && test "x$HIDE_PERFORMANCE_HINTS" = "xno"; then

Mercurial > jdk8-mips64-public / file comparison

comparison: common/autoconf/generated-configure.sh

common/autoconf/generated-configure.sh