-
Notifications
You must be signed in to change notification settings - Fork 5.4k
Refactor ObjectDataInterner to support pluggable deduplicators and enable for ReadyToRun #126112
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
5a94384
Refactor ObjectDataInterner to use pluggable deduplicators
jkoritzinsky 99dccf9
Move ObjectDataInterner to Common/Compiler and include in ReadyToRun
jkoritzinsky fcf26c5
Add CopiedMethodILDeduplicator for ReadyToRun
jkoritzinsky f9427e7
Enable ObjectDataInterner in ObjectWriter for ReadyToRun
jkoritzinsky 9cf56de
Address review feedback from Copilot
jkoritzinsky 05f0f3e
Set marking complete for composite component images
jkoritzinsky 88dceb7
Address review feedback: robust convergence, caching, determinism
jkoritzinsky 066c5f4
Don't deduplicate unmarked method il nodes
jkoritzinsky f5c2f7c
Update src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/MethodBodyD…
jkoritzinsky File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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,88 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System.Collections.Generic; | ||
|
|
||
| using ILCompiler.DependencyAnalysis; | ||
|
|
||
| using Debug = System.Diagnostics.Debug; | ||
|
|
||
| namespace ILCompiler | ||
| { | ||
| /// <summary> | ||
| /// Pluggable strategy for identifying and deduplicating equivalent object data. | ||
| /// </summary> | ||
| public interface IObjectDataDeduplicator | ||
| { | ||
| /// <summary> | ||
| /// Performs one deduplication pass, adding entries to <paramref name="symbolRemapping"/>. | ||
| /// Called iteratively until the overall mapping converges. | ||
| /// </summary> | ||
| void DeduplicatePass(NodeFactory factory, Dictionary<ISymbolNode, ISymbolNode> previousSymbolRemapping, Dictionary<ISymbolNode, ISymbolNode> symbolRemapping); | ||
| } | ||
|
|
||
| public sealed class ObjectDataInterner | ||
| { | ||
| private readonly IObjectDataDeduplicator[] _deduplicators; | ||
| private Dictionary<ISymbolNode, ISymbolNode> _symbolRemapping; | ||
|
|
||
| public static ObjectDataInterner Null { get; } = new ObjectDataInterner() { _symbolRemapping = new() }; | ||
|
|
||
| public ObjectDataInterner(params IObjectDataDeduplicator[] deduplicators) | ||
| { | ||
| _deduplicators = deduplicators; | ||
| } | ||
|
jkoritzinsky marked this conversation as resolved.
|
||
|
|
||
| private void EnsureMap(NodeFactory factory) | ||
| { | ||
| Debug.Assert(factory.MarkingComplete); | ||
|
|
||
| if (_symbolRemapping != null) | ||
| return; | ||
|
|
||
| Dictionary<ISymbolNode, ISymbolNode> previousSymbolRemapping; | ||
| Dictionary<ISymbolNode, ISymbolNode> symbolRemapping = null; | ||
|
|
||
| do | ||
| { | ||
| previousSymbolRemapping = symbolRemapping; | ||
| symbolRemapping = new Dictionary<ISymbolNode, ISymbolNode>((int)(1.05 * (previousSymbolRemapping?.Count ?? 0))); | ||
|
|
||
| foreach (IObjectDataDeduplicator deduplicator in _deduplicators) | ||
| { | ||
| deduplicator.DeduplicatePass(factory, previousSymbolRemapping, symbolRemapping); | ||
| } | ||
| } while (!MappingsEqual(previousSymbolRemapping, symbolRemapping)); | ||
|
|
||
| _symbolRemapping = symbolRemapping; | ||
| } | ||
|
|
||
| private static bool MappingsEqual(Dictionary<ISymbolNode, ISymbolNode> a, Dictionary<ISymbolNode, ISymbolNode> b) | ||
| { | ||
| if (a is null) | ||
| return false; | ||
|
|
||
| if (a.Count != b.Count) | ||
| return false; | ||
|
|
||
| foreach (KeyValuePair<ISymbolNode, ISymbolNode> kvp in a) | ||
| { | ||
| if (!b.TryGetValue(kvp.Key, out ISymbolNode value) || value != kvp.Value) | ||
| return false; | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| public ISymbolNode GetDeduplicatedSymbol(NodeFactory factory, ISymbolNode original) | ||
| { | ||
| EnsureMap(factory); | ||
|
|
||
| ISymbolNode target = original; | ||
| if (target is ISymbolNodeWithLinkage symbolWithLinkage) | ||
| target = symbolWithLinkage.NodeForLinkage(factory); | ||
|
|
||
| return _symbolRemapping.TryGetValue(target, out ISymbolNode result) ? result : original; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
88 changes: 88 additions & 0 deletions
88
...LCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedMethodILDeduplicator.cs
This file contains hidden or 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,88 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
|
|
||
| using ILCompiler.DependencyAnalysis; | ||
|
|
||
| namespace ILCompiler.DependencyAnalysis.ReadyToRun | ||
| { | ||
| public sealed class CopiedMethodILDeduplicator : IObjectDataDeduplicator | ||
| { | ||
| private readonly Func<IEnumerable<CopiedMethodILNode>> _nodesProvider; | ||
| private Dictionary<ISymbolNode, ISymbolNode> _cachedMapping; | ||
|
|
||
| public CopiedMethodILDeduplicator(Func<IEnumerable<CopiedMethodILNode>> nodesProvider) | ||
| { | ||
| _nodesProvider = nodesProvider; | ||
| } | ||
|
|
||
| public void DeduplicatePass(NodeFactory factory, Dictionary<ISymbolNode, ISymbolNode> previousSymbolRemapping, Dictionary<ISymbolNode, ISymbolNode> symbolRemapping) | ||
| { | ||
| if (_cachedMapping is null) | ||
| { | ||
| _cachedMapping = new Dictionary<ISymbolNode, ISymbolNode>(); | ||
|
|
||
| var sortedNodes = new List<CopiedMethodILNode>(_nodesProvider()); | ||
| sortedNodes.Sort(CompilerComparer.Instance); | ||
|
|
||
| var hashSet = new HashSet<InternKey>(new InternComparer()); | ||
|
|
||
| foreach (CopiedMethodILNode node in sortedNodes) | ||
| { | ||
| // No need to deduplicate unmarked nodes. | ||
| // They won't be emitted anyway. | ||
| if (!node.Marked) | ||
| { | ||
| continue; | ||
| } | ||
| var key = new InternKey(node, factory); | ||
| if (hashSet.TryGetValue(key, out InternKey existing)) | ||
| { | ||
| _cachedMapping[node] = existing.Node; | ||
| } | ||
| else | ||
| { | ||
| hashSet.Add(key); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| foreach (KeyValuePair<ISymbolNode, ISymbolNode> entry in _cachedMapping) | ||
| { | ||
| symbolRemapping.TryAdd(entry.Key, entry.Value); | ||
|
jkoritzinsky marked this conversation as resolved.
|
||
| } | ||
| } | ||
|
|
||
| private sealed class InternKey | ||
| { | ||
| public CopiedMethodILNode Node { get; } | ||
| public int HashCode { get; } | ||
| public byte[] Data { get; } | ||
|
|
||
| public InternKey(CopiedMethodILNode node, NodeFactory factory) | ||
| { | ||
| Node = node; | ||
|
|
||
| Data = node.GetData(factory, relocsOnly: false).Data; | ||
| var hashCode = new HashCode(); | ||
| hashCode.AddBytes(Data); | ||
| HashCode = hashCode.ToHashCode(); | ||
|
jkoritzinsky marked this conversation as resolved.
|
||
| } | ||
| } | ||
|
|
||
| private sealed class InternComparer : IEqualityComparer<InternKey> | ||
| { | ||
| public int GetHashCode(InternKey key) => key.HashCode; | ||
|
|
||
| public bool Equals(InternKey a, InternKey b) | ||
| { | ||
| if (a.HashCode != b.HashCode) | ||
| return false; | ||
|
|
||
| return a.Data.AsSpan().SequenceEqual(b.Data); | ||
| } | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.