Skip to content

Change YAML witness generation default to version 2.0 with only invariant_set #1718

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

Merged
merged 5 commits into from
Apr 18, 2025
Merged

Change YAML witness generation default to version 2.0 with only invariant_set #1718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e93ec45
Change YAML witness generation default to version 2.0 with only invar…
sim642 Mar 26, 2025
4b651c3
Remove YAML witness location file_hash in cram tests
sim642 Apr 17, 2025
b074df8
Fix remaning failing YAML witness cram tests
sim642 Apr 17, 2025
a17e50d
Specify witness.yaml.entry-types location/loop_invariant in witness t…
sim642 Apr 17, 2025
8a079a4
Merge branch 'master' into yaml-witness-default
sim642 Apr 17, 2025
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
7 changes: 1 addition & 6 deletions src/config/options.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2812,7 +2812,7 @@
"2.0",
"2.1"
],
"default": "0.1"
"default": "2.0"
},
"entry-types": {
"title": "witness.yaml.entry-types",
Expand All @@ -2833,11 +2833,6 @@
]
},
"default": [
"location_invariant",
"loop_invariant",
"flow_insensitive_invariant",
"loop_invariant_certificate",
"precondition_loop_invariant_certificate",
"invariant_set"
]
},
Expand Down
12 changes: 0 additions & 12 deletions tests/regression/13-privatized/01-priv_nr.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
- entry_type: location_invariant
location:
file_name: 01-priv_nr.c
file_hash: $FILE_HASH
line: 25
column: 3
function: main
Expand All @@ -35,7 +34,6 @@
- entry_type: location_invariant
location:
file_name: 01-priv_nr.c
file_hash: $FILE_HASH
line: 11
column: 3
function: t_fun
Expand All @@ -46,7 +44,6 @@
- entry_type: location_invariant
location:
file_name: 01-priv_nr.c
file_hash: $FILE_HASH
line: 11
column: 3
function: t_fun
Expand Down Expand Up @@ -81,7 +78,6 @@
- entry_type: location_invariant
location:
file_name: 01-priv_nr.c
file_hash: $FILE_HASH
line: 25
column: 3
function: main
Expand All @@ -92,7 +88,6 @@
- entry_type: location_invariant
location:
file_name: 01-priv_nr.c
file_hash: $FILE_HASH
line: 11
column: 3
function: t_fun
Expand All @@ -103,7 +98,6 @@
- entry_type: location_invariant
location:
file_name: 01-priv_nr.c
file_hash: $FILE_HASH
line: 11
column: 3
function: t_fun
Expand Down Expand Up @@ -138,7 +132,6 @@
- entry_type: location_invariant
location:
file_name: 01-priv_nr.c
file_hash: $FILE_HASH
line: 25
column: 3
function: main
Expand All @@ -149,7 +142,6 @@
- entry_type: location_invariant
location:
file_name: 01-priv_nr.c
file_hash: $FILE_HASH
line: 11
column: 3
function: t_fun
Expand All @@ -160,7 +152,6 @@
- entry_type: location_invariant
location:
file_name: 01-priv_nr.c
file_hash: $FILE_HASH
line: 11
column: 3
function: t_fun
Expand Down Expand Up @@ -195,7 +186,6 @@
- entry_type: location_invariant
location:
file_name: 01-priv_nr.c
file_hash: $FILE_HASH
line: 25
column: 3
function: main
Expand All @@ -206,7 +196,6 @@
- entry_type: location_invariant
location:
file_name: 01-priv_nr.c
file_hash: $FILE_HASH
line: 11
column: 3
function: t_fun
Expand All @@ -217,7 +206,6 @@
- entry_type: location_invariant
location:
file_name: 01-priv_nr.c
file_hash: $FILE_HASH
line: 11
column: 3
function: t_fun
Expand Down
28 changes: 3 additions & 25 deletions tests/regression/13-privatized/04-priv_multi.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
ghost_updates:
- location:
file_name: 04-priv_multi.c
file_hash: $FILE_HASH
line: 15
column: 5
function: generate
Expand All @@ -61,7 +60,6 @@
format: c_expression
- location:
file_name: 04-priv_multi.c
file_hash: $FILE_HASH
line: 18
column: 5
function: generate
Expand All @@ -71,7 +69,6 @@
format: c_expression
- location:
file_name: 04-priv_multi.c
file_hash: $FILE_HASH
line: 26
column: 5
function: process
Expand All @@ -81,7 +78,6 @@
format: c_expression
- location:
file_name: 04-priv_multi.c
file_hash: $FILE_HASH
line: 29
column: 7
function: process
Expand All @@ -91,7 +87,6 @@
format: c_expression
- location:
file_name: 04-priv_multi.c
file_hash: $FILE_HASH
line: 32
column: 7
function: process
Expand All @@ -101,7 +96,6 @@
format: c_expression
- location:
file_name: 04-priv_multi.c
file_hash: $FILE_HASH
line: 34
column: 7
function: process
Expand All @@ -111,7 +105,6 @@
format: c_expression
- location:
file_name: 04-priv_multi.c
file_hash: $FILE_HASH
line: 46
column: 5
function: dispose
Expand All @@ -121,7 +114,6 @@
format: c_expression
- location:
file_name: 04-priv_multi.c
file_hash: $FILE_HASH
line: 49
column: 7
function: dispose
Expand All @@ -131,7 +123,6 @@
format: c_expression
- location:
file_name: 04-priv_multi.c
file_hash: $FILE_HASH
line: 63
column: 3
function: main
Expand All @@ -141,7 +132,6 @@
format: c_expression
- location:
file_name: 04-priv_multi.c
file_hash: $FILE_HASH
line: 68
column: 5
function: main
Expand All @@ -151,7 +141,6 @@
format: c_expression
- location:
file_name: 04-priv_multi.c
file_hash: $FILE_HASH
line: 69
column: 5
function: main
Expand All @@ -161,7 +150,6 @@
format: c_expression
- location:
file_name: 04-priv_multi.c
file_hash: $FILE_HASH
line: 73
column: 5
function: main
Expand All @@ -171,7 +159,6 @@
format: c_expression
- location:
file_name: 04-priv_multi.c
file_hash: $FILE_HASH
line: 74
column: 5
function: main
Expand Down Expand Up @@ -230,38 +217,35 @@ Flow-insensitive invariants as location invariants.
Location invariant at `for` loop in `main` should be on column 3, not 7.

