# HG changeset patch
# User jdv
# Date 1540378765 -19800
# Node ID a083dbe558f78a03774a5b61ff0b7450604ceb85
# Parent  da2ddafdd4e1ab26ccd6f3f95ce5dc76984d37e6# Parent  876e91d9bb136ca815ac8b812bf914f3a4829b29
Merge

diff -r da2ddafdd4e1 -r a083dbe558f7 src/bsd/doc/man/java.1
--- a/src/bsd/doc/man/java.1	Wed Oct 24 15:57:43 2018 +0530
+++ b/src/bsd/doc/man/java.1	Wed Oct 24 16:29:25 2018 +0530
@@ -1606,11 +1606,6 @@
 .PP
 These options control the dynamic just\-in\-time (JIT) compilation performed by the Java HotSpot VM\&.
 .PP
-\-XX:+AggressiveOpts
-.RS 4
-Enables the use of aggressive performance optimization features, which are expected to become default in upcoming releases\&. By default, this option is disabled and experimental performance features are not used\&.
-.RE
-.PP
 \-XX:AllocateInstancePrefetchLines=\fIlines\fR
 .RS 4
 Sets the number of lines to prefetch ahead of the instance allocation pointer\&. By default, the number of lines to prefetch is set to 1:
@@ -3444,7 +3439,7 @@
 .RS 4
 .\}
 .nf
-\fBjava \-d64 \-server \-XX:+AggressiveOpts \-XX:+UseLargePages \-Xmn10g  \-Xms26g \-Xmx26g\fR
+\fBjava \-d64 \-server \-XX:+UseLargePages \-Xmn10g  \-Xms26g \-Xmx26g\fR
  
 .fi
 .if n \{\
diff -r da2ddafdd4e1 -r a083dbe558f7 src/hotspot/share/runtime/arguments.cpp
--- a/src/hotspot/share/runtime/arguments.cpp	Wed Oct 24 15:57:43 2018 +0530
+++ b/src/hotspot/share/runtime/arguments.cpp	Wed Oct 24 16:29:25 2018 +0530
@@ -536,7 +536,6 @@
   { "IgnoreUnverifiableClassesDuringDump", JDK_Version::jdk(10),  JDK_Version::undefined(), JDK_Version::undefined() },
   { "CompilerThreadHintNoPreempt",  JDK_Version::jdk(11), JDK_Version::jdk(12), JDK_Version::jdk(13) },
   { "VMThreadHintNoPreempt",        JDK_Version::jdk(11), JDK_Version::jdk(12), JDK_Version::jdk(13) },
-  { "AggressiveOpts",               JDK_Version::jdk(11), JDK_Version::jdk(12), JDK_Version::jdk(13) },
 
   // --- Deprecated alias flags (see also aliased_jvm_flags) - sorted by obsolete_in then expired_in:
   { "DefaultMaxRAMFraction",        JDK_Version::jdk(8),  JDK_Version::undefined(), JDK_Version::undefined() },
@@ -563,6 +562,7 @@
   { "SyncFlags",                     JDK_Version::undefined(), JDK_Version::jdk(12), JDK_Version::jdk(13) },
   { "SyncKnobs",                     JDK_Version::undefined(), JDK_Version::jdk(12), JDK_Version::jdk(13) },
   { "MonitorInUseLists",             JDK_Version::jdk(10),     JDK_Version::jdk(12), JDK_Version::jdk(13) },
+  { "AggressiveOpts",                JDK_Version::jdk(11),     JDK_Version::jdk(12), JDK_Version::jdk(13) },
 
 #ifdef TEST_VERIFY_SPECIAL_JVM_FLAGS
   { "dep > obs",                    JDK_Version::jdk(9), JDK_Version::jdk(8), JDK_Version::undefined() },
@@ -1940,7 +1940,7 @@
   }
 }
 
