< prev index next >
make/RunTests.gmk
Print this page
@@ -201,15 +201,24 @@
TEST_JOBS_FACTOR ?= 1
TEST_JOBS_FACTOR_JDL ?= 1
TEST_JOBS_FACTOR_MACHINE ?= 1
ifeq ($(TEST_JOBS), 0)
- # Concurrency based on min(cores / 2, 12) * TEST_JOBS_FACTOR
+ CORES_DIVIDER := 2
+ ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
+ # For smaller sparc machines we see reasonable scaling of throughput up to
+ # cpus/4 without affecting test reliability. On the bigger machines, cpus/4
+ # causes intermittent timeouts.
+ ifeq ($(shell $(EXPR) $(NUM_CORES) \> 16), 1)
+ CORES_DIVIDER := 5
+ else
+ CORES_DIVIDER := 4
+ endif
+ endif
TEST_JOBS := $(shell $(AWK) \
'BEGIN { \
- c = $(NUM_CORES) / 2; \
- if (c > 12) c = 12; \
+ c = $(NUM_CORES) / $(CORES_DIVIDER); \
c = c * $(TEST_JOBS_FACTOR); \
c = c * $(TEST_JOBS_FACTOR_JDL); \
c = c * $(TEST_JOBS_FACTOR_MACHINE); \
if (c < 1) c = 1; \
printf "%.0f", c; \
@@ -619,11 +628,16 @@
# Make sure MaxRAMPercentage is high enough to not cause OOM or swapping since
# we may end up with a lot of JVM's
$1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS))
+ # Sparcs are in general slower per core so need to scale up timeouts a bit.
+ ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
+ JTREG_TIMEOUT_FACTOR ?= 8
+ else
JTREG_TIMEOUT_FACTOR ?= 4
+ endif
JTREG_VERBOSE ?= fail,error,summary
JTREG_RETAIN ?= fail,error
ifneq ($$($1_JTREG_MAX_MEM), 0)
$1_JTREG_BASIC_OPTIONS += -vmoption:-Xmx$$($1_JTREG_MAX_MEM)
< prev index next >