[GR-37247] Reduce memory footprint.

PullRequest: graal/11378

Author: Christian Wimmer

compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Edges.java

@@ -204,6 +204,15 @@ public void copy(Node fromNode, Node toNode) {
  }
  }
 
+ void minimizeSize(Node node) {
+ for (int i = getDirectCount(); i < getCount(); i++) {
+ NodeList<Node> list = getNodeList(node, offsets, i);
+ if (list != null) {
+ list.minimizeSize();
+ }
+ }
+ }
+
  /**
  * Sets the value of a given edge without notifying the new and old nodes on the other end of
  * the edge of the change.

compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java

@@ -948,15 +948,31 @@ protected void afterNodeIdChange(Node node, Object value) {
  * of nodes is compressed such that all non-null entries precede all null entries while
  * preserving the ordering between the nodes within the list.
  */
- public boolean maybeCompress() {
- if (debug.isDumpEnabledForMethod() || debug.isLogEnabledForMethod()) {
+ public final boolean maybeCompress() {
+ return compress(false);
+ }
+
+ /**
+ * Minimize the memory occupied by the graph by trimming all node arrays to the minimum size.
+ * Note that this can make subsequent optimization phases run slower, because additions to the
+ * graph must re-allocate larger arrays again. So invoking this method is only beneficial if a
+ * graph is alive for a long time.
+ */
+ public final void minimizeSize() {
+ compress(true);
+ }
+
+ protected boolean compress(boolean minimizeSize) {
+ if (!minimizeSize && (debug.isDumpEnabledForMethod() || debug.isLogEnabledForMethod())) {
  return false;
  }
  int liveNodeCount = getNodeCount();
- int liveNodePercent = liveNodeCount * 100 / nodesSize;
- int compressionThreshold = Options.GraphCompressionThreshold.getValue(options);
- if (compressionThreshold == 0 || liveNodePercent >= compressionThreshold) {
- return false;
+ if (!minimizeSize) {
+ int liveNodePercent = liveNodeCount * 100 / nodesSize;
+ int compressionThreshold = Options.GraphCompressionThreshold.getValue(options);
+ if (compressionThreshold == 0 || liveNodePercent >= compressionThreshold) {
+ return false;
+ }
  }
  GraphCompressions.increment(debug);
  int nextId = 0;
@@ -984,9 +1000,38 @@ public boolean maybeCompress() {
  compressions++;
  nodesDeletedBeforeLastCompression += nodesDeletedSinceLastCompression;
  nodesDeletedSinceLastCompression = 0;
+
+ if (minimizeSize) {
+ /* Trim the array of all alive nodes itself. */
+ nodes = trimArrayToNewSize(nodes, nextId, NodeList.EMPTY_NODE_ARRAY);
+ /* Remove deleted nodes from the linked list of Node.typeCacheNext. */
+ recomputeIterableNodeLists();
+ /* Trim node arrays used within each node. */
+ for (Node node : nodes) {
+ node.extraUsages = trimArrayToNewSize(node.extraUsages, node.extraUsagesCount, NodeList.EMPTY_NODE_ARRAY);
+ node.getNodeClass().getInputEdges().minimizeSize(node);
+ node.getNodeClass().getSuccessorEdges().minimizeSize(node);
+ }
+ }
  return true;
  }
 
+ static <T> T[] trimArrayToNewSize(T[] input, int newSize, T[] emptyArray) {
+ assert emptyArray.length == 0;
+ if (input.length == newSize) {
+ return input;
+ }
+ for (int i = newSize; i < input.length; i++) {
+ GraalError.guarantee(input[i] == null, "removing non-null element");
+ }
+
+ if (newSize == 0) {
+ return emptyArray;
+ } else {
+ return Arrays.copyOf(input, newSize);
+ }
+ }
+
  /**
  * Returns an {@link Iterable} providing all the live nodes whose type is compatible with
  * {@code type}.

compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeList.java

@@ -76,7 +76,11 @@ protected NodeList(Node self, int initialSize) {
  checkMaxSize(initialSize);
  this.size = initialSize;
  this.initialSize = initialSize;
- this.nodes = new Node[initialSize];
+ if (initialSize == 0) {
+ this.nodes = EMPTY_NODE_ARRAY;
+ } else {
+ this.nodes = new Node[initialSize];
+ }
  }
 
  protected NodeList(Node self, T[] elements) {
@@ -232,8 +236,13 @@ public void initialize(int index, Node node) {
  void copy(NodeList<? extends Node> other) {
  self.incModCount();
  incModCount();
- Node[] newNodes = new Node[other.size];
- System.arraycopy(other.nodes, 0, newNodes, 0, newNodes.length);
+ Node[] newNodes;
+ if (other.size == 0) {
+ newNodes = EMPTY_NODE_ARRAY;
+ } else {
+ newNodes = new Node[other.size];
+ System.arraycopy(other.nodes, 0, newNodes, 0, newNodes.length);
+ }
  nodes = newNodes;
  size = other.size;
  }
@@ -279,6 +288,10 @@ void clearWithoutUpdate() {
  size = 0;
  }
 
+ void minimizeSize() {
+ nodes = Graph.trimArrayToNewSize(nodes, size, EMPTY_NODE_ARRAY);
+ }
+
  @Override
  @SuppressWarnings("unchecked")
  public boolean remove(Object node) {

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/AbstractForeignCallStub.java

@@ -221,7 +221,7 @@ protected final StructuredGraph getGraph(DebugContext debug, CompilationIdentifi
  ResolvedJavaMethod getAndClearObjectResult = foreignCallSnippets.getAndClearObjectResult.getMethod();
  ResolvedJavaMethod verifyObject = foreignCallSnippets.verifyObject.getMethod();
  ResolvedJavaMethod thisMethod = getGraphMethod();
- GraphKit kit = new GraphKit(debug, thisMethod, providers, wordTypes, providers.getGraphBuilderPlugins(), compilationId, toString(), false);
+ GraphKit kit = new GraphKit(debug, thisMethod, providers, wordTypes, providers.getGraphBuilderPlugins(), compilationId, toString(), false, true);
  StructuredGraph graph = kit.getGraph();
  graph.disableFrameStateVerification();
  ReadRegisterNode thread = kit.append(new ReadRegisterNode(providers.getRegisters().getThreadRegister(), wordTypes.getWordKind(), true, false));

compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java

@@ -560,8 +560,8 @@ protected void afterNodeIdChange(Node node, Object value) {
  }
 
  @Override
- public boolean maybeCompress() {
- if (super.maybeCompress()) {
+ protected boolean compress(boolean minimizeSize) {
+ if (super.compress(minimizeSize)) {
  /*
  * The schedule contains a NodeMap which is unusable after compression.
  */

compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/GraphKit.java

@@ -106,9 +106,9 @@ protected abstract static class Structure {
  }
 
  public GraphKit(DebugContext debug, ResolvedJavaMethod stubMethod, Providers providers, WordTypes wordTypes, Plugins graphBuilderPlugins, CompilationIdentifier compilationId, String name,
- boolean trackNodeSourcePosition) {
+ boolean trackNodeSourcePosition, boolean recordInlinedMethods) {
  super(providers);
- StructuredGraph.Builder builder = new StructuredGraph.Builder(debug.getOptions(), debug).compilationId(compilationId).profileProvider(null);
+ StructuredGraph.Builder builder = new StructuredGraph.Builder(debug.getOptions(), debug).recordInlinedMethods(recordInlinedMethods).compilationId(compilationId).profileProvider(null);
  if (name != null) {
  builder.name(name);
  } else {

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/AnalysisParsedGraph.java

@@ -114,7 +114,10 @@ public static AnalysisParsedGraph parseBytecode(BigBang bb, AnalysisMethod metho
  return EMPTY;
  }
 
- graph = new StructuredGraph.Builder(options, debug).method(method).build();
+ graph = new StructuredGraph.Builder(options, debug)
+ .method(method)
+ .recordInlinedMethods(false)
+ .build();
  try (DebugContext.Scope s = debug.scope("ClosedWorldAnalysis", graph, method)) {
 
  // enable this logging to get log output in compilation passes

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java

@@ -205,6 +205,7 @@ private boolean parse() {
  * needed after static analysis.
  */
  if (bb.strengthenGraalGraphs()) {
+ graph.minimizeSize();
  method.setAnalyzedGraph(graph);
  }
 

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/CompletionExecutor.java

@@ -60,7 +60,7 @@ private enum State {
  private final AtomicReference<State> state;
  private final LongAdder postedOperations;
  private final LongAdder completedOperations;
- private final List<DebugContextRunnable> postedBeforeStart;
+ private List<DebugContextRunnable> postedBeforeStart;
  private final CopyOnWriteArrayList<Throwable> exceptions = new CopyOnWriteArrayList<>();
 
  private ExecutorService executorService;
@@ -90,7 +90,6 @@ public CompletionExecutor(BigBang bb, ForkJoinPool forkJoin, Runnable heartbeatC
  state = new AtomicReference<>(State.UNUSED);
  postedOperations = new LongAdder();
  completedOperations = new LongAdder();
- postedBeforeStart = new ArrayList<>();
  startingThread = Thread.currentThread();
  }
 
@@ -103,7 +102,7 @@ public void init(Timing newTiming) {
  setState(State.BEFORE_START);
  postedOperations.reset();
  completedOperations.reset();
- postedBeforeStart.clear();
+ postedBeforeStart = new ArrayList<>();
  vmConfig = bb.getHostVM().getConfiguration();
  }
 
@@ -213,7 +212,7 @@ public void start() {
 
  setState(State.STARTED);
  postedBeforeStart.forEach(this::execute);
- postedBeforeStart.clear();
+ postedBeforeStart = null;
  }
 
  private void setState(State newState) {
@@ -271,7 +270,7 @@ public long complete() throws InterruptedException {
  }
 
  public long getPostedOperations() {
- return postedOperations.sum() + postedBeforeStart.size();
+ return postedOperations.sum() + (postedBeforeStart == null ? 0 : postedBeforeStart.size());
  }
 
  public boolean isSequential() {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateReplacements.java

@@ -220,7 +220,12 @@ public StructuredGraph getSnippet(ResolvedJavaMethod method, ResolvedJavaMethod
 
  EncodedGraph encodedGraph = new EncodedGraph(snippetEncoding, startOffset, snippetObjects, snippetNodeClasses, null, null, false, trackNodeSourcePosition);
  try (DebugContext debug = openSnippetDebugContext("SVMSnippet_", method, options)) {
- StructuredGraph result = new StructuredGraph.Builder(options, debug).method(method).trackNodeSourcePosition(trackNodeSourcePosition).setIsSubstitution(true).build();
+ StructuredGraph result = new StructuredGraph.Builder(options, debug)
+ .method(method)
+ .trackNodeSourcePosition(trackNodeSourcePosition)
+ .recordInlinedMethods(false)
+ .setIsSubstitution(true)
+ .build();
  PEGraphDecoder graphDecoder = new PEGraphDecoder(ConfigurationValues.getTarget().arch, result, providers, null, snippetInvocationPlugins, new InlineInvokePlugin[0], parameterPlugin, null,
  null, null, new ConcurrentHashMap<>(), new ConcurrentHashMap<>(), true) {