-// Aggressive optimization flags  -XX:+AggressiveOpts
+// Aggressive optimization flags
 jint Arguments::set_aggressive_opts_flags() {
 #ifdef COMPILER2
   if (AggressiveUnboxing) {
@@ -1957,14 +1957,10 @@
       AggressiveUnboxing = false;
     }
   }
-  if (AggressiveOpts || !FLAG_IS_DEFAULT(AutoBoxCacheMax)) {
+  if (!FLAG_IS_DEFAULT(AutoBoxCacheMax)) {
     if (FLAG_IS_DEFAULT(EliminateAutoBox)) {
       FLAG_SET_DEFAULT(EliminateAutoBox, true);
     }
-    if (FLAG_IS_DEFAULT(AutoBoxCacheMax)) {
-      FLAG_SET_DEFAULT(AutoBoxCacheMax, 20000);
-    }
-
     // Feed the cache size setting into the JDK
     char buffer[1024];
     jio_snprintf(buffer, 1024, "java.lang.Integer.IntegerCache.high=" INTX_FORMAT, AutoBoxCacheMax);
@@ -1972,18 +1968,8 @@
       return JNI_ENOMEM;
     }
   }
-  if (AggressiveOpts && FLAG_IS_DEFAULT(BiasedLockingStartupDelay)) {
-    FLAG_SET_DEFAULT(BiasedLockingStartupDelay, 500);
-  }
 #endif
 
-  if (AggressiveOpts) {
-// Sample flag setting code
-//    if (FLAG_IS_DEFAULT(EliminateZeroing)) {
-//      FLAG_SET_DEFAULT(EliminateZeroing, true);
-//    }
-  }
-
   return JNI_OK;
 }
 
@@ -3913,7 +3899,7 @@
   // Set bytecode rewriting flags
   set_bytecode_flags();
 
-  // Set flags if Aggressive optimization flags (-XX:+AggressiveOpts) enabled
+  // Set flags if aggressive optimization flags are enabled
   jint code = set_aggressive_opts_flags();
   if (code != JNI_OK) {
     return code;
diff -r da2ddafdd4e1 -r a083dbe558f7 src/hotspot/share/runtime/globals.hpp
--- a/src/hotspot/share/runtime/globals.hpp	Wed Oct 24 15:57:43 2018 +0530
+++ b/src/hotspot/share/runtime/globals.hpp	Wed Oct 24 16:29:25 2018 +0530
@@ -1351,9 +1351,6 @@
           /* Note:  This value is zero mod 1<<13 for a cheap sparc set. */  \
           "Inline allocations larger than this in doublewords must go slow")\
                                                                             \
-  product(bool, AggressiveOpts, false,                                      \
-          "(Deprecated) Enable aggressive optimizations - see arguments.cpp") \
-                                                                            \
   product_pd(bool, CompactStrings,                                          \
           "Enable Strings to use single byte chars in backing store")       \
                                                                             \
diff -r da2ddafdd4e1 -r a083dbe558f7 src/linux/doc/man/ja/java.1
--- a/src/linux/doc/man/ja/java.1	Wed Oct 24 15:57:43 2018 +0530
+++ b/src/linux/doc/man/ja/java.1	Wed Oct 24 16:29:25 2018 +0530
@@ -1246,11 +1246,6 @@
 .PP
 これらのオプションは、Java HotSpot VMで実行される動的なjust\-in\-time (JIT)コンパイラを制御します。
 .PP
-\-XX:+AggressiveOpts
-.RS 4
-積極的なパフォーマンス最適化機能の使用を有効にします。これは今後のリリースでデフォルトになる予定です。デフォルトでは、このオプションは無効であり、試験的なパフォーマンス機能は使用されません。
-.RE
-.PP
 \-XX:AllocateInstancePrefetchLines=\fIlines\fR
 .RS 4
 インスタンス割当てポインタの前にプリフェッチする行数を設定します。デフォルトでは、プリフェッチする行数は1に設定されています。
@@ -2641,7 +2636,7 @@
 .RS 4
 .\}
 .nf
