Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GR-58622] Compact binary encoding for ObjectCopier. #9959

Closed
wants to merge 13 commits into from
Closed

[GR-58622] Compact binary encoding for ObjectCopier. #9959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ebc86cf
Disable strengthened graphs for now.
peter-hofer Oct 3, 2024
ab6a45d
Binary ObjectCopier encoding.
peter-hofer Oct 1, 2024
9687489
Binary ObjectCopier array encoding.
peter-hofer Oct 2, 2024
dae7277
Use FrequencyEncoder in ObjectCopier.
peter-hofer Oct 3, 2024
815a469
Use a string table for compact indexes (using a frequency encoder) an…
peter-hofer Oct 3, 2024
38ca85e
Compact binary map encoding in ObjectCopier.
peter-hofer Oct 4, 2024
cf1f54a
Encode ObjectCopier objects and fields in compact binary format.
peter-hofer Oct 4, 2024
dad70fd
Omit implicit incrementing ids in ObjectCopier.
peter-hofer Oct 4, 2024
4ab6228
Use packing for most integer values.
peter-hofer Oct 4, 2024
5c55805
Omit field counts, names and types.
peter-hofer Oct 7, 2024
693732b
Different extension for graphs file.
peter-hofer Oct 15, 2024
91384f5
Add human-readable debug output for maintainability.
peter-hofer Oct 16, 2024
1e0bcc3
Add fingerprints for ObjectCopier types and enum constants for safety.
peter-hofer Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/ObjectCopierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
package jdk.graal.compiler.util.test;

import java.io.IOException;
import java.io.PrintStream;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
Expand Down Expand Up @@ -175,20 +176,14 @@ public void testIt() {
List<Field> externalValueFields = List.of(ObjectCopier.getField(BaseClass.class, "BASE_SINGLETON"),
ObjectCopier.getField(TestObject.class, "TEST_OBJECT_SINGLETON"));

String encoded = ObjectCopier.encode(new ObjectCopier.Encoder(externalValueFields), root);
if (DEBUG) {
System.out.printf("encoded:%n%s%n", encoded);
}
byte[] encoded = encode(externalValueFields, root, "encoded");
Object decoded = ObjectCopier.decode(encoded, loader);
if (DEBUG) {
System.out.printf("root:%n%s%n", root);
System.out.printf("decoded:%n%s%n", decoded);
}
String reencoded = ObjectCopier.encode(new ObjectCopier.Encoder(externalValueFields), decoded);
if (DEBUG) {
System.out.printf("reencoded:%n%s%n", reencoded);
}
Assert.assertEquals(encoded, reencoded);
byte[] reencoded = encode(externalValueFields, decoded, "reencoded");
Assert.assertArrayEquals(encoded, reencoded);

Map<String, Object> root2 = (Map<String, Object>) ObjectCopier.decode(reencoded, loader);

Expand All @@ -201,6 +196,15 @@ public void testIt() {
Assert.assertSame(root2.get("singleton2"), root2.get("singleton2_2"));
}

private static byte[] encode(List<Field> externalValueFields, Object root, String debugLabel) {
PrintStream debugStream = null;
if (DEBUG) {
debugStream = System.out;
debugStream.printf("%s:%n", debugLabel);
}
return ObjectCopier.encode(new ObjectCopier.Encoder(externalValueFields, debugStream), root);
}

@Test
public void test() throws IOException, InterruptedException {
launchSubprocess(this::testIt,
Expand Down
6 changes: 3 additions & 3 deletions compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/libgraal/BuildTime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@
import java.util.function.Consumer;
import java.util.function.Supplier;

import jdk.graal.compiler.core.ArchitectureSpecific;
import jdk.graal.compiler.hotspot.CompilerConfigurationFactory;
import org.graalvm.collections.EconomicMap;

import jdk.graal.compiler.core.ArchitectureSpecific;
import jdk.graal.compiler.core.common.spi.ForeignCallSignature;
import jdk.graal.compiler.debug.GraalError;
import jdk.graal.compiler.debug.TTY;
import jdk.graal.compiler.graph.NodeClass;
import jdk.graal.compiler.hotspot.CompilerConfigurationFactory;
import jdk.graal.compiler.hotspot.EncodedSnippets;
import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage;
import jdk.graal.compiler.hotspot.HotSpotReplacementsImpl;
Expand Down Expand Up @@ -148,7 +148,7 @@ public static void configureGraalForLibGraal(String arch,
Consumer<Class<?>> registerAsInHeap,
Consumer<List<Class<?>>> hostedGraalSetFoldNodePluginClasses,
String nativeImageLocationQualifier,
String encodedGuestObjects) {
byte[] encodedGuestObjects) {
GraalError.guarantee(VALID_LOADER_NAME.equals(LOADER.getName()),
"Only call this method from classloader " + VALID_LOADER_NAME);

Expand Down
4 changes: 2 additions & 2 deletions compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/libgraal/CompilerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ protected ClassInfo makeClassInfo(Class<?> declaringClass) {
return ci;
}
};
String encoded = ObjectCopier.encode(encoder, encodedObjects);
byte[] encoded = ObjectCopier.encode(encoder, encodedObjects);

Files.writeString(Path.of(args[0]), encoded);
Files.write(Path.of(args[0]), encoded);
}

private static EncodedSnippets getEncodedSnippets(HotSpotReplacementsImpl replacements, OptionValues options) {
Expand Down
Loading