8345435: Eliminate tier1_compiler_not_xcomp group

Reviewed-by: kvn

Author: lmesnik

test/hotspot/jtreg/TEST.groups

@@ -38,10 +38,6 @@ hotspot_all_no_apps = \
 hotspot_compiler = \
   compiler
 
-hotspot_compiler_xcomp = \
-  :hotspot_compiler \
-  -:tier1_compiler_not_xcomp
-
 hotspot_gc = \
   gc
 
@@ -151,8 +147,7 @@ tier1_common = \
 tier1_compiler = \
   :tier1_compiler_1 \
   :tier1_compiler_2 \
-  :tier1_compiler_3 \
-  :tier1_compiler_not_xcomp
+  :tier1_compiler_3
 
 hotspot_not_fast_compiler = \
   :hotspot_compiler \
@@ -210,6 +205,7 @@ tier1_compiler_3 = \
   compiler/macronodes/ \
   compiler/memoryinitialization/ \
   compiler/osr/ \
+  compiler/profiling \
   compiler/regalloc/ \
   compiler/runtime/ \
   compiler/startup/ \
@@ -269,9 +265,6 @@ tier3_compiler = \
   -:tier1_compiler \
   -:tier2_compiler
 
-tier1_compiler_not_xcomp = \
-  compiler/profiling
-
 ctw_1 = \
   applications/ctw/modules/ \
   -:ctw_2 \

test/hotspot/jtreg/compiler/profiling/TestMethodHandleInvokesIntrinsic.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
  * @bug 8041458
  * @summary profiling of arguments in C1 at MethodHandle invoke of intrinsic tries to profile popped argument.
  *
+ * @requires vm.compMode != "Xcomp"
  * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement
  *                   -XX:TieredStopAtLevel=3
  *                   compiler.profiling.TestMethodHandleInvokesIntrinsic

test/hotspot/jtreg/compiler/profiling/TestMultiBranchDataOverflow.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug 8251458
  * @summary Test int range overflow of MultiBranchData counter.
+ * @requires vm.compMode != "Xcomp"
  * @run main/othervm -XX:CompileCommand=dontinline,compiler.profiling.TestMultiBranchDataOverflow::test
  *                   -Xbatch -XX:Tier4BackEdgeThreshold=2147483647
  *                   compiler.profiling.TestMultiBranchDataOverflow

test/hotspot/jtreg/compiler/profiling/TestProfileCounterOverflow.java

@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2019, Loongson Technology Co. Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,6 +26,7 @@
  * @test
  * @bug 8224162
  * @summary Profile counter for a call site may overflow.
+ * @requires vm.compMode != "Xcomp"
  * @run main/othervm -Xbatch -XX:-UseOnStackReplacement -XX:+IgnoreUnrecognizedVMOptions -XX:MaxTrivialSize=0 -XX:C1MaxTrivialSize=0 compiler.profiling.TestProfileCounterOverflow
  */
 

test/hotspot/jtreg/compiler/profiling/TestSharedHeadExceptionBackedges.java

@@ -25,6 +25,7 @@
  * @test
  * bug 8280842
  * @summary Access violation in ciTypeFlow::profiled_count
+ * @requires vm.compMode != "Xcomp"
  * @run main/othervm -XX:-BackgroundCompilation TestSharedHeadExceptionBackedges
  */
 

test/hotspot/jtreg/compiler/profiling/TestSpecTrapClassUnloading.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,6 +26,7 @@
  * @bug 8031752
  * @summary speculative traps need to be cleaned up at GC
  *
+ * @requires vm.compMode != "Xcomp"
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation
  *                   -XX:-UseOnStackReplacement -XX:-BackgroundCompilation
  *                   -XX:CompileThreshold=10000

test/hotspot/jtreg/compiler/profiling/TestTypeProfileArgsLimit.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 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
@@ -26,6 +26,7 @@
  * @bug 8295406
  * @summary Tests execution with TypeProfileArgsLimit=0 TypeProfileLevel=222.
  *
+ * @requires vm.compMode != "Xcomp"
  * @run main/othervm -XX:TypeProfileArgsLimit=0 -XX:TypeProfileLevel=222 compiler.profiling.TestTypeProfileArgsLimit
  * @run main/othervm -XX:TypeProfileArgsLimit=0 -XX:TypeProfileLevel=212 compiler.profiling.TestTypeProfileArgsLimit
  * @run main/othervm -XX:TypeProfileArgsLimit=0 -XX:TypeProfileLevel=202 compiler.profiling.TestTypeProfileArgsLimit

test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -31,6 +31,7 @@
   *
   * @comment the test can't be run w/ TieredStopAtLevel < 4
   * @requires vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4
+  * @requires vm.compMode != "Xcomp"
   *
   * @library /test/lib /
   * @build jdk.test.whitebox.WhiteBox

test/hotspot/jtreg/compiler/profiling/TestUnexpectedProfilingMismatch.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -26,6 +26,7 @@
  * @bug 8027631
  * @summary profiling of arguments at calls cannot rely on signature of callee for types
  *
+ * @requires vm.compMode != "Xcomp"
  * @run main/othervm -XX:-BackgroundCompilation -XX:TieredStopAtLevel=3 -XX:TypeProfileLevel=111
  *                   -XX:Tier3InvocationThreshold=200 -XX:Tier0InvokeNotifyFreqLog=7
  *                   compiler.profiling.TestUnexpectedProfilingMismatch

test/hotspot/jtreg/compiler/profiling/UnsafeAccess.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -25,6 +25,7 @@
  * @bug 8134918
  * @modules java.base/jdk.internal.misc
  *
+ * @requires vm.compMode != "Xcomp"
  * @run main/bootclasspath/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:TypeProfileLevel=222 -XX:+UseTypeSpeculation -Xbatch
  *                                 -XX:CompileCommand=dontinline,compiler.profiling.UnsafeAccess::test*
  *                                 compiler.profiling.UnsafeAccess

test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Launcher.java

@@ -28,6 +28,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.instrument
  * @requires vm.jvmti & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4)
+ * @requires vm.compMode != "Xcomp"
  * @build compiler.profiling.spectrapredefineclass.Agent
  * @run driver jdk.test.lib.helpers.ClassFileInstaller compiler.profiling.spectrapredefineclass.Agent
  * @run driver compiler.profiling.spectrapredefineclass.Launcher

test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java

@@ -28,6 +28,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.instrument
  * @requires vm.jvmti & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4)
+ * @requires vm.compMode != "Xcomp"
  * @build compiler.profiling.spectrapredefineclass_classloaders.Agent
  *        compiler.profiling.spectrapredefineclass_classloaders.Test
  *        compiler.profiling.spectrapredefineclass_classloaders.A

test/hotspot/jtreg/compiler/profiling/unloadingconflict/TestProfileConflictClassUnloading.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -27,6 +27,7 @@
  * @summary class unloading resets profile, method compiled after the profile is
  * first set and before class loading sets unknown bit with not recorded class
  * @library /
+ * @requires vm.compMode != "Xcomp"
  * @build compiler.profiling.unloadingconflict.B
  * @run main/othervm -XX:TypeProfileLevel=222 -XX:-BackgroundCompilation
  *                   compiler.profiling.unloadingconflict.TestProfileConflictClassUnloading