Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8258383: vmTestbase/gc/g1/unloading/tests/unloading_compilation_level… 
…[1,2,3] time out without TieredCompilation

Reviewed-by: kvn
  • Loading branch information
@TobiHartmann
TobiHartmann committed Jan 20, 2021
1 parent 9f21bb6 commit 7c32ffe
Show file tree
Hide file tree
Showing 25 changed files with 69 additions and 25 deletions.
4 changes: 3 additions & 1 deletion test/hotspot/jtreg/vmTestbase/gc/g1/unloading/loading/ClassLoadingHelper.java
View file
Expand Up @@ -290,7 +290,9 @@ private void warmUpClassIfNeeded(Object object) {
if (!wb.isMethodCompilable(m, configuration.getCompilationLevel())) {
continue;
}
wb.enqueueMethodForCompilation(m, configuration.getCompilationLevel());
if (!wb.enqueueMethodForCompilation(m, configuration.getCompilationLevel())) {
throw new RuntimeException("Method could not be enqueued for compilation at level " + configuration.getCompilationLevel());
}
while (!wb.isMethodCompiled(m) && executionController.continueExecution()) {
sleep(50);
try {
Expand Down
4 changes: 3 additions & 1 deletion ...ading/tests/unloading_compilation_level1_inMemoryCompilation_keep_cl/TestDescription.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -40,12 +40,14 @@
* @requires vm.gc.G1
* @requires vm.opt.ClassUnloading != false
* @requires vm.opt.ClassUnloadingWithConcurrentMark != false
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel >= 1)
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm
* -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+TieredCompilation
* -XX:+UseG1GC
* -XX:+ExplicitGCInvokesConcurrent
* -Xlog:gc:gc.log
Expand Down
4 changes: 3 additions & 1 deletion ...ng/tests/unloading_compilation_level1_inMemoryCompilation_keep_class/TestDescription.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -40,12 +40,14 @@
* @requires vm.gc.G1
* @requires vm.opt.ClassUnloading != false
* @requires vm.opt.ClassUnloadingWithConcurrentMark != false
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel >= 1)
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm
* -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+TieredCompilation
* -XX:+UseG1GC
* -XX:+ExplicitGCInvokesConcurrent
* -Xlog:gc:gc.log
Expand Down
4 changes: 3 additions & 1 deletion ...ding/tests/unloading_compilation_level1_inMemoryCompilation_keep_obj/TestDescription.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -40,12 +40,14 @@
* @requires vm.gc.G1
* @requires vm.opt.ClassUnloading != false
* @requires vm.opt.ClassUnloadingWithConcurrentMark != false
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel >= 1)
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm
* -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+TieredCompilation
* -XX:+UseG1GC
* -XX:+ExplicitGCInvokesConcurrent
* -Xlog:gc:gc.log
Expand Down
4 changes: 3 additions & 1 deletion ...mTestbase/gc/g1/unloading/tests/unloading_compilation_level1_keep_cl/TestDescription.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -40,12 +40,14 @@
* @requires vm.gc.G1
* @requires vm.opt.ClassUnloading != false
* @requires vm.opt.ClassUnloadingWithConcurrentMark != false
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel >= 1)
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm
* -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+TieredCompilation
* -XX:+UseG1GC
* -XX:+ExplicitGCInvokesConcurrent
* -Xlog:gc:gc.log
Expand Down
4 changes: 3 additions & 1 deletion ...stbase/gc/g1/unloading/tests/unloading_compilation_level1_keep_class/TestDescription.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -40,12 +40,14 @@
* @requires vm.gc.G1
* @requires vm.opt.ClassUnloading != false
* @requires vm.opt.ClassUnloadingWithConcurrentMark != false
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel >= 1)
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm
* -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+TieredCompilation
* -XX:+UseG1GC
* -XX:+ExplicitGCInvokesConcurrent
* -Xlog:gc:gc.log
Expand Down
4 changes: 3 additions & 1 deletion ...Testbase/gc/g1/unloading/tests/unloading_compilation_level1_keep_obj/TestDescription.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -40,12 +40,14 @@
* @requires vm.gc.G1
* @requires vm.opt.ClassUnloading != false
* @requires vm.opt.ClassUnloadingWithConcurrentMark != false
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel >= 1)
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm
* -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+TieredCompilation
* -XX:+UseG1GC
* -XX:+ExplicitGCInvokesConcurrent
* -Xlog:gc:gc.log
Expand Down
4 changes: 3 additions & 1 deletion ...ading/tests/unloading_compilation_level2_inMemoryCompilation_keep_cl/TestDescription.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -40,12 +40,14 @@
* @requires vm.gc.G1
* @requires vm.opt.ClassUnloading != false
* @requires vm.opt.ClassUnloadingWithConcurrentMark != false
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel >= 2)
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm
* -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+TieredCompilation
* -XX:+UseG1GC
* -XX:+ExplicitGCInvokesConcurrent
* -Xlog:gc:gc.log
Expand Down
4 changes: 3 additions & 1 deletion ...ng/tests/unloading_compilation_level2_inMemoryCompilation_keep_class/TestDescription.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -40,12 +40,14 @@
* @requires vm.gc.G1
* @requires vm.opt.ClassUnloading != false
* @requires vm.opt.ClassUnloadingWithConcurrentMark != false
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel >= 2)
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm
* -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+TieredCompilation
* -XX:+UseG1GC
* -XX:+ExplicitGCInvokesConcurrent
* -Xlog:gc:gc.log
Expand Down
4 changes: 3 additions & 1 deletion ...ding/tests/unloading_compilation_level2_inMemoryCompilation_keep_obj/TestDescription.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -40,12 +40,14 @@
* @requires vm.gc.G1
* @requires vm.opt.ClassUnloading != false
* @requires vm.opt.ClassUnloadingWithConcurrentMark != false
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel >= 2)
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm
* -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+TieredCompilation
* -XX:+UseG1GC
* -XX:+ExplicitGCInvokesConcurrent
* -Xlog:gc:gc.log
Expand Down
4 changes: 3 additions & 1 deletion ...mTestbase/gc/g1/unloading/tests/unloading_compilation_level2_keep_cl/TestDescription.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -40,12 +40,14 @@
* @requires vm.gc.G1
* @requires vm.opt.ClassUnloading != false
* @requires vm.opt.ClassUnloadingWithConcurrentMark != false
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel >= 2)
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm
* -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+TieredCompilation
* -XX:+UseG1GC
* -XX:+ExplicitGCInvokesConcurrent
* -Xlog:gc:gc.log
Expand Down
4 changes: 3 additions & 1 deletion ...stbase/gc/g1/unloading/tests/unloading_compilation_level2_keep_class/TestDescription.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -40,12 +40,14 @@
* @requires vm.gc.G1
* @requires vm.opt.ClassUnloading != false
* @requires vm.opt.ClassUnloadingWithConcurrentMark != false
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel >= 2)
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm
* -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+TieredCompilation
* -XX:+UseG1GC
* -XX:+ExplicitGCInvokesConcurrent
* -Xlog:gc:gc.log
Expand Down
4 changes: 3 additions & 1 deletion ...Testbase/gc/g1/unloading/tests/unloading_compilation_level2_keep_obj/TestDescription.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -40,12 +40,14 @@
* @requires vm.gc.G1
* @requires vm.opt.ClassUnloading != false
* @requires vm.opt.ClassUnloadingWithConcurrentMark != false
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel >= 2)
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm
* -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+TieredCompilation
* -XX:+UseG1GC
* -XX:+ExplicitGCInvokesConcurrent
* -Xlog:gc:gc.log
Expand Down
4 changes: 3 additions & 1 deletion ...ading/tests/unloading_compilation_level3_inMemoryCompilation_keep_cl/TestDescription.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -40,12 +40,14 @@
* @requires vm.gc.G1
* @requires vm.opt.ClassUnloading != false
* @requires vm.opt.ClassUnloadingWithConcurrentMark != false
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel >= 3)
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm
* -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+TieredCompilation
* -XX:+UseG1GC
* -XX:+ExplicitGCInvokesConcurrent
* -Xlog:gc:gc.log
Expand Down
4 changes: 3 additions & 1 deletion ...ng/tests/unloading_compilation_level3_inMemoryCompilation_keep_class/TestDescription.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -40,12 +40,14 @@
* @requires vm.gc.G1
* @requires vm.opt.ClassUnloading != false
* @requires vm.opt.ClassUnloadingWithConcurrentMark != false
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel >= 3)
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm
* -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+TieredCompilation
* -XX:+UseG1GC
* -XX:+ExplicitGCInvokesConcurrent
* -Xlog:gc:gc.log
Expand Down
4 changes: 3 additions & 1 deletion ...ding/tests/unloading_compilation_level3_inMemoryCompilation_keep_obj/TestDescription.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -40,12 +40,14 @@
* @requires vm.gc.G1
* @requires vm.opt.ClassUnloading != false
* @requires vm.opt.ClassUnloadingWithConcurrentMark != false
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel >= 3)
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm
* -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+TieredCompilation
* -XX:+UseG1GC
* -XX:+ExplicitGCInvokesConcurrent
* -Xlog:gc:gc.log
Expand Down
4 changes: 3 additions & 1 deletion ...mTestbase/gc/g1/unloading/tests/unloading_compilation_level3_keep_cl/TestDescription.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -40,12 +40,14 @@
* @requires vm.gc.G1
* @requires vm.opt.ClassUnloading != false
* @requires vm.opt.ClassUnloadingWithConcurrentMark != false
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel >= 3)
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm
* -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+TieredCompilation
* -XX:+UseG1GC
* -XX:+ExplicitGCInvokesConcurrent
* -Xlog:gc:gc.log
Expand Down
4 changes: 3 additions & 1 deletion ...stbase/gc/g1/unloading/tests/unloading_compilation_level3_keep_class/TestDescription.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand Down Expand Up @@ -40,12 +40,14 @@
* @requires vm.gc.G1
* @requires vm.opt.ClassUnloading != false
* @requires vm.opt.ClassUnloadingWithConcurrentMark != false
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel >= 3)
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm
* -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* -XX:+TieredCompilation
* -XX:+UseG1GC
* -XX:+ExplicitGCInvokesConcurrent
* -Xlog:gc:gc.log
Expand Down

1 comment on commit 7c32ffe

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

Please sign in to comment.