Skip to content

Turn non-analysis expRelation into queryProvider #2076

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

Open
michael-schwarz wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Turn non-analysis expRelation into queryProvider #2076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
105ba25
Turn non-analysis `expRelation` into queryProvider
michael-schwarz Jul 17, 2026
ecd309b
Move QueryProvides to new folder
michael-schwarz Jul 17, 2026
897b904
QueryProvider
michael-schwarz Jul 17, 2026
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
1 change: 0 additions & 1 deletion conf/bench-yaml-validate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/bench-yaml.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/examples/medium-program.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"pthreadMutexType",
Expand Down
1 change: 0 additions & 1 deletion conf/examples/very-precise.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"pthreadMutexType",
Expand Down
1 change: 0 additions & 1 deletion conf/ldv-races.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp-ghost.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp-yaml-validate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp-yaml.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp21.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"access",
"race",
"escape",
"expRelation",
"assert",
"var_eq",
"symb_locks",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp22-intervals-novareq-affeq-apron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"access",
"race",
"escape",
"expRelation",
"apron",
"symb_locks",
"region",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp22-intervals-novareq-affeq-native.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"access",
"race",
"escape",
"expRelation",
"symb_locks",
"region",
"thread",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp22-intervals-novareq-octagon-apron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"access",
"race",
"escape",
"expRelation",
"apron",
"symb_locks",
"region",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp22-intervals-novareq-polyhedra-apron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"access",
"race",
"escape",
"expRelation",
"apron",
"symb_locks",
"region",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"access",
"race",
"escape",
"expRelation",
"assert",
"var_eq",
"symb_locks",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp23.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp24-validate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp24.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp25-validate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp25.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp26/level00.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"symb_locks",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp26/level01.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp26/level02.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp26/level03.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp26/level04-validate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp26/level04.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp26/level05.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/svcomp2var.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"access",
"race",
"escape",
"expRelation",
"mhp",
"assert",
"var_eq",
Expand Down
1 change: 0 additions & 1 deletion conf/traces-rel-toy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"ana": {
"activated": [
"expRelation",
"base",
"threadid",
"threadflag",
Expand Down
2 changes: 1 addition & 1 deletion conf/zstd-race.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"ana": {
"activated": [
"expRelation", "base", "threadid", "threadflag", "threadreturn",
"base", "threadid", "threadflag", "threadreturn",
"escape", "mutexEvents", "mutex", "access", "race", "mallocWrapper", "mhp", "assert",
"symb_locks", "var_eq", "mallocFresh"
],
Expand Down
2 changes: 1 addition & 1 deletion scripts/test-param-activated.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

# copied from options
activated_default = set([
"expRelation", "base", "threadid", "threadflag", "threadreturn",
"base", "threadid", "threadflag", "threadreturn",
"escape", "mutexEvents", "mutex", "access", "mallocWrapper", "mhp",
"assert"
])
Expand Down
85 changes: 0 additions & 85 deletions src/analyses/expRelation.ml
View file
Open in desktop

This file was deleted.

14 changes: 13 additions & 1 deletion src/analyses/mCP.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,19 @@ struct
(* Abort to avoid infinite recursion *)
false
| _ ->
let r = fold_left (f ~q) (Result.top ()) @@ spec_list man.local in
let providers =
if get_bool "ana.queryproviders.exprelation" then
[(module ExpRelation.Provider : QueryProvider.S)]
else
[]
in
let r = fold_left (fun r (module P: QueryProvider.S) ->
let res = P.query q in
if M.tracing then M.trace "queryanswers" "query provider %s query %a -> answer %a" (P.name ()) Queries.Any.pretty anyq Result.pretty res;
Result.meet r res
) (Result.top ()) providers
in
let r = fold_left (f ~q) r @@ spec_list man.local in
do_sideg man !sides;
Queries.Hashtbl.replace querycache anyq (Obj.repr r);
r
Expand Down
20 changes: 17 additions & 3 deletions src/config/options.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,15 +339,29 @@
"properties": {
"activated": {
"title": "ana.activated",
"description": "Lists of activated analyses.",
"description": "List of activated analyses.",
"type": "array",
"items": { "type": "string" },
"default": [
"expRelation", "base", "threadid", "threadflag", "threadreturn",
"base", "threadid", "threadflag", "threadreturn",
"escape", "mutexEvents", "mutex", "access", "race", "mallocWrapper", "mhp",
"assert", "pthreadMutexType"
]
},
"queryproviders": {
"title": "ana.queryproviders",
"description": "Options for stateless query providers.",
"type": "object",
"properties": {
"exprelation": {
"title": "ana.queryproviders.exprelation",
"description": "Enable syntactic expression-relation queries.",
"type": "boolean",
"default": true
}
},
"additionalProperties": false
},
"path_sens": {
"title": "ana.path_sens",
"description": "List of path-sensitive analyses",
Expand Down Expand Up @@ -716,7 +730,7 @@
"domain": {
"title": "ana.base.arrays.domain",
"description":
"The domain that should be used for arrays. When employing the partition array domain, make sure to enable the expRelation analysis as well. When employing the unrolling array domain, make sure to set the ana.base.arrays.unrolling-factor >0.",
"The domain that should be used for arrays. When employing the partition array domain, make sure to enable ana.queryproviders.exprelation as well. When employing the unrolling array domain, make sure to set the ana.base.arrays.unrolling-factor >0.",
"type": "string",
"enum": ["trivial", "partitioned", "unroll"],
"default": "trivial"
Expand Down
Loading
Loading