src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/MemoryUsageBenchmark.java

*** 20,34 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.hotspot.test;
  
! import static org.graalvm.compiler.debug.internal.MemUseTrackerImpl.getCurrentThreadAllocatedBytes;
  
  import org.graalvm.compiler.api.test.Graal;
  import org.graalvm.compiler.core.test.AllocSpy;
- import org.graalvm.compiler.debug.DebugEnvironment;
  import org.graalvm.compiler.hotspot.CompilationTask;
  import org.graalvm.compiler.hotspot.HotSpotGraalCompiler;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
  import org.graalvm.compiler.options.OptionValues;
  
--- 20,33 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.hotspot.test;
  
! import static org.graalvm.compiler.debug.MemUseTrackerKey.getCurrentThreadAllocatedBytes;
  
  import org.graalvm.compiler.api.test.Graal;
  import org.graalvm.compiler.core.test.AllocSpy;
  import org.graalvm.compiler.hotspot.CompilationTask;
  import org.graalvm.compiler.hotspot.HotSpotGraalCompiler;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
  import org.graalvm.compiler.options.OptionValues;
  
*** 119,130 ****
      public static void main(String[] args) {
          // Ensure a Graal runtime is initialized prior to Debug being initialized as the former
          // may include processing command line options used by the latter.
          Graal.getRuntime();
  
-         // Ensure a debug configuration for this thread is initialized
-         DebugEnvironment.ensureInitialized(getInitialOptions());
          new MemoryUsageBenchmark().run();
      }
  
      @SuppressWarnings("try")
      private void doCompilation(String methodName, String label) {
--- 118,127 ----
*** 154,164 ****
  
              long jvmciEnv = 0L;
              try (AllocSpy as = AllocSpy.open(methodName)) {
                  HotSpotJVMCIRuntimeProvider runtime = HotSpotJVMCIRuntime.runtime();
                  HotSpotCompilationRequest request = new HotSpotCompilationRequest(method, JVMCICompiler.INVOCATION_ENTRY_BCI, jvmciEnv);
!                 CompilationTask task = new CompilationTask(runtime, (HotSpotGraalCompiler) runtime.getCompiler(), request, true, false, getInitialOptions());
                  task.runCompilation();
              }
          }
      }
  
--- 151,163 ----
  
              long jvmciEnv = 0L;
              try (AllocSpy as = AllocSpy.open(methodName)) {
                  HotSpotJVMCIRuntimeProvider runtime = HotSpotJVMCIRuntime.runtime();
                  HotSpotCompilationRequest request = new HotSpotCompilationRequest(method, JVMCICompiler.INVOCATION_ENTRY_BCI, jvmciEnv);
!                 HotSpotGraalCompiler compiler = (HotSpotGraalCompiler) runtime.getCompiler();
!                 OptionValues options = getInitialOptions();
!                 CompilationTask task = new CompilationTask(runtime, compiler, request, true, false, options);
                  task.runCompilation();
              }
          }
      }