Skip to content

Commit

Permalink
JDK-8334567
Browse files Browse the repository at this point in the history
  • Loading branch information
MBaesken committed Jun 19, 2024
1 parent 50bed6c commit bd5c072
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions test/hotspot/jtreg/runtime/os/TestTracePageSizes.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2024, 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 @@ -28,6 +28,7 @@
* @library /test/lib
* @build jdk.test.lib.Platform
* @requires os.family == "linux"
* @requires os.arch != "ppc64le"
* @run main/othervm -XX:+AlwaysPreTouch -Xlog:pagesize:ps-%p.log TestTracePageSizes
*/

Expand All @@ -51,6 +52,7 @@
* @library /test/lib
* @build jdk.test.lib.Platform
* @requires os.family == "linux"
* @requires os.arch != "ppc64le"
* @requires vm.gc != "Z" & vm.gc != "Shenandoah"
* @run main/othervm -XX:+AlwaysPreTouch -Xmx128m -Xlog:pagesize:ps-%p.log -XX:-SegmentedCodeCache TestTracePageSizes
* @run main/othervm -XX:+AlwaysPreTouch -Xmx128m -Xlog:pagesize:ps-%p.log -XX:-SegmentedCodeCache -XX:+UseLargePages TestTracePageSizes
Expand All @@ -63,6 +65,7 @@
* @library /test/lib
* @build jdk.test.lib.Platform
* @requires os.family == "linux"
* @requires os.arch != "ppc64le"
* @requires vm.gc.G1
* @run main/othervm -XX:+AlwaysPreTouch -Xmx128m -Xlog:pagesize:ps-%p.log -XX:+UseG1GC TestTracePageSizes
* @run main/othervm -XX:+AlwaysPreTouch -Xmx128m -Xlog:pagesize:ps-%p.log -XX:+UseG1GC -XX:+UseLargePages TestTracePageSizes
Expand All @@ -75,6 +78,7 @@
* @library /test/lib
* @build jdk.test.lib.Platform
* @requires os.family == "linux"
* @requires os.arch != "ppc64le"
* @requires vm.gc.Parallel
* @run main/othervm -XX:+AlwaysPreTouch -Xmx128m -Xlog:pagesize:ps-%p.log -XX:+UseParallelGC TestTracePageSizes
* @run main/othervm -XX:+AlwaysPreTouch -Xmx128m -Xlog:pagesize:ps-%p.log -XX:+UseParallelGC -XX:+UseLargePages TestTracePageSizes
Expand All @@ -87,6 +91,7 @@
* @library /test/lib
* @build jdk.test.lib.Platform
* @requires os.family == "linux"
* @requires os.arch != "ppc64le"
* @requires vm.gc.Serial
* @run main/othervm -XX:+AlwaysPreTouch -Xmx128m -Xlog:pagesize:ps-%p.log -XX:+UseSerialGC TestTracePageSizes
* @run main/othervm -XX:+AlwaysPreTouch -Xmx128m -Xlog:pagesize:ps-%p.log -XX:+UseSerialGC -XX:+UseLargePages TestTracePageSizes
Expand Down Expand Up @@ -261,12 +266,6 @@ public static void main(String args[]) throws Exception {
throw new SkippedException("Kernel older than 3.8 - skipping this test.");
}

// For similar reasons, we skip the test on ppc platforms, since there the smaps
// format may follow a different logic.
if (Platform.isPPC()) {
throw new SkippedException("PPC - skipping this test.");
}

// Parse /proc/self/smaps to compare with values logged in the VM.
parseSmaps();

Expand Down

0 comments on commit bd5c072

Please sign in to comment.