Merge pull request #3981 from rwy0717/arraylets

Turn on hybrid arraylets by default
eclipse-openj9 · Jun 11, 2019 · 323d800 · 323d800
2 parents 4d5d304 + f6d7ac3
commit 323d800
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/cmake/config.cmake b/cmake/config.cmake
@@ -132,7 +132,7 @@ set(OMR_GC_MODRON_SCAVENGER OFF CACHE BOOL "TODO: Document")
 set(OMR_GC_DOUBLE_MAP_ARRAYLETS OFF CACHE BOOL "TODO: Document")
 set(OMR_GC_CONCURRENT_SCAVENGER OFF CACHE BOOL "TODO: Document")
 set(OMR_GC_CONCURRENT_SWEEP OFF CACHE BOOL "TODO: Document")
-set(OMR_GC_HYBRID_ARRAYLETS OFF CACHE BOOL "TODO: Document")
+set(OMR_GC_HYBRID_ARRAYLETS ON CACHE BOOL "TODO: Document")
 set(OMR_GC_IDLE_HEAP_MANAGER OFF CACHE BOOL "TODO: Document")
 set(OMR_GC_OBJECT_ALLOCATION_NOTIFY OFF CACHE BOOL "TODO: Document")
 set(OMR_GC_REALTIME OFF CACHE BOOL "TODO: Document")

diff --git a/configure b/configure
@@ -1628,7 +1628,7 @@ Optional Features:
 
   --enable-OMR_GC_CONCURRENT_SWEEP
 
-  --enable-OMR_GC_HYBRID_ARRAYLETS
+  --disable-OMR_GC_HYBRID_ARRAYLETS
 
   --enable-OMR_GC_LEAF_BITS
 
@@ -6026,7 +6026,9 @@ else
 
 fi
 else
-  OMR_GC_HYBRID_ARRAYLETS=0
+  OMR_GC_HYBRID_ARRAYLETS=1
+
+   $as_echo "#define OMR_GC_HYBRID_ARRAYLETS 1" >>confdefs.h
 
 
 fi

diff --git a/configure.ac b/configure.ac
@@ -410,7 +410,7 @@ OMRCFG_DEFINE_FLAG_OFF([OMR_GC_MODRON_SCAVENGER])
 OMRCFG_DEFINE_FLAG_OFF([OMR_GC_DOUBLE_MAP_ARRAYLETS])
 OMRCFG_DEFINE_FLAG_OFF([OMR_GC_CONCURRENT_SCAVENGER])
 OMRCFG_DEFINE_FLAG_OFF([OMR_GC_CONCURRENT_SWEEP])
-OMRCFG_DEFINE_FLAG_OFF([OMR_GC_HYBRID_ARRAYLETS])
+OMRCFG_DEFINE_FLAG_ON([OMR_GC_HYBRID_ARRAYLETS])
 OMRCFG_DEFINE_FLAG_OFF([OMR_GC_LEAF_BITS])
 OMRCFG_DEFINE_FLAG_OFF([OMR_GC_OBJECT_ALLOCATION_NOTIFY])
 OMRCFG_DEFINE_FLAG_OFF([OMR_GC_REALTIME])