[GR-68420] Use a sparse bitset and process fewer blocks during global liveness

PullRequest: graal/21894

Author: tkrodriguez

compiler/src/jdk.graal.compiler.management/src/jdk/graal/compiler/management/JMXServiceProvider.java

@@ -122,7 +122,7 @@ static class GCTimeStatisticsImpl implements GCTimeStatistics {
         }
 
         @Override
-        public long getGCTimeMills() {
+        public long getGCTimeMillis() {
             long afterMillis = 0;
             for (GarbageCollectorMXBean gc : gcs) {
                 afterMillis += gc.getCollectionTime();

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/CompilationAlarm.java

@@ -201,7 +201,7 @@ public void checkExpiration() {
             // Include information about time spent in the GC if it's available.
             String gcMessage = "";
             if (gcTiming != null) {
-                gcMessage = String.format(" (GC time is %s ms of %s ms elapsed)", gcTiming.getGCTimeMills(), gcTiming.getElapsedTimeMillis());
+                gcMessage = String.format(" (GC time is %s ms of %s ms elapsed)", gcTiming.getGCTimeMillis(), gcTiming.getElapsedTimeMillis());
             }
 
             throw new PermanentBailoutException("Compilation exceeded %.3f seconds%s. %n Phase timings:%n %s <===== TIMEOUT HERE", period, gcMessage, sb.toString().trim());

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilationTask.java

@@ -36,7 +36,6 @@
 import java.io.PrintStream;
 import java.util.List;
 import java.util.ListIterator;
-import java.util.concurrent.TimeUnit;
 
 import org.graalvm.collections.EconomicMap;
 
@@ -78,7 +77,6 @@
 import jdk.graal.compiler.phases.tiers.Suites;
 import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
 import jdk.graal.compiler.serviceprovider.GraalServices;
-import jdk.graal.compiler.serviceprovider.JMXService;
 import jdk.vm.ci.code.BailoutException;
 import jdk.vm.ci.hotspot.HotSpotCompilationRequest;
 import jdk.vm.ci.hotspot.HotSpotCompilationRequestResult;
@@ -594,16 +592,6 @@ public HotSpotInstalledCode getInstalledCode() {
      */
     public static final TimerKey CompilationTime = DebugContext.timer("CompilationTime").doc("Time spent in compilation and code installation.");
 
-    /**
-     * Time spent in garbage collection during this compilation.
-     */
-    public static final TimerKey GarbageCollectionTime = DebugContext.timer("GarbageCollectionTime").doc("Time spent in GC during compilation and code installation.");
-
-    /**
-     * Number of garbage collection during this compilation.
-     */
-    public static final CounterKey GarbageCollectionCount = DebugContext.counter("GarbageCollectionCount").doc("Number of GCs during compilation and code installation.");
-
     /**
      * Counts the number of compiled {@linkplain CompilationResult#getBytecodeSize() bytecodes}.
      */
@@ -638,27 +626,9 @@ public HotSpotCompilationRequestResult runCompilation(OptionValues initialOption
         }
     }
 
-    public record GCTimerScope(DebugContext debug, JMXService.GCTimeStatistics gcStats) implements DebugCloseable {
-        static DebugCloseable create(DebugContext debug) {
-            if (GarbageCollectionTime.isEnabled(debug) || GarbageCollectionCount.isEnabled(debug)) {
-                final JMXService.GCTimeStatistics gcStats = GraalServices.getGCTimeStatistics();
-                if (gcStats != null) {
-                    return new GCTimerScope(debug, gcStats);
-                }
-            }
-            return null;
-        }
-
-        @Override
-        public void close() {
-            GarbageCollectionCount.add(debug, gcStats.getGCCount());
-            GarbageCollectionTime.add(debug, gcStats.getGCTimeMills(), TimeUnit.MILLISECONDS);
-        }
-    }
-
     @SuppressWarnings({"try"})
     public HotSpotCompilationRequestResult runCompilation(DebugContext debug) {
-        try (DebugCloseable a = CompilationTime.start(debug); DebugCloseable b = GCTimerScope.create(debug)) {
+        try (DebugCloseable a = CompilationTime.start(debug); DebugCloseable b = GraalServices.GCTimerScope.create(debug)) {
             HotSpotCompilationRequestResult result = runCompilation(debug, new HotSpotCompilationWrapper());
             LibGraalSupport libgraal = LibGraalSupport.INSTANCE;
             if (libgraal != null) {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScan.java

@@ -32,7 +32,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.BitSet;
 import java.util.List;
 
 import org.graalvm.collections.Pair;
@@ -75,6 +74,10 @@
  */
 public class LinearScan {
 
+    protected boolean isDetailedAsserts() {
+        return Assertions.assertionsEnabled() && detailedAsserts;
+    }
+
     public static class Options {
         // @formatter:off
         @Option(help = "Enable spill position optimization", type = OptionType.Debug)
@@ -90,28 +93,34 @@ public static class BlockData {
          * block. The bit index of an operand is its {@linkplain LinearScan#operandNumber(Value)
          * operand number}.
          */
-        public BitSet liveIn;
+        public SparseBitSet liveIn;
 
         /**
          * Bit map specifying which operands are live upon exit from this block. These are values
          * used in a successor block that are either defined in this block or were live upon entry
          * to this block. The bit index of an operand is its
          * {@linkplain LinearScan#operandNumber(Value) operand number}.
          */
-        public BitSet liveOut;
+        public SparseBitSet liveOut;
 
         /**
          * Bit map specifying which operands are used (before being defined) in this block. That is,
          * these are the values that are live upon entry to the block. The bit index of an operand
          * is its {@linkplain LinearScan#operandNumber(Value) operand number}.
          */
-        public BitSet liveGen;
+        public SparseBitSet liveGen;
 
         /**
          * Bit map specifying which operands are defined/overwritten in this block. The bit index of
          * an operand is its {@linkplain LinearScan#operandNumber(Value) operand number}.
          */
-        public BitSet liveKill;
+        public SparseBitSet liveKill;
+
+        /**
+         * State used during {@link LinearScanLifetimeAnalysisPhase#computeGlobalLiveSets()} to
+         * create a worklist.
+         */
+        boolean dirty = true;
     }
 
     public static final int DOMINATOR_SPILL_MOVE_ID = -2;
@@ -160,14 +169,14 @@ public static class BlockData {
     private Interval[] sortedIntervals;
 
     /**
-     * Map from an instruction {@linkplain LIRInstruction#id id} to the instruction. Entries should
-     * be retrieved with {@link #instructionForId(int)} as the id is not simply an index into this
-     * array.
+     * Map from an instruction {@linkplain LIRInstruction#id() id} to the instruction. Entries
+     * should be retrieved with {@link #instructionForId(int)} as the id is not simply an index into
+     * this array.
      */
     private LIRInstruction[] opIdToInstructionMap;
 
     /**
-     * Map from an instruction {@linkplain LIRInstruction#id id} to the {@linkplain BasicBlock
+     * Map from an instruction {@linkplain LIRInstruction#id() id} to the {@linkplain BasicBlock
      * block} containing the instruction. Entries should be retrieved with {@link #blockForId(int)}
      * as the id is not simply an index into this array.
      */
@@ -188,7 +197,7 @@ public static class BlockData {
      */
     protected final Interval intervalEndMarker;
     public final Range rangeEndMarker;
-    public final boolean detailedAsserts;
+    private final boolean detailedAsserts;
     private final LIRGenerationResult res;
 
     @SuppressWarnings("this-escape")
@@ -461,7 +470,7 @@ int maxOpId() {
     }
 
     /**
-     * Converts an {@linkplain LIRInstruction#id instruction id} to an instruction index. All LIR
+     * Converts an {@linkplain LIRInstruction#id() instruction id} to an instruction index. All LIR
      * instructions in a method have an index one greater than their linear-scan order predecessor
      * with the first instruction having an index of 0.
      */
@@ -470,10 +479,10 @@ private static int opIdToIndex(int opId) {
     }
 
     /**
-     * Retrieves the {@link LIRInstruction} based on its {@linkplain LIRInstruction#id id}.
+     * Retrieves the {@link LIRInstruction} based on its {@linkplain LIRInstruction#id() id}.
      *
-     * @param opId an instruction {@linkplain LIRInstruction#id id}
-     * @return the instruction whose {@linkplain LIRInstruction#id} {@code == id}
+     * @param opId an instruction {@linkplain LIRInstruction#id() id}
+     * @return the instruction whose {@linkplain LIRInstruction#id()} {@code == id}
      */
     public LIRInstruction instructionForId(int opId) {
         assert isEven(opId) : "opId not even";
@@ -485,7 +494,7 @@ public LIRInstruction instructionForId(int opId) {
     /**
      * Gets the block containing a given instruction.
      *
-     * @param opId an instruction {@linkplain LIRInstruction#id id}
+     * @param opId an instruction {@linkplain LIRInstruction#id() id}
      * @return the block containing the instruction denoted by {@code opId}
      */
     public BasicBlock<?> blockForId(int opId) {
@@ -500,7 +509,7 @@ boolean isBlockBegin(int opId) {
     /**
      * Determines if an {@link LIRInstruction} destroys all caller saved registers.
      *
-     * @param opId an instruction {@linkplain LIRInstruction#id id}
+     * @param opId an instruction {@linkplain LIRInstruction#id() id}
      * @return {@code true} if the instruction denoted by {@code id} destroys all caller saved
      *         registers.
      */
@@ -740,14 +749,14 @@ protected void allocate(TargetDescription target, LIRGenerationResult lirGenRes,
 
                 sortIntervalsAfterAllocation();
 
-                if (detailedAsserts) {
+                if (isDetailedAsserts()) {
                     verify();
                 }
                 beforeSpillMoveElimination();
                 createSpillMoveEliminationPhase().apply(target, lirGenRes, context);
                 createAssignLocationsPhase().apply(target, lirGenRes, context);
 
-                if (detailedAsserts) {
+                if (isDetailedAsserts()) {
                     verifyIntervals();
                 }
             } catch (Throwable e) {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanAllocationPhase.java

@@ -24,44 +24,12 @@
  */
 package jdk.graal.compiler.lir.alloc.lsra;
 
-import jdk.graal.compiler.debug.DebugContext;
-import jdk.graal.compiler.debug.DebugContext.CompilerPhaseScope;
-import jdk.graal.compiler.lir.gen.LIRGenerationResult;
 import jdk.graal.compiler.lir.phases.AllocationPhase;
 import jdk.graal.compiler.lir.phases.LIRPhase;
-import jdk.vm.ci.code.TargetDescription;
-
-abstract class LinearScanAllocationPhase {
-
-    final CharSequence getName() {
-        return LIRPhase.createName(getClass());
-    }
 
+abstract class LinearScanAllocationPhase extends LIRPhase<AllocationPhase.AllocationContext> {
     @Override
     public final String toString() {
         return getName().toString();
     }
-
-    public final void apply(TargetDescription target, LIRGenerationResult lirGenRes, AllocationPhase.AllocationContext context) {
-        apply(target, lirGenRes, context, true);
-    }
-
-    @SuppressWarnings("try")
-    public final void apply(TargetDescription target, LIRGenerationResult lirGenRes, AllocationPhase.AllocationContext context, boolean dumpLIR) {
-        DebugContext debug = lirGenRes.getLIR().getDebug();
-        CharSequence name = getName();
-        try (DebugContext.Scope s = debug.scope(name, this); CompilerPhaseScope cps = debug.enterCompilerPhase(name, null)) {
-            run(target, lirGenRes, context);
-            if (dumpLIR) {
-                if (debug.isDumpEnabled(DebugContext.VERBOSE_LEVEL)) {
-                    debug.dump(DebugContext.VERBOSE_LEVEL, lirGenRes.getLIR(), "After %s", name);
-                }
-            }
-        } catch (Throwable e) {
-            throw debug.handle(e);
-        }
-    }
-
-    protected abstract void run(TargetDescription target, LIRGenerationResult lirGenRes, AllocationPhase.AllocationContext context);
-
 }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanAssignLocationsPhase.java

@@ -79,7 +79,7 @@ protected Value colorLirOperand(LIRInstruction op, Variable operand, LIRInstruct
         assert interval != null : "interval must exist";
 
         if (opId != -1) {
-            if (allocator.detailedAsserts) {
+            if (allocator.isDetailedAsserts()) {
                 BasicBlock<?> block = allocator.blockForId(opId);
                 if (block.getSuccessorCount() <= 1 && opId == allocator.getLastLirInstructionId(block)) {
                     /*