Skip to content
Permalink
Browse files

8242082: Shenandoah: Purge Traversal mode

Reviewed-by: shade
  • Loading branch information
rkennke committed Apr 3, 2020
1 parent c09b0a7 commit 553ea1e891a645a2a122ebfe898e8ac110adb9e6
Showing with 25 additions and 3,158 deletions.
  1. +2 −2 src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
  2. +0 −3 src/hotspot/share/gc/shared/gcCause.cpp
  3. +0 −1 src/hotspot/share/gc/shared/gcCause.hpp
  4. +2 −5 src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp
  5. +1 −2 src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
  6. +0 −131 src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalAggressiveHeuristics.cpp
  7. +0 −52 src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalAggressiveHeuristics.hpp
  8. +0 −258 src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp
  9. +0 −53 src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.hpp
  10. +0 −4 src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp
  11. +3 −5 src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
  12. +1 −5 src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
  13. +0 −4 src/hotspot/share/gc/shenandoah/shenandoahBarrierSetClone.inline.hpp
  14. +1 −4 src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp
  15. +0 −1 src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp
  16. +1 −1 src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp
  17. +2 −4 src/hotspot/share/gc/shenandoah/shenandoahConcurrentRoots.cpp
  18. +2 −33 src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
  19. +0 −2 src/hotspot/share/gc/shenandoah/shenandoahControlThread.hpp
  20. +0 −12 src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
  21. +3 −171 src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
  22. +0 −24 src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
  23. +1 −6 src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
  24. +0 −15 src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
  25. +0 −25 src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
  26. +0 −5 src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
  27. +0 −1 src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.cpp
  28. +0 −1 src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.hpp
  29. +0 −7 src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp
  30. +0 −156 src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp
  31. +0 −6 src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp
  32. +0 −27 src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp
  33. +0 −1 src/hotspot/share/gc/shenandoah/shenandoahPacer.hpp
  34. +0 −3 src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.cpp
  35. +0 −19 src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
  36. +4 −8 src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp
  37. +0 −1,117 src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp
  38. +0 −76 src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp
  39. +0 −85 src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp
  40. +0 −59 src/hotspot/share/gc/shenandoah/shenandoahTraversalMode.cpp
  41. +0 −38 src/hotspot/share/gc/shenandoah/shenandoahTraversalMode.hpp
  42. +0 −3 src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp
  43. +0 −2 src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp
  44. +0 −10 src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp
  45. +0 −18 src/hotspot/share/gc/shenandoah/shenandoahVMOperations.hpp
  46. +0 −26 src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
  47. +0 −2 src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp
  48. +0 −22 src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.cpp
  49. +0 −8 src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp
  50. +0 −1 src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
  51. +0 −2 src/hotspot/share/runtime/vmOperations.hpp
  52. +1 −17 test/hotspot/jtreg/compiler/c2/aarch64/TestVolatiles.java
  53. +0 −2 test/hotspot/jtreg/gc/CriticalNativeArgs.java
  54. +0 −36 test/hotspot/jtreg/gc/shenandoah/TestAllocHumongousFragment.java
  55. +0 −40 test/hotspot/jtreg/gc/shenandoah/TestAllocIntArrays.java
  56. +0 −40 test/hotspot/jtreg/gc/shenandoah/TestAllocObjectArrays.java
  57. +0 −45 test/hotspot/jtreg/gc/shenandoah/TestAllocObjects.java
  58. +0 −19 test/hotspot/jtreg/gc/shenandoah/TestGCThreadGroups.java
  59. +0 −20 test/hotspot/jtreg/gc/shenandoah/TestHeapUncommit.java
  60. +0 −28 test/hotspot/jtreg/gc/shenandoah/TestLotsOfCycles.java
  61. +0 −1 test/hotspot/jtreg/gc/shenandoah/TestObjItrWithHeapDump.java
  62. +0 −30 test/hotspot/jtreg/gc/shenandoah/TestPeriodicGC.java
  63. +0 −20 test/hotspot/jtreg/gc/shenandoah/TestRefprocSanity.java
  64. +0 −14 test/hotspot/jtreg/gc/shenandoah/TestRegionSampling.java
  65. +0 −30 test/hotspot/jtreg/gc/shenandoah/TestRetainObjects.java
  66. +0 −30 test/hotspot/jtreg/gc/shenandoah/TestSieveObjects.java
  67. +0 −19 test/hotspot/jtreg/gc/shenandoah/TestStringDedup.java
  68. +0 −32 test/hotspot/jtreg/gc/shenandoah/TestStringDedupStress.java
  69. +0 −21 test/hotspot/jtreg/gc/shenandoah/TestStringInternCleanup.java
  70. +0 −14 test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java
  71. +0 −1 test/hotspot/jtreg/gc/shenandoah/TestWrongArrayMember.java
  72. +0 −16 test/hotspot/jtreg/gc/shenandoah/mxbeans/TestChurnNotifications.java
  73. +0 −15 test/hotspot/jtreg/gc/shenandoah/mxbeans/TestPauseNotifications.java
  74. +0 −1 test/hotspot/jtreg/gc/shenandoah/oom/TestClassLoaderLeak.java
  75. +0 −38 test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java
  76. +0 −2 test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java
  77. +1 −1 test/hotspot/jtreg/gc/shenandoah/options/TestSelectiveBarrierFlags.java
  78. +0 −8 test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java
  79. +0 −2 test/hotspot/jtreg/gc/stress/CriticalNativeStress.java
  80. +0 −43 test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java
  81. +0 −32 test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java
  82. +0 −15 test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithShenandoah.java
