Navigation Menu

Skip to content

Commit

Permalink
8237798: rewrite vmTestbase/jit/tiered from shell to java
Browse files Browse the repository at this point in the history
Reviewed-by: roland, neliasso
  • Loading branch information
iignatev committed Jan 27, 2020
1 parent 08e6353 commit fc8d71b
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 113 deletions.
2 changes: 1 addition & 1 deletion test/hotspot/jtreg/TEST.quick-groups
Expand Up @@ -1785,7 +1785,7 @@ vmTestbase_vm_compiler_quick = \
vmTestbase/jit/t/t111/TestDescription.java \
vmTestbase/jit/t/t112/TestDescription.java \
vmTestbase/jit/t/t113/TestDescription.java \
vmTestbase/jit/tiered/TestDescription.java \
vmTestbase/jit/tiered/Test.java \
vmTestbase/jit/verifier/VerifyInitLocal/VerifyInitLocal.java \
vmTestbase/jit/verifier/VerifyMergeStack/VerifyMergeStack.java \
vmTestbase/jit/wide/wide01/wide01.java \
Expand Down
76 changes: 76 additions & 0 deletions test/hotspot/jtreg/vmTestbase/jit/tiered/Test.java
@@ -0,0 +1,76 @@
/*
* Copyright (c) 2017, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/


/*
* @test
*
* @summary converted from VM Testbase jit/tiered.
* VM Testbase keywords: [jit, quick]
* VM Testbase readme:
* Description
* The test verifies that JVM prints tiered events with -XX:+PrintTieredEvents
* for tiered compilation explicitly enabled with -XX:+TieredCompilation.
* If tiered compilation is explicitly disabled the test verifies that there are no
* output from PrintTieredEvents.
*
* @library /vmTestbase
* /test/lib
* @run driver vmTestbase.jit.tiered.Test
*/

package vmTestbase.jit.tiered;

import jtreg.SkippedException;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;

public class Test {
private static String UNSUPPORTED_OPTION_MESSAGE = "-XX:TieredCompilation not supported in this VM";
private static String REGEXP = "^[0-9.]+: \\[compile level=\\d";
public static void main(String[] args) throws Exception {
{
System.out.println("TieredCompilation is enabled");
var pb = ProcessTools.createJavaProcessBuilder(true,
"-XX:+TieredCompilation",
"-XX:+PrintTieredEvents",
"-version");
var output = new OutputAnalyzer(pb.start());
if (output.getStdout().contains(UNSUPPORTED_OPTION_MESSAGE)) {
throw new SkippedException(UNSUPPORTED_OPTION_MESSAGE);
}
output.shouldHaveExitValue(0)
.stdoutShouldMatch(REGEXP);
}
{
System.out.println("TieredCompilation is disabled");
var pb = ProcessTools.createJavaProcessBuilder(true,
"-XX:-TieredCompilation",
"-XX:+PrintTieredEvents",
"-version");
var output = new OutputAnalyzer(pb.start())
.shouldHaveExitValue(0)
.stdoutShouldNotMatch(REGEXP);
}
}
}
42 changes: 0 additions & 42 deletions test/hotspot/jtreg/vmTestbase/jit/tiered/TestDescription.java

This file was deleted.

70 changes: 0 additions & 70 deletions test/hotspot/jtreg/vmTestbase/jit/tiered/tieredTest.sh

This file was deleted.

0 comments on commit fc8d71b

Please sign in to comment.