Mercurial > hg > graal-jvmci-8

changeset 22447:ecbf949a9dcd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replace JVMCIDeferredInitBarriers with ReduceInitialCardMarks
author Doug Simon <doug.simon@oracle.com>
date Fri, 21 Aug 2015 11:14:48 +0200
parents 252486bf863f
children bd786aba15a7
files jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotVMConfig.java src/share/vm/gc_interface/collectedHeap.cpp src/share/vm/gc_interface/collectedHeap.hpp src/share/vm/jvmci/jvmciGlobals.hpp src/share/vm/jvmci/jvmciRuntime.cpp
diffstat 5 files changed, 9 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotVMConfig.java	Fri Aug 21 11:05:48 2015 +0200
+++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotVMConfig.java	Fri Aug 21 11:14:48 2015 +0200
@@ -744,7 +744,7 @@
         return universeCollectedHeap + collectedHeapTotalCollectionsOffset;
     }
 
-    @HotSpotVMFlag(name = "JVMCIDeferredInitBarriers") @Stable public boolean useDeferredInitBarriers;
+    @HotSpotVMFlag(name = "ReduceInitialCardMarks") @Stable public boolean useDeferredInitBarriers;
     @HotSpotVMFlag(name = "JVMCIHProfEnabled") @Stable public boolean useHeapProfiler;
 
     // Compressed Oops related values.
--- a/src/share/vm/gc_interface/collectedHeap.cpp	Fri Aug 21 11:05:48 2015 +0200
+++ b/src/share/vm/gc_interface/collectedHeap.cpp	Fri Aug 21 11:14:48 2015 +0200
@@ -214,12 +214,9 @@
 void CollectedHeap::pre_initialize() {
   // Used for ReduceInitialCardMarks (when COMPILER2 is used);
   // otherwise remains unused.
-#ifdef COMPILER2
+#if defined(COMPILER2) || INCLUDE_JVMCI
   _defer_initial_card_mark =    ReduceInitialCardMarks && can_elide_tlab_store_barriers()
                              && (DeferInitialCardMark || card_mark_must_follow_store());
-#elif INCLUDE_JVMCI
-  _defer_initial_card_mark =   JVMCIDeferredInitBarriers && can_elide_tlab_store_barriers()
-                               && (DeferInitialCardMark || card_mark_must_follow_store());
 #else
   assert(_defer_initial_card_mark == false, "Who would set it?");
 #endif
--- a/src/share/vm/gc_interface/collectedHeap.hpp	Fri Aug 21 11:05:48 2015 +0200
+++ b/src/share/vm/gc_interface/collectedHeap.hpp	Fri Aug 21 11:14:48 2015 +0200
@@ -94,7 +94,8 @@
 
   GCHeapLog* _gc_heap_log;
 
-  // Used in support of ReduceInitialCardMarks; only consulted if COMPILER2 is being used
+  // Used in support of ReduceInitialCardMarks; only consulted if COMPILER2
+  // or COMPILERJVMCI is being used
   bool _defer_initial_card_mark;
 
  protected:
--- a/src/share/vm/jvmci/jvmciGlobals.hpp	Fri Aug 21 11:05:48 2015 +0200
+++ b/src/share/vm/jvmci/jvmciGlobals.hpp	Fri Aug 21 11:14:48 2015 +0200
@@ -74,6 +74,9 @@
           "Max vector size in bytes, "                                      \
           "actual size could be less depending on elements type"))          \
                                                                             \
+  NOT_COMPILER2(product(bool, ReduceInitialCardMarks, true,                 \
+          "Defer write barriers of young objects"))                         \
+                                                                            \
   product(intx, TraceJVMCI, 0,                                              \
           "Trace level for JVMCI")                                          \
                                                                             \
@@ -83,9 +86,6 @@
   product(bool, JVMCICountersExcludeCompiler, true,                         \
           "Exclude JVMCI compiler threads from benchmark counters")         \
                                                                             \
-  product(bool, JVMCIDeferredInitBarriers, true,                            \
-          "Defer write barriers of young objects")                          \
-                                                                            \
   product(bool, JVMCIHProfEnabled, false,                                   \
           "Is Heap  Profiler enabled")                                      \
                                                                             \
--- a/src/share/vm/jvmci/jvmciRuntime.cpp	Fri Aug 21 11:05:48 2015 +0200
+++ b/src/share/vm/jvmci/jvmciRuntime.cpp	Fri Aug 21 11:14:48 2015 +0200
@@ -142,7 +142,7 @@
   thread->set_vm_result(obj);
   JRT_BLOCK_END;
 
-  if (JVMCIDeferredInitBarriers) {
+  if (ReduceInitialCardMarks) {
     new_store_pre_barrier(thread);
   }
 JRT_END
@@ -176,7 +176,7 @@
   }
   JRT_BLOCK_END;
 
-  if (JVMCIDeferredInitBarriers) {
+  if (ReduceInitialCardMarks) {
     new_store_pre_barrier(thread);
   }
 JRT_END