--- a/make/test/JtregGraalUnit.gmk Tue Oct 29 11:13:39 2019 +0100
+++ b/make/test/JtregGraalUnit.gmk Tue Oct 29 11:17:25 2019 +0100
@@ -41,115 +41,128 @@
ifeq ($(INCLUDE_GRAAL), true)
ifneq ($(GRAALUNIT_LIB), )
+
SRC_DIR := $(TOPDIR)/src/jdk.internal.vm.compiler/share/classes
TEST_DIR := $(TOPDIR)/test/hotspot/jtreg/compiler/graalunit
COMPILE_OUTPUTDIR := $(SUPPORT_OUTPUTDIR)/test/graalunit
LIB_OUTPUTDIR := $(TEST_IMAGE_DIR)/hotspot/jtreg/graal
- TEST_COMPILE_CP := \
- $(JDK_OUTPUTDIR)/modules/jdk.internal.vm.compiler \
- $(JDK_OUTPUTDIR)/modules/jdk.internal.vm.ci \
- $(LIB_OUTPUTDIR)/junit-4.12.jar \
- $(LIB_OUTPUTDIR)/asm-5.0.4.jar \
- $(LIB_OUTPUTDIR)/asm-tree-5.0.4.jar \
- $(LIB_OUTPUTDIR)/java-allocation-instrumenter.jar \
- $(LIB_OUTPUTDIR)/hamcrest-core-1.3.jar
+ # This evaluation is expensive and should only be done if this target was
+ # explicitly called.
+ ifneq ($(filter build-test-hotspot-jtreg-graal, $(MAKECMDGOALS)), )
+
+ TEST_COMPILE_CP := \
+ $(JDK_OUTPUTDIR)/modules/jdk.internal.vm.compiler \
+ $(JDK_OUTPUTDIR)/modules/jdk.internal.vm.ci \
+ $(LIB_OUTPUTDIR)/junit-4.12.jar \
+ $(LIB_OUTPUTDIR)/asm-5.0.4.jar \
+ $(LIB_OUTPUTDIR)/asm-tree-5.0.4.jar \
+ $(LIB_OUTPUTDIR)/java-allocation-instrumenter.jar \
+ $(LIB_OUTPUTDIR)/hamcrest-core-1.3.jar
- TEST_JAVAC_FLAGS := \
- -Xlint:none \
- -processorpath $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier.jar \
- --add-exports jdk.unsupported/sun.misc=ALL-UNNAMED \
- --add-exports java.base/jdk.internal.misc=ALL-UNNAMED \
+ TEST_JAVAC_FLAGS := \
+ -Xlint:none \
+ -processorpath $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier.jar \
+ --add-exports jdk.unsupported/sun.misc=ALL-UNNAMED \
+ --add-exports java.base/jdk.internal.misc=ALL-UNNAMED \
+ --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
- ### Copy 3rd party libs
- $(eval $(call SetupCopyFiles, COPY_GRAALUNIT_LIBS, \
- FILES := $(wildcard $(GRAALUNIT_LIB)/*.jar), \
- DEST := $(LIB_OUTPUTDIR), \
- ))
+ ### Copy 3rd party libs
+ $(eval $(call SetupCopyFiles, COPY_GRAALUNIT_LIBS, \
+ FILES := $(wildcard $(GRAALUNIT_LIB)/*.jar), \
+ DEST := $(LIB_OUTPUTDIR), \
+ ))
- TARGETS_EXTRA_LIB += $(COPY_GRAALUNIT_LIBS)
+ TARGETS_EXTRA_LIB += $(COPY_GRAALUNIT_LIBS)
- ### Compile graalunit tests
- $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_TESTS, \
- SETUP := GENERATE_USINGJDKBYTECODE, \
- SRC := \
- $(SRC_DIR)/jdk.internal.vm.compiler.collections.test/src \
- $(SRC_DIR)/org.graalvm.compiler.api.directives.test/src \
- $(SRC_DIR)/org.graalvm.compiler.api.test/src \
- $(SRC_DIR)/org.graalvm.compiler.asm.aarch64.test/src \
- $(SRC_DIR)/org.graalvm.compiler.asm.amd64.test/src \
- $(SRC_DIR)/org.graalvm.compiler.asm.sparc.test/src \
- $(SRC_DIR)/org.graalvm.compiler.asm.test/src \
- $(SRC_DIR)/org.graalvm.compiler.core.aarch64.test/src \
- $(SRC_DIR)/org.graalvm.compiler.core.amd64.test/src \
- $(SRC_DIR)/org.graalvm.compiler.core.jdk9.test/src \
- $(SRC_DIR)/org.graalvm.compiler.core.test/src \
- $(SRC_DIR)/org.graalvm.compiler.debug.test/src \
- $(SRC_DIR)/org.graalvm.compiler.graph.test/src \
- $(SRC_DIR)/org.graalvm.compiler.hotspot.amd64.test/src \
- $(SRC_DIR)/org.graalvm.compiler.hotspot.lir.test/src \
- $(SRC_DIR)/org.graalvm.compiler.hotspot.sparc.test/src \
- $(SRC_DIR)/org.graalvm.compiler.hotspot.test/src \
- $(SRC_DIR)/org.graalvm.compiler.jtt/src \
- $(SRC_DIR)/org.graalvm.compiler.lir.jtt/src \
- $(SRC_DIR)/org.graalvm.compiler.lir.test/src \
- $(SRC_DIR)/org.graalvm.compiler.loop.test/src \
- $(SRC_DIR)/org.graalvm.compiler.nodes.test/src \
- $(SRC_DIR)/org.graalvm.compiler.options.test/src \
- $(SRC_DIR)/org.graalvm.compiler.phases.common.test/src \
- $(SRC_DIR)/org.graalvm.compiler.replacements.jdk12.test/src \
- $(SRC_DIR)/org.graalvm.compiler.replacements.jdk9.test/src \
- $(SRC_DIR)/org.graalvm.compiler.replacements.test/src \
- $(SRC_DIR)/org.graalvm.compiler.test/src \
- $(SRC_DIR)/org.graalvm.util.test/src \
- , \
- EXCLUDE_FILES := org/graalvm/compiler/core/test/VerifyDebugUsageTest.java, \
- BIN := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests, \
- CLASSPATH := $(TEST_COMPILE_CP), \
- ADD_JAVAC_FLAGS := $(TEST_JAVAC_FLAGS), \
- ))
+ ### Compile graalunit tests
+ $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_TESTS, \
+ SETUP := GENERATE_USINGJDKBYTECODE, \
+ SRC := \
+ $(SRC_DIR)/jdk.internal.vm.compiler.collections.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.api.directives.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.api.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.asm.aarch64.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.asm.amd64.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.asm.sparc.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.asm.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.core.aarch64.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.core.amd64.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.core.jdk9.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.core.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.debug.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.graph.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.hotspot.aarch64.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.hotspot.amd64.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.hotspot.jdk9.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.hotspot.lir.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.hotspot.sparc.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.hotspot.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.jtt/src \
+ $(SRC_DIR)/org.graalvm.compiler.lir.jtt/src \
+ $(SRC_DIR)/org.graalvm.compiler.lir.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.loop.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.nodes.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.options.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.phases.common.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.replacements.jdk12.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.replacements.jdk9.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.replacements.test/src \
+ $(SRC_DIR)/org.graalvm.compiler.test/src \
+ $(SRC_DIR)/org.graalvm.util.test/src \
+ , \
+ EXCLUDE_FILES := org/graalvm/compiler/core/test/VerifyDebugUsageTest.java, \
+ BIN := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests, \
+ CLASSPATH := $(TEST_COMPILE_CP), \
+ ADD_JAVAC_FLAGS := $(TEST_JAVAC_FLAGS), \
+ COPY := .input, \
+ ))
- TARGETS_BUILD += $(BUILD_VM_COMPILER_TESTS)
+ TARGETS_BUILD += $(BUILD_VM_COMPILER_TESTS)
- ### Compile graalunit tests which require -XDstringConcat=inline
- $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_TESTS_SET2, \
- SETUP := GENERATE_USINGJDKBYTECODE, \
- DEPENDS := $(BUILD_VM_COMPILER_TESTS), \
- SRC := $(SRC_DIR)/org.graalvm.compiler.core.test/src, \
- INCLUDE_FILES := org/graalvm/compiler/core/test/VerifyDebugUsageTest.java, \
- BIN := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests, \
- CLASSPATH := \
- $(TEST_COMPILE_CP) \
- $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests \
- , \
- ADD_JAVAC_FLAGS := \
- $(TEST_JAVAC_FLAGS) \
- -XDstringConcat=inline \
- , \
- ))
+ ### Compile graalunit tests which require -XDstringConcat=inline
+ $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_TESTS_SET2, \
+ SETUP := GENERATE_USINGJDKBYTECODE, \
+ DEPENDS := $(BUILD_VM_COMPILER_TESTS), \
+ SRC := $(SRC_DIR)/org.graalvm.compiler.core.test/src, \
+ INCLUDE_FILES := org/graalvm/compiler/core/test/VerifyDebugUsageTest.java, \
+ BIN := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests, \
+ CLASSPATH := \
+ $(TEST_COMPILE_CP) \
+ $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests \
+ , \
+ ADD_JAVAC_FLAGS := \
+ $(TEST_JAVAC_FLAGS) \
+ -XDstringConcat=inline \
+ , \
+ ))
- TARGETS_BUILD += $(BUILD_VM_COMPILER_TESTS_SET2)
+ TARGETS_BUILD += $(BUILD_VM_COMPILER_TESTS_SET2)
- ### Generate jdk.vm.compiler.tests.jar
- $(eval $(call SetupJarArchive, BUILD_VM_COMPILER_TESTS_JAR, \
- DEPENDENCIES := $(BUILD_VM_COMPILER_TESTS) $(BUILD_VM_COMPILER_TESTS_SET2), \
- SRCS := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests, \
- JAR := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests.jar, \
- ))
+ ### Generate jdk.vm.compiler.tests.jar
+ $(eval $(call SetupJarArchive, BUILD_VM_COMPILER_TESTS_JAR, \
+ DEPENDENCIES := $(BUILD_VM_COMPILER_TESTS) $(BUILD_VM_COMPILER_TESTS_SET2), \
+ SRCS := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests, \
+ SUFFIXES:=.class .input, \
+ JAR := $(COMPILE_OUTPUTDIR)/jdk.vm.compiler.tests.jar, \
+ ))
- TARGETS_BUILD += $(BUILD_VM_COMPILER_TESTS_JAR)
+ TARGETS_BUILD += $(BUILD_VM_COMPILER_TESTS_JAR)
- ### Compile and build mxtool
- $(eval $(call SetupJavaCompilation, BUILD_MXTOOL, \
- SETUP := GENERATE_USINGJDKBYTECODE, \
- SRC := $(TEST_DIR)/com.oracle.mxtool.junit, \
- BIN := $(COMPILE_OUTPUTDIR)/com.oracle.mxtool.junit, \
- JAR := $(COMPILE_OUTPUTDIR)/com.oracle.mxtool.junit.jar, \
- CLASSPATH := $(LIB_OUTPUTDIR)/junit-4.12.jar, \
- ))
+ ### Compile and build mxtool
+ $(eval $(call SetupJavaCompilation, BUILD_MXTOOL, \
+ SETUP := GENERATE_USINGJDKBYTECODE, \
+ SRC := $(TEST_DIR)/com.oracle.mxtool.junit, \
+ BIN := $(COMPILE_OUTPUTDIR)/com.oracle.mxtool.junit, \
+ JAR := $(COMPILE_OUTPUTDIR)/com.oracle.mxtool.junit.jar, \
+ CLASSPATH := $(LIB_OUTPUTDIR)/junit-4.12.jar, \
+ ))
- TARGETS_BUILD += $(BUILD_MXTOOL)
+ TARGETS_BUILD += $(BUILD_MXTOOL)
+ $(TARGETS_BUILD): $(TARGETS_EXTRA_LIB)
+
+ endif # build-test-hotspot-jtreg-graal
################################################################################
# Targets for building test-image.
@@ -168,7 +181,6 @@
endif
endif
-$(TARGETS_BUILD): $(TARGETS_EXTRA_LIB)
build-test-hotspot-jtreg-graal: $(TARGETS_BUILD)
test-image-hotspot-jtreg-graal: $(TARGETS_IMAGE)