From 513ab6d322540aaaf5a167cebb30b87736f7cd91 Mon Sep 17 00:00:00 2001 From: Saranya Natarajan Date: Wed, 30 Jul 2025 15:09:41 +0200 Subject: [PATCH 1/4] Initial Fix --- .../jtreg/compiler/debug/TestStress.java | 12 +- .../debug/TestStressDistinctSeed.java | 116 ++++++++++++++++++ 2 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 test/hotspot/jtreg/compiler/debug/TestStressDistinctSeed.java diff --git a/test/hotspot/jtreg/compiler/debug/TestStress.java b/test/hotspot/jtreg/compiler/debug/TestStress.java index 2046488ac4006..f43818e8bd81a 100644 --- a/test/hotspot/jtreg/compiler/debug/TestStress.java +++ b/test/hotspot/jtreg/compiler/debug/TestStress.java @@ -77,7 +77,17 @@ static String macroEliminationTrace(int stressSeed) throws Exception { static void sum(int n) { int acc = 0; - for (int i = 0; i < n; i++) acc += i; + int[] arr1 = new int[n]; + int[] arr2 = new int[n]; + int[] arr3 = new int[n]; + int[] arr4 = new int[n]; + for (int i = 0; i < n; i++) { + acc += i; + arr1[i] = i; + arr2[i] = acc; + arr3[i] = i * n; + arr4[i] = acc * n; + } System.out.println(acc); } diff --git a/test/hotspot/jtreg/compiler/debug/TestStressDistinctSeed.java b/test/hotspot/jtreg/compiler/debug/TestStressDistinctSeed.java new file mode 100644 index 0000000000000..627584a43b162 --- /dev/null +++ b/test/hotspot/jtreg/compiler/debug/TestStressDistinctSeed.java @@ -0,0 +1,116 @@ +/* Copyright (c) 2025, 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. +*/ + +package compiler.debug; + +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.Asserts; +import java.util.Set; +import java.util.HashSet; +import java.util.Arrays; + +/* + * @test + * @key stress randomness + * @requires vm.debug == true & vm.compiler2.enabled + * @requires vm.flagless + * @summary Tests that stress compilations with the N different seed yield different + * IGVN, CCP, macro elimination, and macro expansion traces. + * @library /test/lib / + * @run driver compiler.debug.TestStressDistinctSeed + */ + +public class TestStressDistinctSeed { + + private static int counter = 0; + + static String phaseTrace(String stressOption, String traceOption, + int stressSeed) throws Exception { + String className = TestStressDistinctSeed.class.getName(); + String[] procArgs = { + "-Xcomp", "-XX:-TieredCompilation", "-XX:-Inline", "-XX:+CICountNative", + "-XX:CompileOnly=" + className + "::sum", "-XX:" + traceOption, + "-XX:+" + stressOption, "-XX:StressSeed=" + stressSeed, + className, "10" }; + ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(procArgs); + OutputAnalyzer out = new OutputAnalyzer(pb.start()); + out.shouldHaveExitValue(0); + return out.getStdout(); + } + + static String igvnTrace(int stressSeed) throws Exception { + return phaseTrace("StressIGVN", "+TraceIterativeGVN", stressSeed); + } + + static String ccpTrace(int stressSeed) throws Exception { + return phaseTrace("StressCCP", "+TracePhaseCCP", stressSeed); + } + + static String macroExpansionTrace(int stressSeed) throws Exception { + return phaseTrace("StressMacroExpansion", + "CompileCommand=PrintIdealPhase,*::*,AFTER_MACRO_EXPANSION_STEP", + stressSeed); + } + + static String macroEliminationTrace(int stressSeed) throws Exception { + return phaseTrace("StressMacroElimination", + "CompileCommand=PrintIdealPhase,*::*,AFTER_MACRO_ELIMINATION_STEP", + stressSeed); + } + + static void sum(int n) { + int[] arr1 = new int[n]; + for (int i = 0; i < n; i++) { + synchronized (TestStressDistinctSeed.class) { + counter += i; + arr1[i] = counter; + } + } + System.out.println(counter); + } + + public static void main(String[] args) throws Exception { + Set igvnTraceSet = new HashSet<>(); + Set ccpTraceSet = new HashSet<>(); + Set macroExpansionTraceSet = new HashSet<>(); + Set macroEliminationTraceSet = new HashSet<>(); + if (args.length == 0) { + for (int s = 0; s < 10; s++) { + igvnTraceSet.add(igvnTrace(s)); + ccpTraceSet.add(ccpTrace(s)); + macroExpansionTraceSet.add(macroExpansionTrace(s)); + macroEliminationTraceSet.add(macroEliminationTrace(s)); + } + Asserts.assertGT(igvnTraceSet.size(), 1, + "got same IGVN traces for 10 different seeds"); + Asserts.assertGT(ccpTraceSet.size(), 1, + "got same CCP traces for 10 different seeds"); + Asserts.assertGT(macroExpansionTraceSet.size(), 1, + "got same macro expansion traces for 10 different seeds"); + Asserts.assertGT(macroEliminationTraceSet.size(), 1, + "got same macro elimination traces for 10 different seeds"); + } else if (args.length > 0) { + sum(Integer.parseInt(args[0])); + } + } +} \ No newline at end of file From 7eff4d55024db36b811e4304cf706354e25c8200 Mon Sep 17 00:00:00 2001 From: Saranya Natarajan Date: Fri, 1 Aug 2025 13:21:03 +0200 Subject: [PATCH 2/4] Adding test for same seed --> same result for N = 10 --- .../debug/TestStressDistinctSeed.java | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/test/hotspot/jtreg/compiler/debug/TestStressDistinctSeed.java b/test/hotspot/jtreg/compiler/debug/TestStressDistinctSeed.java index 627584a43b162..f0956fce0b085 100644 --- a/test/hotspot/jtreg/compiler/debug/TestStressDistinctSeed.java +++ b/test/hotspot/jtreg/compiler/debug/TestStressDistinctSeed.java @@ -32,9 +32,8 @@ /* * @test * @key stress randomness - * @requires vm.debug == true & vm.compiler2.enabled - * @requires vm.flagless - * @summary Tests that stress compilations with the N different seed yield different + * @requires vm.debug == true & vm.compiler2.enabled & vm.flagless + * @summary Tests that stress compilations with the N different seeds yield different * IGVN, CCP, macro elimination, and macro expansion traces. * @library /test/lib / * @run driver compiler.debug.TestStressDistinctSeed @@ -94,12 +93,28 @@ public static void main(String[] args) throws Exception { Set ccpTraceSet = new HashSet<>(); Set macroExpansionTraceSet = new HashSet<>(); Set macroEliminationTraceSet = new HashSet<>(); + String igvntrace, ccptrace, macroexpansiontrace, macroeliminationtrace; if (args.length == 0) { for (int s = 0; s < 10; s++) { - igvnTraceSet.add(igvnTrace(s)); - ccpTraceSet.add(ccpTrace(s)); - macroExpansionTraceSet.add(macroExpansionTrace(s)); - macroEliminationTraceSet.add(macroEliminationTrace(s)); + igvntrace = igvnTrace(s); + ccptrace = ccpTrace(s); + macroexpansiontrace = macroExpansionTrace(s); + macroeliminationtrace = macroEliminationTrace(s); + // Test same seed produce same result to test that different traces come from different seed and + // not indeterminism with the test. + Asserts.assertEQ(igvntrace, igvnTrace(s), + "got different IGVN traces for the same seed"); + Asserts.assertEQ(ccptrace, ccpTrace(s), + "got different CCP traces for the same seed"); + Asserts.assertEQ(macroexpansiontrace, macroExpansionTrace(s), + "got different macro expansion traces for the same seed"); + Asserts.assertEQ(macroeliminationtrace, macroEliminationTrace(s), + "got different macro elimination traces for the same seed"); + + igvnTraceSet.add(igvntrace); + ccpTraceSet.add(ccptrace); + macroExpansionTraceSet.add(macroexpansiontrace); + macroEliminationTraceSet.add(macroeliminationtrace); } Asserts.assertGT(igvnTraceSet.size(), 1, "got same IGVN traces for 10 different seeds"); From 14617e01a032fe05775eda36f4f3172137ccd2e8 Mon Sep 17 00:00:00 2001 From: Saranya Natarajan Date: Fri, 1 Aug 2025 13:26:54 +0200 Subject: [PATCH 3/4] changing N to 5 --- .../jtreg/compiler/debug/TestStressDistinctSeed.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/hotspot/jtreg/compiler/debug/TestStressDistinctSeed.java b/test/hotspot/jtreg/compiler/debug/TestStressDistinctSeed.java index f0956fce0b085..ded1499ad36bb 100644 --- a/test/hotspot/jtreg/compiler/debug/TestStressDistinctSeed.java +++ b/test/hotspot/jtreg/compiler/debug/TestStressDistinctSeed.java @@ -50,7 +50,7 @@ static String phaseTrace(String stressOption, String traceOption, "-Xcomp", "-XX:-TieredCompilation", "-XX:-Inline", "-XX:+CICountNative", "-XX:CompileOnly=" + className + "::sum", "-XX:" + traceOption, "-XX:+" + stressOption, "-XX:StressSeed=" + stressSeed, - className, "10" }; + className, "5" }; ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(procArgs); OutputAnalyzer out = new OutputAnalyzer(pb.start()); out.shouldHaveExitValue(0); @@ -95,7 +95,7 @@ public static void main(String[] args) throws Exception { Set macroEliminationTraceSet = new HashSet<>(); String igvntrace, ccptrace, macroexpansiontrace, macroeliminationtrace; if (args.length == 0) { - for (int s = 0; s < 10; s++) { + for (int s = 0; s < 5; s++) { igvntrace = igvnTrace(s); ccptrace = ccpTrace(s); macroexpansiontrace = macroExpansionTrace(s); @@ -117,13 +117,13 @@ public static void main(String[] args) throws Exception { macroEliminationTraceSet.add(macroeliminationtrace); } Asserts.assertGT(igvnTraceSet.size(), 1, - "got same IGVN traces for 10 different seeds"); + "got same IGVN traces for 5 different seeds"); Asserts.assertGT(ccpTraceSet.size(), 1, - "got same CCP traces for 10 different seeds"); + "got same CCP traces for 5 different seeds"); Asserts.assertGT(macroExpansionTraceSet.size(), 1, - "got same macro expansion traces for 10 different seeds"); + "got same macro expansion traces for 5 different seeds"); Asserts.assertGT(macroEliminationTraceSet.size(), 1, - "got same macro elimination traces for 10 different seeds"); + "got same macro elimination traces for 5 different seeds"); } else if (args.length > 0) { sum(Integer.parseInt(args[0])); } From bca4a0ece39b8a75859a9267222a023ed5429720 Mon Sep 17 00:00:00 2001 From: Saranya Natarajan Date: Mon, 4 Aug 2025 14:38:43 +0200 Subject: [PATCH 4/4] addressing review comments on camelCase --- .../debug/TestStressDistinctSeed.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/test/hotspot/jtreg/compiler/debug/TestStressDistinctSeed.java b/test/hotspot/jtreg/compiler/debug/TestStressDistinctSeed.java index ded1499ad36bb..3b29daf2ce6fb 100644 --- a/test/hotspot/jtreg/compiler/debug/TestStressDistinctSeed.java +++ b/test/hotspot/jtreg/compiler/debug/TestStressDistinctSeed.java @@ -93,28 +93,28 @@ public static void main(String[] args) throws Exception { Set ccpTraceSet = new HashSet<>(); Set macroExpansionTraceSet = new HashSet<>(); Set macroEliminationTraceSet = new HashSet<>(); - String igvntrace, ccptrace, macroexpansiontrace, macroeliminationtrace; + String igvnTraceOutput, ccpTraceOutput, macroExpansionTraceOutput, macroEliminationTraceOutput; if (args.length == 0) { for (int s = 0; s < 5; s++) { - igvntrace = igvnTrace(s); - ccptrace = ccpTrace(s); - macroexpansiontrace = macroExpansionTrace(s); - macroeliminationtrace = macroEliminationTrace(s); + igvnTraceOutput = igvnTrace(s); + ccpTraceOutput = ccpTrace(s); + macroExpansionTraceOutput = macroExpansionTrace(s); + macroEliminationTraceOutput = macroEliminationTrace(s); // Test same seed produce same result to test that different traces come from different seed and // not indeterminism with the test. - Asserts.assertEQ(igvntrace, igvnTrace(s), + Asserts.assertEQ(igvnTraceOutput, igvnTrace(s), "got different IGVN traces for the same seed"); - Asserts.assertEQ(ccptrace, ccpTrace(s), + Asserts.assertEQ(ccpTraceOutput, ccpTrace(s), "got different CCP traces for the same seed"); - Asserts.assertEQ(macroexpansiontrace, macroExpansionTrace(s), + Asserts.assertEQ(macroExpansionTraceOutput, macroExpansionTrace(s), "got different macro expansion traces for the same seed"); - Asserts.assertEQ(macroeliminationtrace, macroEliminationTrace(s), + Asserts.assertEQ(macroEliminationTraceOutput, macroEliminationTrace(s), "got different macro elimination traces for the same seed"); - igvnTraceSet.add(igvntrace); - ccpTraceSet.add(ccptrace); - macroExpansionTraceSet.add(macroexpansiontrace); - macroEliminationTraceSet.add(macroeliminationtrace); + igvnTraceSet.add(igvnTraceOutput); + ccpTraceSet.add(ccpTraceOutput); + macroExpansionTraceSet.add(macroExpansionTraceOutput); + macroEliminationTraceSet.add(macroEliminationTraceOutput); } Asserts.assertGT(igvnTraceSet.size(), 1, "got same IGVN traces for 5 different seeds");