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

[Civl] small fixes to Treiber stack example #883

Merged
merged 1 commit into from
May 5, 2024
Merged

[Civl] small fixes to Treiber stack example #883

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
4 changes: 2 additions & 2 deletions Test/civl/inductive-sequentialization/2PC.bpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ modifies RequestChannel, VoteChannel, DecisionChannel, votes, decisions;
call set_choice(PARTICIPANT2(One(k+1)));
}

yield invariant {:layer 5} YieldParticipant ({:linear} foo: One int);
invariant DecisionChannel[foo->val][COMMIT()] > 0 || DecisionChannel[foo->val][ABORT()] > 0;
yield invariant {:layer 5} YieldParticipant ({:linear} pid: One int);
invariant DecisionChannel[pid->val][COMMIT()] > 0 || DecisionChannel[pid->val][ABORT()] > 0;

////////////////////////////////////////////////////////////////////////////////

Expand Down
38 changes: 31 additions & 7 deletions Test/civl/samples/treiber-stack.bpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ refines AtomicReadTopOfStack#Push;
}

right action {:layer 3} AtomicLoadNode(loc_t: Loc (Treiber X), loc_n: Loc (Node X)) returns (node: Node X)
modifies ts;
{
assert Map_Contains(ts, loc_t);
assert Map_Contains(Map_At(ts, loc_t)->stack, loc_n);
Expand Down Expand Up @@ -227,18 +228,43 @@ preserves call YieldInv#2(loc_t);
}

atomic action {:layer 1, 2} AtomicReadTopOfStack(loc_t: Loc (Treiber X)) returns (loc_n: Option (Loc (Node X)))
modifies ts;
{
assert Map_Contains(ts, loc_t);
loc_n := Map_At(ts, loc_t)->top;
var {:linear} one_loc_t: One (Loc (Treiber X));
var {:linear} treiber: Treiber X;
var {:linear} cell_t: Cell (Loc (Treiber X)) (Treiber X);

call cell_t := Map_Get(ts, loc_t);
call one_loc_t, treiber := Cell_Unpack(cell_t);
loc_n := treiber->top;
call cell_t := Cell_Pack(one_loc_t, treiber);
call Map_Put(ts, cell_t);
}
yield procedure {:layer 0} ReadTopOfStack(loc_t: Loc (Treiber X)) returns (loc_n: Option (Loc (Node X)));
refines AtomicReadTopOfStack;

atomic action {:layer 1,2} AtomicLoadNode#0(loc_t: Loc (Treiber X), loc_n: Loc (Node X)) returns (node: Node X)
modifies ts;
{
assume Map_Contains(ts, loc_t);
assume Set_Contains(Domain(ts, loc_t), loc_n);
node := Map_At(Map_At(ts, loc_t)->stack, loc_n);
var {:linear} one_loc_t: One (Loc (Treiber X));
var {:linear} treiber: Treiber X;
var {:linear} cell_t: Cell (Loc (Treiber X)) (Treiber X);
var top: Option (Loc (Node X));
var {:linear} stack: Map (Loc (Node X)) (Node X);
var {:linear} one_loc_n: One (Loc (Node X));
var {:linear} cell_n: Cell (Loc (Node X)) (Node X);

call cell_t := Map_Get(ts, loc_t);
call one_loc_t, treiber := Cell_Unpack(cell_t);
Treiber(top, stack) := treiber;
assume Map_Contains(stack, loc_n); // problematic assume
call cell_n := Map_Get(stack, loc_n);
call one_loc_n, node := Cell_Unpack(cell_n);
call cell_n := Cell_Pack(one_loc_n, node);
call Map_Put(stack, cell_n);
treiber := Treiber(top, stack);
call cell_t := Cell_Pack(one_loc_t, treiber);
call Map_Put(ts, cell_t);
}
yield procedure {:layer 0} LoadNode#0(loc_t: Loc (Treiber X), loc_n: Loc (Node X)) returns (node: Node X);
refines AtomicLoadNode#0;
Expand All @@ -251,7 +277,6 @@ modifies ts;
var {:linear} treiber: Treiber X;
var {:linear} cell_t: Cell (Loc (Treiber X)) (Treiber X);

assert Map_Contains(ts, loc_t);
call cell_t := Map_Get(ts, loc_t);
call one_loc_t, treiber := Cell_Unpack(cell_t);
call Map_Put(treiber->stack, cell_n);
Expand All @@ -270,7 +295,6 @@ modifies ts;
var {:linear} cell_t: Cell (Loc (Treiber X)) (Treiber X);
var {:linear} one_loc_t: One (Loc (Treiber X));

assert Map_Contains(ts, loc_t);
call cell_t := Map_Get(ts, loc_t);
call one_loc_t, treiber := Cell_Unpack(cell_t);
if (old_loc_n == treiber->top) {
Expand Down
2 changes: 1 addition & 1 deletion Test/civl/samples/treiber-stack.bpl.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

Boogie program verifier finished with 47 verified, 0 errors
Boogie program verifier finished with 58 verified, 0 errors
Loading