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

DataflowAnalysis preserves dependencies order #6493

Merged
merged 4 commits into from
May 2, 2023
Merged

DataflowAnalysis preserves dependencies order #6493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
668fc00
feat: perserve dependencies order
4e6 May 1, 2023
0afc15f
Merge branch 'develop' into wip/db/6324-dropdown-not-shown-on-a-node-…
4e6 May 1, 2023
0dd1737
Merge branch 'develop' into wip/db/6324-dropdown-not-shown-on-a-node-…
4e6 May 2, 2023
dbbcf43
Merge branch 'develop' into wip/db/6324-dropdown-not-shown-on-a-node-…
4e6 May 2, 2023
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
25 changes: 21 additions & 4 deletions ...yglot/src/test/scala/org/enso/interpreter/test/instrument/RuntimeVisualizationsTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3138,8 +3138,12 @@ class RuntimeVisualizationsTest
val moduleName = "Enso_Test.Test.Main"
val metadata = new Metadata

val idX = metadata.addItem(65, 1, "aa")
val idY = metadata.addItem(65, 7, "ab")
val idX = metadata.addItem(65, 1, "aa")
val idY = metadata.addItem(65, 7, "ab")
val idS = metadata.addItem(81, 1)
val idZ = metadata.addItem(91, 5, "ac")
val idZexprS = metadata.addItem(93, 1)
val idZexpr1 = metadata.addItem(95, 1)

val code =
"""type T
Expand All @@ -3150,7 +3154,11 @@ class RuntimeVisualizationsTest
|main =
| x = T.C
| y = x.inc 7
| y
| s = 1
| z = p y s
| z
|
|p x y = x + y
|""".stripMargin.linesIterator.mkString("\n")
val contents = metadata.appendToCode(code)
val mainFile = context.writeMain(contents)
Expand All @@ -3177,7 +3185,7 @@ class RuntimeVisualizationsTest
Api.Request(requestId, Api.PushContextRequest(contextId, item1))
)
context.receiveNIgnorePendingExpressionUpdates(
5
9
) should contain theSameElementsAs Seq(
Api.Response(Api.BackgroundJobsStartedNotification()),
Api.Response(requestId, Api.PushContextResponse(contextId)),
Expand All @@ -3188,6 +3196,15 @@ class RuntimeVisualizationsTest
ConstantsGen.INTEGER_BUILTIN,
Api.MethodPointer(moduleName, s"$moduleName.T", "inc")
),
TestMessages.update(contextId, idS, ConstantsGen.INTEGER_BUILTIN),
TestMessages.update(
contextId,
idZ,
ConstantsGen.INTEGER_BUILTIN,
Api.MethodPointer(moduleName, moduleName, "p")
),
TestMessages.update(contextId, idZexprS, ConstantsGen.INTEGER_BUILTIN),
TestMessages.update(contextId, idZexpr1, ConstantsGen.INTEGER_BUILTIN),
context.executionComplete(contextId)
)

Expand Down
41 changes: 29 additions & 12 deletions engine/runtime/src/main/scala/org/enso/compiler/pass/analyse/DataflowAnalysis.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import org.enso.compiler.exception.CompilerError
import org.enso.compiler.pass.IRPass
import org.enso.compiler.pass.analyse.DataflowAnalysis.DependencyInfo.Type.asStatic

import scala.collection.immutable.ListSet
import scala.collection.mutable

/** This pass implements dataflow analysis for Enso.
Expand Down Expand Up @@ -826,23 +827,39 @@ case object DataflowAnalysis extends IRPass {
* @return the set of all associations with `key`, if key exists
*/
def get(key: DependencyInfo.Type): Option[Set[DependencyInfo.Type]] = {
val visited = mutable.LinkedHashSet[DependencyInfo.Type]()

def go(key: DependencyInfo.Type): Set[DependencyInfo.Type] = {
if (!visited.contains(key)) {
visited += key

mapping.get(key) match {
case Some(deps) => deps ++ deps.map(go).reduceLeft(_ ++ _)
case None => Set()
@scala.annotation.tailrec
def go(
queue: mutable.Queue[DependencyInfo.Type],
visited: mutable.Set[DependencyInfo.Type],
result: mutable.Set[DependencyInfo.Type]
): Set[DependencyInfo.Type] =
if (queue.isEmpty) result.to(ListSet)
else {
val elem = queue.dequeue()
if (visited.contains(elem)) go(queue, visited, result)
else {
mapping.get(elem) match {
case Some(deps) =>
go(
queue.enqueueAll(deps),
visited.addOne(elem),
result.addAll(deps)
)
case None =>
go(queue, visited.addOne(elem), result)
}
}
} else {
Set()
}
}

if (mapping.contains(key)) {
Some(go(key))
Some(
go(
mutable.Queue(key),
mutable.HashSet(),
mutable.LinkedHashSet()
)
)
} else {
None
}
Expand Down