Skip to content

Commit ea1bf23

Browse files
authored
Merge pull request #1295 from goblint/sv-comp-cleanup
Clean up SV-COMP directory
2 parents 3015607 + cbece4f commit ea1bf23

29 files changed

+39
-668
lines changed

docs/developer-guide/releasing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070

7171
This is required such that the created archive would have everything in a single directory called `goblint`.
7272

73-
4. Update SV-COMP year in `sv-comp/archive.sh`.
73+
4. Update SV-COMP year in `scripts/sv-comp/archive.sh`.
7474

7575
This includes: git tag name, git tag message and zipped conf file.
7676

@@ -83,9 +83,9 @@
8383

8484
2. Make sure you have nothing valuable that would be deleted by `make clean`.
8585
3. Delete git tag from previous prerun: `git tag -d svcompXY`.
86-
4. Create archive: `./sv-comp/archive.sh`.
86+
4. Create archive: `./scripts/sv-comp/archive.sh`.
8787

88-
The resulting archive is `sv-comp/goblint.zip`.
88+
The resulting archive is `scripts/sv-comp/goblint.zip`.
8989

9090
5. Check unextracted archive in latest SV-COMP container image: <https://gitlab.com/sosy-lab/benchmarking/competition-scripts/#container-image>.
9191

docs/user-guide/inspecting.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,20 @@ To build GobView (also for development):
2323
`./_build/default/gobview/goblint-http-server/goblint_http.exe -with-goblint ../analyzer/goblint -goblint --set files[+] "../analyzer/tests/regression/00-sanity/01-assert.c"`
2424

2525
4. Visit <http://localhost:8080>
26+
27+
## Witnesses
28+
29+
### GraphML
30+
31+
#### yEd
32+
33+
1. Open (Ctrl+o) `witness.graphml` from Goblint root directory.
34+
2. Click menu "Edit" → "Properties Mapper".
35+
1. _First time:_ Click button "Imports additional configurations" and open `scripts/sv-comp/yed-sv-comp.cnfx`.
36+
2. Select "SV-COMP (Node)" and click "Apply".
37+
3. Select "SV-COMP (Edge)" and click "Ok".
38+
3. Click menu "Layout" → "Hierarchial" (Alt+shift+h).
39+
1. _First time:_ Click tab "Labeling", select "Hierarchic" in "Edge Labeling".
40+
2. Click "Ok".
41+
42+
yEd manual for the Properties Mapper: <https://yed.yworks.com/support/manual/properties_mapper.html>.

docs/user-guide/running.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,20 @@ Here is a list of issues and workarounds for different compilation database gene
6767
#### bear
6868
1. Bear 2.3.11 from Ubuntu 18.04 produces incomplete database (<https://github.com/goblint/bench/issues/7#issuecomment-1011055984>, <https://github.com/goblint/bench/issues/7#issuecomment-1011987188>).
6969
* Bear 3.0.8 seems fine.
70+
71+
72+
## SV-COMP
73+
The most up-to-date SV-COMP configuration is in `conf/svcomp.json`.
74+
There are also per-year configurations (e.g. `conf/svcomp24.json`) which try to reflect that year's submission using current option names.
75+
Due to unconfigurable changes (e.g. bug fixes) these do not _exactly_ behave as that year's submission.
76+
See SV-COMP submissions in GitHub releases for exact submitted versions.
77+
78+
In SV-COMP Goblint is run as follows:
79+
```console
80+
./goblint --conf conf/svcomp.json --set ana.specification property.prp --set exp.architecture {32bit,64bit} input.c
81+
```
82+
83+
Goblint YAML correctness witness validator is run as:
84+
```console
85+
./goblint --conf conf/svcomp.json --set ana.specification property.prp --set exp.architecture {32bit,64bit} --set witness.yaml.unassume witness.yml --set witness.yaml.validate witness.yml input.c
86+
```

sv-comp/archive.sh renamed to scripts/sv-comp/archive.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ wget -O lib/LICENSE.APRON https://raw.githubusercontent.com/antoinemine/apron/ma
2323
# done outside to ensure archive contains goblint/ directory
2424
cd ..
2525

26-
rm goblint/sv-comp/goblint.zip
26+
rm goblint/scripts/sv-comp/goblint.zip
2727

28-
zip goblint/sv-comp/goblint.zip \
28+
zip goblint/scripts/sv-comp/goblint.zip \
2929
goblint/goblint \
3030
goblint/lib/libapron.so \
3131
goblint/lib/liboctD.so \
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

sv-comp/README.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

sv-comp/my-bench-sv-comp/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)