8234146: compiler/jsr292/ContinuousCallSiteTargetChange.java times out on SPARC

Reviewed-by: vlivanov, thartmann
This commit is contained in:
Richard Reingruber 2020-03-12 11:51:00 +01:00
parent 0368e41c12
commit c5bd0d7934
2 changed files with 11 additions and 5 deletions

View File

@ -71,8 +71,6 @@ compiler/rtm/locking/TestUseRTMDeopt.java 8183263 generic-x64
compiler/rtm/locking/TestUseRTMXendForLockBusy.java 8183263 generic-x64
compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java 8183263 generic-x64
compiler/jsr292/ContinuousCallSiteTargetChange.java 8234146 solaris-sparcv9
compiler/c2/Test8004741.java 8235801 generic-all
#############################################################################

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -25,6 +25,9 @@
* @test
* @library /test/lib /
*
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.jsr292.ContinuousCallSiteTargetChange
*/
@ -33,6 +36,7 @@ package compiler.jsr292;
import jdk.test.lib.Asserts;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
import sun.hotspot.WhiteBox;
import java.lang.invoke.CallSite;
import java.lang.invoke.MethodHandle;
@ -71,7 +75,8 @@ public class ContinuousCallSiteTargetChange {
static void testServer(Class<?> test, String... args) throws Exception {
List<String> extraArgsList = new ArrayList<>(
List.of("-server", "-XX:-TieredCompilation"));
List.of("-server", "-XX:-TieredCompilation", "-Xbootclasspath/a:.",
"-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI"));
extraArgsList.addAll(Arrays.asList(args));
runTest(test, extraArgsList.toArray(new String[extraArgsList.size()]));
@ -79,7 +84,8 @@ public class ContinuousCallSiteTargetChange {
static void testClient(Class<?> test, String... args) throws Exception {
List<String> extraArgsList = new ArrayList<>(
List.of("-client", "-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1"));
List.of("-client", "-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1",
"-Xbootclasspath/a:.", "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI"));
extraArgsList.addAll(Arrays.asList(args));
runTest(test, extraArgsList.toArray(new String[extraArgsList.size()]));
@ -163,8 +169,10 @@ public class ContinuousCallSiteTargetChange {
public static void main(String[] args) throws Throwable {
int iterations = Integer.parseInt(args[0]);
WhiteBox whiteBox = WhiteBox.getWhiteBox();
for (int i = 0; i < iterations; i++) {
iteration();
whiteBox.forceNMethodSweep();
}
}
}