From 396af967d63efb78f4cb652f51dc247b92bc2c67 Mon Sep 17 00:00:00 2001 From: Boris Molodenkov Date: Wed, 21 Dec 2016 14:41:48 +0300 Subject: [PATCH 1/4] 8170918: Remove shell script from test/compiler/c2/cr7200264/TestIntVect.java Reviewed-by: kvn --- test/jtreg-ext/requires/VMProps.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java index 06299e7ecd5..15c854f964b 100644 --- a/test/jtreg-ext/requires/VMProps.java +++ b/test/jtreg-ext/requires/VMProps.java @@ -33,6 +33,8 @@ import java.util.Map; import java.util.concurrent.Callable; import java.util.regex.Matcher; import java.util.regex.Pattern; + +import sun.hotspot.cpuinfo.CPUInfo; import sun.hotspot.gc.GC; import sun.hotspot.WhiteBox; @@ -62,6 +64,7 @@ public class VMProps implements Callable> { map.put("vm.simpleArch", vmArch()); map.put("vm.debug", vmDebug()); map.put("vm.jvmci", vmJvmci()); + map.put("vm.cpu.features", cpuFeatures()); vmGC(map); // vm.gc.X = true/false VMProps.dump(map); @@ -165,6 +168,13 @@ public class VMProps implements Callable> { return "" + (WB.getBooleanVMFlag("EnableJVMCI") != null); } + /** + * @return supported CPU features + */ + protected String cpuFeatures() { + return CPUInfo.getFeatures().toString(); + } + /** * For all existing GC sets vm.gc.X property. * Example vm.gc.G1=true means: From dcb007ab96d2b9cf120a6caa554fc62241bc2cb2 Mon Sep 17 00:00:00 2001 From: Igor Ignatyev Date: Wed, 28 Dec 2016 18:37:09 +0300 Subject: [PATCH 2/4] 8172094: 8171433 changes in generated-configure should be restored Reviewed-by: erikj, kzhaldyb --- common/autoconf/generated-configure.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 644f25ab435..13c74505795 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -5170,7 +5170,7 @@ VS_SDK_PLATFORM_NAME_2013= #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1482309967 +DATE_WHEN_GENERATED=1483099656 ############################################################################### # @@ -52997,7 +52997,7 @@ $as_echo "yes, forced" >&6; } $as_echo "no, forced" >&6; } BUILD_GTEST="false" elif test "x$enable_hotspot_gtest" = "x"; then - if test "x$GTEST_DIR_EXISTS" = "xtrue" && test "x$OPENJDK_TARGET_OS" != "xaix"; then + if test "x$GTEST_DIR_EXISTS" = "xtrue"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } BUILD_GTEST="true" From 0ac0d9ac29c0226fce7a965163e96e2a536d3716 Mon Sep 17 00:00:00 2001 From: Jamsheed Mohammed C M Date: Tue, 17 Jan 2017 21:39:22 -0800 Subject: [PATCH 3/4] 8166002: Emulate client build on platforms with reduced virtual address space The default VM ergonomics on Windows/x86 (32-bit) are changed to client like. Reviewed-by: kvn, iveresov --- test/jtreg-ext/requires/VMProps.java | 12 ++++++++++++ test/lib/jdk/test/lib/Platform.java | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java index 15c854f964b..8ac981d28b2 100644 --- a/test/jtreg-ext/requires/VMProps.java +++ b/test/jtreg-ext/requires/VMProps.java @@ -64,6 +64,7 @@ public class VMProps implements Callable> { map.put("vm.simpleArch", vmArch()); map.put("vm.debug", vmDebug()); map.put("vm.jvmci", vmJvmci()); + map.put("vm.emulatedClient", vmEmulatedClient()); map.put("vm.cpu.features", cpuFeatures()); vmGC(map); // vm.gc.X = true/false @@ -168,6 +169,17 @@ public class VMProps implements Callable> { return "" + (WB.getBooleanVMFlag("EnableJVMCI") != null); } + /** + * @return true if VM runs in emulated-client mode and false otherwise. + */ + protected String vmEmulatedClient() { + String vmInfo = System.getProperty("java.vm.info"); + if (vmInfo == null) { + return "false"; + } + return "" + vmInfo.contains(" emulated-client"); + } + /** * @return supported CPU features */ diff --git a/test/lib/jdk/test/lib/Platform.java b/test/lib/jdk/test/lib/Platform.java index 3f924371c43..26bbf1bae94 100644 --- a/test/lib/jdk/test/lib/Platform.java +++ b/test/lib/jdk/test/lib/Platform.java @@ -63,6 +63,10 @@ public class Platform { return vmName.contains("Embedded"); } + public static boolean isEmulatedClient() { + return vmInfo.contains(" emulated-client"); + } + public static boolean isTieredSupported() { return compiler.contains("Tiered Compilers"); } From 2e7f42b44fda6217da342e95e584049e264c4925 Mon Sep 17 00:00:00 2001 From: George Triantafillou Date: Thu, 19 Jan 2017 10:55:07 -0500 Subject: [PATCH 4/4] 8152206: Simplify jvmstat modules Reviewed-by: alanb, mchung, hseigel --- common/bin/unshuffle_list.txt | 8 ++++---- make/CompileJavaModules.gmk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/bin/unshuffle_list.txt b/common/bin/unshuffle_list.txt index a43b049fce4..5e240f3f0d1 100644 --- a/common/bin/unshuffle_list.txt +++ b/common/bin/unshuffle_list.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -1330,9 +1330,9 @@ jdk/src/jdk.jdwp.agent/unix/native/libdt_socket : jdk/src/solaris/transport/sock jdk/src/jdk.jdwp.agent/unix/native/libjdwp : jdk/src/solaris/back jdk/src/jdk.jdwp.agent/windows/native/libdt_socket : jdk/src/windows/transport/socket jdk/src/jdk.jdwp.agent/windows/native/libjdwp : jdk/src/windows/back -jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/monitor : jdk/src/share/classes/sun/jvmstat/monitor -jdk/src/jdk.jvmstat/share/classes/sun/jvmstat/perfdata : jdk/src/share/classes/sun/jvmstat/perfdata -jdk/src/jdk.jvmstat/share/classes/sun/tools/jstatd : jdk/src/share/classes/sun/tools/jstatd +jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor : jdk/src/share/classes/sun/jvmstat/monitor +jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata : jdk/src/share/classes/sun/jvmstat/perfdata +jdk/src/jdk.internal.jvmstat/share/classes/sun/tools/jstatd : jdk/src/share/classes/sun/tools/jstatd jdk/src/jdk.localedata/share/classes/sun/text/resources/ar : jdk/src/share/classes/sun/text/resources/ar jdk/src/jdk.localedata/share/classes/sun/text/resources/be : jdk/src/share/classes/sun/text/resources/be jdk/src/jdk.localedata/share/classes/sun/text/resources/bg : jdk/src/share/classes/sun/text/resources/bg diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk index 678618ec3f0..bd3a12c8e0d 100644 --- a/make/CompileJavaModules.gmk +++ b/make/CompileJavaModules.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -446,7 +446,7 @@ jdk.dev_COPY := .js oqlhelp.html .txt ################################################################################ -jdk.jvmstat_COPY := aliasmap +jdk.internal.jvmstat_COPY := aliasmap ################################################################################