-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[GR-37550] Reduce memory footprint of graphs.
PullRequest: graal/11435
- Loading branch information
Showing
36 changed files
with
759 additions
and
362 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
129 changes: 129 additions & 0 deletions
129
...compiler.core.test/src/org/graalvm/compiler/core/test/VerifySharedConstantEmptyArray.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| /* | ||
| * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. Oracle designates this | ||
| * particular file as subject to the "Classpath" exception as provided | ||
| * by Oracle in the LICENSE file that accompanied this code. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
| package org.graalvm.compiler.core.test; | ||
|
|
||
| import java.util.Set; | ||
|
|
||
| import org.graalvm.compiler.graph.Node; | ||
| import org.graalvm.compiler.graph.NodeInputList; | ||
| import org.graalvm.compiler.nodes.StructuredGraph; | ||
| import org.graalvm.compiler.nodes.ValueNode; | ||
| import org.graalvm.compiler.nodes.java.MethodCallTargetNode; | ||
| import org.graalvm.compiler.nodes.java.NewArrayNode; | ||
| import org.graalvm.compiler.nodes.java.StoreFieldNode; | ||
| import org.graalvm.compiler.nodes.spi.CoreProviders; | ||
| import org.graalvm.compiler.nodes.util.GraphUtil; | ||
|
|
||
| import jdk.vm.ci.meta.ResolvedJavaField; | ||
| import jdk.vm.ci.meta.ResolvedJavaMethod; | ||
| import jdk.vm.ci.meta.ResolvedJavaType; | ||
|
|
||
| /** | ||
| * Verifies that if a shared 0-length array constant is available for some type (e.g. | ||
| * {@link ValueNode#EMPTY_ARRAY}), then it is used everywhere such a value is needed. | ||
| */ | ||
| public class VerifySharedConstantEmptyArray extends VerifyStringFormatterUsage { | ||
|
|
||
| /** | ||
| * Names of static final fields in the Graal code base that defined shared 0-length arrays. | ||
| */ | ||
| private static final Set<String> NAMES = Set.of( | ||
| "EMPTY_ARRAY", | ||
| "EMPTY_PATTERNS", | ||
| "NO_NODES"); | ||
|
|
||
| @Override | ||
| protected void verify(StructuredGraph graph, CoreProviders context) { | ||
| for (NewArrayNode t : graph.getNodes().filter(NewArrayNode.class)) { | ||
| checkNewArrayNode(graph, t); | ||
| } | ||
| } | ||
|
|
||
| private static void checkNewArrayNode(StructuredGraph graph, NewArrayNode t) { | ||
| ResolvedJavaMethod method = graph.method(); | ||
| if (t.length().isDefaultConstant()) { | ||
| ResolvedJavaType elementType = t.elementType(); | ||
| if (!checkSharedConstantDefinition(t, method, elementType)) { | ||
| for (ResolvedJavaField field : elementType.getStaticFields()) { | ||
| if (field.isFinal() && field.getType().isArray() && field.getType().getElementalType().equals(elementType) && NAMES.contains(field.getName())) { | ||
| if (isUsageVarargsParameter(t)) { | ||
| return; | ||
| } | ||
| throw new VerificationError("In %s use %s instead of `new %s[0]`%s", method.format("%H.%n(%p)"), field.format("%H.%n"), elementType.toJavaName(false), approxLocation(t)); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Determines if {@code newZeroLengthArray} has a usage as a varargs parameter. | ||
| */ | ||
| private static boolean isUsageVarargsParameter(NewArrayNode newZeroLengthArray) { | ||
| for (Node usage : newZeroLengthArray.usages()) { | ||
| if (usage instanceof MethodCallTargetNode) { | ||
| MethodCallTargetNode target = (MethodCallTargetNode) usage; | ||
| ResolvedJavaMethod m = target.targetMethod(); | ||
| if (m.isVarArgs()) { | ||
| NodeInputList<ValueNode> margs = target.arguments(); | ||
| if (margs.last() == newZeroLengthArray) { | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| * Checks if {@code newZeroLengthArray} in {@code method} is defining a shared constant and if | ||
| * so, that its name is in {@link #NAMES}. | ||
| * | ||
| * @return {@code true} if it is a shared constant definition | ||
| */ | ||
| private static boolean checkSharedConstantDefinition(NewArrayNode newZeroLengthArray, ResolvedJavaMethod method, ResolvedJavaType elementType) { | ||
| if (method.getDeclaringClass().equals(elementType) && method.getName().equals("<clinit>")) { | ||
| for (Node usage : newZeroLengthArray.usages()) { | ||
| if (usage instanceof StoreFieldNode) { | ||
| StoreFieldNode store = (StoreFieldNode) usage; | ||
| ResolvedJavaField f = store.field(); | ||
| if (f.isStatic() && f.isFinal() && store.value() == newZeroLengthArray) { | ||
| if (!NAMES.contains(f.getName())) { | ||
| throw new VerificationError("%s appears to be a shared 0-length array constant - rename to EMPTY_ARRAY or add its name to %s.NAMES%s", f.format("%H.%n"), | ||
| VerifySharedConstantEmptyArray.class.getName(), approxLocation(newZeroLengthArray)); | ||
| } | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| private static String approxLocation(NewArrayNode n) { | ||
| String loc = GraphUtil.approxSourceLocation(n); | ||
| return loc == null ? "" : String.format(" [approx location: %s]", loc); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.