-\fBjava \-d64 \-server \-XX:+AggressiveOpts \-XX:+UseLargePages \-Xmn10g  \-Xms26g \-Xmx26g\fR
+\fBjava \-d64 \-server \-XX:+UseLargePages \-Xmn10g  \-Xms26g \-Xmx26g\fR
  
 .fi
 .if n \{\
diff -r da2ddafdd4e1 -r a083dbe558f7 src/linux/doc/man/java.1
--- a/src/linux/doc/man/java.1	Wed Oct 24 15:57:43 2018 +0530
+++ b/src/linux/doc/man/java.1	Wed Oct 24 16:29:25 2018 +0530
@@ -1601,11 +1601,6 @@
 .PP
 These options control the dynamic just\-in\-time (JIT) compilation performed by the Java HotSpot VM\&.
 .PP
-\-XX:+AggressiveOpts
-.RS 4
-Enables the use of aggressive performance optimization features, which are expected to become default in upcoming releases\&. By default, this option is disabled and experimental performance features are not used\&.
-.RE
-.PP
 \-XX:AllocateInstancePrefetchLines=\fIlines\fR
 .RS 4
 Sets the number of lines to prefetch ahead of the instance allocation pointer\&. By default, the number of lines to prefetch is set to 1:
@@ -3439,7 +3434,7 @@
 .RS 4
 .\}
 .nf
-\fBjava \-d64 \-server \-XX:+AggressiveOpts \-XX:+UseLargePages \-Xmn10g  \-Xms26g \-Xmx26g\fR
+\fBjava \-d64 \-server \-XX:+UseLargePages \-Xmn10g  \-Xms26g \-Xmx26g\fR
  
 .fi
 .if n \{\
diff -r da2ddafdd4e1 -r a083dbe558f7 src/solaris/doc/sun/man/man1/ja/java.1
--- a/src/solaris/doc/sun/man/man1/ja/java.1	Wed Oct 24 15:57:43 2018 +0530
+++ b/src/solaris/doc/sun/man/man1/ja/java.1	Wed Oct 24 16:29:25 2018 +0530
@@ -1246,11 +1246,6 @@
 .PP
 これらのオプションは、Java HotSpot VMで実行される動的なjust\-in\-time (JIT)コンパイラを制御します。
 .PP
-\-XX:+AggressiveOpts
-.RS 4
-積極的なパフォーマンス最適化機能の使用を有効にします。これは今後のリリースでデフォルトになる予定です。デフォルトでは、このオプションは無効であり、試験的なパフォーマンス機能は使用されません。
-.RE
-.PP
 \-XX:AllocateInstancePrefetchLines=\fIlines\fR
 .RS 4
 インスタンス割当てポインタの前にプリフェッチする行数を設定します。デフォルトでは、プリフェッチする行数は1に設定されています。
@@ -2641,7 +2636,7 @@
 .RS 4
 .\}
 .nf
-\fBjava \-d64 \-server \-XX:+AggressiveOpts \-XX:+UseLargePages \-Xmn10g  \-Xms26g \-Xmx26g\fR
+\fBjava \-d64 \-server \-XX:+UseLargePages \-Xmn10g  \-Xms26g \-Xmx26g\fR
  
 .fi
 .if n \{\
diff -r da2ddafdd4e1 -r a083dbe558f7 src/solaris/doc/sun/man/man1/java.1
--- a/src/solaris/doc/sun/man/man1/java.1	Wed Oct 24 15:57:43 2018 +0530
+++ b/src/solaris/doc/sun/man/man1/java.1	Wed Oct 24 16:29:25 2018 +0530
@@ -1601,11 +1601,6 @@
 .PP
 These options control the dynamic just\-in\-time (JIT) compilation performed by the Java HotSpot VM\&.
 .PP
-\-XX:+AggressiveOpts
-.RS 4
-Enables the use of aggressive performance optimization features, which are expected to become default in upcoming releases\&. By default, this option is disabled and experimental performance features are not used\&.
-.RE
-.PP
 \-XX:AllocateInstancePrefetchLines=\fIlines\fR
 .RS 4
 Sets the number of lines to prefetch ahead of the instance allocation pointer\&. By default, the number of lines to prefetch is set to 1:
@@ -3439,7 +3434,7 @@
 .RS 4
 .\}
 .nf