@@ -157,7 +157,7 @@ void ShenandoahBarrierSetAssembler::satb_write_barrier_pre(MacroAssembler* masm,
Address buffer(thread, in_bytes(ShenandoahThreadLocalData::satb_mark_queue_buffer_offset()));

Address gc_state(thread, in_bytes(ShenandoahThreadLocalData::gc_state_offset()));
__ testb(gc_state, ShenandoahHeap::MARKING | ShenandoahHeap::TRAVERSAL);
__ testb(gc_state, ShenandoahHeap::MARKING);
__ jcc(Assembler::zero, done);

// Do we need to load the previous value?
@@ -892,7 +892,7 @@ void ShenandoahBarrierSetAssembler::generate_c1_pre_barrier_runtime_stub(StubAss

// Is SATB still active?
Address gc_state(thread, in_bytes(ShenandoahThreadLocalData::gc_state_offset()));
__ testb(gc_state, ShenandoahHeap::MARKING | ShenandoahHeap::TRAVERSAL);
__ testb(gc_state, ShenandoahHeap::MARKING);
__ jcc(Assembler::zero, done);

// Can we store original value in the thread's buffer?
@@ -111,9 +111,6 @@ const char* GCCause::to_string(GCCause::Cause cause) {
case _shenandoah_concurrent_gc:
return "Concurrent GC";

case _shenandoah_traversal_gc:
return "Traversal GC";

case _shenandoah_upgrade_to_full_gc:
return "Upgrade To Full GC";

@@ -79,7 +79,6 @@ class GCCause : public AllStatic {
_shenandoah_stop_vm,
_shenandoah_allocation_failure_evac,
_shenandoah_concurrent_gc,
_shenandoah_traversal_gc,
_shenandoah_upgrade_to_full_gc,

_z_timer,
@@ -135,9 +135,7 @@ LIR_Opr ShenandoahBarrierSetC1::load_reference_barrier_impl(LIRGenerator* gen, L
// Read and check the gc-state-flag.
LIR_Opr flag_val = gen->new_register(T_INT);
__ load(active_flag_addr, flag_val);
LIR_Opr mask = LIR_OprFact::intConst(ShenandoahHeap::HAS_FORWARDED |
ShenandoahHeap::EVACUATION |
ShenandoahHeap::TRAVERSAL);
LIR_Opr mask = LIR_OprFact::intConst(ShenandoahHeap::HAS_FORWARDED);
LIR_Opr mask_reg = gen->new_register(T_INT);
__ move(mask, mask_reg);

@@ -225,8 +223,7 @@ void ShenandoahBarrierSetC1::load_at_resolved(LIRAccess& access, LIR_Opr result)
bool is_weak = (decorators & ON_WEAK_OOP_REF) != 0;
bool is_phantom = (decorators & ON_PHANTOM_OOP_REF) != 0;
bool is_anonymous = (decorators & ON_UNKNOWN_OOP_REF) != 0;
bool is_traversal_mode = ShenandoahHeap::heap()->is_traversal_mode();
bool keep_alive = (decorators & AS_NO_KEEPALIVE) == 0 || is_traversal_mode;
bool keep_alive = (decorators & AS_NO_KEEPALIVE) == 0;

if ((is_weak || is_phantom || is_anonymous) && keep_alive) {
// Register the value in the referent field with the pre-barrier
@@ -566,8 +566,7 @@ Node* ShenandoahBarrierSetC2::load_at_resolved(C2Access& access, const Type* val

bool unknown = (decorators & ON_UNKNOWN_OOP_REF) != 0;
bool on_weak_ref = (decorators & (ON_WEAK_OOP_REF | ON_PHANTOM_OOP_REF)) != 0;
bool is_traversal_mode = ShenandoahHeap::heap()->is_traversal_mode();
bool keep_alive = (decorators & AS_NO_KEEPALIVE) == 0 || is_traversal_mode;
bool keep_alive = (decorators & AS_NO_KEEPALIVE) == 0;

// If we are reading the value of the referent field of a Reference
// object (either by using Unsafe directly or through reflection)

This file was deleted.

This file was deleted.

0 comments on commit 553ea1e

Please sign in to comment.