src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java

*** 29,44 ****
  import static org.junit.Assert.assertThat;
  
  import java.util.ArrayList;
  import java.util.List;
  
- import org.junit.Assert;
- import org.junit.Test;
- 
  import org.graalvm.compiler.api.directives.GraalDirectives;
! import org.graalvm.compiler.debug.Debug;
! import org.graalvm.compiler.debug.Debug.Scope;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.graph.iterators.NodeIterable;
  import org.graalvm.compiler.nodes.ReturnNode;
  import org.graalvm.compiler.nodes.StartNode;
  import org.graalvm.compiler.nodes.StructuredGraph;
--- 29,40 ----
  import static org.junit.Assert.assertThat;
  
  import java.util.ArrayList;
  import java.util.List;
  
  import org.graalvm.compiler.api.directives.GraalDirectives;
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.graph.iterators.NodeIterable;
  import org.graalvm.compiler.nodes.ReturnNode;
  import org.graalvm.compiler.nodes.StartNode;
  import org.graalvm.compiler.nodes.StructuredGraph;
*** 58,67 ****
--- 54,65 ----
  import org.graalvm.compiler.phases.common.inlining.InliningPhase;
  import org.graalvm.compiler.phases.schedule.SchedulePhase;
  import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy;
  import org.graalvm.compiler.phases.tiers.HighTierContext;
  import org.graalvm.compiler.phases.tiers.MidTierContext;
+ import org.junit.Assert;
+ import org.junit.Test;
  
  /**
   * In these test the FrameStates are explicitly cleared out, so that the scheduling of
   * FloatingReadNodes depends solely on the scheduling algorithm. The FrameStates normally keep the
   * FloatingReadNodes above a certain point, so that they (most of the time...) magically do the
*** 704,725 ****
  
      @SuppressWarnings("try")
      private ScheduleResult getFinalSchedule(final String snippet, final TestMode mode, final SchedulingStrategy schedulingStrategy) {
          OptionValues options = new OptionValues(getInitialOptions(), OptScheduleOutOfLoops, schedulingStrategy == SchedulingStrategy.LATEST_OUT_OF_LOOPS, OptImplicitNullChecks, false);
          final StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO, options);
!         try (Scope d = Debug.scope("FloatingReadTest", graph)) {
              HighTierContext context = getDefaultHighTierContext();
              CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
              canonicalizer.apply(graph, context);
              if (mode == TestMode.INLINED_WITHOUT_FRAMESTATES) {
                  new InliningPhase(canonicalizer).apply(graph, context);
              }
              new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
              if (mode == TestMode.WITHOUT_FRAMESTATES || mode == TestMode.INLINED_WITHOUT_FRAMESTATES) {
                  graph.clearAllStateAfter();
              }
!             Debug.dump(Debug.BASIC_LEVEL, graph, "after removal of framestates");
  
              new FloatingReadPhase().apply(graph);
              new RemoveValueProxyPhase().apply(graph);
  
              MidTierContext midContext = new MidTierContext(getProviders(), getTargetProvider(), OptimisticOptimizations.ALL, graph.getProfilingInfo());
--- 702,724 ----
  
      @SuppressWarnings("try")
      private ScheduleResult getFinalSchedule(final String snippet, final TestMode mode, final SchedulingStrategy schedulingStrategy) {
          OptionValues options = new OptionValues(getInitialOptions(), OptScheduleOutOfLoops, schedulingStrategy == SchedulingStrategy.LATEST_OUT_OF_LOOPS, OptImplicitNullChecks, false);
          final StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO, options);
!         DebugContext debug = graph.getDebug();
!         try (DebugContext.Scope d = debug.scope("FloatingReadTest", graph)) {
              HighTierContext context = getDefaultHighTierContext();
              CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
              canonicalizer.apply(graph, context);
              if (mode == TestMode.INLINED_WITHOUT_FRAMESTATES) {
                  new InliningPhase(canonicalizer).apply(graph, context);
              }
              new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
              if (mode == TestMode.WITHOUT_FRAMESTATES || mode == TestMode.INLINED_WITHOUT_FRAMESTATES) {
                  graph.clearAllStateAfter();
              }
!             debug.dump(DebugContext.BASIC_LEVEL, graph, "after removal of framestates");
  
              new FloatingReadPhase().apply(graph);
              new RemoveValueProxyPhase().apply(graph);
  
              MidTierContext midContext = new MidTierContext(getProviders(), getTargetProvider(), OptimisticOptimizations.ALL, graph.getProfilingInfo());
*** 730,738 ****
              SchedulePhase schedule = new SchedulePhase(schedulingStrategy);
              schedule.apply(graph);
              assertDeepEquals(1, graph.getNodes().filter(StartNode.class).count());
              return graph.getLastSchedule();
          } catch (Throwable e) {
!             throw Debug.handle(e);
          }
      }
  }
--- 729,737 ----
              SchedulePhase schedule = new SchedulePhase(schedulingStrategy);
              schedule.apply(graph);
              assertDeepEquals(1, graph.getNodes().filter(StartNode.class).count());
              return graph.getLastSchedule();
          } catch (Throwable e) {
!             throw debug.handle(e);
          }
      }
  }