make/Main.gmk

rev 52573 : 8061281: Microbenchmark suite build support, directory layout and sample benchmarks
8061282: Migrate jmh-jdk-microbenchmarks into the JDK
Reviewed-by: ecaspole, mchung, erikj, ihse
Contributed-by: magnus.ihse.bursie@oracle.com, erik.joelsson@oracle.com, claes.redestad@oracle.com, sfriberg@kth.se

*** 491,501 ****
  ALL_EXPLODED_TEST_TARGETS := $(addprefix exploded-test-, $(ALL_EXPLODED_TESTS))
  
  ALL_TARGETS += $(ALL_TEST_TARGETS) $(ALL_EXPLODED_TEST_TARGETS)
  
  ################################################################################
! # Build tests
  #
  
  prepare-test-image:
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f TestImage.gmk prepare-test-image)
  
--- 491,501 ----
  ALL_EXPLODED_TEST_TARGETS := $(addprefix exploded-test-, $(ALL_EXPLODED_TESTS))
  
  ALL_TARGETS += $(ALL_TEST_TARGETS) $(ALL_EXPLODED_TEST_TARGETS)
  
  ################################################################################
! # Build tests and microbenchmarks
  #
  
  prepare-test-image:
          +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f TestImage.gmk prepare-test-image)
  
*** 541,555 ****
    test-image-failure-handler:
          +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \
               -f BuildFailureHandler.gmk images)
  endif
  
  ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \
      test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \
      test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \
      test-failure-handler test-image-failure-handler test-image-hotspot-gtest \
!     test-image-hotspot-jtreg-graal build-test-hotspot-jtreg-graal
  
  ################################################################################
  # Run tests
  
  test:
--- 541,559 ----
    test-image-failure-handler:
          +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \
               -f BuildFailureHandler.gmk images)
  endif
  
+ build-microbenchmark:
+         +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f test/BuildMicrobenchmark.gmk)
+ 
  ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \
      test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \
      test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \
      test-failure-handler test-image-failure-handler test-image-hotspot-gtest \
!     test-image-hotspot-jtreg-graal build-test-hotspot-jtreg-graal \
!     build-microbenchmark
  
  ################################################################################
  # Run tests
  
  test:
*** 787,796 ****
--- 791,802 ----
  
    zip-source: gensrc rmic
  
    jrtfs-jar: interim-langtools
  
+   build-microbenchmark: interim-langtools jdk.unsupported java.management
+ 
    ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
      ifeq ($(CREATE_BUILDJDK), true)
        # If creating a buildjdk, the interim image needs to be based on that.
        generate-link-opt-data: create-buildjdk
      else ifeq ($(EXTERNAL_BUILDJDK), false)
*** 1021,1030 ****
--- 1027,1040 ----
  # This target builds the test image
  test-image: prepare-test-image \
      test-image-jdk-jtreg-native test-image-failure-handler \
      test-image-demos-jdk $(JVM_TEST_IMAGE_TARGETS)
  
+ ifneq ($(JMH_CORE_JAR), )
+   test-image: build-microbenchmark
+ endif
+ 
  ################################################################################
  
  # all-images builds all our deliverables as images.
  all-images: product-images test-image docs-image