natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempting optimizations in the matcher. Minor refactorings.

This commit is contained in:
Fedor Isakov 2016-03-08 11:40:31 +01:00
parent ec6ce31cc2
commit 64591e113b
5 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
reactor/Core/src/jetbrains/mps/logic/reactor/core/Matcher.kt
View File

@ -14,6 +14,7 @@ import jetbrains.mps.logic.reactor.program.Rule
import jetbrains.mps.unification.Substitution
import jetbrains.mps.unification.Term
import jetbrains.mps.unification.Unification
import java.util.*
/**
* @author Fedor Isakov
@ -45,18 +46,22 @@ class Matcher {
fun lookupMatches(occ: ConstraintOccurrence): Sequence<PartialMatch> {
return profiler.profile<Sequence<PartialMatch>>("lookupMatches", {
val partialMatches = rules.forSymbol(occ.constraint().symbol())?.asSequence()?.flatMap { r ->
val matchedKept = r.headKept().filter { cst -> cst.matches(occ) }.asSequence()
val matchedDiscarded = r.headReplaced().filter { cst -> cst.matches(occ) }.asSequence()
val matchingRules = rules.forConstraint(occ.constraint().symbol())
val partialMatches = matchingRules?.asSequence()?.flatMap { rule ->
rule.headKept().asSequence().filter { cst ->
cst.symbol() == occ.constraint().symbol() && cst.matches(occ, profiler) }.map { cst ->
PartialMatch(rule, profiler).keep(cst, occ) } +
rule.headReplaced().asSequence().filter { cst ->
cst.symbol() == occ.constraint().symbol() && cst.matches(occ, profiler) }.map { cst ->
PartialMatch(rule, profiler).discard(cst, occ) }
matchedKept.map { cst -> PartialMatch(r, profiler).keep(cst, occ) } +
matchedDiscarded.map { cst -> PartialMatch(r, profiler).discard(cst, occ) }
}
partialMatches?.flatMap { pm ->
pm.completeMatch(auxLookup) }?.filter { pm ->
pm.matches() && !propHistory.isRecorded(pm) } ?: emptySequence<PartialMatch>()
val fullMatches = partialMatches?.flatMap { pm -> pm.completeMatch(auxLookup) }
fullMatches?.filter { pm -> !propHistory.isRecorded(pm) && pm.matches() } ?: emptySequence()
})
}
@ -92,7 +97,7 @@ private class PropagationHistory {
}
private class IdWrapper<T>(val wrapped: T) {
class IdWrapper<T>(val wrapped: T) {
val idHash = System.identityHashCode(wrapped)

6
reactor/Core/src/jetbrains/mps/logic/reactor/core/MemEvaluationSession.kt
View File

@ -59,8 +59,10 @@ class MemEvaluationSession : EvaluationSession {
}
finally {
ourBackend.ourSession.set(null)
profiler?.formattedData()?.entries?.forEach { e -> durations?.put(e.key, e.value) }
profiler?.clear()
profiler?.run {
formattedData().entries.forEach { e -> durations?.put(e.key, e.value) }
clear()
}
}
return session

28
reactor/Core/src/jetbrains/mps/logic/reactor/core/PartialMatch.kt
View File

@ -23,6 +23,8 @@ class PartialMatch(val rule: Rule, val profiler: Profiler? = null) : MatchRule {
private set
var discarded = emptyConsList<Pair<Constraint, ConstraintOccurrence>>()
private set
var matched = emptyConsList<IdWrapper<Constraint>>()
private set
var meta2logical = Maps.of<MetaLogical<*>, PersSet<Logical<*>>>()
private set
private lateinit var logicalContext : LogicalContext
@ -34,7 +36,7 @@ class PartialMatch(val rule: Rule, val profiler: Profiler? = null) : MatchRule {
{
this.kept = if (keep != null) original.kept.prepend(keep) else original.kept
this.discarded = if (discard != null) original.discarded.prepend(discard) else original.discarded
this.matched = original.matched.prepend(IdWrapper((keep?.first ?: discard?.first)!!)) // exactly one is not null
this.meta2logical = original.meta2logical
val pair = keep ?: discard!!
for ((ptr, log) in pair.first.arguments().zip(pair.second.arguments())) {
@ -50,24 +52,22 @@ class PartialMatch(val rule: Rule, val profiler: Profiler? = null) : MatchRule {
return profiler.profile<Sequence<PartialMatch>>("completeMatch", {
val matchesFromKept =
rule.headKept().
filter { cst -> !kept.any { p -> cst === p.first } }.
asSequence().
flatMap { cst -> findOccurrences(aux, cst).flatMap { occ -> keep(cst, occ).completeMatch(aux) } }
rule.headKept().asSequence().filter { cst -> !matched.contains(IdWrapper(cst)) }.flatMap { cst ->
lookupAuxOccurrences(aux, cst).flatMap { occ ->
keep(cst, occ).completeMatch(aux)
}
} +
val matchesFromDiscarded =
rule.headReplaced().
filter { cst -> !discarded.any { p -> cst === p.first } }.
asSequence().
flatMap { cst -> findOccurrences(aux, cst).flatMap { occ -> discard(cst, occ).completeMatch(aux) } }
matchesFromKept + matchesFromDiscarded
rule.headReplaced().asSequence().filter { cst ->!matched.contains(IdWrapper(cst)) }.flatMap { cst ->
lookupAuxOccurrences(aux, cst).flatMap { occ ->
discard(cst, occ).completeMatch(aux)
}
}
})
}
fun findOccurrences(aux: Matcher.AuxOccurrencesLookup, cst: Constraint): Sequence<ConstraintOccurrence> {
fun lookupAuxOccurrences(aux: Matcher.AuxOccurrencesLookup, cst: Constraint): Sequence<ConstraintOccurrence> {
val logicals = HashSet<Logical<*>>()
val values = HashSet<Any>()

4
reactor/Core/src/jetbrains/mps/logic/reactor/core/Profiler.kt
View File

@ -89,7 +89,7 @@ class Token(val name: String, val id: Int) {
inline fun Profiler?.profile(name: String, proc: () -> Unit): Unit {
val tok = this?.start(name)
try {
proc.invoke()
proc()
}
finally {
this?.end(tok)
@ -99,7 +99,7 @@ inline fun Profiler?.profile(name: String, proc: () -> Unit): Unit {
inline fun <R> Profiler?.profile(name: String, function: () -> R): R {
val tok = this?.start(name)
try {
return function.invoke()
return function()
}
finally {
this?.end(tok)

2
reactor/Core/src/jetbrains/mps/logic/reactor/core/RuleIndex.kt
View File

@ -21,7 +21,7 @@ class RuleIndex : Iterable<Rule> {
buildIndex(rules)
}
fun forSymbol(symbol: ConstraintSymbol): Iterable<Rule>? = symbol2rules[symbol]
fun forConstraint(symbol: ConstraintSymbol): Iterable<Rule>? = symbol2rules[symbol]
override fun iterator(): Iterator<Rule> = rules.iterator()