# HG changeset patch # User goetz # Date 1494341311 -7200 # Node ID f8e5223d15017b69e76d5f9fba5a3168e5329690 # Parent 314aa24e62d600d6c22ec6b0eb1e967f5b541b71 8179953: [ppc] TLABWasteIncrement not loaded correctly Summary: Also fix TestOptionWithRanges to show the bug. Reviewed-by: dholmes, shade diff -r 314aa24e62d6 -r f8e5223d1501 hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp --- a/hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp Fri Apr 28 14:34:24 2017 +0200 +++ b/hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp Tue May 09 16:48:31 2017 +0200 @@ -3720,7 +3720,7 @@ __ bge(CCR0, Lslow_case); // Increment waste limit to prevent getting stuck on this slow path. - __ addi(RtlabWasteLimitValue, RtlabWasteLimitValue, (int)ThreadLocalAllocBuffer::refill_waste_limit_increment()); + __ add_const_optimized(RtlabWasteLimitValue, RtlabWasteLimitValue, ThreadLocalAllocBuffer::refill_waste_limit_increment()); __ std(RtlabWasteLimitValue, in_bytes(JavaThread::tlab_refill_waste_limit_offset()), R16_thread); } // else: No allocation in the shared eden. // fallthru: __ b(Lslow_case); diff -r 314aa24e62d6 -r f8e5223d1501 hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java --- a/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java Fri Apr 28 14:34:24 2017 +0200 +++ b/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java Tue May 09 16:48:31 2017 +0200 @@ -383,7 +383,11 @@ runJava.add(VMType); } - if (GCType != null) { + if (GCType != null && + !(prepend.contains("-XX:+UseConcMarkSweepGC") || + prepend.contains("-XX:+UseSerialGC") || + prepend.contains("-XX:+UseParallelGC") || + prepend.contains("-XX:+UseG1GC"))) { runJava.add(GCType); } diff -r 314aa24e62d6 -r f8e5223d1501 hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java --- a/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java Fri Apr 28 14:34:24 2017 +0200 +++ b/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java Tue May 09 16:48:31 2017 +0200 @@ -242,6 +242,9 @@ option.addPrepend("-XX:SharedArchiveFile=TestOptionsWithRanges.jsa"); option.addPrepend("-Xshare:dump"); break; + case "TLABWasteIncrement": + option.addPrepend("-XX:+UseParallelGC"); + break; default: /* Do nothing */ break;