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.

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

Sort disjuncts generated by ZipOracle #2149

Merged
merged 4 commits into from
Sep 9, 2022
Merged

Sort disjuncts generated by ZipOracle #2149

merged 4 commits into from
Sep 9, 2022

Conversation

thpani
Copy link
Collaborator

@thpani thpani commented Sep 6, 2022

Make SMT output deterministic by fixing the order of SMT constraints generated by ZipOracle.
Fixes #2150

Tested across 14 identical runs of Apalache.

  • Tests added for any new code
  • Ran make fmt-fix (or had formatting run automatically on all files edited)
  • Documentation added for any new functionality
  • Entries added to ./unreleased/ for any new functionality

@codecov-commenter
Copy link

codecov-commenter commented Sep 6, 2022

Codecov Report

Merging #2149 (396fb41) into main (970ab4d) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main    #2149   +/-   ##
=======================================
  Coverage   77.14%   77.15%           
=======================================
  Files         423      423           
  Lines       13845    13846    +1     
  Branches     1879     1898   +19     
=======================================
+ Hits        10681    10683    +2     
+ Misses       3164     3163    -1     
Impacted Files Coverage Δ
...rsyte/apalache/tla/bmcmt/rules/aux/ZipOracle.scala 66.66% <ø> (ø)
...syte/apalache/tla/bmcmt/rules/aux/CherryPick.scala 93.62% <100.00%> (+0.01%) ⬆️
...a/at/forsyte/apalache/tla/lir/TlaLevelFinder.scala 95.83% <0.00%> (+2.08%) ⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@thpani thpani marked this pull request as ready for review September 6, 2022 11:56
Copy link
Collaborator

@konnov konnov left a comment

Choose a reason for hiding this comment

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

Amazing fix. It's interesting to see how an optimization introduced non-deterministic behavior :)

@thpani thpani enabled auto-merge (squash) September 9, 2022 09:49
@thpani thpani merged commit 5987b87 into main Sep 9, 2022
@apalache-bot apalache-bot mentioned this pull request Sep 12, 2022
@thpani thpani deleted the th/sort-zip-oracle branch September 20, 2022 11:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Non-deterministic SMT output by ZipOracle
4 participants