-\fBjava \-d64 \-server \-XX:+AggressiveOpts \-XX:+UseLargePages \-Xmn10g  \-Xms26g \-Xmx26g\fR
+\fBjava \-d64 \-server \-XX:+UseLargePages \-Xmn10g  \-Xms26g \-Xmx26g\fR
  
 .fi
 .if n \{\
diff -r da2ddafdd4e1 -r a083dbe558f7 test/hotspot/jtreg/gc/TestNUMAPageSize.java
--- a/test/hotspot/jtreg/gc/TestNUMAPageSize.java	Wed Oct 24 15:57:43 2018 +0530
+++ b/test/hotspot/jtreg/gc/TestNUMAPageSize.java	Wed Oct 24 16:29:25 2018 +0530
@@ -26,7 +26,6 @@
  * @key gc regression
  * @summary Make sure that start up with NUMA support does not cause problems.
  * @bug 8061467
- * @requires vm.opt.AggressiveOpts != true
  * @requires vm.gc != "Z"
  * @run main/othervm -Xmx128m -XX:+UseNUMA -XX:+UseLargePages TestNUMAPageSize
  */
diff -r da2ddafdd4e1 -r a083dbe558f7 test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData00.java
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData00.java	Wed Oct 24 15:57:43 2018 +0530
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData00.java	Wed Oct 24 16:29:25 2018 +0530
@@ -27,7 +27,6 @@
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc.G1
- * @requires vm.opt.AggressiveOpts != true
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff -r da2ddafdd4e1 -r a083dbe558f7 test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData05.java
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData05.java	Wed Oct 24 15:57:43 2018 +0530
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData05.java	Wed Oct 24 16:29:25 2018 +0530
@@ -27,7 +27,6 @@
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc.G1
- * @requires vm.opt.AggressiveOpts != true
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff -r da2ddafdd4e1 -r a083dbe558f7 test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData10.java
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData10.java	Wed Oct 24 15:57:43 2018 +0530
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData10.java	Wed Oct 24 16:29:25 2018 +0530
@@ -27,7 +27,6 @@
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc.G1
- * @requires vm.opt.AggressiveOpts != true
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff -r da2ddafdd4e1 -r a083dbe558f7 test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData15.java
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData15.java	Wed Oct 24 15:57:43 2018 +0530
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData15.java	Wed Oct 24 16:29:25 2018 +0530
@@ -27,7 +27,6 @@
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc.G1
- * @requires vm.opt.AggressiveOpts != true
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff -r da2ddafdd4e1 -r a083dbe558f7 test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData20.java
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData20.java	Wed Oct 24 15:57:43 2018 +0530
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData20.java	Wed Oct 24 16:29:25 2018 +0530
@@ -27,7 +27,6 @@
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc.G1
- * @requires vm.opt.AggressiveOpts != true
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
   *          java.management
diff -r da2ddafdd4e1 -r a083dbe558f7 test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData25.java
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData25.java	Wed Oct 24 15:57:43 2018 +0530
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData25.java	Wed Oct 24 16:29:25 2018 +0530
@@ -27,7 +27,6 @@
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc.G1
- * @requires vm.opt.AggressiveOpts != true
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff -r da2ddafdd4e1 -r a083dbe558f7 test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData30.java
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData30.java	Wed Oct 24 15:57:43 2018 +0530
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData30.java	Wed Oct 24 16:29:25 2018 +0530
@@ -27,7 +27,6 @@
  * @summary Checks that decommitment occurs for JVM with different
  * G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
  * @requires vm.gc.G1
- * @requires vm.opt.AggressiveOpts != true
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management