From 8cc15bedb94264a64ad97520a20ca92273cb1c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr> Date: Thu, 10 Dec 2020 16:55:16 +0100 Subject: [PATCH] [Eva] Uses x86_32 machdep in alternative test configurations. --- tests/builtins/test_config_apron | 2 +- tests/builtins/test_config_bitwise | 2 +- tests/builtins/test_config_equalities | 2 +- tests/builtins/test_config_gauges | 2 +- tests/builtins/test_config_octagons | 2 +- tests/builtins/test_config_symblocs | 2 +- tests/test_config_apron | 2 +- tests/test_config_bitwise | 2 +- tests/test_config_equalities | 2 +- tests/test_config_gauges | 2 +- tests/test_config_octagons | 2 +- tests/test_config_symblocs | 2 +- tests/value/diff_apron | 8 ++++---- tests/value/diff_gauges | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/builtins/test_config_apron b/tests/builtins/test_config_apron index e5aae733192..365fdc8d48c 100644 --- a/tests/builtins/test_config_apron +++ b/tests/builtins/test_config_apron @@ -1,3 +1,3 @@ MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null -MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic +MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32 OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps diff --git a/tests/builtins/test_config_bitwise b/tests/builtins/test_config_bitwise index e5aae733192..365fdc8d48c 100644 --- a/tests/builtins/test_config_bitwise +++ b/tests/builtins/test_config_bitwise @@ -1,3 +1,3 @@ MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null -MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic +MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32 OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps diff --git a/tests/builtins/test_config_equalities b/tests/builtins/test_config_equalities index e5aae733192..365fdc8d48c 100644 --- a/tests/builtins/test_config_equalities +++ b/tests/builtins/test_config_equalities @@ -1,3 +1,3 @@ MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null -MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic +MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32 OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps diff --git a/tests/builtins/test_config_gauges b/tests/builtins/test_config_gauges index e5aae733192..365fdc8d48c 100644 --- a/tests/builtins/test_config_gauges +++ b/tests/builtins/test_config_gauges @@ -1,3 +1,3 @@ MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null -MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic +MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32 OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps diff --git a/tests/builtins/test_config_octagons b/tests/builtins/test_config_octagons index e5aae733192..365fdc8d48c 100644 --- a/tests/builtins/test_config_octagons +++ b/tests/builtins/test_config_octagons @@ -1,3 +1,3 @@ MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null -MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic +MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32 OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps diff --git a/tests/builtins/test_config_symblocs b/tests/builtins/test_config_symblocs index e5aae733192..365fdc8d48c 100644 --- a/tests/builtins/test_config_symblocs +++ b/tests/builtins/test_config_symblocs @@ -1,3 +1,3 @@ MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null -MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic +MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32 OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps diff --git a/tests/test_config_apron b/tests/test_config_apron index 9756305b89f..568bc84e0ab 100644 --- a/tests/test_config_apron +++ b/tests/test_config_apron @@ -1,3 +1,3 @@ MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains apron-octagon -eva-warn-key experimental=inactive -MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic +MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32 OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps diff --git a/tests/test_config_bitwise b/tests/test_config_bitwise index 2de393bf539..9a4d5dfea1a 100644 --- a/tests/test_config_bitwise +++ b/tests/test_config_bitwise @@ -1,3 +1,3 @@ MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains bitwise -MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic +MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32 OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps diff --git a/tests/test_config_equalities b/tests/test_config_equalities index 2758bbcdc4c..45664b6c913 100644 --- a/tests/test_config_equalities +++ b/tests/test_config_equalities @@ -1,3 +1,3 @@ MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains equality -MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic +MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32 OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps diff --git a/tests/test_config_gauges b/tests/test_config_gauges index 9c8f4771245..ee46c34eb9c 100644 --- a/tests/test_config_gauges +++ b/tests/test_config_gauges @@ -1,3 +1,3 @@ MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains gauges -MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic +MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32 OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps diff --git a/tests/test_config_octagons b/tests/test_config_octagons index 27c9bcc8171..689c4edbfbb 100644 --- a/tests/test_config_octagons +++ b/tests/test_config_octagons @@ -1,3 +1,3 @@ MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-domains octagon -MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic +MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32 OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps diff --git a/tests/test_config_symblocs b/tests/test_config_symblocs index c90d71b9e63..b4a58bcd9f8 100644 --- a/tests/test_config_symblocs +++ b/tests/test_config_symblocs @@ -1,3 +1,3 @@ MACRO: EVA_OPTIONS -eva-show-progress -eva-msg-key=-summary -eva-auto-loop-unroll 0 -eva-domains symbolic-locations -MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic +MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32 OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps diff --git a/tests/value/diff_apron b/tests/value/diff_apron index b8f9fbe7d8c..2baa50c4f00 100644 --- a/tests/value/diff_apron +++ b/tests/value/diff_apron @@ -1074,7 +1074,7 @@ diff tests/value/oracle/loopinv.res.oracle tests/value/oracle_apron/loopinv.res. > 3 To be validated > 12 Total diff tests/value/oracle/memexec.res.oracle tests/value/oracle_apron/memexec.res.oracle -27,32c27,50 +29,34c29,52 < [eva] tests/value/memexec.c:13: Reusing old results for call to f11 < [eva] tests/value/memexec.c:14: Reusing old results for call to f11 < [eva] tests/value/memexec.c:16: Reusing old results for call to f11 @@ -1106,21 +1106,21 @@ diff tests/value/oracle/memexec.res.oracle tests/value/oracle_apron/memexec.res. > Called from tests/value/memexec.c:21. > [eva] Recording results for f11 > [eva] Done for function f11 -106c124,127 +108c126,129 < [eva] tests/value/memexec.c:113: Reusing old results for call to f5_aux --- > [eva] computing for function f5_aux <- f5 <- main. > Called from tests/value/memexec.c:113. > [eva] Recording results for f5_aux > [eva] Done for function f5_aux -129c150,153 +131c152,155 < [eva] tests/value/memexec.c:137: Reusing old results for call to f7_1 --- > [eva] computing for function f7_1 <- f7 <- main. > Called from tests/value/memexec.c:137. > [eva] Recording results for f7_1 > [eva] Done for function f7_1 -144c168,171 +146c170,173 < [eva] tests/value/memexec.c:150: Reusing old results for call to f8_1 --- > [eva] computing for function f8_1 <- f8 <- main. diff --git a/tests/value/diff_gauges b/tests/value/diff_gauges index f6010fb62ca..4459f5ccfc6 100644 --- a/tests/value/diff_gauges +++ b/tests/value/diff_gauges @@ -764,7 +764,7 @@ diff tests/value/oracle/loopfun.1.res.oracle tests/value/oracle_gauges/loopfun.1 13a18 > [eva] tests/value/loopfun.i:27: starting to merge loop iterations diff tests/value/oracle/memexec.res.oracle tests/value/oracle_gauges/memexec.res.oracle -101a102 +103a104 > [eva] tests/value/memexec.c:98: starting to merge loop iterations diff tests/value/oracle/modulo.res.oracle tests/value/oracle_gauges/modulo.res.oracle 40a41,123 -- GitLab