Skip to content

Commit 6ff4ba2

Browse files
committed
8267271: Fix gc/arguments/TestNewRatioFlag.java expectedNewSize calculation
Backport-of: 59de99d
1 parent c6e4a44 commit 6ff4ba2

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,12 @@ public static void main(String args[]) {
124124
public static void verifyDefNewNewRatio(int expectedRatio) {
125125
long initEden = HeapRegionUsageTool.getEdenUsage().getInit();
126126
long initSurv = HeapRegionUsageTool.getSurvivorUsage().getInit();
127-
long initOld = HeapRegionUsageTool.getOldUsage().getInit();
127+
long initHeap = HeapRegionUsageTool.getHeapUsage().getInit();
128128

129129
long newSize = initEden + 2 * initSurv;
130130

131-
long expectedNewSize = HeapRegionUsageTool.alignDown(initOld / expectedRatio,
131+
// See GenArguments::scale_by_NewRatio_aligned for calculation in the JVM.
132+
long expectedNewSize = HeapRegionUsageTool.alignDown(initHeap / (expectedRatio + 1),
132133
wb.getHeapSpaceAlignment());
133134

134135
if (expectedNewSize != newSize) {
@@ -145,11 +146,12 @@ public static void verifyDefNewNewRatio(int expectedRatio) {
145146
public static void verifyPSNewRatio(int expectedRatio) {
146147
long initEden = HeapRegionUsageTool.getEdenUsage().getInit();
147148
long initSurv = HeapRegionUsageTool.getSurvivorUsage().getInit();
148-
long initOld = HeapRegionUsageTool.getOldUsage().getInit();
149+
long initHeap = HeapRegionUsageTool.getHeapUsage().getInit();
149150

150151
long newSize = initEden + 2 * initSurv;
151152

152-
long alignedDownNewSize = HeapRegionUsageTool.alignDown(initOld / expectedRatio,
153+
// See GenArguments::scale_by_NewRatio_aligned for calculation in the JVM.
154+
long alignedDownNewSize = HeapRegionUsageTool.alignDown(initHeap / (expectedRatio + 1),
153155
wb.getHeapSpaceAlignment());
154156
long expectedNewSize = HeapRegionUsageTool.alignUp(alignedDownNewSize,
155157
wb.psVirtualSpaceAlignment());

0 commit comments

Comments
 (0)