< prev index next >

test/jtreg-ext/requires/VMProps.java

Print this page
*** 103,12 ***
          map.put("vm.compMode", this::vmCompMode);
          map.put("vm.bits", this::vmBits);
          map.put("vm.flightRecorder", this::vmFlightRecorder);
          map.put("vm.simpleArch", this::vmArch);
          map.put("vm.debug", this::vmDebug);
-         map.put("vm.jvmci", this::vmJvmci);
-         map.put("vm.jvmci.enabled", this::vmJvmciEnabled);
          // vm.hasSA is "true" if the VM contains the serviceability agent
          // and jhsdb.
          map.put("vm.hasSA", this::vmHasSA);
          // vm.hasJFR is "true" if JFR is included in the build of the VM and
          // so tests can be executed.
--- 103,10 ---

*** 126,16 ***
          map.put("vm.cds.supports.aot.code.caching", this::vmCDSSupportsAOTCodeCaching);
          map.put("vm.cds.write.archived.java.heap", this::vmCDSCanWriteArchivedJavaHeap);
          map.put("vm.cds.write.mapped.java.heap", this::vmCDSCanWriteMappedArchivedJavaHeap);
          map.put("vm.cds.write.streamed.java.heap", this::vmCDSCanWriteStreamedArchivedJavaHeap);
          map.put("vm.continuations", this::vmContinuations);
-         // vm.graal.enabled is true if Graal is used as JIT
-         map.put("vm.graal.enabled", this::isGraalEnabled);
-         // jdk.hasLibgraal is true if the libgraal shared library file is present
-         map.put("jdk.hasLibgraal", this::hasLibgraal);
          map.put("java.enablePreview", this::isPreviewEnabled);
-         map.put("vm.libgraal.jit", this::isLibgraalJIT);
          map.put("vm.compiler1.enabled", this::isCompiler1Enabled);
          map.put("vm.compiler2.enabled", this::isCompiler2Enabled);
          map.put("container.support", this::containerSupport);
          map.put("systemd.support", this::systemdSupport);
          map.put("vm.musl", this::isMusl);
--- 124,11 ---

*** 261,45 ***
          } else {
              return errorWithMessage("Can't get 'jdk.debug' property");
          }
      }
  
-     /**
-      * @return true if VM supports JVMCI and false otherwise
-      */
-     protected String vmJvmci() {
-         // builds with jvmci have this flag
-         if (WB.getBooleanVMFlag("EnableJVMCI") == null) {
-             return "false";
-         }
- 
-         // Not all GCs have full JVMCI support
-         if (!WB.isJVMCISupportedByGC()) {
-           return "false";
-         }
- 
-         // Interpreted mode cannot enable JVMCI
-         if (vmCompMode().equals("Xint")) {
-           return "false";
-         }
- 
-         return "true";
-     }
- 
- 
-     /**
-      * @return true if JVMCI is enabled
-      */
-     protected String vmJvmciEnabled() {
-         // builds with jvmci have this flag
-         if ("false".equals(vmJvmci())) {
-             return "false";
-         }
- 
-         return "" + Compiler.isJVMCIEnabled();
-     }
- 
      /**
       * @return supported CPU features
       */
      protected String cpuFeatures() {
          return CPUInfo.getFeatures().toString();
--- 254,10 ---

*** 313,13 ***
       *    G1 can be selected, i.e. it doesn't conflict with other VM flags
       *
       * @param map - property-value pairs
       */
      protected void vmGC(SafeMap map) {
-         var isJVMCIEnabled = Compiler.isJVMCIEnabled();
          Predicate<GC> vmGCProperty = (GC gc) -> (gc.isSupported()
-                                         && (!isJVMCIEnabled || gc.isSupportedByJVMCICompiler())
                                          && (gc.isSelected() || GC.isSelectedErgonomically()));
          for (GC gc: GC.values()) {
              map.put("vm.gc." + gc.name(), () -> "" + vmGCProperty.test(gc));
          }
      }
--- 271,11 ---

*** 368,12 ***
       */
      protected void vmOptFinalFlags(SafeMap map) {
          vmOptFinalFlag(map, "ClassUnloading");
          vmOptFinalFlag(map, "ClassUnloadingWithConcurrentMark");
          vmOptFinalFlag(map, "CriticalJNINatives");
-         vmOptFinalFlag(map, "EnableJVMCI");
          vmOptFinalFlag(map, "EliminateAllocations");
          vmOptFinalFlag(map, "UnlockExperimentalVMOptions");
          vmOptFinalFlag(map, "UseAdaptiveSizePolicy");
          vmOptFinalFlag(map, "UseCompressedOops");
          vmOptFinalFlag(map, "UseLargePages");
          vmOptFinalFlag(map, "UseTransparentHugePages");
--- 324,12 ---
       */
      protected void vmOptFinalFlags(SafeMap map) {
          vmOptFinalFlag(map, "ClassUnloading");
          vmOptFinalFlag(map, "ClassUnloadingWithConcurrentMark");
          vmOptFinalFlag(map, "CriticalJNINatives");
          vmOptFinalFlag(map, "EliminateAllocations");
+         vmOptFinalFlag(map, "TieredCompilation");
          vmOptFinalFlag(map, "UnlockExperimentalVMOptions");
          vmOptFinalFlag(map, "UseAdaptiveSizePolicy");
          vmOptFinalFlag(map, "UseCompressedOops");
          vmOptFinalFlag(map, "UseLargePages");
          vmOptFinalFlag(map, "UseTransparentHugePages");

*** 508,11 ***
       * @return true if this VM can support the AOT Code Caching
       */
      protected String vmCDSSupportsAOTCodeCaching() {
        if ("true".equals(vmCDSSupportsAOTClassLinking()) &&
            !"zero".equals(vmFlavor()) &&
-           "false".equals(vmJvmciEnabled()) &&
            (Platform.isX64() || Platform.isAArch64())) {
          return "true";
        } else {
          return "false";
        }
--- 464,10 ---

*** 534,37 ***
       */
      protected String vmPageSize() {
          return "" + WB.getVMPageSize();
      }
  
-     /**
-      * Check if Graal is used as JIT compiler.
-      *
-      * @return true if Graal is used as JIT compiler.
-      */
-     protected String isGraalEnabled() {
-         return "" + Compiler.isGraalEnabled();
-     }
- 
-     /**
-      * Check if the libgraal shared library file is present.
-      *
-      * @return true if the libgraal shared library file is present.
-      */
-     protected String hasLibgraal() {
-         return "" + WB.hasLibgraal();
-     }
- 
-     /**
-      * Check if libgraal is used as JIT compiler.
-      *
-      * @return true if libgraal is used as JIT compiler.
-      */
-     protected String isLibgraalJIT() {
-         return "" + Compiler.isLibgraalJIT();
-     }
- 
      /**
       * Check if Compiler1 is present.
       *
       * @return true if Compiler1 is used as JIT compiler, either alone or as part of the tiered system.
       */
--- 489,10 ---
< prev index next >