test/hotspot/jtreg/compiler/intrinsics/IntrinsicAvailableTest.java

*** 1,7 ***
  /*
!  * Copyright (c) 2016, 2022, 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.
--- 1,7 ---
  /*
!  * Copyright (c) 2016, 2026, 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.

*** 144,14 ***
          Executable intrinsicMethod = testCase.getExecutable();
          if (Platform.isServer() && (TIERED_STOP_AT_LEVEL == COMP_LEVEL_FULL_OPTIMIZATION)) {
              if (TIERED_COMPILATION) {
                  checkIntrinsicForCompilationLevel(intrinsicMethod, COMP_LEVEL_SIMPLE);
              }
!             // Dont bother check JVMCI compiler - returns false on all intrinsics.
-             if (!Boolean.valueOf(getVMOption("UseJVMCICompiler"))) {
-                 checkIntrinsicForCompilationLevel(intrinsicMethod, COMP_LEVEL_FULL_OPTIMIZATION);
-             }
          } else {
              checkIntrinsicForCompilationLevel(intrinsicMethod, COMP_LEVEL_SIMPLE);
          }
      }
  
--- 144,11 ---
          Executable intrinsicMethod = testCase.getExecutable();
          if (Platform.isServer() && (TIERED_STOP_AT_LEVEL == COMP_LEVEL_FULL_OPTIMIZATION)) {
              if (TIERED_COMPILATION) {
                  checkIntrinsicForCompilationLevel(intrinsicMethod, COMP_LEVEL_SIMPLE);
              }
!             checkIntrinsicForCompilationLevel(intrinsicMethod, COMP_LEVEL_FULL_OPTIMIZATION);
          } else {
              checkIntrinsicForCompilationLevel(intrinsicMethod, COMP_LEVEL_SIMPLE);
          }
      }