Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set JTREG concurrency based on cores and memory size #1427

Merged
merged 1 commit into from
Nov 7, 2019
Merged

Set JTREG concurrency based on cores and memory size #1427

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion openjdk/openjdk.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,46 @@
# limitations under the License.
##############################################################################
NPROCS:=1
# Memory size in MB
MEMORY_SIZE:=1024

OS:=$(shell uname -s)

ifeq ($(OS),Linux)
NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
MEMORY_SIZE:=$(shell \
expr `cat /proc/meminfo | grep MemTotal | awk '{print $$2}'` / 1024 \
)
endif
ifeq ($(OS),Darwin)
NPROCS:=$(shell sysctl -n hw.ncpu)
MEMORY_SIZE:=$(shell expr `sysctl -n hw.memsize` / 1024 / 1024)
endif
ifeq ($(OS),FreeBSD)
NPROCS:=$(shell sysctl -n hw.ncpu)
MEMORY_SIZE:=$(shell expr `sysctl -n hw.memsize` / 1024 / 1024)
endif
ifeq ($(CYGWIN),1)
NPROCS:=$(NUMBER_OF_PROCESSORS)
MEMORY_SIZE:=$(shell \
expr `wmic computersystem get totalphysicalmemory -value | grep = \
| cut -d "=" -f 2-` / 1024 / 1024 \
)
endif
# Upstream OpenJDK, roughly, sets concurrency based on the
# following: min(NPROCS/2, MEM_IN_GB/2).
MEM := $(shell expr $(MEMORY_SIZE) / 2048)
CORE := $(shell expr $(NPROCS) / 2)
CONC := $(CORE)
ifeq ($(shell expr $(CORE) \> $(MEM)), 1)
CONC := $(MEM)
endif
JTREG_CONC ?= 0
# Allow JTREG_CONC be set via parameter
ifeq ($(JTREG_CONC), 0)
JTREG_CONC := $(CONC)
endif
EXTRA_JTREG_OPTIONS += -concurrency:$(NPROCS)
EXTRA_JTREG_OPTIONS += -concurrency:$(JTREG_CONC)

JTREG_BASIC_OPTIONS += -agentvm
# Only run automatic tests
Expand Down