Skip to content

Avoid HashSet allocations for singleton conditional dependencies #132934

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

Open
awakecoding wants to merge 2 commits into
base: main
Choose a base branch
from
+61 −16
Open

Avoid HashSet allocations for singleton conditional dependencies #132934

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5543a55
Reduce conditional dependency allocations
awakecoding Aug 29, 2026
9509ea6
Remove dependency analyzer tests
awakecoding Aug 31, 2026
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
77 changes: 61 additions & 16 deletions src/coreclr/tools/aot/ILCompiler.DependencyAnalysisFramework/DependencyAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,57 @@ public sealed class DependencyAnalyzer<MarkStrategy, DependencyContextType> : De
private List<DynamicDependencyNode> _markedNodesWithDynamicDependencies = new List<DynamicDependencyNode>();
private bool _newDynamicDependenciesMayHaveAppeared;

private Dictionary<DependencyNodeCore<DependencyContextType>, HashSet<DependencyNodeCore<DependencyContextType>.CombinedDependencyListEntry>> _conditional_dependency_store = new Dictionary<DependencyNodeCore<DependencyContextType>, HashSet<DependencyNodeCore<DependencyContextType>.CombinedDependencyListEntry>>();
private Dictionary<DependencyNodeCore<DependencyContextType>, ConditionalDependencyBucket> _conditionalDependencyStore =
new Dictionary<DependencyNodeCore<DependencyContextType>, ConditionalDependencyBucket>();
private bool _markingCompleted;

private sealed class ConditionalDependencyBucket
{
private readonly DependencyNodeCore<DependencyContextType>.CombinedDependencyListEntry _singleDependency;
private HashSet<DependencyNodeCore<DependencyContextType>.CombinedDependencyListEntry> _dependencies;

public ConditionalDependencyBucket(DependencyNodeCore<DependencyContextType>.CombinedDependencyListEntry dependency)
{
_singleDependency = dependency;
}

public void Add(DependencyNodeCore<DependencyContextType>.CombinedDependencyListEntry dependency)
{
if (_dependencies is null)
{
if (_singleDependency.Equals(dependency))
{
return;
}

_dependencies = new HashSet<DependencyNodeCore<DependencyContextType>.CombinedDependencyListEntry>
{
_singleDependency,
dependency,
};
return;
}

_dependencies.Add(dependency);
}

public void MarkDependencies(
DependencyAnalyzer<MarkStrategy, DependencyContextType> analyzer,
DependencyNodeCore<DependencyContextType> condition)
{
if (_dependencies is null)
{
analyzer.AddToMarkStack(_singleDependency.Node, _singleDependency.Reason, _singleDependency.OtherReasonNode, condition);
return;
}

foreach (DependencyNodeCore<DependencyContextType>.CombinedDependencyListEntry dependency in _dependencies)
{
analyzer.AddToMarkStack(dependency.Node, dependency.Reason, dependency.OtherReasonNode, condition);
}
}
}

private sealed class RandomInsertStack<T>
{
private List<T> _nodes = new List<T>();
Expand Down Expand Up @@ -199,16 +247,19 @@ private void GetStaticDependenciesImpl(DependencyNodeCore<DependencyContextType>
}
else
{
HashSet<DependencyNodeCore<DependencyContextType>.CombinedDependencyListEntry> storedDependencySet;
if (!_conditional_dependency_store.TryGetValue(dependency.OtherReasonNode, out storedDependencySet))
{
storedDependencySet = new HashSet<DependencyNodeCore<DependencyContextType>.CombinedDependencyListEntry>();
_conditional_dependency_store.Add(dependency.OtherReasonNode, storedDependencySet);
}
// Swap out other reason node as we're storing that as the dictionary key
DependencyNodeCore<DependencyContextType>.CombinedDependencyListEntry conditionalDependencyStoreEntry =
new DependencyNodeCore<DependencyContextType>.CombinedDependencyListEntry(dependency.Node, node, dependency.Reason);
storedDependencySet.Add(conditionalDependencyStoreEntry);
ConditionalDependencyBucket storedDependencies;
if (!_conditionalDependencyStore.TryGetValue(dependency.OtherReasonNode, out storedDependencies))
{
storedDependencies = new ConditionalDependencyBucket(conditionalDependencyStoreEntry);
_conditionalDependencyStore.Add(dependency.OtherReasonNode, storedDependencies);
}
else
{
storedDependencies.Add(conditionalDependencyStoreEntry);
}
}
}
}
Expand Down Expand Up @@ -266,15 +317,9 @@ private void ProcessMarkStack()

// If this new node satisfies any stored conditional dependencies,
// add them to the mark stack
HashSet<DependencyNodeCore<DependencyContextType>.CombinedDependencyListEntry> storedDependencySet;
if (_conditional_dependency_store.TryGetValue(currentNode, out storedDependencySet))
if (_conditionalDependencyStore.Remove(currentNode, out ConditionalDependencyBucket storedDependencies))
{
foreach (DependencyNodeCore<DependencyContextType>.CombinedDependencyListEntry newlySatisfiedDependency in storedDependencySet)
{
AddToMarkStack(newlySatisfiedDependency.Node, newlySatisfiedDependency.Reason, newlySatisfiedDependency.OtherReasonNode, currentNode);
}

_conditional_dependency_store.Remove(currentNode);
storedDependencies.MarkDependencies(this, currentNode);
}
}

Expand Down
Loading