equal
deleted
inserted
replaced
64 SLASH_JAVA = /java |
64 SLASH_JAVA = /java |
65 ARCH = $(shell uname -p) |
65 ARCH = $(shell uname -p) |
66 ifeq ($(ARCH), i386) |
66 ifeq ($(ARCH), i386) |
67 ARCH=i586 |
67 ARCH=i586 |
68 endif |
68 endif |
|
69 NUM_CORES := $(shell LC_MESSAGES=C /usr/sbin/psrinfo -v | grep -c on-line) |
69 endif |
70 endif |
70 ifeq ($(UNAME_S), Linux) |
71 ifeq ($(UNAME_S), Linux) |
71 PLATFORM = linux |
72 PLATFORM = linux |
72 SLASH_JAVA = /java |
73 SLASH_JAVA = /java |
73 ARCH = $(shell uname -m) |
74 ARCH = $(shell uname -m) |
74 ifeq ($(ARCH), i386) |
75 ifeq ($(ARCH), i386) |
75 ARCH = i586 |
76 ARCH = i586 |
76 endif |
77 endif |
|
78 NUM_CORES := $(shell cat /proc/cpuinfo | grep -c processor) |
77 endif |
79 endif |
78 ifeq ($(UNAME_S), Darwin) |
80 ifeq ($(UNAME_S), Darwin) |
79 PLATFORM = bsd |
81 PLATFORM = bsd |
80 SLASH_JAVA = /java |
82 SLASH_JAVA = /java |
81 ARCH = $(shell uname -m) |
83 ARCH = $(shell uname -m) |
82 ifeq ($(ARCH), i386) |
84 ifeq ($(ARCH), i386) |
83 ARCH = i586 |
85 ARCH = i586 |
84 endif |
86 endif |
|
87 NUM_CORES := $(shell /usr/sbin/sysctl -n hw.ncpu) |
85 endif |
88 endif |
86 ifeq ($(findstring BSD,$(UNAME_S)), BSD) |
89 ifeq ($(findstring BSD,$(UNAME_S)), BSD) |
87 PLATFORM = bsd |
90 PLATFORM = bsd |
88 SLASH_JAVA = /java |
91 SLASH_JAVA = /java |
89 ARCH = $(shell uname -m) |
92 ARCH = $(shell uname -m) |
113 ARCH = i586 |
116 ARCH = i586 |
114 endif |
117 endif |
115 endif |
118 endif |
116 endif |
119 endif |
117 EXESUFFIX = .exe |
120 EXESUFFIX = .exe |
|
121 ifneq ($(NUMBER_OF_PROCESSORS), ) |
|
122 NUM_CORES := $(NUMBER_OF_PROCESSORS) |
|
123 else |
|
124 ifneq ($(HOTSPOT_BUILD_JOBS), ) |
|
125 NUM_CORES := $(HOTSPOT_BUILD_JOBS) |
|
126 endif |
|
127 endif |
118 endif |
128 endif |
119 |
129 |
120 ifdef ALT_SLASH_JAVA |
130 ifdef ALT_SLASH_JAVA |
121 SLASH_JAVA = $(ALT_SLASH_JAVA) |
131 SLASH_JAVA = $(ALT_SLASH_JAVA) |
122 endif |
132 endif |
306 # When called from JPRT the TESTDIRS variable is set to the jtreg tests to run |
316 # When called from JPRT the TESTDIRS variable is set to the jtreg tests to run |
307 ifdef TESTDIRS |
317 ifdef TESTDIRS |
308 TEST_SELECTION = $(TESTDIRS) |
318 TEST_SELECTION = $(TESTDIRS) |
309 endif |
319 endif |
310 |
320 |
311 ifdef CONCURRENCY |
321 # Concurrency based on min(cores / 2, 12) |
312 JTREG_BASIC_OPTIONS += -concurrency:$(CONCURRENCY) |
322 ifdef NUM_CORES |
313 endif |
323 CONCURRENCY := $(shell expr $(NUM_CORES) / 2) |
|
324 ifeq ($(CONCURRENCY), 0) |
|
325 CONCURRENCY := 1 |
|
326 else ifeq ($(shell expr $(CONCURRENCY) \> 12), 1) |
|
327 CONCURRENCY := 12 |
|
328 endif |
|
329 else |
|
330 CONCURRENCY := 1 |
|
331 endif |
|
332 JTREG_BASIC_OPTIONS += -concurrency:$(CONCURRENCY) |
|
333 |
|
334 # Make sure MaxRAMFraction is high enough to not cause OOM or swapping since we may end up with a lot of JVM's |
|
335 JTREG_BASIC_OPTIONS += -vmoption:-XX:MaxRAMFraction=$(shell expr $(CONCURRENCY) \* 4) |
|
336 |
314 ifdef EXTRA_JTREG_OPTIONS |
337 ifdef EXTRA_JTREG_OPTIONS |
315 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS) |
338 JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS) |
316 endif |
339 endif |
317 |
340 |
318 # Default JTREG to run |
341 # Default JTREG to run |