--- a/src/hotspot/share/gc/epsilon/epsilonArguments.cpp	Thu Apr 26 19:13:26 2018 +0200
+++ b/src/hotspot/share/gc/epsilon/epsilonArguments.cpp	Thu Apr 26 19:32:01 2018 +0200
@@ -51,6 +51,16 @@
     EpsilonMaxTLABSize = MinTLABSize;
   }
 #endif
+
+#ifdef COMPILER2
+  // Enable loop strip mining: there are still non-GC safepoints, no need to make it worse
+  if (FLAG_IS_DEFAULT(UseCountedLoopSafepoints)) {
+    FLAG_SET_DEFAULT(UseCountedLoopSafepoints, true);
+    if (FLAG_IS_DEFAULT(LoopStripMiningIter)) {
+      FLAG_SET_DEFAULT(LoopStripMiningIter, 1000);
+    }
+  }
+#endif
 }
 
 CollectedHeap* EpsilonArguments::create_heap() {

--- a/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp	Thu Apr 26 19:13:26 2018 +0200
+++ b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp	Thu Apr 26 19:32:01 2018 +0200
@@ -45,7 +45,6 @@
                  size_t max_size,
                  size_t initial_capacity,
                  GenerationCounters* gc) {
-
     if (UsePerfData) {
       EXCEPTION_MARK;
       ResourceMark rm;