$ diff witness.flow_insensitive.yml witness.location.yml
153,154c153,160
140,141c140,146
< - entry_type: flow_insensitive_invariant
< flow_insensitive_invariant:
---
> - entry_type: location_invariant
> location:
> file_name: 04-priv_multi.c
> file_hash: $FILE_HASH
> line: 67
> column: 3
> function: main
> location_invariant:
158,159c164,171
145,146c150,156
< - entry_type: flow_insensitive_invariant
< flow_insensitive_invariant:
---
> - entry_type: location_invariant
> location:
> file_name: 04-priv_multi.c
> file_hash: $FILE_HASH
> line: 67
> column: 3
> function: main
> location_invariant:
163,164c175,248
150,151c160,226
< - entry_type: flow_insensitive_invariant
< flow_insensitive_invariant:
---
> - entry_type: location_invariant
> location:
> file_name: 04-priv_multi.c
> file_hash: $FILE_HASH
> line: 67
> column: 3
> function: main
Expand All @@ -272,7 +256,6 @@ Location invariant at `for` loop in `main` should be on column 3, not 7.
> - entry_type: location_invariant
> location:
> file_name: 04-priv_multi.c
> file_hash: $FILE_HASH
> line: 65
> column: 3
> function: main
Expand All @@ -283,7 +266,6 @@ Location invariant at `for` loop in `main` should be on column 3, not 7.
> - entry_type: location_invariant
> location:
> file_name: 04-priv_multi.c
> file_hash: $FILE_HASH
> line: 65
> column: 3
> function: main
Expand All @@ -294,7 +276,6 @@ Location invariant at `for` loop in `main` should be on column 3, not 7.
> - entry_type: location_invariant
> location:
> file_name: 04-priv_multi.c
> file_hash: $FILE_HASH
> line: 65
> column: 3
> function: main
Expand All @@ -305,7 +286,6 @@ Location invariant at `for` loop in `main` should be on column 3, not 7.
> - entry_type: location_invariant
> location:
> file_name: 04-priv_multi.c
> file_hash: $FILE_HASH
> line: 64
> column: 3
> function: main
Expand All @@ -316,7 +296,6 @@ Location invariant at `for` loop in `main` should be on column 3, not 7.
> - entry_type: location_invariant
> location:
> file_name: 04-priv_multi.c
> file_hash: $FILE_HASH
> line: 64
> column: 3
> function: main
Expand All @@ -327,7 +306,6 @@ Location invariant at `for` loop in `main` should be on column 3, not 7.
> - entry_type: location_invariant
> location:
> file_name: 04-priv_multi.c
> file_hash: $FILE_HASH
> line: 64
> column: 3
> function: main
Expand Down
5 changes: 0 additions & 5 deletions tests/regression/13-privatized/25-struct_nr.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
ghost_updates:
- location:
file_name: 25-struct_nr.c
file_hash: $FILE_HASH
line: 14
column: 3
function: t_fun
Expand All @@ -47,7 +46,6 @@
format: c_expression
- location:
file_name: 25-struct_nr.c
file_hash: $FILE_HASH
line: 20
column: 3
function: t_fun
Expand All @@ -57,7 +55,6 @@
format: c_expression
- location:
file_name: 25-struct_nr.c
file_hash: $FILE_HASH
line: 27
column: 3
function: main
Expand All @@ -67,7 +64,6 @@
format: c_expression
- location:
file_name: 25-struct_nr.c
file_hash: $FILE_HASH
line: 28
column: 3
function: main
Expand All @@ -77,7 +73,6 @@
format: c_expression
- location:
file_name: 25-struct_nr.c
file_hash: $FILE_HASH
line: 32
column: 3
function: main
Expand Down
Loading
Loading