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

Jump to bottom

Passes reordered + keep (C)initPrime after InlinePass #327

Merged
merged 1 commit into from
Nov 19, 2020
Merged

Passes reordered + keep (C)initPrime after InlinePass #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion ...nts/src/main/scala/at/forsyte/apalache/tla/assignments/passes/CoverAnalysisPassImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ class CoverAnalysisPassImpl @Inject()(options: PassOptions,

override def name: String = "CoverAnalysisPass"

override def execute(): Boolean = {

// TODO: disabled for the purposes of pass reordering, re-introduced in #308
override def execute( ) : Boolean = true

def execute2(): Boolean = {
val inModule = tlaModule.get

val operDecls = inModule.operDeclarations
Expand Down
32 changes: 16 additions & 16 deletions tla-bmcmt/src/main/scala/at/forsyte/apalache/tla/bmcmt/config/CheckerModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,41 +64,41 @@ class CheckerModule extends AbstractModule {
bind(classOf[Pass])
.annotatedWith(Names.named("AfterConfiguration"))
.to(classOf[UnrollPass])
// the next pass is InlinePass
bind(classOf[InlinePass])
.to(classOf[InlinePassImpl])
bind(classOf[Pass])
.annotatedWith(Names.named("AfterUnroll"))
.to(classOf[InlinePass])
// the next pass is PrimingPass
bind(classOf[PrimingPass])
.to(classOf[PrimingPassImpl])
bind(classOf[Pass])
.annotatedWith(Names.named("AfterInline"))
.annotatedWith(Names.named("AfterUnroll"))
.to(classOf[PrimingPass])
// the next pass is CoverAnalysisPass
bind(classOf[CoverAnalysisPass])
.to(classOf[CoverAnalysisPassImpl])
bind(classOf[Pass])
.annotatedWith(Names.named("AfterPriming"))
.to(classOf[CoverAnalysisPass])
// the next pass is InlinePass
bind(classOf[InlinePass])
.to(classOf[InlinePassImpl])
bind(classOf[Pass])
.annotatedWith(Names.named("AfterCoverAnalysis"))
.to(classOf[InlinePass])
// the next pass is VCGenPass
bind(classOf[VCGenPass])
.to(classOf[VCGenPassImpl])
bind(classOf[Pass])
.annotatedWith(Names.named("AfterPriming"))
.annotatedWith(Names.named("AfterInline"))
.to(classOf[VCGenPass])
// the next pass after SanyParserPass is PreproPass
bind(classOf[PreproPass])
.to(classOf[PreproPassImpl])
bind(classOf[Pass])
.annotatedWith(Names.named("AfterVCGen"))
.to(classOf[PreproPass])
// the next pass after PreproPass is CoverAnalysisPass
bind(classOf[CoverAnalysisPass])
.to(classOf[CoverAnalysisPassImpl])
bind(classOf[Pass])
.annotatedWith(Names.named("AfterPrepro"))
.to(classOf[CoverAnalysisPass])
// the next pass after CoverAnalysisPass is AssignmentPass
// the next pass after PreproPass is AssignmentPass
bind(classOf[TransitionPass])
.to(classOf[TransitionPassImpl])
bind(classOf[Pass])
.annotatedWith(Names.named("AfterCoverAnalysis"))
.annotatedWith(Names.named("AfterPrepro"))
.to(classOf[TransitionPass])
// the next pass after AssignmentPass is AnalysisPass
bind(classOf[OptPass])
Expand Down
11 changes: 9 additions & 2 deletions tla-pp/src/main/scala/at/forsyte/apalache/tla/pp/passes/InlinePassImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,17 @@ class InlinePassImpl @Inject()(val options: PassOptions,
// Remove the operators that are not needed,
// as some of them may contain higher-order operators that cannot be substituted
val relevantOperators = NormalizedNames.userOperatorNamesFromOptions(options).toSet
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why don't you extend userOperatorNamesFromOptions with the operators for cinit, initPrime, etc.? These names should keep the relevant operators, so later passes would not remove them.

logger.info("Leaving only relevant operators: " + relevantOperators.toList.sorted.mkString(", "))

// Since PrimingPass now happens before inlining, we have to add InitPrime and CInitPrime as well
val initName = options.getOrElse("checker", "init", "Init")
val cinitName = options.getOrElse("checker", "cinit", "CInit")
val initPrimedName = initName + "Primed"
val cinitPrimedName = cinitName + "Primed"
val relevantOperatorsAndInitCInitPrimed = relevantOperators + initPrimedName + cinitPrimedName
logger.info("Leaving only relevant operators: " + relevantOperatorsAndInitCInitPrimed.toList.sorted.mkString(", "))
val filteredDefs = inlined.declarations.filter {
case TlaOperDecl(name, _, _) =>
relevantOperators.contains(name)
relevantOperatorsAndInitCInitPrimed.contains(name)
case _ => true // accept all other declarations
}

Expand Down