Improve perf of Graph.Scope.scopeFor hotspot #9620
Merged
Conversation
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
`scopeFor` appears to be a hotspot of the compiler. By choosing a more suitable data structure that indexes on the occurrence's id we seem to gain about 25% on some benchmarks.
hubertp
added
the
CI: No changelog needed
JaroslavTulach
requested changes
Apr 4, 2024
engine/runtime-parser/src/main/java/org/enso/compiler/core/ir/IrPersistance.java
Outdated
Show resolved
Hide resolved
engine/runtime-parser/src/main/java/org/enso/compiler/core/ir/IrPersistance.java
Outdated
Show resolved
Hide resolved
engine/runtime-compiler/src/main/java/org/enso/compiler/pass/analyse/PassPersistance.java
Outdated
Show resolved
Hide resolved
| @@ -456,7 +462,7 @@ object Graph { | |||
| * @return the occurrence for `id`, if it exists | |||
| */ | |||
| def getOccurrence(id: Graph.Id): Option[Occurrence] = { | |||
| occurrences.find(o => o.id == id) | |||
| occurrences.get(id) | |||
There was a problem hiding this comment.
Yes, this shall be faster.
engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/Graph.scala
Show resolved
Hide resolved
JaroslavTulach
approved these changes
Apr 4, 2024
| @@ -145,7 +150,7 @@ protected Graph.Scope readObject(Input in) throws IOException { | |||
| @SuppressWarnings("unchecked") | |||
| protected void writeObject(Graph.Scope obj, Output out) throws IOException { | |||
| out.writeInline(scala.collection.immutable.List.class, obj.childScopes()); | |||
| out.writeObject(obj.occurrences()); | |||
| out.writeObject(obj.occurrences().values().toSet()); | |||
engine/runtime-compiler/src/main/java/org/enso/compiler/pass/analyse/PassPersistance.java
Outdated
Show resolved
Hide resolved
engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/Graph.scala
Show resolved
Hide resolved
4e6
approved these changes
Apr 4, 2024
|
Benchmarks appear to confirm the improvement https://github.com/enso-org/enso/actions/runs/8552014606
|
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Pull Request Description
scopeForappears to be a hotspot of the compiler. By choosing a more suitable data structure that indexes on the occurrence's id we seem to gain about 25% on some benchmarks. Quick win.Related to #9235.
Important Notes
Local benchmark runs of
org.enso.compiler.benchmarks.module.ManyLocalVarsBenchmark.longMethodWithLotOfLocalVarsBefore
After
Checklist
Please ensure that the following checklist has been satisfied before submitting the PR:
Scala,
Java,
and
Rust
style guides. In case you are using a language not listed above, follow the Rust style guide.