From 82c8bd8bcfad7c7c4a6868356a02ba9a4672ba1a Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.maroneze@cea.fr>
Date: Thu, 26 Sep 2024 17:59:21 +0200
Subject: [PATCH] [Eva] add dkeys for partitioning messages and wkey for
 recursion

---
 .../aorai/tests/ya/oracle/serial.res.oracle   |  18 +--
 .../dive/tests/dive/oracle/various.res.oracle |   2 +-
 src/plugins/eva/engine/recursion.ml           |   4 +-
 .../eva/partitioning/trace_partitioning.ml    |   6 +-
 src/plugins/eva/self.ml                       |  10 +-
 src/plugins/eva/self.mli                      |   3 +-
 .../oracle/with_value.res.oracle              |  82 +++++------
 .../tests/md/oracle/cwe126.res.oracle         |   4 +-
 .../tests/nonterm/oracle/n1.res.oracle        |   2 +-
 .../tests/nonterm/oracle/n7.res.oracle        |   2 +-
 tests/builtins/oracle/alloc_weak.res.oracle   |  20 +--
 tests/builtins/oracle/allocated.0.res.oracle  |  10 +-
 tests/builtins/oracle/allocated.1.res.oracle  |   8 +-
 .../builtins/oracle/linked_list.0.res.oracle  |   4 +-
 .../builtins/oracle/linked_list.1.res.oracle  |   4 +-
 tests/builtins/oracle/malloc-deps.res.oracle  |   2 +-
 .../oracle/malloc-optimistic.res.oracle       |   6 +-
 .../oracle/malloc-size-zero.0.res.oracle      |   2 +-
 .../oracle/malloc-size-zero.1.res.oracle      |   2 +-
 tests/builtins/oracle/memchr.res.oracle       |   2 +-
 tests/builtins/oracle/memcpy.0.res.oracle     |  12 +-
 .../builtins/oracle/memexec-malloc.res.oracle |   2 +-
 tests/builtins/oracle/memset.res.oracle       |   2 +-
 tests/builtins/oracle/realloc2.res.oracle     |   2 +-
 .../builtins/oracle/str_allocated.res.oracle  |   2 +-
 tests/builtins/oracle/strchr.res.oracle       |   2 +-
 tests/builtins/oracle/strlen.res.oracle       |   4 +-
 tests/builtins/oracle/strnlen2.res.oracle     |   4 +-
 tests/builtins/oracle/wcslen.res.oracle       |   4 +-
 .../oracle_equality/alloc_weak.res.oracle     |   4 +-
 .../oracle_equality/allocated.1.res.oracle    |  22 +--
 .../malloc-optimistic.res.oracle              | 126 ++++++++---------
 .../oracle_gauges/memcpy.0.res.oracle         |   2 +-
 .../builtins/oracle_gauges/realloc.res.oracle |   4 +-
 .../oracle_multidim/allocated.1.res.oracle    |  22 +--
 .../oracle_octagon/allocated.1.res.oracle     |  22 +--
 .../malloc-optimistic.res.oracle              |   4 +-
 .../oracle_symblocs/alloc_weak.res.oracle     |   2 +-
 .../malloc-optimistic.res.oracle              | 126 ++++++++---------
 tests/float/oracle/absorb_sav2.res            |   2 +-
 tests/float/oracle/some.0.res.oracle          |  10 +-
 tests/float/oracle/widen.0.res.oracle         |   8 +-
 tests/float/oracle/widen.1.res.oracle         |   8 +-
 tests/idct/oracle/ieee_1180_1990.res.oracle   | 108 +++++++--------
 .../oracle_apron/ieee_1180_1990.res.oracle    |  18 +--
 .../oracle_equality/ieee_1180_1990.res.oracle |  56 ++++----
 .../oracle_gauges/ieee_1180_1990.res.oracle   |   4 +-
 .../oracle_multidim/ieee_1180_1990.res.oracle | 109 ++++++++-------
 .../oracle_octagon/ieee_1180_1990.res.oracle  |  18 +--
 tests/impact/oracle/initial.res.oracle        |   4 +-
 tests/impact/oracle/loop2.res.oracle          |   4 +-
 tests/libc/oracle/alloca_h.res.oracle         |   2 +-
 tests/libc/oracle/glob_c.res.oracle           |   6 +-
 tests/libc/oracle/netdb_c.res.oracle          |   2 +-
 tests/libc/oracle/spawn_h.res.oracle          |   4 +-
 tests/libc/oracle/stdio_c.res.oracle          |  18 +--
 tests/libc/oracle/stdlib_c.0.res.oracle       |   2 +-
 tests/libc/oracle/stdlib_c.1.res.oracle       |   2 +-
 tests/libc/oracle/stdlib_c.2.res.oracle       |   2 +-
 tests/libc/oracle/stdlib_c_env.res.oracle     |   2 +-
 tests/libc/oracle/string_c_generic.res.oracle |   9 +-
 tests/libc/oracle/string_c_strchr.res.oracle  |  10 +-
 tests/libc/oracle/string_c_strstr.res.oracle  |   3 +-
 tests/libc/oracle/string_h.res.oracle         |   2 +-
 tests/misc/oracle/audit-out.json              |   2 +-
 tests/misc/oracle/ulevel.res.oracle           |   4 +-
 tests/misc/oracle/widen_hints.2.res.oracle    |  24 ++--
 tests/misc/oracle/widen_hints.3.res.oracle    |  28 ++--
 tests/misc/oracle/widen_hints2.0.res.oracle   |  24 ++--
 .../misc/oracle/widen_hints_float.res.oracle  |  16 +--
 tests/pdg/oracle/annot.1.res.oracle           |   2 +-
 tests/pdg/oracle/dpds_intra.0.res.oracle      |   2 +-
 tests/pdg/oracle/dpds_intra.1.res.oracle      |   2 +-
 tests/pdg/oracle/dpds_intra.2.res.oracle      |   2 +-
 tests/pdg/oracle/dpds_intra.3.res.oracle      |   2 +-
 tests/pdg/oracle/dpds_intra.4.res.oracle      |   2 +-
 tests/pdg/oracle/dpds_intra.6.res.oracle      |   2 +-
 tests/pdg/oracle/dpds_intra.7.res.oracle      |   2 +-
 tests/pdg/oracle/dpds_intra.8.res.oracle      |   2 +-
 tests/pdg/oracle/loops.0.res.oracle           |   2 +-
 tests/pdg/oracle/loops.1.res.oracle           |   2 +-
 tests/pdg/oracle/loops.2.res.oracle           |   2 +-
 tests/pdg/oracle/loops.3.res.oracle           |   2 +-
 tests/pdg/oracle/loops.4.res.oracle           |   2 +-
 tests/pdg/oracle/loops.5.res.oracle           |   4 +-
 tests/pdg/oracle/no_body.res.oracle           |   2 +-
 .../pdg/oracle/pb_infinite_loop.0.res.oracle  |   2 +-
 .../pdg/oracle/pb_infinite_loop.1.res.oracle  |   2 +-
 tests/pdg/oracle/postdom.res.oracle           |   2 +-
 tests/pdg/oracle/simple_call.1.res.oracle     |   2 +-
 .../pdg/oracle/simple_intra_slice.res.oracle  |   4 +-
 tests/pdg/oracle/top_pdg_input.res.oracle     |   2 +-
 tests/rte/oracle/value_rte.res.oracle         |   2 +-
 tests/saveload/oracle/basic_sav.1.res         |   2 +-
 tests/saveload/oracle/basic_sav.res           |   2 +-
 tests/saveload/oracle/bool_sav.res            |   2 +-
 tests/saveload/oracle/deps_sav.res            |   2 +-
 .../oracle/segfault_datatypes_sav.res         |   2 +-
 tests/scope/oracle/bts383.res.oracle          |   6 +-
 tests/scope/oracle/scope.2.res.oracle         |   2 +-
 tests/slicing/oracle/adpcm.1.res.oracle       |  14 +-
 tests/slicing/oracle/bts1768.res.oracle       |   2 +-
 tests/slicing/oracle/bts336.5.res.oracle      |   2 +-
 tests/slicing/oracle/bts336.6.res.oracle      |   2 +-
 tests/slicing/oracle/bts709.res.oracle        |   2 +-
 tests/slicing/oracle/call_demo.0.res.oracle   |   2 +-
 tests/slicing/oracle/call_demo.1.res.oracle   |   2 +-
 tests/slicing/oracle/callwise.res.oracle      |   2 +-
 tests/slicing/oracle/csmith.0.res.oracle      |  14 +-
 tests/slicing/oracle/csmith.1.res.oracle      |   4 +-
 tests/slicing/oracle/csmith.2.res.oracle      |   4 +-
 .../oracle/forall_loop_invariant.res.oracle   |   2 +-
 tests/slicing/oracle/horwitz.res.oracle       |   2 +-
 .../slicing/oracle/if_many_values.res.oracle  |   5 +-
 tests/slicing/oracle/keep_annot.0.res.oracle  |   2 +-
 tests/slicing/oracle/keep_annot.1.res.oracle  |   2 +-
 tests/slicing/oracle/loop_simple.res.oracle   |   4 +-
 tests/slicing/oracle/loops.0.res.oracle       |   2 +-
 tests/slicing/oracle/loops.1.res.oracle       |   2 +-
 tests/slicing/oracle/loops.10.res.oracle      |   2 +-
 tests/slicing/oracle/loops.11.res.oracle      |   2 +-
 tests/slicing/oracle/loops.12.res.oracle      |   2 +-
 tests/slicing/oracle/loops.13.res.oracle      |   2 +-
 tests/slicing/oracle/loops.14.res.oracle      |   2 +-
 tests/slicing/oracle/loops.15.res.oracle      |   2 +-
 tests/slicing/oracle/loops.16.res.oracle      |   2 +-
 tests/slicing/oracle/loops.19.res.oracle      |   2 +-
 tests/slicing/oracle/loops.2.res.oracle       |   2 +-
 tests/slicing/oracle/loops.20.res.oracle      |   2 +-
 tests/slicing/oracle/loops.21.res.oracle      |   2 +-
 tests/slicing/oracle/loops.22.res.oracle      |   2 +-
 tests/slicing/oracle/loops.23.res.oracle      |   2 +-
 tests/slicing/oracle/loops.3.res.oracle       |   2 +-
 tests/slicing/oracle/loops.5.res.oracle       |   2 +-
 tests/slicing/oracle/loops.6.res.oracle       |   2 +-
 tests/slicing/oracle/loops.7.res.oracle       |   2 +-
 tests/slicing/oracle/loops.8.res.oracle       |   2 +-
 tests/slicing/oracle/loops.9.res.oracle       |   2 +-
 tests/slicing/oracle/select_simple.res.oracle |   4 +-
 .../oracle/simple_intra_slice.res.oracle      |   4 +-
 tests/slicing/oracle/top.0.res.oracle         |   2 +-
 tests/slicing/oracle/top.1.res.oracle         |   2 +-
 tests/slicing/oracle/top.2.res.oracle         |   2 +-
 .../oracle/unravel-flavors.0.res.oracle       |   2 +-
 .../oracle/unravel-flavors.1.res.oracle       |   2 +-
 .../oracle/unravel-flavors.2.res.oracle       |   2 +-
 .../oracle/unravel-flavors.3.res.oracle       |   2 +-
 .../oracle/unravel-variance.0.res.oracle      |   4 +-
 .../oracle/unravel-variance.1.res.oracle      |   4 +-
 .../oracle/unravel-variance.2.res.oracle      |   4 +-
 .../oracle/unravel-variance.3.res.oracle      |   4 +-
 .../oracle/unravel-variance.4.res.oracle      |   4 +-
 tests/sparecode/oracle/bts324.0.res.oracle    |   2 +-
 tests/sparecode/oracle/bts324.1.res.oracle    |   2 +-
 tests/sparecode/oracle/bts324.2.res.oracle    |   2 +-
 .../sparecode/oracle/bts324_bis.0.res.oracle  |   2 +-
 .../sparecode/oracle/bts324_bis.1.res.oracle  |   2 +-
 .../sparecode/oracle/bts324_bis.2.res.oracle  |   2 +-
 tests/sparecode/oracle/bts334.0.res.oracle    |   2 +-
 tests/sparecode/oracle/bts334.1.res.oracle    |   2 +-
 tests/sparecode/oracle/bts334.2.res.oracle    |   2 +-
 tests/sparecode/oracle/intra.0.res.oracle     |   2 +-
 tests/sparecode/oracle/intra.1.res.oracle     |   2 +-
 .../spec/oracle/behavior_assert.0.res.oracle  |   2 +-
 .../spec/oracle/behavior_assert.1.res.oracle  |   2 +-
 .../oracle/generalized_check.0.res.oracle     |   2 +-
 .../syntax/oracle/Refresh_visitor.res.oracle  |   4 +-
 .../syntax/oracle/unroll_labels.0.res.oracle  |   8 +-
 tests/syntax/oracle/unroll_visit.res.oracle   |   2 +-
 tests/value/oracle/FP5.res.oracle             |   2 +-
 tests/value/oracle/abs_addr.res.oracle        |   4 +-
 tests/value/oracle/addr2.res.oracle           |   2 +-
 tests/value/oracle/alias.4.res.oracle         |   2 +-
 tests/value/oracle/alias.5.res.oracle         |   4 +-
 tests/value/oracle/any_int.res.oracle         |   2 +-
 tests/value/oracle/array_bounds.0.res.oracle  |   4 +-
 tests/value/oracle/array_bounds.1.res.oracle  |   4 +-
 .../oracle/array_degenerating_loop.res.oracle |   2 +-
 tests/value/oracle/array_loop.res.oracle      |   2 +-
 tests/value/oracle/assigns.res.oracle         |   2 +-
 tests/value/oracle/assigns_from.res.oracle    |   8 +-
 .../oracle/auto_loop_unroll.0.res.oracle      |  99 +++++++-------
 .../oracle/auto_loop_unroll.1.res.oracle      |  42 +++---
 tests/value/oracle/bad_loop.res.oracle        |   2 +-
 tests/value/oracle/bitfield.res.oracle        |   2 +-
 tests/value/oracle/branch2.res.oracle         |   2 +-
 .../value/oracle/buffer_overflow.0.res.oracle |   2 +-
 tests/value/oracle/bug0196.res.oracle         |   2 +-
 tests/value/oracle/bug_0244.res.oracle        |   2 +-
 tests/value/oracle/call.res.oracle            |   2 +-
 tests/value/oracle/cast.res.oracle            |   2 +-
 tests/value/oracle/cast1.res.oracle           |   4 +-
 tests/value/oracle/cond2.0.res.oracle         |   4 +-
 tests/value/oracle/cond2.1.res.oracle         |  12 +-
 tests/value/oracle/control.res.oracle         |   2 +-
 tests/value/oracle/dataflow_order.res.oracle  |   2 +-
 tests/value/oracle/degeneration2.res.oracle   |   2 +-
 tests/value/oracle/descending.res.oracle      |   4 +-
 tests/value/oracle/div.res.oracle             |   2 +-
 tests/value/oracle/domains.res.oracle         |   2 +-
 .../oracle/domains_function.0.res.oracle      |   2 +-
 tests/value/oracle/downcast.0.res.oracle      |   2 +-
 tests/value/oracle/downcast.1.res.oracle      |   2 +-
 tests/value/oracle/downcast.2.res.oracle      |   2 +-
 tests/value/oracle/downcast.3.res.oracle      |   2 +-
 tests/value/oracle/downcast.4.res.oracle      |   2 +-
 tests/value/oracle/dur.res.oracle             |   2 +-
 tests/value/oracle/empty_struct.5.res.oracle  |   2 +-
 tests/value/oracle/enum.res.oracle            |   2 +-
 tests/value/oracle/exit_paths.res.oracle      |  10 +-
 tests/value/oracle/find_ivaltop.res.oracle    |   2 +-
 tests/value/oracle/for_loops.0.res.oracle     |   4 +-
 tests/value/oracle/for_loops.1.res.oracle     |   2 +-
 tests/value/oracle/for_loops.2.res.oracle     |   4 +-
 tests/value/oracle/for_loops.3.res.oracle     |   4 +-
 tests/value/oracle/fptr.0.res.oracle          |   2 +-
 tests/value/oracle/fptr.1.res.oracle          |   2 +-
 tests/value/oracle/gauges.res.oracle          |  62 ++++-----
 tests/value/oracle/ghost.res.oracle           |   2 +-
 .../hierarchical_convergence.res.oracle       |   4 +-
 tests/value/oracle/ilevel.0.res.oracle        |   8 +-
 tests/value/oracle/initialized.res.oracle     |   6 +-
 tests/value/oracle/inout.1.res.oracle         |   2 +-
 tests/value/oracle/interpol.res.oracle        |   2 +-
 .../value/oracle/invalid_pointer.0.res.oracle |   3 +-
 .../value/oracle/invalid_pointer.1.res.oracle |   3 +-
 tests/value/oracle/inversion.res.oracle       |   4 +-
 tests/value/oracle/inversion2.res.oracle      |   4 +-
 tests/value/oracle/local_slevel.res.oracle    |  16 ++-
 tests/value/oracle/local_variables.res.oracle |   2 +-
 tests/value/oracle/long.res.oracle            |   4 +-
 tests/value/oracle/loop.res.oracle            |   2 +-
 tests/value/oracle/loop1.res.oracle           |   4 +-
 tests/value/oracle/loop2.res.oracle           |   2 +-
 tests/value/oracle/loop3.res.oracle           |   2 +-
 tests/value/oracle/loop_array.res.oracle      |   6 +-
 tests/value/oracle/loop_join.res.oracle       |   2 +-
 tests/value/oracle/loop_long.res.oracle       |   2 +-
 tests/value/oracle/loop_simple.res.oracle     |   6 +-
 tests/value/oracle/loop_test.0.res.oracle     |  20 +--
 tests/value/oracle/loop_test.1.res.oracle     |  20 +--
 tests/value/oracle/loop_wvar.0.res.oracle     |   4 +-
 tests/value/oracle/loop_wvar.1.res.oracle     |   4 +-
 tests/value/oracle/loop_wvar.2.res.oracle     |   2 +-
 tests/value/oracle/loop_wvar.3.res.oracle     |   2 +-
 tests/value/oracle/loopinv.res.oracle         |   8 +-
 .../oracle/multidim-relations.res.oracle      |   2 +-
 tests/value/oracle/multidim.res.oracle        |  20 +--
 tests/value/oracle/no_results.res.oracle      |  81 +++++++----
 tests/value/oracle/non_natural.res.oracle     |   2 +-
 tests/value/oracle/nonlin.res.oracle          |   2 +-
 .../octagons-pointers-intermediate.res.oracle |   3 +-
 .../octagons-pointers-simple.res.oracle       |   2 +-
 .../value/oracle/octagons-pointers.res.oracle |   2 +-
 tests/value/oracle/octagons.res.oracle        |   8 +-
 tests/value/oracle/offsetmap.0.res.oracle     |   4 +-
 tests/value/oracle/offsetmap.1.res.oracle     |   4 +-
 tests/value/oracle/offsetmap.2.res.oracle     |   4 +-
 .../oracle/partitioning-annots.0.res.oracle   |  18 +--
 .../oracle/partitioning-annots.2.res.oracle   |   2 +-
 tests/value/oracle/pointer4.res.oracle        |   2 +-
 .../oracle/pointer_comparison.0.res.oracle    |   2 +-
 .../oracle/pointer_comparison.1.res.oracle    |   2 +-
 tests/value/oracle/pointer_loop.res.oracle    |   2 +-
 tests/value/oracle/postcondition.res.oracle   |   2 +-
 .../value/oracle/precise_locations.res.oracle |  14 +-
 tests/value/oracle/raz.res.oracle             |   2 +-
 tests/value/oracle/reading_null.res.oracle    |   2 +-
 tests/value/oracle/red_alarms.res.oracle      |   6 +-
 .../value/oracle/reevaluate_alarms.res.oracle |   4 +-
 tests/value/oracle/relations2.res.oracle      |   2 +-
 tests/value/oracle/semaphore.res.oracle       |   4 +-
 tests/value/oracle/shift_big.res.oracle       |   4 +-
 tests/value/oracle/statistics.res.oracle      |   2 +-
 tests/value/oracle/strings_cond.res.oracle    |   2 +-
 tests/value/oracle/symbolic_locs.res.oracle   |   2 +-
 tests/value/oracle/taint.res.oracle           |   2 +-
 tests/value/oracle/test.0.res.oracle          |   6 +-
 .../value/oracle/threat_redundant.res.oracle  |   2 +-
 .../value/oracle/ulongvslonglong.0.res.oracle |   4 +-
 .../value/oracle/ulongvslonglong.1.res.oracle |   4 +-
 .../oracle/undefined_sequence.0.res.oracle    |   6 +-
 .../oracle/undefined_sequence.1.res.oracle    |  10 +-
 tests/value/oracle/unroll.res.oracle          |   2 +-
 tests/value/oracle/unroll_simple.res.oracle   |   2 +-
 .../user_assertion_uninit_var.res.oracle      |   2 +-
 tests/value/oracle/va_list2.0.res.oracle      |   2 +-
 tests/value/oracle/va_list2.1.res.oracle      |   2 +-
 .../oracle/widen_non_constant.res.oracle      |  20 +--
 .../oracle/widen_on_non_monotonic.res.oracle  |   6 +-
 tests/value/oracle/widen_overflow.res.oracle  |   2 +-
 .../oracle/widening_thresholds.res.oracle     |   2 +-
 tests/value/oracle/with_comment.res.oracle    |   2 +-
 .../auto_loop_unroll.0.res.oracle             | 128 +++++++++---------
 .../auto_loop_unroll.1.res.oracle             | 106 +++++++--------
 .../oracle_apron/local_slevel.res.oracle      |  12 +-
 .../octagons-pointers-simple.res.oracle       |   2 +-
 .../widen_on_non_monotonic.res.oracle         |   2 +-
 .../value/oracle_equality/alias.5.res.oracle  |   2 +-
 .../auto_loop_unroll.0.res.oracle             |   4 +-
 .../oracle_equality/from_termin.res.oracle    |   2 +-
 tests/value/oracle_gauges/alias.5.res.oracle  |   2 +-
 .../auto_loop_unroll.0.res.oracle             |  76 +++++------
 .../auto_loop_unroll.1.res.oracle             |  12 +-
 tests/value/oracle_gauges/bad_loop.res.oracle |   2 +-
 tests/value/oracle_gauges/cast2.res.oracle    |   2 +-
 .../oracle_gauges/from_termin.res.oracle      |   2 +-
 tests/value/oracle_gauges/infinite.res.oracle |   2 +-
 tests/value/oracle_gauges/inout.2.res.oracle  |   2 +-
 tests/value/oracle_gauges/inout.3.res.oracle  |   2 +-
 tests/value/oracle_gauges/inout.4.res.oracle  |   2 +-
 .../oracle_gauges/local_slevel.res.oracle     |  12 +-
 .../oracle_gauges/loop_no_var.res.oracle      |   2 +-
 .../value/oracle_gauges/loopfun.1.res.oracle  |   8 +-
 tests/value/oracle_gauges/memexec.res.oracle  |   2 +-
 tests/value/oracle_gauges/modulo.res.oracle   |   4 +-
 tests/value/oracle_gauges/noreturn.res.oracle |   8 +-
 .../octagons-pointers-intermediate.res.oracle |   5 +-
 .../octagons-pointers-simple.res.oracle       |   2 +-
 .../octagons-pointers.res.oracle              |   2 +-
 .../oracle_gauges/reduce_formals.res.oracle   |   2 +-
 .../oracle_gauges/redundant_alarms.res.oracle |   2 +-
 .../oracle_gauges/symbolic_locs.res.oracle    |   2 +-
 tests/value/oracle_gauges/taint.res.oracle    |   2 +-
 .../undefined_sequence.0.res.oracle           |   4 +-
 tests/value/oracle_gauges/unroll.res.oracle   |   2 +-
 .../oracle_gauges/unroll_simple.res.oracle    |   2 +-
 .../widen_on_non_monotonic.res.oracle         |   4 +-
 .../value/oracle_multidim/alias.5.res.oracle  |   2 +-
 tests/value/oracle_octagon/alias.5.res.oracle |   2 +-
 .../auto_loop_unroll.0.res.oracle             |  14 +-
 .../auto_loop_unroll.1.res.oracle             |   2 +-
 .../oracle_octagon/from_termin.res.oracle     |   2 +-
 .../redundant_alarms.res.oracle               |   2 +-
 tests/value/oracle_octagon/unroll.res.oracle  |   2 +-
 .../oracle_octagon/unroll_simple.res.oracle   |   2 +-
 tests/value/traces/oracle/test4.res.oracle    |   2 +-
 tests/value/traces/oracle/test5.res.oracle    |   4 +-
 338 files changed, 1304 insertions(+), 1259 deletions(-)

diff --git a/src/plugins/aorai/tests/ya/oracle/serial.res.oracle b/src/plugins/aorai/tests/ya/oracle/serial.res.oracle
index a65af24e91b..11b74cc25ed 100644
--- a/src/plugins/aorai/tests/ya/oracle/serial.res.oracle
+++ b/src/plugins/aorai/tests/ya/oracle/serial.res.oracle
@@ -14,19 +14,19 @@
   aorai_StatesHistory_1 ∈ {19}
   aorai_StatesHistory_2 ∈ {19}
 [eva] using specification for function Frama_C_interval
-[eva] serial.c:58: starting to merge loop iterations
-[eva] serial.c:63: Trace partitioning superposing up to 100 states
-[eva] serial.c:63: Trace partitioning superposing up to 200 states
+[eva:partition] serial.c:58: starting to merge loop iterations
+[eva:partition] serial.c:63: Trace partitioning superposing up to 100 states
+[eva:partition] serial.c:63: Trace partitioning superposing up to 200 states
 [eva:alarm] serial.c:33: Warning: 
   assertion 'Aorai,aorai_smoke_test' got status invalid (stopping propagation).
 [aorai] serial.c:92: Wait1 <- Wait1 <- Complete
 [aorai] serial.c:92: n in {5},x in [0..16383],y in [0..16383]
-[eva] serial.c:63: Trace partitioning superposing up to 400 states
-[eva] serial.c:63: Trace partitioning superposing up to 600 states
-[eva] serial.c:63: Trace partitioning superposing up to 800 states
-[eva] serial.c:63: Trace partitioning superposing up to 900 states
-[eva] serial.c:63: Trace partitioning superposing up to 1000 states
-[eva] serial.c:63: Trace partitioning superposing up to 1100 states
+[eva:partition] serial.c:63: Trace partitioning superposing up to 400 states
+[eva:partition] serial.c:63: Trace partitioning superposing up to 600 states
+[eva:partition] serial.c:63: Trace partitioning superposing up to 800 states
+[eva:partition] serial.c:63: Trace partitioning superposing up to 900 states
+[eva:partition] serial.c:63: Trace partitioning superposing up to 1000 states
+[eva:partition] serial.c:63: Trace partitioning superposing up to 1100 states
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function input_data_post_func:
   aorai_x1 ∈ [0..127]
diff --git a/src/plugins/dive/tests/dive/oracle/various.res.oracle b/src/plugins/dive/tests/dive/oracle/various.res.oracle
index 6bad52b3bea..ddca782f39a 100644
--- a/src/plugins/dive/tests/dive/oracle/various.res.oracle
+++ b/src/plugins/dive/tests/dive/oracle/various.res.oracle
@@ -1,6 +1,6 @@
 [kernel] Parsing various.i (no preprocessing)
 [eva] Analyzing a complete application starting at main
-[eva] various.i:10: starting to merge loop iterations
+[eva:partition] various.i:10: starting to merge loop iterations
 [eva:alarm] various.i:13: Warning: 
   non-finite float value.
   assert \is_finite((float)\mul_double((double)y, (double)2.0));
diff --git a/src/plugins/eva/engine/recursion.ml b/src/plugins/eva/engine/recursion.ml
index d485cceb900..ba99da15a32 100644
--- a/src/plugins/eva/engine/recursion.ml
+++ b/src/plugins/eva/engine/recursion.ml
@@ -148,8 +148,8 @@ let make_stack (kf, depth) =
 let get_stack kf depth = VarStack.memo make_stack (kf, depth)
 
 let make_recursion call depth =
-  let dkey = Self.dkey_recursion in
-  Self.feedback ~dkey ~once:true ~current:true
+  let wkey = Self.wkey_recursion in
+  Self.warning ~wkey ~once:true ~current:true
     "@[detected recursive call@ of function %a.@]"
     Kernel_function.pretty call.kf;
   let substitution = get_stack call.kf depth in
diff --git a/src/plugins/eva/partitioning/trace_partitioning.ml b/src/plugins/eva/partitioning/trace_partitioning.ml
index c9930c43e30..74f9c2175a9 100644
--- a/src/plugins/eva/partitioning/trace_partitioning.ml
+++ b/src/plugins/eva/partitioning/trace_partitioning.ml
@@ -25,6 +25,8 @@ open Partition
 
 let stat_max_widenings = Statistics.register_statement_stat "max-widenings"
 
+let dkey = Self.dkey_partition
+
 module Make
     (Abstract: Abstractions.S_with_evaluation)
     (Kf : sig val kf: kernel_function end) =
@@ -241,7 +243,7 @@ struct
       if x >= !max_displayed + slevel_display_step
       then
         let rounded = x / slevel_display_step * slevel_display_step in
-        Self.feedback ~once:true ~current:true
+        Self.feedback ~dkey ~once:true ~current:true
           "Trace partitioning superposing up to %d states"
           rounded;
         max_displayed := rounded
@@ -301,7 +303,7 @@ struct
             else begin
               (* Propagate the join of the two states *)
               if is_loop_head then
-                Self.feedback ~level:1 ~once:true ~current:true
+                Self.feedback ~dkey ~level:1 ~once:true ~current:true
                   "starting to merge loop iterations";
               Some (Domain.join previous_state current_state)
             end
diff --git a/src/plugins/eva/self.ml b/src/plugins/eva/self.ml
index 6f4f14883d2..19cb808d800 100644
--- a/src/plugins/eva/self.ml
+++ b/src/plugins/eva/self.ml
@@ -107,15 +107,15 @@ let dkey_widening =
   register_category "widening"
     ~help:"print a message at each point where the analysis applies a widening"
 
-let dkey_recursion =
-  register_category "recursion"
-    ~help:"print a message for each recursive call"
+let dkey_partition =
+  register_category "partition"
+    ~help:"messages about states partitioning"
 
 let () =
   let activate dkey = add_debug_keys dkey in
   List.iter activate
     [dkey_initial_state; dkey_final_states; dkey_summary; dkey_cvalue_domain;
-     dkey_recursion; ]
+     dkey_partition]
 
 (* Warning categories. *)
 let wkey_alarm = register_warn_category "alarm"
@@ -145,3 +145,5 @@ let wkey_unknown_size = register_warn_category "unknown-size"
 let wkey_ensures_false = register_warn_category "ensures-false"
 let wkey_watchpoint = register_warn_category "watchpoint"
 let () = set_warn_status wkey_watchpoint Log.Wfeedback
+let wkey_recursion = register_warn_category "recursion"
+let () = set_warn_status wkey_recursion Log.Wfeedback
diff --git a/src/plugins/eva/self.mli b/src/plugins/eva/self.mli
index 1c3f9472c47..85525c88041 100644
--- a/src/plugins/eva/self.mli
+++ b/src/plugins/eva/self.mli
@@ -51,7 +51,7 @@ val dkey_pointer_comparison: category
 val dkey_cvalue_domain: category
 val dkey_iterator : category
 val dkey_widening : category
-val dkey_recursion : category
+val dkey_partition : category
 
 (** {2 Warning categories.} *)
 
@@ -73,3 +73,4 @@ val wkey_experimental : warn_category
 val wkey_unknown_size : warn_category
 val wkey_ensures_false : warn_category
 val wkey_watchpoint : warn_category
+val wkey_recursion : warn_category
diff --git a/src/plugins/loop_analysis/tests/loop_analysis/oracle/with_value.res.oracle b/src/plugins/loop_analysis/tests/loop_analysis/oracle/with_value.res.oracle
index e94639819e8..ab4907a07ed 100644
--- a/src/plugins/loop_analysis/tests/loop_analysis/oracle/with_value.res.oracle
+++ b/src/plugins/loop_analysis/tests/loop_analysis/oracle/with_value.res.oracle
@@ -6,56 +6,56 @@
   nondet ∈ [--..--]
 [eva] computing for function f1 <- main.
   Called from with_value.i:187.
-[eva] with_value.i:6: starting to merge loop iterations
+[eva:partition] with_value.i:6: starting to merge loop iterations
 [eva] Recording results for f1
 [eva] Done for function f1
 [eva] computing for function f2 <- main.
   Called from with_value.i:188.
-[eva] with_value.i:10: starting to merge loop iterations
+[eva:partition] with_value.i:10: starting to merge loop iterations
 [eva] Recording results for f2
 [eva] Done for function f2
 [eva] computing for function f3 <- main.
   Called from with_value.i:189.
-[eva] with_value.i:14: starting to merge loop iterations
+[eva:partition] with_value.i:14: starting to merge loop iterations
 [eva] Recording results for f3
 [eva] Done for function f3
 [eva] computing for function f4 <- main.
   Called from with_value.i:190.
-[eva] with_value.i:18: starting to merge loop iterations
+[eva:partition] with_value.i:18: starting to merge loop iterations
 [eva] Recording results for f4
 [eva] Done for function f4
 [eva] computing for function f5 <- main.
   Called from with_value.i:191.
-[eva] with_value.i:22: starting to merge loop iterations
+[eva:partition] with_value.i:22: starting to merge loop iterations
 [eva] Recording results for f5
 [eva] Done for function f5
 [eva] computing for function f6 <- main.
   Called from with_value.i:192.
-[eva] with_value.i:26: starting to merge loop iterations
+[eva:partition] with_value.i:26: starting to merge loop iterations
 [eva] Recording results for f6
 [eva] Done for function f6
 [eva] computing for function f7 <- main.
   Called from with_value.i:193.
-[eva] with_value.i:30: starting to merge loop iterations
+[eva:partition] with_value.i:30: starting to merge loop iterations
 [eva] Recording results for f7
 [eva] Done for function f7
 [eva] computing for function f8 <- main.
   Called from with_value.i:194.
-[eva] with_value.i:34: starting to merge loop iterations
+[eva:partition] with_value.i:34: starting to merge loop iterations
 [eva] Recording results for f8
 [eva] Done for function f8
 [eva] computing for function g1 <- main.
   Called from with_value.i:195.
 [eva:alarm] with_value.i:38: Warning: 
   signed overflow. assert n + 2 ≤ 2147483647;
-[eva] with_value.i:38: starting to merge loop iterations
+[eva:partition] with_value.i:38: starting to merge loop iterations
 [eva] Recording results for g1
 [eva] Done for function g1
 [eva] computing for function g2 <- main.
   Called from with_value.i:196.
 [eva:alarm] with_value.i:42: Warning: 
   signed overflow. assert n + 2 ≤ 2147483647;
-[eva] with_value.i:42: starting to merge loop iterations
+[eva:partition] with_value.i:42: starting to merge loop iterations
 [eva:alarm] with_value.i:42: Warning: 
   signed overflow. assert i + 1 ≤ 2147483647;
 [eva] Recording results for g2
@@ -64,7 +64,7 @@
   Called from with_value.i:197.
 [eva:alarm] with_value.i:46: Warning: 
   signed overflow. assert n + 2 ≤ 2147483647;
-[eva] with_value.i:46: starting to merge loop iterations
+[eva:partition] with_value.i:46: starting to merge loop iterations
 [eva:alarm] with_value.i:46: Warning: 
   signed overflow. assert i + 1 ≤ 2147483647;
 [eva] Recording results for g3
@@ -73,7 +73,7 @@
   Called from with_value.i:198.
 [eva:alarm] with_value.i:50: Warning: 
   signed overflow. assert n + 2 ≤ 2147483647;
-[eva] with_value.i:50: starting to merge loop iterations
+[eva:partition] with_value.i:50: starting to merge loop iterations
 [eva] Recording results for g4
 [eva] Done for function g4
 [eva] computing for function g5 <- main.
@@ -102,7 +102,7 @@
 [eva] Done for function g8
 [eva] computing for function h1 <- main.
   Called from with_value.i:203.
-[eva] with_value.i:70: starting to merge loop iterations
+[eva:partition] with_value.i:70: starting to merge loop iterations
 [eva] Recording results for h1
 [eva] Done for function h1
 [eva] computing for function h1 <- main.
@@ -111,7 +111,7 @@
 [eva] Done for function h1
 [eva] computing for function h2 <- main.
   Called from with_value.i:205.
-[eva] with_value.i:74: starting to merge loop iterations
+[eva:partition] with_value.i:74: starting to merge loop iterations
 [eva] Recording results for h2
 [eva] Done for function h2
 [eva] computing for function h2 <- main.
@@ -120,7 +120,7 @@
 [eva] Done for function h2
 [eva] computing for function h3 <- main.
   Called from with_value.i:207.
-[eva] with_value.i:78: starting to merge loop iterations
+[eva:partition] with_value.i:78: starting to merge loop iterations
 [eva] Recording results for h3
 [eva] Done for function h3
 [eva] computing for function h3 <- main.
@@ -129,7 +129,7 @@
 [eva] Done for function h3
 [eva] computing for function h4 <- main.
   Called from with_value.i:209.
-[eva] with_value.i:82: starting to merge loop iterations
+[eva:partition] with_value.i:82: starting to merge loop iterations
 [eva] Recording results for h4
 [eva] Done for function h4
 [eva] computing for function h4 <- main.
@@ -138,7 +138,7 @@
 [eva] Done for function h4
 [eva] computing for function h5 <- main.
   Called from with_value.i:211.
-[eva] with_value.i:86: starting to merge loop iterations
+[eva:partition] with_value.i:86: starting to merge loop iterations
 [eva] Recording results for h5
 [eva] Done for function h5
 [eva] computing for function h5 <- main.
@@ -147,7 +147,7 @@
 [eva] Done for function h5
 [eva] computing for function h6 <- main.
   Called from with_value.i:213.
-[eva] with_value.i:90: starting to merge loop iterations
+[eva:partition] with_value.i:90: starting to merge loop iterations
 [eva] Recording results for h6
 [eva] Done for function h6
 [eva] computing for function h6 <- main.
@@ -156,7 +156,7 @@
 [eva] Done for function h6
 [eva] computing for function h7 <- main.
   Called from with_value.i:215.
-[eva] with_value.i:94: starting to merge loop iterations
+[eva:partition] with_value.i:94: starting to merge loop iterations
 [eva] Recording results for h7
 [eva] Done for function h7
 [eva] computing for function h7 <- main.
@@ -165,7 +165,7 @@
 [eva] Done for function h7
 [eva] computing for function h8 <- main.
   Called from with_value.i:217.
-[eva] with_value.i:98: starting to merge loop iterations
+[eva:partition] with_value.i:98: starting to merge loop iterations
 [eva] Recording results for h8
 [eva] Done for function h8
 [eva] computing for function h8 <- main.
@@ -174,32 +174,32 @@
 [eva] Done for function h8
 [eva] computing for function i1 <- main.
   Called from with_value.i:219.
-[eva] with_value.i:102: starting to merge loop iterations
+[eva:partition] with_value.i:102: starting to merge loop iterations
 [eva] Recording results for i1
 [eva] Done for function i1
 [eva] computing for function i2 <- main.
   Called from with_value.i:220.
-[eva] with_value.i:106: starting to merge loop iterations
+[eva:partition] with_value.i:106: starting to merge loop iterations
 [eva] Recording results for i2
 [eva] Done for function i2
 [eva] computing for function i3 <- main.
   Called from with_value.i:221.
-[eva] with_value.i:110: starting to merge loop iterations
+[eva:partition] with_value.i:110: starting to merge loop iterations
 [eva] Recording results for i3
 [eva] Done for function i3
 [eva] computing for function i4 <- main.
   Called from with_value.i:222.
-[eva] with_value.i:114: starting to merge loop iterations
+[eva:partition] with_value.i:114: starting to merge loop iterations
 [eva] Recording results for i4
 [eva] Done for function i4
 [eva] computing for function j1 <- main.
   Called from with_value.i:223.
-[eva] with_value.i:118: starting to merge loop iterations
+[eva:partition] with_value.i:118: starting to merge loop iterations
 [eva] Recording results for j1
 [eva] Done for function j1
 [eva] computing for function j2 <- main.
   Called from with_value.i:224.
-[eva] with_value.i:122: starting to merge loop iterations
+[eva:partition] with_value.i:122: starting to merge loop iterations
 [eva] Recording results for j2
 [eva] Done for function j2
 [eva] computing for function j3 <- main.
@@ -220,99 +220,99 @@
 [eva] Done for function j2
 [eva] computing for function j3 <- main.
   Called from with_value.i:229.
-[eva] with_value.i:126: starting to merge loop iterations
+[eva:partition] with_value.i:126: starting to merge loop iterations
 [eva] Recording results for j3
 [eva] Done for function j3
 [eva] computing for function j4 <- main.
   Called from with_value.i:230.
-[eva] with_value.i:130: starting to merge loop iterations
+[eva:partition] with_value.i:130: starting to merge loop iterations
 [eva] Recording results for j4
 [eva] Done for function j4
 [eva] computing for function f2_u_const <- main.
   Called from with_value.i:232.
-[eva] with_value.i:134: starting to merge loop iterations
+[eva:partition] with_value.i:134: starting to merge loop iterations
 [eva] Recording results for f2_u_const
 [eva] Done for function f2_u_const
 [eva] computing for function ne1 <- main.
   Called from with_value.i:234.
-[eva] with_value.i:138: starting to merge loop iterations
+[eva:partition] with_value.i:138: starting to merge loop iterations
 [eva:alarm] with_value.i:138: Warning: 
   signed overflow. assert i + 4 ≤ 2147483647;
 [eva] Recording results for ne1
 [eva] Done for function ne1
 [eva] computing for function ne2 <- main.
   Called from with_value.i:235.
-[eva] with_value.i:142: starting to merge loop iterations
+[eva:partition] with_value.i:142: starting to merge loop iterations
 [eva:alarm] with_value.i:142: Warning: 
   signed overflow. assert i + 4 ≤ 2147483647;
 [eva] Recording results for ne2
 [eva] Done for function ne2
 [eva] computing for function ne3 <- main.
   Called from with_value.i:236.
-[eva] with_value.i:146: starting to merge loop iterations
+[eva:partition] with_value.i:146: starting to merge loop iterations
 [eva:alarm] with_value.i:146: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for ne3
 [eva] Done for function ne3
 [eva] computing for function ne4 <- main.
   Called from with_value.i:237.
-[eva] with_value.i:150: starting to merge loop iterations
+[eva:partition] with_value.i:150: starting to merge loop iterations
 [eva:alarm] with_value.i:150: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for ne4
 [eva] Done for function ne4
 [eva] computing for function nev1 <- main.
   Called from with_value.i:238.
-[eva] with_value.i:154: starting to merge loop iterations
+[eva:partition] with_value.i:154: starting to merge loop iterations
 [eva:alarm] with_value.i:154: Warning: 
   signed overflow. assert i + 4 ≤ 2147483647;
 [eva] Recording results for nev1
 [eva] Done for function nev1
 [eva] computing for function nev2 <- main.
   Called from with_value.i:239.
-[eva] with_value.i:158: starting to merge loop iterations
+[eva:partition] with_value.i:158: starting to merge loop iterations
 [eva:alarm] with_value.i:158: Warning: 
   signed overflow. assert i + 4 ≤ 2147483647;
 [eva] Recording results for nev2
 [eva] Done for function nev2
 [eva] computing for function nev3 <- main.
   Called from with_value.i:240.
-[eva] with_value.i:162: starting to merge loop iterations
+[eva:partition] with_value.i:162: starting to merge loop iterations
 [eva:alarm] with_value.i:162: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for nev3
 [eva] Done for function nev3
 [eva] computing for function nev4 <- main.
   Called from with_value.i:241.
-[eva] with_value.i:166: starting to merge loop iterations
+[eva:partition] with_value.i:166: starting to merge loop iterations
 [eva:alarm] with_value.i:166: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for nev4
 [eva] Done for function nev4
 [eva] computing for function nev5 <- main.
   Called from with_value.i:242.
-[eva] with_value.i:170: starting to merge loop iterations
+[eva:partition] with_value.i:170: starting to merge loop iterations
 [eva:alarm] with_value.i:170: Warning: 
   signed overflow. assert i + 4 ≤ 2147483647;
 [eva] Recording results for nev5
 [eva] Done for function nev5
 [eva] computing for function nev6 <- main.
   Called from with_value.i:243.
-[eva] with_value.i:174: starting to merge loop iterations
+[eva:partition] with_value.i:174: starting to merge loop iterations
 [eva:alarm] with_value.i:174: Warning: 
   signed overflow. assert i + 4 ≤ 2147483647;
 [eva] Recording results for nev6
 [eva] Done for function nev6
 [eva] computing for function nev7 <- main.
   Called from with_value.i:244.
-[eva] with_value.i:178: starting to merge loop iterations
+[eva:partition] with_value.i:178: starting to merge loop iterations
 [eva:alarm] with_value.i:178: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for nev7
 [eva] Done for function nev7
 [eva] computing for function nev8 <- main.
   Called from with_value.i:245.
-[eva] with_value.i:182: starting to merge loop iterations
+[eva:partition] with_value.i:182: starting to merge loop iterations
 [eva:alarm] with_value.i:182: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for nev8
diff --git a/src/plugins/markdown-report/tests/md/oracle/cwe126.res.oracle b/src/plugins/markdown-report/tests/md/oracle/cwe126.res.oracle
index aa34eaebd50..9e8d5c98827 100644
--- a/src/plugins/markdown-report/tests/md/oracle/cwe126.res.oracle
+++ b/src/plugins/markdown-report/tests/md/oracle/cwe126.res.oracle
@@ -6,10 +6,10 @@
 [eva] using specification for function exit
 [eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
-[eva] cwe126.c:63: starting to merge loop iterations
+[eva:partition] cwe126.c:63: starting to merge loop iterations
 [eva:malloc:new] cwe126.c:41: 
   allocating variable __malloc_CWE126_Buffer_Overread__malloc_char_loop_64_bad_l41
-[eva] cwe126.c:27: starting to merge loop iterations
+[eva:partition] cwe126.c:27: starting to merge loop iterations
 [eva:alarm] cwe126.c:29: Warning: 
   out of bounds read. assert \valid_read(data + i);
 [eva] ====== VALUES COMPUTED ======
diff --git a/src/plugins/nonterm/tests/nonterm/oracle/n1.res.oracle b/src/plugins/nonterm/tests/nonterm/oracle/n1.res.oracle
index 3587b6cfbcb..b7226e27c01 100644
--- a/src/plugins/nonterm/tests/nonterm/oracle/n1.res.oracle
+++ b/src/plugins/nonterm/tests/nonterm/oracle/n1.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] n1.i:6: starting to merge loop iterations
+[eva:partition] n1.i:6: starting to merge loop iterations
 [eva:alarm] n1.i:7: Warning: signed overflow. assert res + i ≤ 2147483647;
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/src/plugins/nonterm/tests/nonterm/oracle/n7.res.oracle b/src/plugins/nonterm/tests/nonterm/oracle/n7.res.oracle
index c783a87aa6e..5749dc73e0a 100644
--- a/src/plugins/nonterm/tests/nonterm/oracle/n7.res.oracle
+++ b/src/plugins/nonterm/tests/nonterm/oracle/n7.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] n7.i:5: starting to merge loop iterations
+[eva:partition] n7.i:5: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/builtins/oracle/alloc_weak.res.oracle b/tests/builtins/oracle/alloc_weak.res.oracle
index fe9898c64f9..492d56d769e 100644
--- a/tests/builtins/oracle/alloc_weak.res.oracle
+++ b/tests/builtins/oracle/alloc_weak.res.oracle
@@ -43,21 +43,21 @@
   pointer downcast.
   assert (unsigned int)tmp ≤ 2147483647;
   (tmp from malloc(sizeof(int)))
-[eva] alloc_weak.c:40: Trace partitioning superposing up to 100 states
-[eva] alloc_weak.c:40: Trace partitioning superposing up to 200 states
-[eva] alloc_weak.c:40: Trace partitioning superposing up to 300 states
-[eva] alloc_weak.c:40: Trace partitioning superposing up to 400 states
-[eva] alloc_weak.c:40: Trace partitioning superposing up to 500 states
-[eva] alloc_weak.c:40: Trace partitioning superposing up to 600 states
-[eva] alloc_weak.c:40: Trace partitioning superposing up to 700 states
-[eva] alloc_weak.c:40: Trace partitioning superposing up to 800 states
+[eva:partition] alloc_weak.c:40: Trace partitioning superposing up to 100 states
+[eva:partition] alloc_weak.c:40: Trace partitioning superposing up to 200 states
+[eva:partition] alloc_weak.c:40: Trace partitioning superposing up to 300 states
+[eva:partition] alloc_weak.c:40: Trace partitioning superposing up to 400 states
+[eva:partition] alloc_weak.c:40: Trace partitioning superposing up to 500 states
+[eva:partition] alloc_weak.c:40: Trace partitioning superposing up to 600 states
+[eva:partition] alloc_weak.c:40: Trace partitioning superposing up to 700 states
+[eva:partition] alloc_weak.c:40: Trace partitioning superposing up to 800 states
 [eva] Recording results for main2
 [eva] Done for function main2
 [eva] computing for function main3 <- main.
   Called from alloc_weak.c:95.
 [eva] alloc_weak.c:51: Call to builtin malloc
 [eva:malloc:new] alloc_weak.c:51: allocating variable __malloc_main3_l51
-[eva] alloc_weak.c:50: starting to merge loop iterations
+[eva:partition] alloc_weak.c:50: starting to merge loop iterations
 [eva] alloc_weak.c:51: Call to builtin malloc
 [eva:malloc:weak] alloc_weak.c:51: marking variable `__malloc_main3_l51' as weak
 [eva] alloc_weak.c:51: Call to builtin malloc
@@ -80,7 +80,7 @@
 [eva] alloc_weak.c:82: Call to builtin calloc
 [eva:malloc:new] alloc_weak.c:82: 
   allocating variable __calloc_convergence_issue_l82
-[eva] alloc_weak.c:74: starting to merge loop iterations
+[eva:partition] alloc_weak.c:74: starting to merge loop iterations
 [eva:alarm] alloc_weak.c:80: Warning: 
   out of bounds read. assert \valid_read((p + size) - 1);
 [eva] alloc_weak.c:82: Call to builtin calloc
diff --git a/tests/builtins/oracle/allocated.0.res.oracle b/tests/builtins/oracle/allocated.0.res.oracle
index 789283dae7a..af7856ce675 100644
--- a/tests/builtins/oracle/allocated.0.res.oracle
+++ b/tests/builtins/oracle/allocated.0.res.oracle
@@ -83,7 +83,7 @@
 [eva] allocated.c:76: Frama_C_show_each_p0: {1}
 [eva] allocated.c:77: Call to builtin free
 [eva:malloc] allocated.c:77: strong free on bases: {__malloc_main_l73}
-[eva] allocated.c:72: starting to merge loop iterations
+[eva:partition] allocated.c:72: starting to merge loop iterations
 [eva] allocated.c:73: Call to builtin malloc
 [eva] allocated.c:75: Frama_C_show_each_p: {{ &__malloc_main_l73 }}
 [eva] allocated.c:76: Frama_C_show_each_p0: {1; 2}
@@ -105,10 +105,10 @@
 [eva:malloc] allocated.c:82: 
   resizing variable `__malloc_w_main_l82' (0..-1) to fit 0..31
 [eva:alarm] allocated.c:85: Warning: out of bounds write. assert \valid(p + j);
-[eva] allocated.c:84: starting to merge loop iterations
+[eva:partition] allocated.c:84: starting to merge loop iterations
 [eva] allocated.c:87: Call to builtin free
 [eva:malloc] allocated.c:87: weak free on bases: {__malloc_w_main_l82}
-[eva] allocated.c:81: starting to merge loop iterations
+[eva:partition] allocated.c:81: starting to merge loop iterations
 [eva] allocated.c:82: Call to builtin malloc
 [eva:malloc] allocated.c:82: 
   resizing variable `__malloc_w_main_l82' (0..-1/31) to fit 0..31/63
@@ -162,12 +162,12 @@
 [eva] allocated.c:127: Call to builtin __fc_vla_alloc
 [eva:malloc] allocated.c:127: 
   resizing variable `__malloc_main_l127' (0..31) to fit 0..63
-[eva] allocated.c:128: starting to merge loop iterations
+[eva:partition] allocated.c:128: starting to merge loop iterations
 [eva:alarm] allocated.c:129: Warning: out of bounds write. assert \valid(a + j);
 [eva] allocated.c:131: Frama_C_show_each: {0; 1}
 [eva] allocated.c:127: Call to builtin __fc_vla_free
 [eva:malloc] allocated.c:127: strong free on bases: {__malloc_main_l127}
-[eva] allocated.c:126: starting to merge loop iterations
+[eva:partition] allocated.c:126: starting to merge loop iterations
 [eva] allocated.c:127: Call to builtin __fc_vla_alloc
 [eva:malloc] allocated.c:127: 
   resizing variable `__malloc_main_l127' (0..31/63) to fit 0..63/95
diff --git a/tests/builtins/oracle/allocated.1.res.oracle b/tests/builtins/oracle/allocated.1.res.oracle
index 61693dca458..3c1ba912ce8 100644
--- a/tests/builtins/oracle/allocated.1.res.oracle
+++ b/tests/builtins/oracle/allocated.1.res.oracle
@@ -221,10 +221,10 @@
 [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_29
 [eva] allocated.c:82: Call to builtin malloc
 [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_30
-[eva] allocated.c:84: Trace partitioning superposing up to 100 states
-[eva] allocated.c:84: Trace partitioning superposing up to 200 states
-[eva] allocated.c:84: Trace partitioning superposing up to 300 states
-[eva] allocated.c:84: Trace partitioning superposing up to 400 states
+[eva:partition] allocated.c:84: Trace partitioning superposing up to 100 states
+[eva:partition] allocated.c:84: Trace partitioning superposing up to 200 states
+[eva:partition] allocated.c:84: Trace partitioning superposing up to 300 states
+[eva:partition] allocated.c:84: Trace partitioning superposing up to 400 states
 [eva] allocated.c:87: Call to builtin free
 [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_30}
 [eva] allocated.c:87: Call to builtin free
diff --git a/tests/builtins/oracle/linked_list.0.res.oracle b/tests/builtins/oracle/linked_list.0.res.oracle
index c8eb4801d04..c1062456d5a 100644
--- a/tests/builtins/oracle/linked_list.0.res.oracle
+++ b/tests/builtins/oracle/linked_list.0.res.oracle
@@ -85,7 +85,7 @@
   S_0___fc_env[0..1] ∈ [--..--]
   S_1___fc_env[0..1] ∈ [--..--]
   ==END OF DUMP==
-[eva] linked_list.c:39: starting to merge loop iterations
+[eva:partition] linked_list.c:39: starting to merge loop iterations
 [eva] linked_list.c:40: 
   Frama_C_dump_each:
   # cvalue:
@@ -2301,7 +2301,7 @@
 [eva] using specification for function printf
 [eva] linked_list.c:51: function printf_va_1: precondition got status valid.
 [eva] Done for function printf_va_1
-[eva] linked_list.c:50: starting to merge loop iterations
+[eva:partition] linked_list.c:50: starting to merge loop iterations
 [eva] computing for function printf_va_1 <- main.
   Called from linked_list.c:51.
 [eva] Done for function printf_va_1
diff --git a/tests/builtins/oracle/linked_list.1.res.oracle b/tests/builtins/oracle/linked_list.1.res.oracle
index 99d1d200f80..bdbac128f37 100644
--- a/tests/builtins/oracle/linked_list.1.res.oracle
+++ b/tests/builtins/oracle/linked_list.1.res.oracle
@@ -85,7 +85,7 @@
   S_0___fc_env[0..1] ∈ [--..--]
   S_1___fc_env[0..1] ∈ [--..--]
   ==END OF DUMP==
-[eva] linked_list.c:39: starting to merge loop iterations
+[eva:partition] linked_list.c:39: starting to merge loop iterations
 [eva] linked_list.c:40: 
   Frama_C_dump_each:
   # cvalue:
@@ -811,7 +811,7 @@
   has generated a garbled mix of addresses
   for assigns clause __fc_stdout->__fc_FILE_data.
 [eva] Done for function printf_va_1
-[eva] linked_list.c:50: starting to merge loop iterations
+[eva:partition] linked_list.c:50: starting to merge loop iterations
 [eva:alarm] linked_list.c:51: Warning: 
   out of bounds read. assert \valid_read(&curr->val);
 [eva] computing for function printf_va_1 <- main.
diff --git a/tests/builtins/oracle/malloc-deps.res.oracle b/tests/builtins/oracle/malloc-deps.res.oracle
index 4a24d0440cc..0abfe1e2a85 100644
--- a/tests/builtins/oracle/malloc-deps.res.oracle
+++ b/tests/builtins/oracle/malloc-deps.res.oracle
@@ -65,7 +65,7 @@
 [from] Computing for function g
 [from] Done for function g
 [eva] Done for function g
-[eva] malloc-deps.c:23: starting to merge loop iterations
+[eva:partition] malloc-deps.c:23: starting to merge loop iterations
 [eva] malloc-deps.c:25: Call to builtin malloc
 [eva:malloc] malloc-deps.c:25: 
   resizing variable `__malloc_w_main_l25' (0..31/191) to fit 0..191/223
diff --git a/tests/builtins/oracle/malloc-optimistic.res.oracle b/tests/builtins/oracle/malloc-optimistic.res.oracle
index b22dec34c0b..430d8fdd116 100644
--- a/tests/builtins/oracle/malloc-optimistic.res.oracle
+++ b/tests/builtins/oracle/malloc-optimistic.res.oracle
@@ -1784,7 +1784,7 @@
   ==END OF DUMP==
 [eva] malloc-optimistic.c:94: Call to builtin free
 [eva:malloc] malloc-optimistic.c:94: strong free on bases: {__malloc_main7_l90}
-[eva] malloc-optimistic.c:88: starting to merge loop iterations
+[eva:partition] malloc-optimistic.c:88: starting to merge loop iterations
 [eva] malloc-optimistic.c:90: Call to builtin malloc
 [eva:malloc] malloc-optimistic.c:90: 
   resizing variable `__malloc_main7_l90' (0..31/543) to fit 0..511/575
@@ -2979,7 +2979,7 @@
 [eva] malloc-optimistic.c:107: Call to builtin free
 [eva:malloc] malloc-optimistic.c:107: 
   weak free on bases: {__malloc_w_main8_l103}
-[eva] malloc-optimistic.c:101: starting to merge loop iterations
+[eva:partition] malloc-optimistic.c:101: starting to merge loop iterations
 [eva] malloc-optimistic.c:103: Call to builtin malloc
 [eva:malloc] malloc-optimistic.c:103: 
   resizing variable `__malloc_w_main8_l103' (0..31/543) to fit 0..511/575
@@ -3374,7 +3374,7 @@
   Called from malloc-optimistic.c:123.
 [eva] Recording results for main9_aux
 [eva] Done for function main9_aux
-[eva] malloc-optimistic.c:118: starting to merge loop iterations
+[eva:partition] malloc-optimistic.c:118: starting to merge loop iterations
 [eva] malloc-optimistic.c:119: Call to builtin malloc
 [eva] malloc-optimistic.c:120: 
   Frama_C_show_each: {30; 31}, {{ &__malloc_w_main9_l119 }}
diff --git a/tests/builtins/oracle/malloc-size-zero.0.res.oracle b/tests/builtins/oracle/malloc-size-zero.0.res.oracle
index 46969acb5e8..6f3ecd978f6 100644
--- a/tests/builtins/oracle/malloc-size-zero.0.res.oracle
+++ b/tests/builtins/oracle/malloc-size-zero.0.res.oracle
@@ -21,7 +21,7 @@
   allocating variable __malloc_my_calloc_l10_0
 [eva] Recording results for my_calloc
 [eva] Done for function my_calloc
-[eva] malloc-size-zero.c:27: starting to merge loop iterations
+[eva:partition] malloc-size-zero.c:27: starting to merge loop iterations
 [eva] computing for function my_calloc <- main.
   Called from malloc-size-zero.c:29.
 [eva] malloc-size-zero.c:10: Call to builtin malloc
diff --git a/tests/builtins/oracle/malloc-size-zero.1.res.oracle b/tests/builtins/oracle/malloc-size-zero.1.res.oracle
index 51b8f812c59..d7e3d15a79d 100644
--- a/tests/builtins/oracle/malloc-size-zero.1.res.oracle
+++ b/tests/builtins/oracle/malloc-size-zero.1.res.oracle
@@ -19,7 +19,7 @@
 [eva:malloc:new] malloc-size-zero.c:10: allocating variable __malloc_main_l29
 [eva] Recording results for my_calloc
 [eva] Done for function my_calloc
-[eva] malloc-size-zero.c:27: starting to merge loop iterations
+[eva:partition] malloc-size-zero.c:27: starting to merge loop iterations
 [eva] computing for function my_calloc <- main.
   Called from malloc-size-zero.c:29.
 [eva] malloc-size-zero.c:10: Call to builtin malloc
diff --git a/tests/builtins/oracle/memchr.res.oracle b/tests/builtins/oracle/memchr.res.oracle
index 95a734ff993..80471edbbf9 100644
--- a/tests/builtins/oracle/memchr.res.oracle
+++ b/tests/builtins/oracle/memchr.res.oracle
@@ -407,7 +407,7 @@
   pointer subtraction. assert \base_addr(_ss_1) ≡ \base_addr(s1);
 [eva] memchr.c:341: Frama_C_show_each_mymemchr: {3; 4}
 [eva] memchr.c:342: assertion got status valid.
-[eva] memchr.c:340: starting to merge loop iterations
+[eva:partition] memchr.c:340: starting to merge loop iterations
 [eva] memchr.c:341: Call to builtin memchr
 [eva] memchr.c:341: Frama_C_show_each_mymemchr: {3; 4}
 [eva] memchr.c:341: Call to builtin memchr
diff --git a/tests/builtins/oracle/memcpy.0.res.oracle b/tests/builtins/oracle/memcpy.0.res.oracle
index 8e98d1f82e5..020250bbca9 100644
--- a/tests/builtins/oracle/memcpy.0.res.oracle
+++ b/tests/builtins/oracle/memcpy.0.res.oracle
@@ -64,7 +64,7 @@
 [eva] Done for function many
 [eva] computing for function init <- test <- main.
   Called from memcpy.c:69.
-[eva] memcpy.c:24: Trace partitioning superposing up to 100 states
+[eva:partition] memcpy.c:24: Trace partitioning superposing up to 100 states
 [eva] Recording results for init
 [from] Computing for function init
 [from] Done for function init
@@ -143,7 +143,7 @@
   function memcpy: precondition 'separation' got status unknown.
 [eva:imprecision] memcpy.c:100: 
   In memcpy builtin: too many sizes to enumerate, possible loss of precision
-[eva] memcpy.c:99: starting to merge loop iterations
+[eva:partition] memcpy.c:99: starting to merge loop iterations
 [eva] memcpy.c:100: Call to builtin memcpy
 [eva] memcpy.c:105: Call to builtin memcpy
 [eva] memcpy.c:105: function memcpy: precondition 'valid_dest' got status valid.
@@ -156,7 +156,7 @@
 [eva] memcpy.c:109: function memcpy: precondition 'separation' got status valid.
 [eva:imprecision] memcpy.c:109: 
   In memcpy builtin: too many sizes to enumerate, possible loss of precision
-[eva] memcpy.c:114: starting to merge loop iterations
+[eva:partition] memcpy.c:114: starting to merge loop iterations
 [eva] memcpy.c:118: Call to builtin memcpy
 [eva:alarm] memcpy.c:118: Warning: 
   function memcpy: precondition 'valid_dest' got status unknown.
@@ -164,7 +164,7 @@
 [eva] memcpy.c:118: function memcpy: precondition 'separation' got status valid.
 [kernel:approximation] memcpy.c:118: 
   too many locations to update in array. Approximating.
-[eva] memcpy.c:122: starting to merge loop iterations
+[eva:partition] memcpy.c:122: starting to merge loop iterations
 [eva] memcpy.c:126: Call to builtin memcpy
 [eva:alarm] memcpy.c:126: Warning: 
   function memcpy: precondition 'valid_dest' got status unknown.
@@ -172,7 +172,7 @@
 [eva] memcpy.c:126: function memcpy: precondition 'separation' got status valid.
 [kernel:approximation] memcpy.c:126: 
   too many locations to update in array. Approximating.
-[eva] memcpy.c:130: starting to merge loop iterations
+[eva:partition] memcpy.c:130: starting to merge loop iterations
 [eva] memcpy.c:135: Call to builtin memcpy
 [eva:alarm] memcpy.c:135: Warning: 
   function memcpy: precondition 'valid_dest' got status unknown.
@@ -180,7 +180,7 @@
 [eva] memcpy.c:135: function memcpy: precondition 'separation' got status valid.
 [kernel:approximation] memcpy.c:135: 
   too many locations to update in array. Approximating.
-[eva] memcpy.c:139: starting to merge loop iterations
+[eva:partition] memcpy.c:139: starting to merge loop iterations
 [eva] memcpy.c:144: Call to builtin memcpy
 [eva:alarm] memcpy.c:144: Warning: 
   function memcpy: precondition 'valid_dest' got status unknown.
diff --git a/tests/builtins/oracle/memexec-malloc.res.oracle b/tests/builtins/oracle/memexec-malloc.res.oracle
index 21784bb7920..07bc41c19a7 100644
--- a/tests/builtins/oracle/memexec-malloc.res.oracle
+++ b/tests/builtins/oracle/memexec-malloc.res.oracle
@@ -6,7 +6,7 @@
   t[0..1999] ∈ {0}
 [eva] computing for function f <- main.
   Called from memexec-malloc.c:23.
-[eva] memexec-malloc.c:10: starting to merge loop iterations
+[eva:partition] memexec-malloc.c:10: starting to merge loop iterations
 [eva] Recording results for f
 [eva] Done for function f
 [eva] computing for function f <- main.
diff --git a/tests/builtins/oracle/memset.res.oracle b/tests/builtins/oracle/memset.res.oracle
index 1dba7ce5413..58ab28e9830 100644
--- a/tests/builtins/oracle/memset.res.oracle
+++ b/tests/builtins/oracle/memset.res.oracle
@@ -67,7 +67,7 @@
 [eva] memset.c:47: Call to builtin memset
 [eva:alarm] memset.c:47: Warning: 
   function memset: precondition 'valid_s' got status unknown.
-[eva] memset.c:50: starting to merge loop iterations
+[eva:partition] memset.c:50: starting to merge loop iterations
 [eva] memset.c:54: Call to builtin memset
 [eva:alarm] memset.c:54: Warning: 
   function memset: precondition 'valid_s' got status unknown.
diff --git a/tests/builtins/oracle/realloc2.res.oracle b/tests/builtins/oracle/realloc2.res.oracle
index 7858ec9b449..64d738020e2 100644
--- a/tests/builtins/oracle/realloc2.res.oracle
+++ b/tests/builtins/oracle/realloc2.res.oracle
@@ -454,7 +454,7 @@
   Called from realloc2.c:189.
 [eva] Recording results for fill
 [eva] Done for function fill
-[eva] realloc2.c:185: starting to merge loop iterations
+[eva:partition] realloc2.c:185: starting to merge loop iterations
 [eva] realloc2.c:187: Call to builtin realloc
 [eva:malloc] 
   bases_to_realloc: {__malloc_test_realloc_multiple_bases_loop_l184,
diff --git a/tests/builtins/oracle/str_allocated.res.oracle b/tests/builtins/oracle/str_allocated.res.oracle
index 4aec51e154f..8983fda3390 100644
--- a/tests/builtins/oracle/str_allocated.res.oracle
+++ b/tests/builtins/oracle/str_allocated.res.oracle
@@ -8,7 +8,7 @@
   Called from str_allocated.c:19.
 [eva] str_allocated.c:12: Call to builtin malloc
 [eva:malloc:new] str_allocated.c:12: allocating variable __malloc_memchr_bug_l12
-[eva] str_allocated.c:11: starting to merge loop iterations
+[eva:partition] str_allocated.c:11: starting to merge loop iterations
 [eva] str_allocated.c:12: Call to builtin malloc
 [eva:malloc:weak] str_allocated.c:12: 
   marking variable `__malloc_memchr_bug_l12' as weak
diff --git a/tests/builtins/oracle/strchr.res.oracle b/tests/builtins/oracle/strchr.res.oracle
index 577719cd86e..614f43290dd 100644
--- a/tests/builtins/oracle/strchr.res.oracle
+++ b/tests/builtins/oracle/strchr.res.oracle
@@ -285,7 +285,7 @@
   pointer subtraction. assert \base_addr(_ss) ≡ \base_addr(s1);
 [eva] strchr.c:335: Frama_C_show_each_mystrchr: {3; 4}
 [eva] strchr.c:336: assertion got status valid.
-[eva] strchr.c:334: starting to merge loop iterations
+[eva:partition] strchr.c:334: starting to merge loop iterations
 [eva] strchr.c:335: Call to builtin strchr
 [eva] strchr.c:335: Frama_C_show_each_mystrchr: {3; 4}
 [eva] strchr.c:335: Call to builtin strchr
diff --git a/tests/builtins/oracle/strlen.res.oracle b/tests/builtins/oracle/strlen.res.oracle
index 2d6111ad504..665d7a87902 100644
--- a/tests/builtins/oracle/strlen.res.oracle
+++ b/tests/builtins/oracle/strlen.res.oracle
@@ -232,7 +232,7 @@
 [eva] strlen.c:270: 
   function strlen: precondition 'valid_string_s' got status valid.
 [eva] strlen.c:271: assertion got status valid.
-[eva] strlen.c:269: starting to merge loop iterations
+[eva:partition] strlen.c:269: starting to merge loop iterations
 [eva] strlen.c:270: Call to builtin strlen
 [eva] strlen.c:270: Call to builtin strlen
 [eva] strlen.c:270: Call to builtin strlen
@@ -303,7 +303,7 @@
 [eva] Done for function big_array
 [eva] computing for function negative_offsets <- main.
   Called from strlen.c:360.
-[eva] strlen.c:310: starting to merge loop iterations
+[eva:partition] strlen.c:310: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- negative_offsets <- main.
   Called from strlen.c:314.
 [eva] strlen.c:314: 
diff --git a/tests/builtins/oracle/strnlen2.res.oracle b/tests/builtins/oracle/strnlen2.res.oracle
index e801b85f736..137bfa8c095 100644
--- a/tests/builtins/oracle/strnlen2.res.oracle
+++ b/tests/builtins/oracle/strnlen2.res.oracle
@@ -232,7 +232,7 @@
 [eva] strnlen2.c:244: 
   function strnlen: precondition 'valid_string_s' got status valid.
 [eva] strnlen2.c:245: assertion got status valid.
-[eva] strnlen2.c:243: starting to merge loop iterations
+[eva:partition] strnlen2.c:243: starting to merge loop iterations
 [eva] strnlen2.c:244: Call to builtin strnlen
 [eva] strnlen2.c:244: Call to builtin strnlen
 [eva] strnlen2.c:244: Call to builtin strnlen
@@ -667,7 +667,7 @@
 [eva] Done for function intervals
 [eva] computing for function negative_offsets <- main.
   Called from strnlen2.c:532.
-[eva] strnlen2.c:489: starting to merge loop iterations
+[eva:partition] strnlen2.c:489: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- negative_offsets <- main.
   Called from strnlen2.c:493.
 [eva] strnlen2.c:493: 
diff --git a/tests/builtins/oracle/wcslen.res.oracle b/tests/builtins/oracle/wcslen.res.oracle
index 3e0d35cee3c..b0d04965971 100644
--- a/tests/builtins/oracle/wcslen.res.oracle
+++ b/tests/builtins/oracle/wcslen.res.oracle
@@ -232,7 +232,7 @@
 [eva] wcslen.c:270: 
   function wcslen: precondition 'valid_string_s' got status valid.
 [eva] wcslen.c:271: assertion got status valid.
-[eva] wcslen.c:269: starting to merge loop iterations
+[eva:partition] wcslen.c:269: starting to merge loop iterations
 [eva] wcslen.c:270: Call to builtin wcslen
 [eva] wcslen.c:270: Call to builtin wcslen
 [eva] wcslen.c:270: Call to builtin wcslen
@@ -309,7 +309,7 @@
 [eva] Done for function big_array
 [eva] computing for function negative_offsets <- main.
   Called from wcslen.c:380.
-[eva] wcslen.c:314: starting to merge loop iterations
+[eva:partition] wcslen.c:314: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- negative_offsets <- main.
   Called from wcslen.c:318.
 [eva] wcslen.c:318: 
diff --git a/tests/builtins/oracle_equality/alloc_weak.res.oracle b/tests/builtins/oracle_equality/alloc_weak.res.oracle
index 1e76e3d2408..5d7fe9ed142 100644
--- a/tests/builtins/oracle_equality/alloc_weak.res.oracle
+++ b/tests/builtins/oracle_equality/alloc_weak.res.oracle
@@ -1,13 +1,13 @@
 34,35d33
 < [eva:alarm] alloc_weak.c:30: Warning: 
 <   accessing uninitialized left-value. assert \initialized(p);
-119,121c117
+121,123c119
 <   p ∈
 <    {{ &__calloc_convergence_issue_l73 ;
 <       &__calloc_w_convergence_issue_l82[0] }}
 ---
 >   p ∈ {{ &__calloc_w_convergence_issue_l82[0] }}
-947c943
+949c945
 <   r ∈ [--..--]
 ---
 >   r ∈ {42}
diff --git a/tests/builtins/oracle_equality/allocated.1.res.oracle b/tests/builtins/oracle_equality/allocated.1.res.oracle
index 07f6b70bfde..588f739639f 100644
--- a/tests/builtins/oracle_equality/allocated.1.res.oracle
+++ b/tests/builtins/oracle_equality/allocated.1.res.oracle
@@ -1,6 +1,6 @@
 135a136,137
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_7
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_7
 146a149,150
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 > [eva] allocated.c:87: Call to builtin free
@@ -12,27 +12,27 @@
 > [eva] allocated.c:87: Call to builtin free
 176,177c184,185
 < [eva] allocated.c:82: Call to builtin malloc
-< [eva] allocated.c:82: allocating variable __malloc_main_l82_7
+< [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_7
 ---
 > [eva] allocated.c:87: Call to builtin free
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 223a232,245
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_31
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_31
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_32
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_32
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_33
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_33
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_34
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_34
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_35
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_35
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_36
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_36
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_37
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_37
 226d247
-< [eva] allocated.c:84: Trace partitioning superposing up to 300 states
+< [eva:partition] allocated.c:84: Trace partitioning superposing up to 300 states
 228a250,263
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_37}
 > [eva] allocated.c:87: Call to builtin free
@@ -164,7 +164,7 @@
 < [eva] allocated.c:87: Call to builtin free
 < [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 ---
-> [eva] allocated.c:81: Trace partitioning superposing up to 500 states
+> [eva:partition] allocated.c:81: Trace partitioning superposing up to 500 states
 721,723c839,840
 <   __malloc_main_l82_7[0] ∈ {21} or UNINITIALIZED
 <                      [1] ∈ {24} or UNINITIALIZED
diff --git a/tests/builtins/oracle_equality/malloc-optimistic.res.oracle b/tests/builtins/oracle_equality/malloc-optimistic.res.oracle
index e2b025a8698..550a6f58842 100644
--- a/tests/builtins/oracle_equality/malloc-optimistic.res.oracle
+++ b/tests/builtins/oracle_equality/malloc-optimistic.res.oracle
@@ -1,249 +1,249 @@
-495,496d494
+497,498d496
 < [eva:alarm] malloc-optimistic.c:79: Warning: 
 <   accessing uninitialized left-value. assert \initialized(p + i);
-504c502
+506c504
 <   k ∈ {-2; -1}
 ---
 >   k ∈ {-1}
-539c537
+541c539
 <   k ∈ {-1; 0}
 ---
 >   k ∈ {0}
-576c574
+578c576
 <   k ∈ {0; 1}
 ---
 >   k ∈ {1}
-615c613
+617c615
 <   k ∈ {1; 2}
 ---
 >   k ∈ {2}
-656c654
+658c656
 <   k ∈ {2; 3}
 ---
 >   k ∈ {3}
-699c697
+701c699
 <   k ∈ {3; 4}
 ---
 >   k ∈ {4}
-744c742
+746c744
 <   k ∈ {4; 5}
 ---
 >   k ∈ {5}
-791c789
+793c791
 <   k ∈ {5; 6}
 ---
 >   k ∈ {6}
-840c838
+842c840
 <   k ∈ {6; 7}
 ---
 >   k ∈ {7}
-1757,1758d1754
+1759,1760d1756
 < [eva:alarm] malloc-optimistic.c:92: Warning: 
 <   accessing uninitialized left-value. assert \initialized(p + i);
-1944,1945d1939
+1947,1948d1942
 < [eva:alarm] malloc-optimistic.c:105: Warning: 
 <   accessing uninitialized left-value. assert \initialized(p + i);
-1953c1947
+1956c1950
 <   k ∈ {-2; -1}
 ---
 >   k ∈ {-1}
-2011c2005
+2014c2008
 <   k ∈ {-1; 0}
 ---
 >   k ∈ {0}
-2071c2065
+2074c2068
 <   k ∈ {0; 1}
 ---
 >   k ∈ {1}
-2133c2127
+2136c2130
 <   k ∈ {1; 2}
 ---
 >   k ∈ {2}
-2197c2191
+2200c2194
 <   k ∈ {2; 3}
 ---
 >   k ∈ {3}
-2263c2257
+2266c2260
 <   k ∈ {3; 4}
 ---
 >   k ∈ {4}
-2331c2325
+2334c2328
 <   k ∈ {4; 5}
 ---
 >   k ∈ {5}
-2401c2395
+2404c2398
 <   k ∈ {5; 6}
 ---
 >   k ∈ {6}
-2473c2467
+2476c2470
 <   k ∈ {6; 7}
 ---
 >   k ∈ {7}
-2547c2541
+2550c2544
 <   k ∈ {7; 8}
 ---
 >   k ∈ {8}
-2623c2617
+2626c2620
 <   k ∈ {8; 9}
 ---
 >   k ∈ {9}
-2701c2695
+2704c2698
 <   k ∈ {9; 10}
 ---
 >   k ∈ {10}
-2781c2775
+2784c2778
 <   k ∈ {10; 11}
 ---
 >   k ∈ {11}
-2863c2857
+2866c2860
 <   k ∈ {11; 12}
 ---
 >   k ∈ {12}
-2944c2938
+2947c2941
 <   k ∈ {12; 13}
 ---
 >   k ∈ {13}
-2990c2984
+2993c2987
 <   k ∈ {12; 13; 14}
 ---
 >   k ∈ {13; 14}
-3035c3029
+3038c3032
 <   k ∈ {12; 13; 14; 15}
 ---
 >   k ∈ {13; 14; 15}
-3080c3074
+3083c3077
 <   k ∈ [12..97]
 ---
 >   k ∈ [13..97]
-3136c3130
+3140c3134
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {1}
-3144c3138
+3148c3142
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {2}
-3152c3146
+3156c3150
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {3}
-3160c3154
+3164c3158
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {4}
-3168c3162
+3172c3166
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4; 5}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {5}
-3176c3170
+3180c3174
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4; 5; 6}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {6}
-3184c3178
+3188c3182
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4; 5; 6; 7}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {7}
-3192c3186
+3196c3190
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..8]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {8}
-3200c3194
+3204c3198
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..9]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {9}
-3208c3202
+3212c3206
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..10]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {10}
-3216c3210
+3220c3214
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..11]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {11}
-3224c3218
+3228c3222
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..12]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {12}
-3232c3226
+3236c3230
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..13]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {13}
-3240c3234
+3244c3238
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..14]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {14}
-3248c3242
+3252c3246
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..15]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {15}
-3256c3250
+3260c3254
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..16]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {16}
-3264c3258
+3268c3262
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..17]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {17}
-3272c3266
+3276c3270
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..18]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {18}
-3280c3274
+3284c3278
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..19]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {19}
-3288c3282
+3292c3286
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..20]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {20}
-3296c3290
+3300c3294
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..21]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {21}
-3304c3298
+3308c3302
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..22]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {22}
-3312c3306
+3316c3310
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..23]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {23}
-3320c3314
+3324c3318
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..24]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {24}
-3328c3322
+3332c3326
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..25]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {25}
-3336c3330
+3340c3334
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..26]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {26}
-3344c3338
+3348c3342
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..27]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {27}
-3352c3346
+3356c3350
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..28]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {28}
-3360c3354
+3364c3358
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..29]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {29}
-3368c3362
+3372c3366
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..30]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {30}
-3377c3371
+3381c3375
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..31]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {30; 31}
-3385c3379
+3389c3383
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..32]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {30; 31; 32}
-3393c3387
+3397c3391
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..99]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: [30..99]
diff --git a/tests/builtins/oracle_gauges/memcpy.0.res.oracle b/tests/builtins/oracle_gauges/memcpy.0.res.oracle
index 7fa2ad9c849..82cbb875ec7 100644
--- a/tests/builtins/oracle_gauges/memcpy.0.res.oracle
+++ b/tests/builtins/oracle_gauges/memcpy.0.res.oracle
@@ -2,4 +2,4 @@
 > [eva] memcpy.c:100: Call to builtin memcpy
 > [eva] memcpy.c:100: Call to builtin memcpy
 373a376
-> [eva] memcpy.c:231: starting to merge loop iterations
+> [eva:partition] memcpy.c:231: starting to merge loop iterations
diff --git a/tests/builtins/oracle_gauges/realloc.res.oracle b/tests/builtins/oracle_gauges/realloc.res.oracle
index b61ec8f618b..1874a373987 100644
--- a/tests/builtins/oracle_gauges/realloc.res.oracle
+++ b/tests/builtins/oracle_gauges/realloc.res.oracle
@@ -260,7 +260,7 @@
 >   __realloc_w_main10_l152[0] ∈ {4}
 >                          [1] ∈ UNINITIALIZED
 >   ==END OF DUMP==
-> [eva] realloc.c:150: starting to merge loop iterations
+> [eva:partition] realloc.c:150: starting to merge loop iterations
 > [eva] realloc.c:152: Call to builtin realloc
 > [eva:malloc] bases_to_realloc: {__realloc_w_main10_l152}
 > [eva:malloc] realloc.c:152: weak free on bases: {__realloc_w_main10_l152}
@@ -380,7 +380,7 @@
 >   marking variable `__realloc_main11_l171' as weak
 > [eva:malloc] realloc.c:171: strong free on bases: {}
 > [eva] realloc.c:172: Frama_C_show_each_p: {{ NULL ; &__realloc_w_main11_l171 }}
-> [eva] realloc.c:163: starting to merge loop iterations
+> [eva:partition] realloc.c:163: starting to merge loop iterations
 > [eva] realloc.c:165: Call to builtin reallocarray
 > [eva:malloc] bases_to_realloc: {__realloc_w_main11_l171}
 > [eva:malloc] realloc.c:165: weak free on bases: {__realloc_w_main11_l171}
diff --git a/tests/builtins/oracle_multidim/allocated.1.res.oracle b/tests/builtins/oracle_multidim/allocated.1.res.oracle
index 07f6b70bfde..588f739639f 100644
--- a/tests/builtins/oracle_multidim/allocated.1.res.oracle
+++ b/tests/builtins/oracle_multidim/allocated.1.res.oracle
@@ -1,6 +1,6 @@
 135a136,137
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_7
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_7
 146a149,150
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 > [eva] allocated.c:87: Call to builtin free
@@ -12,27 +12,27 @@
 > [eva] allocated.c:87: Call to builtin free
 176,177c184,185
 < [eva] allocated.c:82: Call to builtin malloc
-< [eva] allocated.c:82: allocating variable __malloc_main_l82_7
+< [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_7
 ---
 > [eva] allocated.c:87: Call to builtin free
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 223a232,245
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_31
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_31
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_32
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_32
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_33
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_33
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_34
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_34
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_35
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_35
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_36
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_36
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_37
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_37
 226d247
-< [eva] allocated.c:84: Trace partitioning superposing up to 300 states
+< [eva:partition] allocated.c:84: Trace partitioning superposing up to 300 states
 228a250,263
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_37}
 > [eva] allocated.c:87: Call to builtin free
@@ -164,7 +164,7 @@
 < [eva] allocated.c:87: Call to builtin free
 < [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 ---
-> [eva] allocated.c:81: Trace partitioning superposing up to 500 states
+> [eva:partition] allocated.c:81: Trace partitioning superposing up to 500 states
 721,723c839,840
 <   __malloc_main_l82_7[0] ∈ {21} or UNINITIALIZED
 <                      [1] ∈ {24} or UNINITIALIZED
diff --git a/tests/builtins/oracle_octagon/allocated.1.res.oracle b/tests/builtins/oracle_octagon/allocated.1.res.oracle
index 07f6b70bfde..588f739639f 100644
--- a/tests/builtins/oracle_octagon/allocated.1.res.oracle
+++ b/tests/builtins/oracle_octagon/allocated.1.res.oracle
@@ -1,6 +1,6 @@
 135a136,137
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_7
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_7
 146a149,150
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 > [eva] allocated.c:87: Call to builtin free
@@ -12,27 +12,27 @@
 > [eva] allocated.c:87: Call to builtin free
 176,177c184,185
 < [eva] allocated.c:82: Call to builtin malloc
-< [eva] allocated.c:82: allocating variable __malloc_main_l82_7
+< [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_7
 ---
 > [eva] allocated.c:87: Call to builtin free
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 223a232,245
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_31
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_31
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_32
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_32
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_33
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_33
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_34
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_34
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_35
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_35
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_36
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_36
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_37
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_37
 226d247
-< [eva] allocated.c:84: Trace partitioning superposing up to 300 states
+< [eva:partition] allocated.c:84: Trace partitioning superposing up to 300 states
 228a250,263
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_37}
 > [eva] allocated.c:87: Call to builtin free
@@ -164,7 +164,7 @@
 < [eva] allocated.c:87: Call to builtin free
 < [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 ---
-> [eva] allocated.c:81: Trace partitioning superposing up to 500 states
+> [eva:partition] allocated.c:81: Trace partitioning superposing up to 500 states
 721,723c839,840
 <   __malloc_main_l82_7[0] ∈ {21} or UNINITIALIZED
 <                      [1] ∈ {24} or UNINITIALIZED
diff --git a/tests/builtins/oracle_octagon/malloc-optimistic.res.oracle b/tests/builtins/oracle_octagon/malloc-optimistic.res.oracle
index daac1b434de..14112693815 100644
--- a/tests/builtins/oracle_octagon/malloc-optimistic.res.oracle
+++ b/tests/builtins/oracle_octagon/malloc-optimistic.res.oracle
@@ -1,8 +1,8 @@
-3441c3441
+3445c3445
 <   i ∈ [14..100]
 ---
 >   i ∈ {98; 99; 100}
-3445c3445
+3449c3449
 <   i ∈ [14..100]
 ---
 >   i ∈ {98; 99; 100}
diff --git a/tests/builtins/oracle_symblocs/alloc_weak.res.oracle b/tests/builtins/oracle_symblocs/alloc_weak.res.oracle
index 85115be80a4..c4476fc435c 100644
--- a/tests/builtins/oracle_symblocs/alloc_weak.res.oracle
+++ b/tests/builtins/oracle_symblocs/alloc_weak.res.oracle
@@ -1,7 +1,7 @@
 34,35d33
 < [eva:alarm] alloc_weak.c:30: Warning: 
 <   accessing uninitialized left-value. assert \initialized(p);
-947c945
+949c947
 <   r ∈ [--..--]
 ---
 >   r ∈ {42}
diff --git a/tests/builtins/oracle_symblocs/malloc-optimistic.res.oracle b/tests/builtins/oracle_symblocs/malloc-optimistic.res.oracle
index e2b025a8698..550a6f58842 100644
--- a/tests/builtins/oracle_symblocs/malloc-optimistic.res.oracle
+++ b/tests/builtins/oracle_symblocs/malloc-optimistic.res.oracle
@@ -1,249 +1,249 @@
-495,496d494
+497,498d496
 < [eva:alarm] malloc-optimistic.c:79: Warning: 
 <   accessing uninitialized left-value. assert \initialized(p + i);
-504c502
+506c504
 <   k ∈ {-2; -1}
 ---
 >   k ∈ {-1}
-539c537
+541c539
 <   k ∈ {-1; 0}
 ---
 >   k ∈ {0}
-576c574
+578c576
 <   k ∈ {0; 1}
 ---
 >   k ∈ {1}
-615c613
+617c615
 <   k ∈ {1; 2}
 ---
 >   k ∈ {2}
-656c654
+658c656
 <   k ∈ {2; 3}
 ---
 >   k ∈ {3}
-699c697
+701c699
 <   k ∈ {3; 4}
 ---
 >   k ∈ {4}
-744c742
+746c744
 <   k ∈ {4; 5}
 ---
 >   k ∈ {5}
-791c789
+793c791
 <   k ∈ {5; 6}
 ---
 >   k ∈ {6}
-840c838
+842c840
 <   k ∈ {6; 7}
 ---
 >   k ∈ {7}
-1757,1758d1754
+1759,1760d1756
 < [eva:alarm] malloc-optimistic.c:92: Warning: 
 <   accessing uninitialized left-value. assert \initialized(p + i);
-1944,1945d1939
+1947,1948d1942
 < [eva:alarm] malloc-optimistic.c:105: Warning: 
 <   accessing uninitialized left-value. assert \initialized(p + i);
-1953c1947
+1956c1950
 <   k ∈ {-2; -1}
 ---
 >   k ∈ {-1}
-2011c2005
+2014c2008
 <   k ∈ {-1; 0}
 ---
 >   k ∈ {0}
-2071c2065
+2074c2068
 <   k ∈ {0; 1}
 ---
 >   k ∈ {1}
-2133c2127
+2136c2130
 <   k ∈ {1; 2}
 ---
 >   k ∈ {2}
-2197c2191
+2200c2194
 <   k ∈ {2; 3}
 ---
 >   k ∈ {3}
-2263c2257
+2266c2260
 <   k ∈ {3; 4}
 ---
 >   k ∈ {4}
-2331c2325
+2334c2328
 <   k ∈ {4; 5}
 ---
 >   k ∈ {5}
-2401c2395
+2404c2398
 <   k ∈ {5; 6}
 ---
 >   k ∈ {6}
-2473c2467
+2476c2470
 <   k ∈ {6; 7}
 ---
 >   k ∈ {7}
-2547c2541
+2550c2544
 <   k ∈ {7; 8}
 ---
 >   k ∈ {8}
-2623c2617
+2626c2620
 <   k ∈ {8; 9}
 ---
 >   k ∈ {9}
-2701c2695
+2704c2698
 <   k ∈ {9; 10}
 ---
 >   k ∈ {10}
-2781c2775
+2784c2778
 <   k ∈ {10; 11}
 ---
 >   k ∈ {11}
-2863c2857
+2866c2860
 <   k ∈ {11; 12}
 ---
 >   k ∈ {12}
-2944c2938
+2947c2941
 <   k ∈ {12; 13}
 ---
 >   k ∈ {13}
-2990c2984
+2993c2987
 <   k ∈ {12; 13; 14}
 ---
 >   k ∈ {13; 14}
-3035c3029
+3038c3032
 <   k ∈ {12; 13; 14; 15}
 ---
 >   k ∈ {13; 14; 15}
-3080c3074
+3083c3077
 <   k ∈ [12..97]
 ---
 >   k ∈ [13..97]
-3136c3130
+3140c3134
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {1}
-3144c3138
+3148c3142
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {2}
-3152c3146
+3156c3150
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {3}
-3160c3154
+3164c3158
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {4}
-3168c3162
+3172c3166
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4; 5}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {5}
-3176c3170
+3180c3174
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4; 5; 6}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {6}
-3184c3178
+3188c3182
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4; 5; 6; 7}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {7}
-3192c3186
+3196c3190
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..8]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {8}
-3200c3194
+3204c3198
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..9]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {9}
-3208c3202
+3212c3206
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..10]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {10}
-3216c3210
+3220c3214
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..11]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {11}
-3224c3218
+3228c3222
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..12]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {12}
-3232c3226
+3236c3230
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..13]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {13}
-3240c3234
+3244c3238
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..14]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {14}
-3248c3242
+3252c3246
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..15]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {15}
-3256c3250
+3260c3254
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..16]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {16}
-3264c3258
+3268c3262
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..17]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {17}
-3272c3266
+3276c3270
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..18]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {18}
-3280c3274
+3284c3278
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..19]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {19}
-3288c3282
+3292c3286
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..20]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {20}
-3296c3290
+3300c3294
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..21]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {21}
-3304c3298
+3308c3302
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..22]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {22}
-3312c3306
+3316c3310
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..23]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {23}
-3320c3314
+3324c3318
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..24]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {24}
-3328c3322
+3332c3326
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..25]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {25}
-3336c3330
+3340c3334
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..26]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {26}
-3344c3338
+3348c3342
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..27]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {27}
-3352c3346
+3356c3350
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..28]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {28}
-3360c3354
+3364c3358
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..29]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {29}
-3368c3362
+3372c3366
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..30]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {30}
-3377c3371
+3381c3375
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..31]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {30; 31}
-3385c3379
+3389c3383
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..32]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {30; 31; 32}
-3393c3387
+3397c3391
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..99]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: [30..99]
diff --git a/tests/float/oracle/absorb_sav2.res b/tests/float/oracle/absorb_sav2.res
index 50a56ee76dc..12c1f09740c 100644
--- a/tests/float/oracle/absorb_sav2.res
+++ b/tests/float/oracle/absorb_sav2.res
@@ -15,7 +15,7 @@
 [eva] absorb.c:19: 
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
-[eva] absorb.c:22: starting to merge loop iterations
+[eva:partition] absorb.c:22: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/float/oracle/some.0.res.oracle b/tests/float/oracle/some.0.res.oracle
index 3d3f8660cc0..6ebb17d02e9 100644
--- a/tests/float/oracle/some.0.res.oracle
+++ b/tests/float/oracle/some.0.res.oracle
@@ -6,11 +6,11 @@
   t[0] ∈ {1.0000000000000000}
    [1..54] ∈ {0}
   y ∈ {1.0000000000000000*2^-1}
-[eva] some.c:11: Trace partitioning superposing up to 10 states
-[eva] some.c:11: Trace partitioning superposing up to 20 states
-[eva] some.c:11: Trace partitioning superposing up to 30 states
-[eva] some.c:11: Trace partitioning superposing up to 40 states
-[eva] some.c:11: Trace partitioning superposing up to 50 states
+[eva:partition] some.c:11: Trace partitioning superposing up to 10 states
+[eva:partition] some.c:11: Trace partitioning superposing up to 20 states
+[eva:partition] some.c:11: Trace partitioning superposing up to 30 states
+[eva:partition] some.c:11: Trace partitioning superposing up to 40 states
+[eva:partition] some.c:11: Trace partitioning superposing up to 50 states
 [eva] some.c:16: 
   Frama_C_dump_each:
   # cvalue:
diff --git a/tests/float/oracle/widen.0.res.oracle b/tests/float/oracle/widen.0.res.oracle
index 4bfb9c2b0c7..05627b3a713 100644
--- a/tests/float/oracle/widen.0.res.oracle
+++ b/tests/float/oracle/widen.0.res.oracle
@@ -6,12 +6,12 @@
   rand ∈ [--..--]
 [eva] computing for function main1 <- main.
   Called from widen.c:50.
-[eva] widen.c:13: starting to merge loop iterations
+[eva:partition] widen.c:13: starting to merge loop iterations
 [eva:alarm] widen.c:14: Warning: 
   non-finite double value. assert \is_finite(\mul_double(max, (double)2.));
-[eva] widen.c:16: starting to merge loop iterations
+[eva:partition] widen.c:16: starting to merge loop iterations
 [eva] widen.c:24: Frama_C_show_each_double_inf: [1. .. 1.79769313486e+308]
-[eva] widen.c:25: starting to merge loop iterations
+[eva:partition] widen.c:25: starting to merge loop iterations
 [eva:alarm] widen.c:27: Warning: 
   non-finite float value. assert \is_finite((float)max);
 [eva] widen.c:34: Frama_C_show_each_float_inf: [1. .. 3.40282346639e+38]
@@ -19,7 +19,7 @@
 [eva] Done for function main1
 [eva] computing for function main2 <- main.
   Called from widen.c:51.
-[eva] widen.c:40: starting to merge loop iterations
+[eva:partition] widen.c:40: starting to merge loop iterations
 [eva] widen.c:45: Frama_C_show_each: [-0. .. 0.]
 [eva] Recording results for main2
 [eva] Done for function main2
diff --git a/tests/float/oracle/widen.1.res.oracle b/tests/float/oracle/widen.1.res.oracle
index 8055bd310fb..22f4906d858 100644
--- a/tests/float/oracle/widen.1.res.oracle
+++ b/tests/float/oracle/widen.1.res.oracle
@@ -6,16 +6,16 @@
   rand ∈ [--..--]
 [eva] computing for function main1 <- main.
   Called from widen.c:50.
-[eva] widen.c:13: starting to merge loop iterations
-[eva] widen.c:16: starting to merge loop iterations
+[eva:partition] widen.c:13: starting to merge loop iterations
+[eva:partition] widen.c:16: starting to merge loop iterations
 [eva] widen.c:24: Frama_C_show_each_double_inf: [1. .. inf]
-[eva] widen.c:25: starting to merge loop iterations
+[eva:partition] widen.c:25: starting to merge loop iterations
 [eva] widen.c:34: Frama_C_show_each_float_inf: [1. .. inf]
 [eva] Recording results for main1
 [eva] Done for function main1
 [eva] computing for function main2 <- main.
   Called from widen.c:51.
-[eva] widen.c:40: starting to merge loop iterations
+[eva:partition] widen.c:40: starting to merge loop iterations
 [eva] widen.c:45: Frama_C_show_each: [-0. .. 0.]
 [eva] Recording results for main2
 [eva] Done for function main2
diff --git a/tests/idct/oracle/ieee_1180_1990.res.oracle b/tests/idct/oracle/ieee_1180_1990.res.oracle
index 16e587299fd..de26bca7dee 100644
--- a/tests/idct/oracle/ieee_1180_1990.res.oracle
+++ b/tests/idct/oracle/ieee_1180_1990.res.oracle
@@ -14,10 +14,10 @@
   idct_init ∈ {1}
   idct_mc1[0..7][0..7] ∈ {0}
   idct_mc2[0..7][0..7] ∈ {0}
-[eva] ieee_1180_1990.c:179: starting to merge loop iterations
-[eva] ieee_1180_1990.c:178: starting to merge loop iterations
-[eva] ieee_1180_1990.c:185: starting to merge loop iterations
-[eva] ieee_1180_1990.c:184: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:179: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:178: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:185: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:184: starting to merge loop iterations
 [eva] computing for function idct <- main.
   Called from ieee_1180_1990.c:187.
 [eva] idct.c:90: Call to builtin Frama_C_sqrt for function sqrt
@@ -25,7 +25,7 @@
 [eva] idct.c:90: function sqrt: precondition 'arg_positive' got status valid.
 [eva] idct.c:91: Call to builtin Frama_C_cos for function cos
 [eva] idct.c:91: function cos: precondition 'finite_arg' got status valid.
-[eva] idct.c:88: starting to merge loop iterations
+[eva:partition] idct.c:88: starting to merge loop iterations
 [eva] idct.c:90: Call to builtin Frama_C_sqrt for function sqrt
 [eva] idct.c:91: Call to builtin Frama_C_cos for function cos
 [eva] idct.c:90: Call to builtin Frama_C_sqrt for function sqrt
@@ -34,7 +34,7 @@
 [eva] idct.c:91: Call to builtin Frama_C_cos for function cos
 [eva] idct.c:90: Call to builtin Frama_C_sqrt for function sqrt
 [eva] idct.c:91: Call to builtin Frama_C_cos for function cos
-[eva] idct.c:87: starting to merge loop iterations
+[eva:partition] idct.c:87: starting to merge loop iterations
 [eva] idct.c:90: Call to builtin Frama_C_sqrt for function sqrt
 [eva] idct.c:91: Call to builtin Frama_C_cos for function cos
 [eva] idct.c:90: Call to builtin Frama_C_sqrt for function sqrt
@@ -47,8 +47,8 @@
 [eva] idct.c:91: Call to builtin Frama_C_cos for function cos
 [eva] idct.c:90: Call to builtin Frama_C_sqrt for function sqrt
 [eva] idct.c:91: Call to builtin Frama_C_cos for function cos
-[eva] idct.c:128: starting to merge loop iterations
-[eva] idct.c:126: starting to merge loop iterations
+[eva:partition] idct.c:128: starting to merge loop iterations
+[eva:partition] idct.c:126: starting to merge loop iterations
 [eva:alarm] idct.c:129: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
 [eva:alarm] idct.c:131: Warning: 
@@ -64,12 +64,12 @@
 [eva:alarm] idct.c:150: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
 [eva:signed-overflow] idct.c:141: Warning: 2's complement assumed for overflow
-[eva] idct.c:125: starting to merge loop iterations
+[eva:partition] idct.c:125: starting to merge loop iterations
 [eva:signed-overflow] idct.c:163: Warning: 2's complement assumed for overflow
 [eva:alarm] idct.c:163: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp2[k][j]);
-[eva] idct.c:162: starting to merge loop iterations
-[eva] idct.c:160: starting to merge loop iterations
+[eva:partition] idct.c:162: starting to merge loop iterations
+[eva:partition] idct.c:160: starting to merge loop iterations
 [eva:alarm] idct.c:163: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
 [eva:alarm] idct.c:166: Warning: 
@@ -85,13 +85,13 @@
   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
 [eva:alarm] idct.c:185: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
-[eva] idct.c:159: starting to merge loop iterations
+[eva:partition] idct.c:159: starting to merge loop iterations
 [eva] Recording results for idct
 [eva] Done for function idct
 [eva:alarm] ieee_1180_1990.c:191: Warning: 
   accessing uninitialized left-value. assert \initialized(&m2[i][j]);
-[eva] ieee_1180_1990.c:190: starting to merge loop iterations
-[eva] ieee_1180_1990.c:189: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:190: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:189: starting to merge loop iterations
 [eva] computing for function printf_va_1 <- main.
   Called from ieee_1180_1990.c:195.
 [eva] using specification for function printf
@@ -107,7 +107,7 @@
   Called from ieee_1180_1990.c:85.
 [eva] Recording results for IEEE_1180_1990_rand
 [eva] Done for function IEEE_1180_1990_rand
-[eva] ieee_1180_1990.c:84: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:84: starting to merge loop iterations
 [eva] computing for function IEEE_1180_1990_rand <- IEEE_1180_1990_mkbk <- main.
   Called from ieee_1180_1990.c:85.
 [eva:signed-overflow] ieee_1180_1990.c:69: Warning: 
@@ -134,7 +134,7 @@
   Called from ieee_1180_1990.c:85.
 [eva] Recording results for IEEE_1180_1990_rand
 [eva] Done for function IEEE_1180_1990_rand
-[eva] ieee_1180_1990.c:83: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:83: starting to merge loop iterations
 [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
@@ -153,7 +153,7 @@
 [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:101: 
   function cos: precondition 'finite_arg' got status valid.
-[eva] ieee_1180_1990.c:99: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:99: starting to merge loop iterations
 [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
@@ -162,7 +162,7 @@
 [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
-[eva] ieee_1180_1990.c:98: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:98: starting to merge loop iterations
 [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
@@ -175,15 +175,15 @@
 [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
-[eva] ieee_1180_1990.c:108: starting to merge loop iterations
-[eva] ieee_1180_1990.c:105: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:108: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:105: starting to merge loop iterations
 [eva:alarm] ieee_1180_1990.c:109: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
-[eva] ieee_1180_1990.c:104: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:104: starting to merge loop iterations
 [eva:alarm] ieee_1180_1990.c:116: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp1[i][k]);
-[eva] ieee_1180_1990.c:115: starting to merge loop iterations
-[eva] ieee_1180_1990.c:112: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:115: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:112: starting to merge loop iterations
 [eva:alarm] ieee_1180_1990.c:116: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp2[i][j]);
 [eva:alarm] ieee_1180_1990.c:117: Warning: 
@@ -208,7 +208,7 @@
 [eva:alarm] ieee_1180_1990.c:124: Warning: 
   overflow in conversion from floating-point to integer.
   assert tmp2[i][j] - 0.5 < 2147483648;
-[eva] ieee_1180_1990.c:111: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:111: starting to merge loop iterations
 [eva] Recording results for IEEE_1180_1990_dctf
 [eva] Done for function IEEE_1180_1990_dctf
 [eva] computing for function IEEE_1180_1990_idctf <- main.
@@ -221,7 +221,7 @@
 [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:141: 
   function cos: precondition 'finite_arg' got status valid.
-[eva] ieee_1180_1990.c:139: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:139: starting to merge loop iterations
 [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
 [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
@@ -230,7 +230,7 @@
 [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
 [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
-[eva] ieee_1180_1990.c:138: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:138: starting to merge loop iterations
 [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
 [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
@@ -245,15 +245,15 @@
 [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
 [eva:alarm] ieee_1180_1990.c:150: Warning: 
   accessing uninitialized left-value. assert \initialized(&(*(m1 + k))[j]);
-[eva] ieee_1180_1990.c:149: starting to merge loop iterations
-[eva] ieee_1180_1990.c:146: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:149: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:146: starting to merge loop iterations
 [eva:alarm] ieee_1180_1990.c:150: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
-[eva] ieee_1180_1990.c:145: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:145: starting to merge loop iterations
 [eva:alarm] ieee_1180_1990.c:157: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp1[i][k]);
-[eva] ieee_1180_1990.c:156: starting to merge loop iterations
-[eva] ieee_1180_1990.c:153: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:156: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:153: starting to merge loop iterations
 [eva:alarm] ieee_1180_1990.c:157: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp2[i][j]);
 [eva:alarm] ieee_1180_1990.c:158: Warning: 
@@ -278,7 +278,7 @@
 [eva:alarm] ieee_1180_1990.c:165: Warning: 
   overflow in conversion from floating-point to integer.
   assert tmp2[i][j] - 0.5 < 2147483648;
-[eva] ieee_1180_1990.c:152: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:152: starting to merge loop iterations
 [eva] Recording results for IEEE_1180_1990_idctf
 [eva] Done for function IEEE_1180_1990_idctf
 [eva] computing for function idct <- main.
@@ -302,14 +302,14 @@
   2's complement assumed for overflow
 [eva:alarm] ieee_1180_1990.c:231: Warning: 
   accessing uninitialized left-value. assert \initialized(&res[0].pmse[j][k]);
-[eva] ieee_1180_1990.c:216: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:216: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:219: Warning: 
   2's complement assumed for overflow
 [eva:signed-overflow] ieee_1180_1990.c:231: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:215: starting to merge loop iterations
-[eva] ieee_1180_1990.c:234: starting to merge loop iterations
-[eva] ieee_1180_1990.c:233: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:215: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:234: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:233: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:235: Warning: 
   2's complement assumed for overflow
 [eva] computing for function IEEE_1180_1990_dctf <- main.
@@ -338,12 +338,12 @@
   2's complement assumed for overflow
 [eva:alarm] ieee_1180_1990.c:255: Warning: 
   accessing uninitialized left-value. assert \initialized(&res[3].pmse[j][k]);
-[eva] ieee_1180_1990.c:240: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:240: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:243: Warning: 
   2's complement assumed for overflow
 [eva:signed-overflow] ieee_1180_1990.c:255: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:239: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:239: starting to merge loop iterations
 [eva] computing for function IEEE_1180_1990_mkbk <- main.
   Called from ieee_1180_1990.c:257.
 [eva] computing for function IEEE_1180_1990_rand <- IEEE_1180_1990_mkbk <- main.
@@ -375,16 +375,16 @@
   2's complement assumed for overflow
 [eva:alarm] ieee_1180_1990.c:277: Warning: 
   accessing uninitialized left-value. assert \initialized(&res[1].pmse[j][k]);
-[eva] ieee_1180_1990.c:262: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:262: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:265: Warning: 
   2's complement assumed for overflow
 [eva:signed-overflow] ieee_1180_1990.c:277: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:261: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:261: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:281: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:280: starting to merge loop iterations
-[eva] ieee_1180_1990.c:279: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:280: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:279: starting to merge loop iterations
 [eva] ieee_1180_1990.c:282: Reusing old results for call to IEEE_1180_1990_dctf
 [eva] ieee_1180_1990.c:283: Reusing old results for call to IEEE_1180_1990_idctf
 [eva] ieee_1180_1990.c:284: Reusing old results for call to idct
@@ -402,12 +402,12 @@
   2's complement assumed for overflow
 [eva:alarm] ieee_1180_1990.c:301: Warning: 
   accessing uninitialized left-value. assert \initialized(&res[4].pmse[j][k]);
-[eva] ieee_1180_1990.c:286: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:286: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:289: Warning: 
   2's complement assumed for overflow
 [eva:signed-overflow] ieee_1180_1990.c:301: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:285: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:285: starting to merge loop iterations
 [eva] computing for function IEEE_1180_1990_mkbk <- main.
   Called from ieee_1180_1990.c:303.
 [eva] computing for function IEEE_1180_1990_rand <- IEEE_1180_1990_mkbk <- main.
@@ -439,16 +439,16 @@
   2's complement assumed for overflow
 [eva:alarm] ieee_1180_1990.c:323: Warning: 
   accessing uninitialized left-value. assert \initialized(&res[2].pmse[j][k]);
-[eva] ieee_1180_1990.c:308: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:308: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:311: Warning: 
   2's complement assumed for overflow
 [eva:signed-overflow] ieee_1180_1990.c:323: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:307: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:307: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:327: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:326: starting to merge loop iterations
-[eva] ieee_1180_1990.c:325: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:326: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:325: starting to merge loop iterations
 [eva] ieee_1180_1990.c:328: Reusing old results for call to IEEE_1180_1990_dctf
 [eva] ieee_1180_1990.c:329: Reusing old results for call to IEEE_1180_1990_idctf
 [eva] ieee_1180_1990.c:330: Reusing old results for call to idct
@@ -466,13 +466,13 @@
   2's complement assumed for overflow
 [eva:alarm] ieee_1180_1990.c:347: Warning: 
   accessing uninitialized left-value. assert \initialized(&res[5].pmse[j][k]);
-[eva] ieee_1180_1990.c:332: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:332: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:335: Warning: 
   2's complement assumed for overflow
 [eva:signed-overflow] ieee_1180_1990.c:347: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:331: starting to merge loop iterations
-[eva] ieee_1180_1990.c:202: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:331: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:202: starting to merge loop iterations
 [eva] computing for function IEEE_1180_1990_mkbk <- main.
   Called from ieee_1180_1990.c:211.
 [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
@@ -664,7 +664,7 @@
   accessing uninitialized left-value. assert \initialized(&res[i].pme[j][k]);
 [eva:signed-overflow] ieee_1180_1990.c:369: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:355: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:355: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:357: Warning: 
   2's complement assumed for overflow
 [eva:alarm] ieee_1180_1990.c:358: Warning: 
@@ -677,10 +677,10 @@
   accessing uninitialized left-value. assert \initialized(&res[i].pme[j][k]);
 [eva:alarm] ieee_1180_1990.c:369: Warning: 
   accessing uninitialized left-value. assert \initialized(&res[i].pme[j][k]);
-[eva] ieee_1180_1990.c:354: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:354: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:389: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:350: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:350: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [scope:rm_asserts] removing 16 assertion(s)
diff --git a/tests/idct/oracle_apron/ieee_1180_1990.res.oracle b/tests/idct/oracle_apron/ieee_1180_1990.res.oracle
index 1a577229392..bac41cbc7dd 100644
--- a/tests/idct/oracle_apron/ieee_1180_1990.res.oracle
+++ b/tests/idct/oracle_apron/ieee_1180_1990.res.oracle
@@ -1,4 +1,4 @@
-139,144c139,162
+138,143c138,161
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
@@ -30,7 +30,7 @@
 >   Called from ieee_1180_1990.c:85.
 > [eva] Recording results for IEEE_1180_1990_rand
 > [eva] Done for function IEEE_1180_1990_rand
-354,359c372,395
+353,358c371,394
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
@@ -62,7 +62,7 @@
 >   Called from ieee_1180_1990.c:85.
 > [eva] Recording results for IEEE_1180_1990_rand
 > [eva] Done for function IEEE_1180_1990_rand
-362,364c398,409
+361,363c397,408
 < [eva] ieee_1180_1990.c:258: Reusing old results for call to IEEE_1180_1990_dctf
 < [eva] ieee_1180_1990.c:259: Reusing old results for call to IEEE_1180_1990_idctf
 < [eva] ieee_1180_1990.c:260: Reusing old results for call to idct
@@ -79,7 +79,7 @@
 >   Called from ieee_1180_1990.c:260.
 > [eva] Recording results for idct
 > [eva] Done for function idct
-389,391c434,445
+388,390c433,444
 < [eva] ieee_1180_1990.c:282: Reusing old results for call to IEEE_1180_1990_dctf
 < [eva] ieee_1180_1990.c:283: Reusing old results for call to IEEE_1180_1990_idctf
 < [eva] ieee_1180_1990.c:284: Reusing old results for call to idct
@@ -96,7 +96,7 @@
 >   Called from ieee_1180_1990.c:284.
 > [eva] Recording results for idct
 > [eva] Done for function idct
-418,423c472,495
+417,422c471,494
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
@@ -128,7 +128,7 @@
 >   Called from ieee_1180_1990.c:85.
 > [eva] Recording results for IEEE_1180_1990_rand
 > [eva] Done for function IEEE_1180_1990_rand
-426,428c498,509
+425,427c497,508
 < [eva] ieee_1180_1990.c:304: Reusing old results for call to IEEE_1180_1990_dctf
 < [eva] ieee_1180_1990.c:305: Reusing old results for call to IEEE_1180_1990_idctf
 < [eva] ieee_1180_1990.c:306: Reusing old results for call to idct
@@ -145,7 +145,7 @@
 >   Called from ieee_1180_1990.c:306.
 > [eva] Recording results for idct
 > [eva] Done for function idct
-453,455c534,545
+452,454c533,544
 < [eva] ieee_1180_1990.c:328: Reusing old results for call to IEEE_1180_1990_dctf
 < [eva] ieee_1180_1990.c:329: Reusing old results for call to IEEE_1180_1990_idctf
 < [eva] ieee_1180_1990.c:330: Reusing old results for call to idct
@@ -162,7 +162,7 @@
 >   Called from ieee_1180_1990.c:330.
 > [eva] Recording results for idct
 > [eva] Done for function idct
-479,485c569,1736
+478,484c568,1735
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
@@ -1339,7 +1339,7 @@
 >   Called from ieee_1180_1990.c:85.
 > [eva] Recording results for IEEE_1180_1990_rand
 > [eva] Done for function IEEE_1180_1990_rand
-518,661c1769,1896
+517,660c1768,1895
 < [eva] ieee_1180_1990.c:214: Reusing old results for call to idct
 < [eva] ieee_1180_1990.c:236: Reusing old results for call to IEEE_1180_1990_dctf
 < [eva] ieee_1180_1990.c:237: Reusing old results for call to IEEE_1180_1990_idctf
diff --git a/tests/idct/oracle_equality/ieee_1180_1990.res.oracle b/tests/idct/oracle_equality/ieee_1180_1990.res.oracle
index 12ecac9ae67..78b0c4d7fff 100644
--- a/tests/idct/oracle_equality/ieee_1180_1990.res.oracle
+++ b/tests/idct/oracle_equality/ieee_1180_1990.res.oracle
@@ -1,79 +1,79 @@
-297a298,299
+296a297,298
 > [eva:signed-overflow] ieee_1180_1990.c:219: Warning: 
 >   2's complement assumed for overflow
-301a304,305
+300a303,304
 > [eva:signed-overflow] ieee_1180_1990.c:220: Warning: 
 >   2's complement assumed for overflow
-307,308d310
+306,307d309
 < [eva:signed-overflow] ieee_1180_1990.c:219: Warning: 
 <   2's complement assumed for overflow
-333a336,337
+332a335,336
 > [eva:signed-overflow] ieee_1180_1990.c:243: Warning: 
 >   2's complement assumed for overflow
-337a342,343
+336a341,342
 > [eva:signed-overflow] ieee_1180_1990.c:244: Warning: 
 >   2's complement assumed for overflow
-343,344d348
+342,343d347
 < [eva:signed-overflow] ieee_1180_1990.c:243: Warning: 
 <   2's complement assumed for overflow
-359a364,367
+358a363,366
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-370a379,380
+369a378,379
 > [eva:signed-overflow] ieee_1180_1990.c:265: Warning: 
 >   2's complement assumed for overflow
-374a385,386
+373a384,385
 > [eva:signed-overflow] ieee_1180_1990.c:266: Warning: 
 >   2's complement assumed for overflow
-380,381d391
+379,380d390
 < [eva:signed-overflow] ieee_1180_1990.c:265: Warning: 
 <   2's complement assumed for overflow
-397a408,409
+396a407,408
 > [eva:signed-overflow] ieee_1180_1990.c:289: Warning: 
 >   2's complement assumed for overflow
-401a414,415
+400a413,414
 > [eva:signed-overflow] ieee_1180_1990.c:290: Warning: 
 >   2's complement assumed for overflow
-407,408d420
+406,407d419
 < [eva:signed-overflow] ieee_1180_1990.c:289: Warning: 
 <   2's complement assumed for overflow
-423a436,439
+422a435,438
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-434a451,452
+433a450,451
 > [eva:signed-overflow] ieee_1180_1990.c:311: Warning: 
 >   2's complement assumed for overflow
-438a457,458
+437a456,457
 > [eva:signed-overflow] ieee_1180_1990.c:312: Warning: 
 >   2's complement assumed for overflow
-444,445d463
+443,444d462
 < [eva:signed-overflow] ieee_1180_1990.c:311: Warning: 
 <   2's complement assumed for overflow
-461a480,481
+460a479,480
 > [eva:signed-overflow] ieee_1180_1990.c:335: Warning: 
 >   2's complement assumed for overflow
-465a486,487
+464a485,486
 > [eva:signed-overflow] ieee_1180_1990.c:336: Warning: 
 >   2's complement assumed for overflow
-471,472d492
+470,471d491
 < [eva:signed-overflow] ieee_1180_1990.c:335: Warning: 
 <   2's complement assumed for overflow
-485a506,509
+484a505,508
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-491a516
+490a515
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-492a518,520
+491a517,519
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-493a522,528
+492a521,527
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
@@ -81,11 +81,11 @@
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-506a542
+505a541
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
-507a544
+506a543
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
-508a546,554
+507a545,553
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
@@ -95,7 +95,7 @@
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
-770c816
+769c815
 <     by the Eva analyzer:      0 errors   42 warnings
 ---
 >     by the Eva analyzer:      0 errors   48 warnings
diff --git a/tests/idct/oracle_gauges/ieee_1180_1990.res.oracle b/tests/idct/oracle_gauges/ieee_1180_1990.res.oracle
index fb60196772f..99a37fe5a9e 100644
--- a/tests/idct/oracle_gauges/ieee_1180_1990.res.oracle
+++ b/tests/idct/oracle_gauges/ieee_1180_1990.res.oracle
@@ -1,4 +1,4 @@
-491a492
+490a491
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-506a508
+505a507
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
diff --git a/tests/idct/oracle_multidim/ieee_1180_1990.res.oracle b/tests/idct/oracle_multidim/ieee_1180_1990.res.oracle
index 657b6a08704..f5d41308dd5 100644
--- a/tests/idct/oracle_multidim/ieee_1180_1990.res.oracle
+++ b/tests/idct/oracle_multidim/ieee_1180_1990.res.oracle
@@ -32,21 +32,20 @@
 <   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
 < [eva:alarm] idct.c:185: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
-95,104d63
+95,103d63
 < [eva] computing for function printf_va_1 <- main.
 <   Called from ieee_1180_1990.c:195.
-< [eva] using specification for function printf_va_1
+< [eva] using specification for function printf
 < [eva] ieee_1180_1990.c:195: function printf_va_1: precondition got status valid.
 < [eva] Done for function printf_va_1
 < [eva] computing for function printf_va_2 <- main.
 <   Called from ieee_1180_1990.c:196.
-< [eva] using specification for function printf_va_2
 < [eva] ieee_1180_1990.c:196: function printf_va_2: precondition got status valid.
 < [eva] Done for function printf_va_2
-181,182d139
+180,181d139
 < [eva:alarm] ieee_1180_1990.c:109: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
-188,211d144
+187,210d144
 < [eva:alarm] ieee_1180_1990.c:116: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&tmp2[i][j]);
 < [eva:alarm] ieee_1180_1990.c:117: Warning: 
@@ -71,10 +70,10 @@
 < [eva:alarm] ieee_1180_1990.c:124: Warning: 
 <   overflow in conversion from floating-point to integer.
 <   assert tmp2[i][j] - 0.5 < 2147483648;
-251,252d183
+250,251d183
 < [eva:alarm] ieee_1180_1990.c:150: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
-258,281d188
+257,280d188
 < [eva:alarm] ieee_1180_1990.c:157: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&tmp2[i][j]);
 < [eva:alarm] ieee_1180_1990.c:158: Warning: 
@@ -99,104 +98,104 @@
 < [eva:alarm] ieee_1180_1990.c:165: Warning: 
 <   overflow in conversion from floating-point to integer.
 <   assert tmp2[i][j] - 0.5 < 2147483648;
-287d193
+286d193
 < [eva:signed-overflow] idct.c:129: Warning: 2's complement assumed for overflow
-289a196,197
+288a196,197
 > [eva:signed-overflow] idct.c:129: Warning: 2's complement assumed for overflow
 > [eva:signed-overflow] idct.c:163: Warning: 2's complement assumed for overflow
-292,293d199
+291,292d199
 < [eva:signed-overflow] ieee_1180_1990.c:218: Warning: 
 <   2's complement assumed for overflow
-300,303d205
+299,302d205
 < [eva:signed-overflow] ieee_1180_1990.c:220: Warning: 
 <   2's complement assumed for overflow
 < [eva:signed-overflow] ieee_1180_1990.c:230: Warning: 
 <   2's complement assumed for overflow
-314,315d215
+313,314d215
 < [eva:signed-overflow] ieee_1180_1990.c:235: Warning: 
 <   2's complement assumed for overflow
-328,329d227
+327,328d227
 < [eva:signed-overflow] ieee_1180_1990.c:242: Warning: 
 <   2's complement assumed for overflow
-336,339d233
+335,338d233
 < [eva:signed-overflow] ieee_1180_1990.c:244: Warning: 
 <   2's complement assumed for overflow
 < [eva:signed-overflow] ieee_1180_1990.c:254: Warning: 
 <   2's complement assumed for overflow
-365,366d258
+364,365d258
 < [eva:signed-overflow] ieee_1180_1990.c:264: Warning: 
 <   2's complement assumed for overflow
-373,376d264
+372,375d264
 < [eva:signed-overflow] ieee_1180_1990.c:266: Warning: 
 <   2's complement assumed for overflow
 < [eva:signed-overflow] ieee_1180_1990.c:276: Warning: 
 <   2's complement assumed for overflow
-385,386d272
+384,385d272
 < [eva:signed-overflow] ieee_1180_1990.c:281: Warning: 
 <   2's complement assumed for overflow
-392,393d277
+391,392d277
 < [eva:signed-overflow] ieee_1180_1990.c:288: Warning: 
 <   2's complement assumed for overflow
-400,403d283
+399,402d283
 < [eva:signed-overflow] ieee_1180_1990.c:290: Warning: 
 <   2's complement assumed for overflow
 < [eva:signed-overflow] ieee_1180_1990.c:300: Warning: 
 <   2's complement assumed for overflow
-429,430d308
+428,429d308
 < [eva:signed-overflow] ieee_1180_1990.c:310: Warning: 
 <   2's complement assumed for overflow
-437,440d314
+436,439d314
 < [eva:signed-overflow] ieee_1180_1990.c:312: Warning: 
 <   2's complement assumed for overflow
 < [eva:signed-overflow] ieee_1180_1990.c:322: Warning: 
 <   2's complement assumed for overflow
-449,450d322
+448,449d322
 < [eva:signed-overflow] ieee_1180_1990.c:327: Warning: 
 <   2's complement assumed for overflow
-456,457d327
+455,456d327
 < [eva:signed-overflow] ieee_1180_1990.c:334: Warning: 
 <   2's complement assumed for overflow
-464,467d333
+463,466d333
 < [eva:signed-overflow] ieee_1180_1990.c:336: Warning: 
 <   2's complement assumed for overflow
 < [eva:signed-overflow] ieee_1180_1990.c:346: Warning: 
 <   2's complement assumed for overflow
-671,672d536
+670,671d536
 < [eva:alarm] ieee_1180_1990.c:358: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&res[i].pmse[j][k]);
-675,680d538
+674,679d538
 < [eva:alarm] ieee_1180_1990.c:369: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&res[i].pme[j][k]);
 < [eva:alarm] ieee_1180_1990.c:369: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&res[i].pme[j][k]);
 < [eva:alarm] ieee_1180_1990.c:369: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&res[i].pme[j][k]);
-687d544
+686d544
 < [scope:rm_asserts] removing 16 assertion(s)
-698c555,556
+697c555,556
 <   M1[0..7][0..7] ∈ [--..--]
 ---
 >   M1[0][0..7] ∈ [-2147483647..2147483647]
 >     [1..7][0..7] ∈ [--..--]
-708c566
+707c566
 <   m2[0..7][0..7] ∈ [--..--] or UNINITIALIZED
 ---
 >   m2[0..7][0..7] ∈ [-2048..2047] or UNINITIALIZED
-720c578
+719c578
 <   m3[0..7][0..7] ∈ [--..--] or UNINITIALIZED
 ---
 >   m3[0..7][0..7] ∈ [-256..255] or UNINITIALIZED
-725,726c583,584
+724,725c583,584
 <   m2[0..7][0..7] ∈ [--..--] or UNINITIALIZED
 <   m4[0..7][0..7] ∈ [--..--] or UNINITIALIZED
 ---
 >   m2[0..7][0..7] ∈ [-2048..2047] or UNINITIALIZED
 >   m4[0..7][0..7] ∈ [-256..255] or UNINITIALIZED
-731c589
+730c589
 <   tmp2[0..7][0..7] ∈ [--..--] or UNINITIALIZED
 ---
 >   tmp2[0..7][0..7] ∈ [-8192..8191] or UNINITIALIZED
-744,746c602,604
+743,745c602,604
 <   m2[0..7][0..7] ∈ [--..--] or UNINITIALIZED
 <   m3[0..7][0..7] ∈ [--..--] or UNINITIALIZED
 <   m4[0..7][0..7] ∈ [--..--] or UNINITIALIZED
@@ -204,40 +203,40 @@
 >   m2[0..7][0..7] ∈ [-2048..2047] or UNINITIALIZED
 >   m3[0..7][0..7] ∈ [-256..255] or UNINITIALIZED
 >   m4[0..7][0..7] ∈ [-256..255] or UNINITIALIZED
-750,751c608,610
+749,750c608,610
 <   err ∈ [--..--] or UNINITIALIZED
 <   M1[0..7][0..7] ∈ [--..--]
 ---
 >   err ∈ [-261121..261121] or UNINITIALIZED
 >   M1[0][0..7] ∈ [-2147483647..2147483647]
 >     [1..7][0..7] ∈ [--..--]
-763d621
+762d621
 <   S___fc_stdout[0..1] ∈ [--..--]
-767c625
+766c625
 <   In these functions, 588 statements reached (out of 626): 93% coverage.
 ---
 >   In these functions, 585 statements reached (out of 626): 93% coverage.
-770c628
+769c628
 <     by the Eva analyzer:      0 errors   42 warnings
 ---
 >     by the Eva analyzer:      0 errors   19 warnings
-773,775c631,632
+772,774c631,632
 <   72 alarms generated by the analysis:
 <       64 accesses to uninitialized left-values
 <        8 illegal conversions from floating-point to integer
 ---
 >   32 alarms generated by the analysis:
 >       32 accesses to uninitialized left-values
-779c636
+778c636
 <     Preconditions    11 valid     0 unknown     0 invalid     11 total
 ---
 >     Preconditions     9 valid     0 unknown     0 invalid      9 total
-797,800d653
+796,799d653
 < [from] Computing for function printf_va_1 <-main
 < [from] Done for function printf_va_1
 < [from] Computing for function printf_va_2 <-main
 < [from] Done for function printf_va_2
-813,822d665
+812,821d665
 < [from] Function printf_va_1:
 <   S___fc_stdout[0].__fc_FILE_data
 <                FROM S___fc_stdout[0];
@@ -248,24 +247,24 @@
 <   S___fc_stdout[0].__fc_FILE_data
 <                FROM S___fc_stdout[0]; "output.\n"[bits 0 to 71] (and SELF)
 <   \result FROM S___fc_stdout[0]; "output.\n"[bits 0 to 71]
-856,860d698
+855,859d698
 <   S___fc_stdout[0].__fc_FILE_data
 <                FROM M1[0..7][0..7]; idct_init; idct_mc1[0..7][0..7];
 <                     idct_mc2[0..7][0..7]; S___fc_stdout[0];
 <                     "For all-zero input, the proposed IDCT shall generate all-zero "[bits 0 to 503];
 <                      "output.\n"[bits 0 to 71] (and SELF)
-903,904c741
+902,903c741
 <     idct_init; idct_mc1[0..7][0..7]; idct_mc2[0..7][0..7]; __retres;
 <     S___fc_stdout[0].__fc_FILE_data
 ---
 >     idct_init; idct_mc1[0..7][0..7]; idct_mc2[0..7][0..7]; __retres
-909,911c746
+908,910c746
 <     idct_init; idct_mc1[0..7][0..7]; idct_mc2[0..7][0..7]; S___fc_stdout[0];
 <     "For all-zero input, the proposed IDCT shall generate all-zero "[bits 0 to 503];
 <      "output.\n"[bits 0 to 71]
 ---
 >     idct_init; idct_mc1[0..7][0..7]; idct_mc2[0..7][0..7]
-4026,4048d3860
+4025,4047d3860
 < [    -    ] Assertion 'Eva,initialization' (file idct.c, line 129)
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             tried with Eva.
@@ -289,7 +288,7 @@
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             By RedundantAlarms, with pending:
 <              - Assertion 'Eva,initialization' (file idct.c, line 145)
-4052,4074d3863
+4051,4073d3863
 < [    -    ] Assertion 'Eva,initialization' (file idct.c, line 163)
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             tried with Eva.
@@ -313,11 +312,11 @@
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             By RedundantAlarms, with pending:
 <              - Assertion 'Eva,initialization' (file idct.c, line 180)
-4096,4098d3884
+4095,4097d3884
 < [    -    ] Assertion 'Eva,initialization' (file ieee_1180_1990.c, line 109)
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             tried with Eva.
-4102,4135d3887
+4101,4134d3887
 < [    -    ] Assertion 'Eva,initialization' (file ieee_1180_1990.c, line 116)
 <             assert Eva: initialization: \initialized(&tmp2[i][j]);
 <             tried with Eva.
@@ -352,11 +351,11 @@
 < [    -    ] Assertion 'Eva,float_to_int' (file ieee_1180_1990.c, line 124)
 <             assert Eva: float_to_int: tmp2[i][j] - 0.5 < 2147483648;
 <             tried with Eva.
-4156,4158d3907
+4155,4157d3907
 < [    -    ] Assertion 'Eva,initialization' (file ieee_1180_1990.c, line 150)
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             tried with Eva.
-4162,4195d3910
+4161,4194d3910
 < [    -    ] Assertion 'Eva,initialization' (file ieee_1180_1990.c, line 157)
 <             assert Eva: initialization: \initialized(&tmp2[i][j]);
 <             tried with Eva.
@@ -391,7 +390,7 @@
 < [    -    ] Assertion 'Eva,float_to_int' (file ieee_1180_1990.c, line 165)
 <             assert Eva: float_to_int: tmp2[i][j] - 0.5 < 2147483648;
 <             tried with Eva.
-4295,4311c4010,4016
+4294,4310c4010,4016
 < [ Partial ] Assertion 'Eva,initialization' (file ieee_1180_1990.c, line 358)
 <             assert Eva: initialization: \initialized(&res[i].pmse[j][k]);
 <             By RedundantAlarms, with pending:
@@ -417,7 +416,7 @@
 >             reachability of stmt line 196 in main
 >             by Eva.
 > [  Dead   ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 248)' at call 'printf_va_1' (file ieee_1180_1990.c, line 195)
-4315,4316c4020,4023
+4314,4315c4020,4023
 <             by Eva.
 < [  Valid  ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 248)' at call 'printf_va_2' (file ieee_1180_1990.c, line 196)
 ---
@@ -425,18 +424,18 @@
 >             By Eva because:
 >              - Unreachable call 'printf_va_1' (file ieee_1180_1990.c, line 195)
 > [  Dead   ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 248)' at call 'printf_va_2' (file ieee_1180_1990.c, line 196)
-4320c4027,4029
+4319c4027,4029
 <             by Eva.
 ---
 >             Locally valid, but unreachable.
 >             By Eva because:
 >              - Unreachable call 'printf_va_2' (file ieee_1180_1990.c, line 196)
-4377,4378c4086
+4376,4377c4086
 <    199 Completely validated
 <     16 Locally validated
 ---
 >    197 Completely validated
-4380,4381c4088,4091
+4379,4380c4088,4091
 <     56 To be validated
 <    863 Total
 ---
diff --git a/tests/idct/oracle_octagon/ieee_1180_1990.res.oracle b/tests/idct/oracle_octagon/ieee_1180_1990.res.oracle
index fdf9672406b..36947f2da78 100644
--- a/tests/idct/oracle_octagon/ieee_1180_1990.res.oracle
+++ b/tests/idct/oracle_octagon/ieee_1180_1990.res.oracle
@@ -1,19 +1,19 @@
-359a360,363
+358a359,362
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-423a428,431
+422a427,430
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-485a494,497
+484a493,496
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-491a504,510
+490a503,509
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
@@ -21,17 +21,17 @@
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-492a512
+491a511
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-493a514,516
+492a513,515
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-506a530
+505a529
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
-507a532
+506a531
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
-508a534,542
+507a533,541
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
diff --git a/tests/impact/oracle/initial.res.oracle b/tests/impact/oracle/initial.res.oracle
index ec4c480ee0b..8decf5f89df 100644
--- a/tests/impact/oracle/initial.res.oracle
+++ b/tests/impact/oracle/initial.res.oracle
@@ -18,7 +18,7 @@
 [eva] Done for function f1
 [eva] Recording results for g1
 [eva] Done for function g1
-[eva] initial.i:24: starting to merge loop iterations
+[eva:partition] initial.i:24: starting to merge loop iterations
 [eva] computing for function g1 <- main1.
   Called from initial.i:25.
 [eva] initial.i:19: Reusing old results for call to f1
@@ -96,7 +96,7 @@
 [eva] Done for function f3
 [eva] Recording results for g3
 [eva] Done for function g3
-[eva] initial.i:80: starting to merge loop iterations
+[eva:partition] initial.i:80: starting to merge loop iterations
 [eva] initial.i:81: Reusing old results for call to g3
 [eva] Recording results for main3
 [eva] Done for function main3
diff --git a/tests/impact/oracle/loop2.res.oracle b/tests/impact/oracle/loop2.res.oracle
index 081db859e86..8bc235d91f7 100644
--- a/tests/impact/oracle/loop2.res.oracle
+++ b/tests/impact/oracle/loop2.res.oracle
@@ -9,7 +9,7 @@
   w[0..9] ∈ [--..--]
 [eva] computing for function init <- main.
   Called from loop2.i:24.
-[eva] loop2.i:11: starting to merge loop iterations
+[eva:partition] loop2.i:11: starting to merge loop iterations
 [eva] Recording results for init
 [from] Computing for function init
 [from] Done for function init
@@ -20,7 +20,7 @@
 [from] Computing for function f
 [from] Done for function f
 [eva] Done for function f
-[eva] loop2.i:25: starting to merge loop iterations
+[eva:partition] loop2.i:25: starting to merge loop iterations
 [eva] computing for function f <- main.
   Called from loop2.i:27.
 [eva] Recording results for f
diff --git a/tests/libc/oracle/alloca_h.res.oracle b/tests/libc/oracle/alloca_h.res.oracle
index 78d3f338143..fa165e7379a 100644
--- a/tests/libc/oracle/alloca_h.res.oracle
+++ b/tests/libc/oracle/alloca_h.res.oracle
@@ -31,7 +31,7 @@
   Called from alloca_h.c:43.
 [eva] alloca_h.c:23: Call to builtin alloca
 [eva:malloc:new] alloca_h.c:23: allocating variable __alloca_loop_l23
-[eva] alloca_h.c:22: starting to merge loop iterations
+[eva:partition] alloca_h.c:22: starting to merge loop iterations
 [eva] alloca_h.c:23: Call to builtin alloca
 [eva] alloca_h.c:23: Call to builtin alloca
 [eva] alloca_h.c:23: Call to builtin alloca
diff --git a/tests/libc/oracle/glob_c.res.oracle b/tests/libc/oracle/glob_c.res.oracle
index 0b746d9c5a8..e4dd2ab757f 100644
--- a/tests/libc/oracle/glob_c.res.oracle
+++ b/tests/libc/oracle/glob_c.res.oracle
@@ -17,8 +17,8 @@
   function realloc: precondition 'freeable' got status valid.
 [eva:malloc:new] FRAMAC_SHARE/libc/glob.c:66: 
   allocating variable __realloc_glob_l66
-[eva] FRAMAC_SHARE/libc/glob.c:71: starting to merge loop iterations
-[eva] FRAMAC_SHARE/libc/glob.c:73: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/glob.c:71: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/glob.c:73: starting to merge loop iterations
 [eva:alarm] FRAMAC_SHARE/libc/glob.c:74: Warning: 
   out of bounds write.
   assert
@@ -124,7 +124,7 @@
 [eva] FRAMAC_SHARE/libc/glob.c:50: Call to builtin realloc
 [eva:malloc:new] FRAMAC_SHARE/libc/glob.c:50: 
   allocating variable __realloc_glob_l50_0
-[eva] FRAMAC_SHARE/libc/glob.c:54: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/glob.c:54: starting to merge loop iterations
 [eva] FRAMAC_SHARE/libc/glob.c:66: Call to builtin realloc
 [eva:malloc:new] FRAMAC_SHARE/libc/glob.c:66: 
   allocating variable __realloc_glob_l66_2
diff --git a/tests/libc/oracle/netdb_c.res.oracle b/tests/libc/oracle/netdb_c.res.oracle
index fac44c24435..d974034b41b 100644
--- a/tests/libc/oracle/netdb_c.res.oracle
+++ b/tests/libc/oracle/netdb_c.res.oracle
@@ -233,7 +233,7 @@
                           gethostbyname <- main.
   Called from FRAMAC_SHARE/libc/netdb.c:103.
 [eva] Done for function Frama_C_char_interval
-[eva] FRAMAC_SHARE/libc/netdb.c:102: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/netdb.c:102: starting to merge loop iterations
 [eva] computing for function Frama_C_char_interval <- res_search <- 
                           gethostbyname <- main.
   Called from FRAMAC_SHARE/libc/netdb.c:103.
diff --git a/tests/libc/oracle/spawn_h.res.oracle b/tests/libc/oracle/spawn_h.res.oracle
index c1ee6d4f4e1..ced0dbaf69d 100644
--- a/tests/libc/oracle/spawn_h.res.oracle
+++ b/tests/libc/oracle/spawn_h.res.oracle
@@ -37,7 +37,7 @@
   Called from spawn_h.c:68.
 [eva] using specification for function posix_spawnattr_setsigmask
 [eva] Done for function posix_spawnattr_setsigmask
-[eva] spawn_h.c:36: starting to merge loop iterations
+[eva:partition] spawn_h.c:36: starting to merge loop iterations
 [eva] computing for function getopt <- main.
   Called from spawn_h.c:36.
 [eva] Done for function getopt
@@ -151,7 +151,7 @@
   Called from spawn_h.c:118.
 [eva] spawn_h.c:118: function printf_va_6: precondition got status valid.
 [eva] Done for function printf_va_6
-[eva] spawn_h.c:105: starting to merge loop iterations
+[eva:partition] spawn_h.c:105: starting to merge loop iterations
 [eva] computing for function waitpid <- main.
   Called from spawn_h.c:106.
 [eva] Done for function waitpid
diff --git a/tests/libc/oracle/stdio_c.res.oracle b/tests/libc/oracle/stdio_c.res.oracle
index 1ea318fc100..e96e300c562 100644
--- a/tests/libc/oracle/stdio_c.res.oracle
+++ b/tests/libc/oracle/stdio_c.res.oracle
@@ -65,14 +65,14 @@
 [eva] Done for function Frama_C_unsigned_char_interval
 [eva] Recording results for fgetc
 [eva] Done for function fgetc
-[eva] FRAMAC_SHARE/libc/stdio.c:85: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/stdio.c:85: starting to merge loop iterations
 [eva] FRAMAC_SHARE/libc/stdio.c:86: Reusing old results for call to fgetc
 [eva] FRAMAC_SHARE/libc/stdio.c:106: Call to builtin realloc
 [eva] FRAMAC_SHARE/libc/stdio.c:106: 
   function realloc: precondition 'freeable' got status valid.
 [eva:malloc:new] FRAMAC_SHARE/libc/stdio.c:106: 
   allocating variable __realloc_getline_l106
-[eva] FRAMAC_SHARE/libc/stdio.c:84: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/stdio.c:84: starting to merge loop iterations
 [eva] computing for function ferror <- getline <- main.
   Called from FRAMAC_SHARE/libc/stdio.c:84.
 [eva] Done for function ferror
@@ -122,7 +122,7 @@
 [eva:alarm] stdio_c.c:21: Warning: assertion 'read_bytes' got status unknown.
 [eva:alarm] stdio_c.c:22: Warning: 
   assertion 'allocated_enough' got status unknown.
-[eva] stdio_c.c:18: starting to merge loop iterations
+[eva:partition] stdio_c.c:18: starting to merge loop iterations
 [eva] computing for function getline <- main.
   Called from stdio_c.c:18.
 [eva] computing for function ferror <- getline <- main.
@@ -328,7 +328,7 @@
 [eva] FRAMAC_SHARE/libc/stdio.c:167: 
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
-[eva] FRAMAC_SHARE/libc/stdio.c:158: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/stdio.c:158: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- fgets <- main.
   Called from FRAMAC_SHARE/libc/stdio.c:161.
 [eva] Done for function Frama_C_interval
@@ -365,16 +365,16 @@
   Called from stdio_c.c:79.
 [eva] computing for function vfscanf <- vscanf <- caller_stub_for_vscanf <- main.
   Called from FRAMAC_SHARE/libc/stdio.c:513.
-[eva] FRAMAC_SHARE/libc/stdio.c:265: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/stdio.c:265: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- vfscanf <- vscanf <- 
                           caller_stub_for_vscanf <- main.
   Called from FRAMAC_SHARE/libc/stdio.c:350.
 [eva] FRAMAC_SHARE/libc/stdio.c:350: 
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
-[eva] FRAMAC_SHARE/libc/stdio.c:256: starting to merge loop iterations
-[eva] FRAMAC_SHARE/libc/stdio.c:280: starting to merge loop iterations
-[eva] FRAMAC_SHARE/libc/stdio.c:338: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/stdio.c:256: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/stdio.c:280: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/stdio.c:338: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- vfscanf <- vscanf <- 
                           caller_stub_for_vscanf <- main.
   Called from FRAMAC_SHARE/libc/stdio.c:350.
@@ -674,7 +674,7 @@
                        (tmp_31 from vararg)
 [eva:alarm] FRAMAC_SHARE/libc/stdio.c:256: Warning: 
   out of bounds read. assert \valid_read(p);
-[eva] FRAMAC_SHARE/libc/stdio.c:291: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/stdio.c:291: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- vfscanf <- vscanf <- 
                           caller_stub_for_vscanf <- main.
   Called from FRAMAC_SHARE/libc/stdio.c:350.
diff --git a/tests/libc/oracle/stdlib_c.0.res.oracle b/tests/libc/oracle/stdlib_c.0.res.oracle
index f5a26937b57..be4aa6d7da7 100644
--- a/tests/libc/oracle/stdlib_c.0.res.oracle
+++ b/tests/libc/oracle/stdlib_c.0.res.oracle
@@ -39,7 +39,7 @@
   resizing variable `__calloc_w_main_l33' (0..31) to fit 0..63
 [eva:alarm] stdlib_c.c:34: Warning: 
   out of bounds write. assert \valid(s + (size_t)(i - 1));
-[eva] stdlib_c.c:32: starting to merge loop iterations
+[eva:partition] stdlib_c.c:32: starting to merge loop iterations
 [eva] stdlib_c.c:33: Call to builtin Frama_C_calloc for function calloc
 [eva:malloc] stdlib_c.c:33: 
   resizing variable `__calloc_w_main_l33' (0..31/63) to fit 0..63/95
diff --git a/tests/libc/oracle/stdlib_c.1.res.oracle b/tests/libc/oracle/stdlib_c.1.res.oracle
index 134ac56939a..12f98f40e14 100644
--- a/tests/libc/oracle/stdlib_c.1.res.oracle
+++ b/tests/libc/oracle/stdlib_c.1.res.oracle
@@ -55,7 +55,7 @@
 [eva] stdlib_c.c:33: Call to builtin Frama_C_calloc for function calloc
 [eva:malloc] stdlib_c.c:33: 
   resizing variable `__calloc_w_main_l33' (0..31/159) to fit 0..191
-[eva] stdlib_c.c:32: starting to merge loop iterations
+[eva:partition] stdlib_c.c:32: starting to merge loop iterations
 [eva] stdlib_c.c:33: Call to builtin Frama_C_calloc for function calloc
 [eva:malloc] stdlib_c.c:33: 
   resizing variable `__calloc_w_main_l33' (0..31/191) to fit 0..191/223
diff --git a/tests/libc/oracle/stdlib_c.2.res.oracle b/tests/libc/oracle/stdlib_c.2.res.oracle
index f0788767157..17d53234f62 100644
--- a/tests/libc/oracle/stdlib_c.2.res.oracle
+++ b/tests/libc/oracle/stdlib_c.2.res.oracle
@@ -54,7 +54,7 @@
 [eva] Done for function memset
 [eva] Recording results for calloc
 [eva] Done for function calloc
-[eva] stdlib_c.c:32: starting to merge loop iterations
+[eva:partition] stdlib_c.c:32: starting to merge loop iterations
 [eva] computing for function calloc <- main.
   Called from stdlib_c.c:33.
 [eva] FRAMAC_SHARE/libc/stdlib.c:72: Call to builtin Frama_C_malloc
diff --git a/tests/libc/oracle/stdlib_c_env.res.oracle b/tests/libc/oracle/stdlib_c_env.res.oracle
index a345521cbb7..f5ee976586d 100644
--- a/tests/libc/oracle/stdlib_c_env.res.oracle
+++ b/tests/libc/oracle/stdlib_c_env.res.oracle
@@ -29,7 +29,7 @@
 [eva] FRAMAC_SHARE/libc/stdlib.c:93: 
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
-[eva] FRAMAC_SHARE/libc/stdlib.c:92: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/stdlib.c:92: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- __fc_initenv <- putenv <- main.
   Called from FRAMAC_SHARE/libc/stdlib.c:93.
 [eva] Done for function Frama_C_interval
diff --git a/tests/libc/oracle/string_c_generic.res.oracle b/tests/libc/oracle/string_c_generic.res.oracle
index 5f69195fdc5..8151dac4c39 100644
--- a/tests/libc/oracle/string_c_generic.res.oracle
+++ b/tests/libc/oracle/string_c_generic.res.oracle
@@ -160,7 +160,8 @@
   function strncpy: precondition 'room_nstring' got status valid.
 [eva] string_c_generic.c:73: 
   function strncpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.c:249: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/string.c:249: 
+  starting to merge loop iterations
 [eva] FRAMAC_SHARE/libc/string.h:453: 
   function strncpy: postcondition 'result_ptr' got status valid.
 [eva] FRAMAC_SHARE/libc/string.h:454: 
@@ -211,7 +212,8 @@
   function strncmp: precondition 'valid_string_s1' got status valid.
 [eva] string_c_generic.c:82: 
   function strncmp: precondition 'valid_string_s2' got status valid.
-[eva] FRAMAC_SHARE/libc/string.c:154: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/string.c:154: 
+  starting to merge loop iterations
 [eva] FRAMAC_SHARE/libc/string.h:197: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strncmp
 [eva:alarm] FRAMAC_SHARE/libc/string.h:197: Warning: 
@@ -323,7 +325,8 @@
 [eva] string_c_generic.c:94: 
   function strrchr: precondition 'valid_string_s' got status valid.
 [eva] FRAMAC_SHARE/libc/string.c:266: Reusing old results for call to strlen
-[eva] FRAMAC_SHARE/libc/string.c:266: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/string.c:266: 
+  starting to merge loop iterations
 [eva] Recording results for strrchr
 [eva] Done for function strrchr
 [eva] Recording results for main
diff --git a/tests/libc/oracle/string_c_strchr.res.oracle b/tests/libc/oracle/string_c_strchr.res.oracle
index f662ee9b679..ce87495a81e 100644
--- a/tests/libc/oracle/string_c_strchr.res.oracle
+++ b/tests/libc/oracle/string_c_strchr.res.oracle
@@ -4,8 +4,10 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] string_c_strchr.c:57: Trace partitioning superposing up to 100 states
-[eva] string_c_strchr.c:59: Trace partitioning superposing up to 200 states
+[eva:partition] string_c_strchr.c:57: 
+  Trace partitioning superposing up to 100 states
+[eva:partition] string_c_strchr.c:59: 
+  Trace partitioning superposing up to 200 states
 [eva] computing for function strchr <- main.
   Called from string_c_strchr.c:62.
 [eva] string_c_strchr.c:62: 
@@ -42,7 +44,7 @@
   Called from string_c_strchr.c:67.
 [eva] string_c_strchr.c:67: 
   function strchr: precondition 'valid_string_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.c:258: 
+[eva:partition] FRAMAC_SHARE/libc/string.c:258: 
   Trace partitioning superposing up to 100 states
 [eva] Recording results for strchr
 [eva] Done for function strchr
@@ -170,7 +172,7 @@
   Called from string_c_strchr.c:87.
 [eva] string_c_strchr.c:87: 
   function strchr: precondition 'valid_string_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.c:258: 
+[eva:partition] FRAMAC_SHARE/libc/string.c:258: 
   Trace partitioning superposing up to 200 states
 [eva] Recording results for strchr
 [eva] Done for function strchr
diff --git a/tests/libc/oracle/string_c_strstr.res.oracle b/tests/libc/oracle/string_c_strstr.res.oracle
index 8fd087fb990..dbe981b4489 100644
--- a/tests/libc/oracle/string_c_strstr.res.oracle
+++ b/tests/libc/oracle/string_c_strstr.res.oracle
@@ -68,7 +68,8 @@
   function strstr: precondition 'valid_string_haystack' got status valid.
 [eva] string_c_strstr.c:59: 
   function strstr: precondition 'valid_string_needle' got status valid.
-[eva] FRAMAC_SHARE/libc/string.c:306: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/string.c:306: 
+  starting to merge loop iterations
 [eva] Recording results for strstr
 [eva] Done for function strstr
 [eva] computing for function strstr <- main.
diff --git a/tests/libc/oracle/string_h.res.oracle b/tests/libc/oracle/string_h.res.oracle
index 098a1f4c9ae..6990b87fa3b 100644
--- a/tests/libc/oracle/string_h.res.oracle
+++ b/tests/libc/oracle/string_h.res.oracle
@@ -63,7 +63,7 @@
 [eva] Done for function test_strstr
 [eva] computing for function test_strncat <- main.
   Called from string_h.c:160.
-[eva] string_h.c:34: Trace partitioning superposing up to 100 states
+[eva:partition] string_h.c:34: Trace partitioning superposing up to 100 states
 [eva] computing for function strncat <- test_strncat <- main.
   Called from string_h.c:36.
 [eva] using specification for function strncat
diff --git a/tests/misc/oracle/audit-out.json b/tests/misc/oracle/audit-out.json
index 797055f81df..87a6533a183 100644
--- a/tests/misc/oracle/audit-out.json
+++ b/tests/misc/oracle/audit-out.json
@@ -47,7 +47,7 @@
         "garbled-mix:assigns", "garbled-mix:summary", "garbled-mix:write",
         "invalid-assigns", "loop-unroll:auto", "loop-unroll:missing",
         "loop-unroll:missing:for", "loop-unroll:partial", "malloc:weak",
-        "watchpoint"
+        "recursion", "watchpoint"
       ]
     }
   },
diff --git a/tests/misc/oracle/ulevel.res.oracle b/tests/misc/oracle/ulevel.res.oracle
index f80b3c79df1..573fb85e70d 100644
--- a/tests/misc/oracle/ulevel.res.oracle
+++ b/tests/misc/oracle/ulevel.res.oracle
@@ -2,8 +2,8 @@
 [eva] Analyzing a complete application starting at main
 [eva:initial-state] Values of globals at initialization
   
-[eva] ulevel.i:13: starting to merge loop iterations
-[eva] ulevel.i:12: starting to merge loop iterations
+[eva:partition] ulevel.i:13: starting to merge loop iterations
+[eva:partition] ulevel.i:12: starting to merge loop iterations
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   i ∈ {4}
diff --git a/tests/misc/oracle/widen_hints.2.res.oracle b/tests/misc/oracle/widen_hints.2.res.oracle
index 3666a12af95..2a74b4a7fad 100644
--- a/tests/misc/oracle/widen_hints.2.res.oracle
+++ b/tests/misc/oracle/widen_hints.2.res.oracle
@@ -11,26 +11,26 @@
   x ∈ {9}
   not_const ∈ {42}
 [eva:widen-hints] widen_hints.c:74: computing dynamic hints for statement 16
-[eva] widen_hints.c:75: starting to merge loop iterations
-[eva] widen_hints.c:74: starting to merge loop iterations
+[eva:partition] widen_hints.c:75: starting to merge loop iterations
+[eva:partition] widen_hints.c:74: starting to merge loop iterations
 [eva:widen-hints] widen_hints.c:90: computing dynamic hints for statement 30
-[eva] widen_hints.c:91: starting to merge loop iterations
-[eva] widen_hints.c:90: starting to merge loop iterations
+[eva:partition] widen_hints.c:91: starting to merge loop iterations
+[eva:partition] widen_hints.c:90: starting to merge loop iterations
 [eva:widen-hints] widen_hints.c:99: computing dynamic hints for statement 48
 [eva:widen-hints] widen_hints.c:99: 
   adding new base due to dynamic widen hint: ip, { 87 }
-[eva] widen_hints.c:100: starting to merge loop iterations
-[eva] widen_hints.c:99: starting to merge loop iterations
+[eva:partition] widen_hints.c:100: starting to merge loop iterations
+[eva:partition] widen_hints.c:99: starting to merge loop iterations
 [eva:widen-hints] widen_hints.c:109: computing dynamic hints for statement 67
 [eva:widen-hints] widen_hints.c:109: 
   adding new base due to dynamic widen hint: ip2, { 87 }
-[eva] widen_hints.c:110: starting to merge loop iterations
-[eva] widen_hints.c:109: starting to merge loop iterations
+[eva:partition] widen_hints.c:110: starting to merge loop iterations
+[eva:partition] widen_hints.c:109: starting to merge loop iterations
 [eva:widen-hints] widen_hints.c:120: computing dynamic hints for statement 91
 [eva:widen-hints] widen_hints.c:120: 
   adding new base due to dynamic widen hint: iarray, { 87 }
-[eva] widen_hints.c:120: starting to merge loop iterations
-[eva] widen_hints.c:118: starting to merge loop iterations
+[eva:partition] widen_hints.c:120: starting to merge loop iterations
+[eva:partition] widen_hints.c:118: starting to merge loop iterations
 [eva] computing for function using_dynamic_global <- main.
   Called from widen_hints.c:126.
 [eva:widen-hints] widen_hints.c:60: computing dynamic hints for statement 2
@@ -42,10 +42,10 @@
   Called from widen_hints.c:126.
 [eva] Recording results for using_dynamic_global
 [eva] Done for function using_dynamic_global
-[eva] widen_hints.c:125: starting to merge loop iterations
+[eva:partition] widen_hints.c:125: starting to merge loop iterations
 [eva] computing for function using_dynamic_global <- main.
   Called from widen_hints.c:126.
-[eva] widen_hints.c:60: starting to merge loop iterations
+[eva:partition] widen_hints.c:60: starting to merge loop iterations
 [eva] Recording results for using_dynamic_global
 [eva] Done for function using_dynamic_global
 [eva] computing for function using_dynamic_global <- main.
diff --git a/tests/misc/oracle/widen_hints.3.res.oracle b/tests/misc/oracle/widen_hints.3.res.oracle
index ad14f519cfb..36f486d9104 100644
--- a/tests/misc/oracle/widen_hints.3.res.oracle
+++ b/tests/misc/oracle/widen_hints.3.res.oracle
@@ -13,33 +13,33 @@
   x ∈ {9}
   not_const ∈ {42}
 [eva:widen-hints] widen_hints.c:74: computing dynamic hints for statement 36
-[eva] widen_hints.c:74: starting to merge loop iterations
-[eva] widen_hints.c:75: starting to merge loop iterations
+[eva:partition] widen_hints.c:74: starting to merge loop iterations
+[eva:partition] widen_hints.c:75: starting to merge loop iterations
 [eva:widen-hints] widen_hints.c:82: computing dynamic hints for statement 50
 [eva] computing for function f <- main.
   Called from widen_hints.c:82.
-[eva] widen_hints.c:43: starting to merge loop iterations
-[eva] widen_hints.c:44: starting to merge loop iterations
+[eva:partition] widen_hints.c:43: starting to merge loop iterations
+[eva:partition] widen_hints.c:44: starting to merge loop iterations
 [eva] Recording results for f
 [eva] Done for function f
 [eva:widen-hints] widen_hints.c:90: computing dynamic hints for statement 52
-[eva] widen_hints.c:90: starting to merge loop iterations
-[eva] widen_hints.c:91: starting to merge loop iterations
+[eva:partition] widen_hints.c:90: starting to merge loop iterations
+[eva:partition] widen_hints.c:91: starting to merge loop iterations
 [eva:widen-hints] widen_hints.c:99: computing dynamic hints for statement 70
 [eva:widen-hints] widen_hints.c:99: 
   adding new base due to dynamic widen hint: ip, { 87 }
-[eva] widen_hints.c:99: starting to merge loop iterations
-[eva] widen_hints.c:100: starting to merge loop iterations
+[eva:partition] widen_hints.c:99: starting to merge loop iterations
+[eva:partition] widen_hints.c:100: starting to merge loop iterations
 [eva:widen-hints] widen_hints.c:109: computing dynamic hints for statement 89
 [eva:widen-hints] widen_hints.c:109: 
   adding new base due to dynamic widen hint: ip2, { 87 }
-[eva] widen_hints.c:109: starting to merge loop iterations
-[eva] widen_hints.c:110: starting to merge loop iterations
+[eva:partition] widen_hints.c:109: starting to merge loop iterations
+[eva:partition] widen_hints.c:110: starting to merge loop iterations
 [eva:widen-hints] widen_hints.c:120: computing dynamic hints for statement 113
 [eva:widen-hints] widen_hints.c:120: 
   adding new base due to dynamic widen hint: iarray, { 87 }
-[eva] widen_hints.c:118: starting to merge loop iterations
-[eva] widen_hints.c:120: starting to merge loop iterations
+[eva:partition] widen_hints.c:118: starting to merge loop iterations
+[eva:partition] widen_hints.c:120: starting to merge loop iterations
 [eva] computing for function using_dynamic_global <- main.
   Called from widen_hints.c:126.
 [eva:widen-hints] widen_hints.c:60: computing dynamic hints for statement 22
@@ -47,10 +47,10 @@
   adding new base due to dynamic widen hint: outer_i, { 87 }
 [eva] Recording results for using_dynamic_global
 [eva] Done for function using_dynamic_global
-[eva] widen_hints.c:125: starting to merge loop iterations
+[eva:partition] widen_hints.c:125: starting to merge loop iterations
 [eva] computing for function using_dynamic_global <- main.
   Called from widen_hints.c:126.
-[eva] widen_hints.c:60: starting to merge loop iterations
+[eva:partition] widen_hints.c:60: starting to merge loop iterations
 [eva] Recording results for using_dynamic_global
 [eva] Done for function using_dynamic_global
 [eva] computing for function using_dynamic_global <- main.
diff --git a/tests/misc/oracle/widen_hints2.0.res.oracle b/tests/misc/oracle/widen_hints2.0.res.oracle
index 270bbf5e2d0..58bf3224c27 100644
--- a/tests/misc/oracle/widen_hints2.0.res.oracle
+++ b/tests/misc/oracle/widen_hints2.0.res.oracle
@@ -32,28 +32,28 @@
 [eva:widen-hints] widen_hints2.c:48: computing dynamic hints for statement 45
 [eva:widen-hints] widen_hints2.c:50: computing dynamic hints for statement 48
 [eva:widen-hints] widen_hints2.c:52: computing dynamic hints for statement 54
-[eva] widen_hints2.c:50: starting to merge loop iterations
-[eva] widen_hints2.c:52: starting to merge loop iterations
+[eva:partition] widen_hints2.c:50: starting to merge loop iterations
+[eva:partition] widen_hints2.c:52: starting to merge loop iterations
 [eva:widen-hints] widen_hints2.c:63: computing dynamic hints for statement 66
-[eva] widen_hints2.c:63: starting to merge loop iterations
-[eva] widen_hints2.c:64: starting to merge loop iterations
+[eva:partition] widen_hints2.c:63: starting to merge loop iterations
+[eva:partition] widen_hints2.c:64: starting to merge loop iterations
 [eva:widen-hints] widen_hints2.c:72: computing dynamic hints for statement 82
-[eva] widen_hints2.c:72: starting to merge loop iterations
-[eva] widen_hints2.c:73: starting to merge loop iterations
+[eva:partition] widen_hints2.c:72: starting to merge loop iterations
+[eva:partition] widen_hints2.c:73: starting to merge loop iterations
 [eva:widen-hints] widen_hints2.c:79: computing dynamic hints for statement 97
-[eva] widen_hints2.c:79: starting to merge loop iterations
-[eva] widen_hints2.c:80: starting to merge loop iterations
+[eva:partition] widen_hints2.c:79: starting to merge loop iterations
+[eva:partition] widen_hints2.c:80: starting to merge loop iterations
 [eva] computing for function f <- main.
   Called from widen_hints2.c:85.
 [eva:widen-hints] widen_hints2.c:22: computing dynamic hints for statement 4
-[eva] widen_hints2.c:22: starting to merge loop iterations
-[eva] widen_hints2.c:23: starting to merge loop iterations
+[eva:partition] widen_hints2.c:22: starting to merge loop iterations
+[eva:partition] widen_hints2.c:23: starting to merge loop iterations
 [eva] Recording results for f
 [eva] Done for function f
 [eva] computing for function g <- main.
   Called from widen_hints2.c:86.
-[eva] widen_hints2.c:34: starting to merge loop iterations
-[eva] widen_hints2.c:35: starting to merge loop iterations
+[eva:partition] widen_hints2.c:34: starting to merge loop iterations
+[eva:partition] widen_hints2.c:35: starting to merge loop iterations
 [eva] Recording results for g
 [eva] Done for function g
 [eva] Recording results for main
diff --git a/tests/misc/oracle/widen_hints_float.res.oracle b/tests/misc/oracle/widen_hints_float.res.oracle
index f32842ede00..529b432f147 100644
--- a/tests/misc/oracle/widen_hints_float.res.oracle
+++ b/tests/misc/oracle/widen_hints_float.res.oracle
@@ -15,19 +15,19 @@
 [eva] widen_hints_float.c:17: 
   function Frama_C_double_interval, behavior finite: precondition 'order' got status valid.
 [eva] Done for function Frama_C_double_interval
-[eva] widen_hints_float.c:20: starting to merge loop iterations
+[eva:partition] widen_hints_float.c:20: starting to merge loop iterations
 [eva] computing for function Frama_C_double_interval <- parabola <- main.
   Called from widen_hints_float.c:24.
 [eva] widen_hints_float.c:24: 
   function Frama_C_double_interval, behavior finite: precondition 'order' got status valid.
 [eva] Done for function Frama_C_double_interval
-[eva] widen_hints_float.c:27: starting to merge loop iterations
+[eva:partition] widen_hints_float.c:27: starting to merge loop iterations
 [eva] computing for function Frama_C_double_interval <- parabola <- main.
   Called from widen_hints_float.c:31.
 [eva] widen_hints_float.c:31: 
   function Frama_C_double_interval, behavior finite: precondition 'order' got status valid.
 [eva] Done for function Frama_C_double_interval
-[eva] widen_hints_float.c:33: starting to merge loop iterations
+[eva:partition] widen_hints_float.c:33: starting to merge loop iterations
 [eva:alarm] widen_hints_float.c:34: Warning: 
   non-finite double value.
   assert
@@ -45,7 +45,7 @@
 [eva] widen_hints_float.c:42: Call to builtin sin
 [eva] widen_hints_float.c:42: 
   function sin: precondition 'finite_arg' got status valid.
-[eva] widen_hints_float.c:41: starting to merge loop iterations
+[eva:partition] widen_hints_float.c:41: starting to merge loop iterations
 [eva] computing for function Frama_C_double_interval <- trigo <- main.
   Called from widen_hints_float.c:42.
 [eva] Done for function Frama_C_double_interval
@@ -75,7 +75,7 @@
 [eva] widen_hints_float.c:49: 
   function Frama_C_double_interval, behavior finite: precondition 'order' got status valid.
 [eva] Done for function Frama_C_double_interval
-[eva] widen_hints_float.c:48: starting to merge loop iterations
+[eva:partition] widen_hints_float.c:48: starting to merge loop iterations
 [eva] computing for function Frama_C_double_interval <- first_order_filter <- main.
   Called from widen_hints_float.c:49.
 [eva] Done for function Frama_C_double_interval
@@ -96,7 +96,7 @@
 [eva] widen_hints_float.c:54: 
   function Frama_C_double_interval, behavior finite: precondition 'order' got status valid.
 [eva] Done for function Frama_C_double_interval
-[eva] widen_hints_float.c:53: starting to merge loop iterations
+[eva:partition] widen_hints_float.c:53: starting to merge loop iterations
 [eva] computing for function Frama_C_double_interval <- first_order_filter <- main.
   Called from widen_hints_float.c:54.
 [eva] Done for function Frama_C_double_interval
@@ -116,8 +116,8 @@
 [eva] Done for function first_order_filter
 [eva] computing for function newton_sqrt <- main.
   Called from widen_hints_float.c:73.
-[eva] widen_hints_float.c:59: starting to merge loop iterations
-[eva] widen_hints_float.c:64: starting to merge loop iterations
+[eva:partition] widen_hints_float.c:59: starting to merge loop iterations
+[eva:partition] widen_hints_float.c:64: starting to merge loop iterations
 [eva] Recording results for newton_sqrt
 [eva] Done for function newton_sqrt
 [eva] Recording results for main
diff --git a/tests/pdg/oracle/annot.1.res.oracle b/tests/pdg/oracle/annot.1.res.oracle
index 8da8b690ebb..e6f01840cee 100644
--- a/tests/pdg/oracle/annot.1.res.oracle
+++ b/tests/pdg/oracle/annot.1.res.oracle
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   G ∈ {0}
 [eva:alarm] annot.c:22: Warning: loop invariant got status unknown.
-[eva] annot.c:25: starting to merge loop iterations
+[eva:partition] annot.c:25: starting to merge loop iterations
 [eva:alarm] annot.c:26: Warning: signed overflow. assert s + 2 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/pdg/oracle/dpds_intra.0.res.oracle b/tests/pdg/oracle/dpds_intra.0.res.oracle
index aeb0f129ba7..82593a1efb0 100644
--- a/tests/pdg/oracle/dpds_intra.0.res.oracle
+++ b/tests/pdg/oracle/dpds_intra.0.res.oracle
@@ -52,7 +52,7 @@
   (tmp_4 from test_goto_else())
 [eva] computing for function test_simple_loop <- main.
   Called from dpds_intra.c:131.
-[eva] dpds_intra.c:99: starting to merge loop iterations
+[eva:partition] dpds_intra.c:99: starting to merge loop iterations
 [eva:alarm] dpds_intra.c:100: Warning: 
   signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for test_simple_loop
diff --git a/tests/pdg/oracle/dpds_intra.1.res.oracle b/tests/pdg/oracle/dpds_intra.1.res.oracle
index 164f652335b..6f952baf40d 100644
--- a/tests/pdg/oracle/dpds_intra.1.res.oracle
+++ b/tests/pdg/oracle/dpds_intra.1.res.oracle
@@ -52,7 +52,7 @@
   (tmp_4 from test_goto_else())
 [eva] computing for function test_simple_loop <- main.
   Called from dpds_intra.c:131.
-[eva] dpds_intra.c:99: starting to merge loop iterations
+[eva:partition] dpds_intra.c:99: starting to merge loop iterations
 [eva:alarm] dpds_intra.c:100: Warning: 
   signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for test_simple_loop
diff --git a/tests/pdg/oracle/dpds_intra.2.res.oracle b/tests/pdg/oracle/dpds_intra.2.res.oracle
index 5cf673d3a93..8de5bdef853 100644
--- a/tests/pdg/oracle/dpds_intra.2.res.oracle
+++ b/tests/pdg/oracle/dpds_intra.2.res.oracle
@@ -52,7 +52,7 @@
   (tmp_4 from test_goto_else())
 [eva] computing for function test_simple_loop <- main.
   Called from dpds_intra.c:131.
-[eva] dpds_intra.c:99: starting to merge loop iterations
+[eva:partition] dpds_intra.c:99: starting to merge loop iterations
 [eva:alarm] dpds_intra.c:100: Warning: 
   signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for test_simple_loop
diff --git a/tests/pdg/oracle/dpds_intra.3.res.oracle b/tests/pdg/oracle/dpds_intra.3.res.oracle
index d7103d823dd..580d8e712a8 100644
--- a/tests/pdg/oracle/dpds_intra.3.res.oracle
+++ b/tests/pdg/oracle/dpds_intra.3.res.oracle
@@ -52,7 +52,7 @@
   (tmp_4 from test_goto_else())
 [eva] computing for function test_simple_loop <- main.
   Called from dpds_intra.c:131.
-[eva] dpds_intra.c:99: starting to merge loop iterations
+[eva:partition] dpds_intra.c:99: starting to merge loop iterations
 [eva:alarm] dpds_intra.c:100: Warning: 
   signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for test_simple_loop
diff --git a/tests/pdg/oracle/dpds_intra.4.res.oracle b/tests/pdg/oracle/dpds_intra.4.res.oracle
index 9056833fb6a..30556cd9a5c 100644
--- a/tests/pdg/oracle/dpds_intra.4.res.oracle
+++ b/tests/pdg/oracle/dpds_intra.4.res.oracle
@@ -52,7 +52,7 @@
   (tmp_4 from test_goto_else())
 [eva] computing for function test_simple_loop <- main.
   Called from dpds_intra.c:131.
-[eva] dpds_intra.c:99: starting to merge loop iterations
+[eva:partition] dpds_intra.c:99: starting to merge loop iterations
 [eva:alarm] dpds_intra.c:100: Warning: 
   signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for test_simple_loop
diff --git a/tests/pdg/oracle/dpds_intra.6.res.oracle b/tests/pdg/oracle/dpds_intra.6.res.oracle
index 3e78f042bf7..13f84aafad1 100644
--- a/tests/pdg/oracle/dpds_intra.6.res.oracle
+++ b/tests/pdg/oracle/dpds_intra.6.res.oracle
@@ -52,7 +52,7 @@
   (tmp_4 from test_goto_else())
 [eva] computing for function test_simple_loop <- main.
   Called from dpds_intra.c:131.
-[eva] dpds_intra.c:99: starting to merge loop iterations
+[eva:partition] dpds_intra.c:99: starting to merge loop iterations
 [eva:alarm] dpds_intra.c:100: Warning: 
   signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for test_simple_loop
diff --git a/tests/pdg/oracle/dpds_intra.7.res.oracle b/tests/pdg/oracle/dpds_intra.7.res.oracle
index 8c2148a6887..f62da4ef3cf 100644
--- a/tests/pdg/oracle/dpds_intra.7.res.oracle
+++ b/tests/pdg/oracle/dpds_intra.7.res.oracle
@@ -52,7 +52,7 @@
   (tmp_4 from test_goto_else())
 [eva] computing for function test_simple_loop <- main.
   Called from dpds_intra.c:131.
-[eva] dpds_intra.c:99: starting to merge loop iterations
+[eva:partition] dpds_intra.c:99: starting to merge loop iterations
 [eva:alarm] dpds_intra.c:100: Warning: 
   signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for test_simple_loop
diff --git a/tests/pdg/oracle/dpds_intra.8.res.oracle b/tests/pdg/oracle/dpds_intra.8.res.oracle
index ad08f6c261d..818690bbbf5 100644
--- a/tests/pdg/oracle/dpds_intra.8.res.oracle
+++ b/tests/pdg/oracle/dpds_intra.8.res.oracle
@@ -52,7 +52,7 @@
   (tmp_4 from test_goto_else())
 [eva] computing for function test_simple_loop <- main.
   Called from dpds_intra.c:131.
-[eva] dpds_intra.c:99: starting to merge loop iterations
+[eva:partition] dpds_intra.c:99: starting to merge loop iterations
 [eva:alarm] dpds_intra.c:100: Warning: 
   signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for test_simple_loop
diff --git a/tests/pdg/oracle/loops.0.res.oracle b/tests/pdg/oracle/loops.0.res.oracle
index f80ca93825b..aa1756957bd 100644
--- a/tests/pdg/oracle/loops.0.res.oracle
+++ b/tests/pdg/oracle/loops.0.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   after ∈ [--..--]
-[eva] loops.c:41: starting to merge loop iterations
+[eva:partition] loops.c:41: starting to merge loop iterations
 [eva:alarm] loops.c:42: Warning: signed overflow. assert s + 2 ≤ 2147483647;
 [eva] Recording results for simple
 [eva] Done for function simple
diff --git a/tests/pdg/oracle/loops.1.res.oracle b/tests/pdg/oracle/loops.1.res.oracle
index ca556ac6f01..3761f0fe9c7 100644
--- a/tests/pdg/oracle/loops.1.res.oracle
+++ b/tests/pdg/oracle/loops.1.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   after ∈ [--..--]
-[eva] loops.c:51: starting to merge loop iterations
+[eva:partition] loops.c:51: starting to merge loop iterations
 [eva:alarm] loops.c:53: Warning: signed overflow. assert s + 2 ≤ 2147483647;
 [eva] Recording results for simple_with_break
 [eva] Done for function simple_with_break
diff --git a/tests/pdg/oracle/loops.2.res.oracle b/tests/pdg/oracle/loops.2.res.oracle
index ee9a26d792d..4bc98d4bfe4 100644
--- a/tests/pdg/oracle/loops.2.res.oracle
+++ b/tests/pdg/oracle/loops.2.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   after ∈ [--..--]
-[eva] loops.c:65: starting to merge loop iterations
+[eva:partition] loops.c:65: starting to merge loop iterations
 [eva:alarm] loops.c:66: Warning: signed overflow. assert s + 2 ≤ 2147483647;
 [eva:alarm] loops.c:67: Warning: signed overflow. assert i + 1 ≤ 2147483647;
 [eva] Recording results for infinite
diff --git a/tests/pdg/oracle/loops.3.res.oracle b/tests/pdg/oracle/loops.3.res.oracle
index 02d5866e739..012fa109855 100644
--- a/tests/pdg/oracle/loops.3.res.oracle
+++ b/tests/pdg/oracle/loops.3.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   after ∈ [--..--]
-[eva] loops.c:75: starting to merge loop iterations
+[eva:partition] loops.c:75: starting to merge loop iterations
 [eva:alarm] loops.c:76: Warning: signed overflow. assert s + 2 ≤ 2147483647;
 [eva] Recording results for infinite2
 [eva] Done for function infinite2
diff --git a/tests/pdg/oracle/loops.4.res.oracle b/tests/pdg/oracle/loops.4.res.oracle
index 6595f2a76ee..a65e7652c3b 100644
--- a/tests/pdg/oracle/loops.4.res.oracle
+++ b/tests/pdg/oracle/loops.4.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   after ∈ [--..--]
-[eva] loops.c:84: starting to merge loop iterations
+[eva:partition] loops.c:84: starting to merge loop iterations
 [eva:alarm] loops.c:88: Warning: signed overflow. assert i + 2 ≤ 2147483647;
 [eva] Recording results for maybe_infinite
 [eva] Done for function maybe_infinite
diff --git a/tests/pdg/oracle/loops.5.res.oracle b/tests/pdg/oracle/loops.5.res.oracle
index 63c95719e2f..f7df38aa530 100644
--- a/tests/pdg/oracle/loops.5.res.oracle
+++ b/tests/pdg/oracle/loops.5.res.oracle
@@ -4,9 +4,9 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   after ∈ [--..--]
-[eva] loops.c:99: starting to merge loop iterations
+[eva:partition] loops.c:99: starting to merge loop iterations
 [eva:alarm] loops.c:110: Warning: signed overflow. assert i1 + 2 ≤ 2147483647;
-[eva] loops.c:105: starting to merge loop iterations
+[eva:partition] loops.c:105: starting to merge loop iterations
 [eva:alarm] loops.c:106: Warning: signed overflow. assert i2 + 1 ≤ 2147483647;
 [eva] Recording results for two_infinite_loops
 [eva] Done for function two_infinite_loops
diff --git a/tests/pdg/oracle/no_body.res.oracle b/tests/pdg/oracle/no_body.res.oracle
index 64da29a0597..4b1547c9ed4 100644
--- a/tests/pdg/oracle/no_body.res.oracle
+++ b/tests/pdg/oracle/no_body.res.oracle
@@ -17,7 +17,7 @@
   Called from no_body.c:16.
 [eva] Done for function f
 [eva:alarm] no_body.c:18: Warning: signed overflow. assert G + 1 ≤ 2147483647;
-[eva] no_body.c:16: starting to merge loop iterations
+[eva:partition] no_body.c:16: starting to merge loop iterations
 [eva] computing for function f <- loop <- main.
   Called from no_body.c:16.
 [eva] Done for function f
diff --git a/tests/pdg/oracle/pb_infinite_loop.0.res.oracle b/tests/pdg/oracle/pb_infinite_loop.0.res.oracle
index 4ffcf852c14..4f12f79c10f 100644
--- a/tests/pdg/oracle/pb_infinite_loop.0.res.oracle
+++ b/tests/pdg/oracle/pb_infinite_loop.0.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   G ∈ [--..--]
-[eva] pb_infinite_loop.c:20: starting to merge loop iterations
+[eva:partition] pb_infinite_loop.c:20: starting to merge loop iterations
 [eva:alarm] pb_infinite_loop.c:23: Warning: 
   signed overflow. assert i + 1 ≤ 2147483647;
 [eva:alarm] pb_infinite_loop.c:22: Warning: 
diff --git a/tests/pdg/oracle/pb_infinite_loop.1.res.oracle b/tests/pdg/oracle/pb_infinite_loop.1.res.oracle
index e83aa50ccc5..f70c76d3fca 100644
--- a/tests/pdg/oracle/pb_infinite_loop.1.res.oracle
+++ b/tests/pdg/oracle/pb_infinite_loop.1.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   G ∈ [--..--]
-[eva] pb_infinite_loop.c:32: starting to merge loop iterations
+[eva:partition] pb_infinite_loop.c:32: starting to merge loop iterations
 [eva:alarm] pb_infinite_loop.c:34: Warning: 
   signed overflow. assert G + 1 ≤ 2147483647;
 [eva:alarm] pb_infinite_loop.c:35: Warning: 
diff --git a/tests/pdg/oracle/postdom.res.oracle b/tests/pdg/oracle/postdom.res.oracle
index 98f69a4410c..7fc5b6696d7 100644
--- a/tests/pdg/oracle/postdom.res.oracle
+++ b/tests/pdg/oracle/postdom.res.oracle
@@ -8,7 +8,7 @@
   Called from postdom.c:23.
 [eva] Recording results for __VERIFIER_assert
 [eva] Done for function __VERIFIER_assert
-[eva] postdom.c:20: starting to merge loop iterations
+[eva:partition] postdom.c:20: starting to merge loop iterations
 [eva] computing for function __VERIFIER_assert <- main.
   Called from postdom.c:23.
 [eva] Recording results for __VERIFIER_assert
diff --git a/tests/pdg/oracle/simple_call.1.res.oracle b/tests/pdg/oracle/simple_call.1.res.oracle
index 1dc23005ff8..57e504441ae 100644
--- a/tests/pdg/oracle/simple_call.1.res.oracle
+++ b/tests/pdg/oracle/simple_call.1.res.oracle
@@ -13,7 +13,7 @@
   signed overflow. assert G + y ≤ 2147483647;
 [eva] Recording results for call
 [eva] Done for function call
-[eva] simple_call.c:51: starting to merge loop iterations
+[eva:partition] simple_call.c:51: starting to merge loop iterations
 [eva] computing for function call <- call_in_loop.
   Called from simple_call.c:52.
 [eva] Recording results for call
diff --git a/tests/pdg/oracle/simple_intra_slice.res.oracle b/tests/pdg/oracle/simple_intra_slice.res.oracle
index ccf3e7bbca9..01227dfa2e8 100644
--- a/tests/pdg/oracle/simple_intra_slice.res.oracle
+++ b/tests/pdg/oracle/simple_intra_slice.res.oracle
@@ -10,14 +10,14 @@
   S2 ∈ {0}
 [eva:alarm] simple_intra_slice.c:99: Warning: 
   signed overflow. assert -2147483648 ≤ uninit - 1;
-[eva] simple_intra_slice.c:98: starting to merge loop iterations
+[eva:partition] simple_intra_slice.c:98: starting to merge loop iterations
 [eva:alarm] simple_intra_slice.c:99: Warning: 
   signed overflow. assert -2147483648 ≤ Unknown - 1;
 [eva:alarm] simple_intra_slice.c:99: Warning: 
   signed overflow. assert Unknown + 1 ≤ 2147483647;
 [eva:alarm] simple_intra_slice.c:101: Warning: 
   signed overflow. assert -2147483648 ≤ uninit2 - 1;
-[eva] simple_intra_slice.c:100: starting to merge loop iterations
+[eva:partition] simple_intra_slice.c:100: starting to merge loop iterations
 [eva:alarm] simple_intra_slice.c:101: Warning: 
   signed overflow. assert S.a + 1 ≤ 2147483647;
 [eva:alarm] simple_intra_slice.c:101: Warning: 
diff --git a/tests/pdg/oracle/top_pdg_input.res.oracle b/tests/pdg/oracle/top_pdg_input.res.oracle
index 426525eb91b..270ff3f805b 100644
--- a/tests/pdg/oracle/top_pdg_input.res.oracle
+++ b/tests/pdg/oracle/top_pdg_input.res.oracle
@@ -32,7 +32,7 @@
   Called from top_pdg_input.c:40.
 [eva:alarm] top_pdg_input.c:31: Warning: 
   out of bounds read. assert \valid_read(q);
-[eva] top_pdg_input.c:31: starting to merge loop iterations
+[eva:partition] top_pdg_input.c:31: starting to merge loop iterations
 [eva:alarm] top_pdg_input.c:31: Warning: 
   signed overflow. assert k + 1 ≤ 2147483647;
 [eva] Recording results for strlen
diff --git a/tests/rte/oracle/value_rte.res.oracle b/tests/rte/oracle/value_rte.res.oracle
index b89b879da84..ee1ec8eedd4 100644
--- a/tests/rte/oracle/value_rte.res.oracle
+++ b/tests/rte/oracle/value_rte.res.oracle
@@ -11,7 +11,7 @@
 [eva] Done for function getchar
 [eva] value_rte.c:13: assertion 'rte,index_bound' got status valid.
 [eva] value_rte.c:15: assertion 'rte,signed_overflow' got status valid.
-[eva] value_rte.c:11: starting to merge loop iterations
+[eva:partition] value_rte.c:11: starting to merge loop iterations
 [eva] computing for function getchar <- main.
   Called from value_rte.c:12.
 [eva] Done for function getchar
diff --git a/tests/saveload/oracle/basic_sav.1.res b/tests/saveload/oracle/basic_sav.1.res
index 1d94311d170..4bbe7c80a48 100644
--- a/tests/saveload/oracle/basic_sav.1.res
+++ b/tests/saveload/oracle/basic_sav.1.res
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   
 [eva] basic.i:20: assertion got status valid.
-[eva] basic.i:21: starting to merge loop iterations
+[eva:partition] basic.i:21: starting to merge loop iterations
 [eva:alarm] basic.i:21: Warning: signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/tests/saveload/oracle/basic_sav.res b/tests/saveload/oracle/basic_sav.res
index 1d94311d170..4bbe7c80a48 100644
--- a/tests/saveload/oracle/basic_sav.res
+++ b/tests/saveload/oracle/basic_sav.res
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   
 [eva] basic.i:20: assertion got status valid.
-[eva] basic.i:21: starting to merge loop iterations
+[eva:partition] basic.i:21: starting to merge loop iterations
 [eva:alarm] basic.i:21: Warning: signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/tests/saveload/oracle/bool_sav.res b/tests/saveload/oracle/bool_sav.res
index 56bc2f79e2b..15f228c19e0 100644
--- a/tests/saveload/oracle/bool_sav.res
+++ b/tests/saveload/oracle/bool_sav.res
@@ -8,7 +8,7 @@
 [eva] computing for function f <- main.
   Called from bool.c:27.
 [eva] bool.c:19: assertion got status valid.
-[eva] bool.c:20: starting to merge loop iterations
+[eva:partition] bool.c:20: starting to merge loop iterations
 [eva:alarm] bool.c:20: Warning: signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for f
 [eva] Done for function f
diff --git a/tests/saveload/oracle/deps_sav.res b/tests/saveload/oracle/deps_sav.res
index 21216900043..a71733a9578 100644
--- a/tests/saveload/oracle/deps_sav.res
+++ b/tests/saveload/oracle/deps_sav.res
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] deps.i:21: starting to merge loop iterations
+[eva:partition] deps.i:21: starting to merge loop iterations
 [eva:alarm] deps.i:21: Warning: signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/tests/saveload/oracle/segfault_datatypes_sav.res b/tests/saveload/oracle/segfault_datatypes_sav.res
index 4fae77424ce..57c747f276a 100644
--- a/tests/saveload/oracle/segfault_datatypes_sav.res
+++ b/tests/saveload/oracle/segfault_datatypes_sav.res
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] segfault_datatypes.i:14: starting to merge loop iterations
+[eva:partition] segfault_datatypes.i:14: starting to merge loop iterations
 [eva:alarm] segfault_datatypes.i:14: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for main
diff --git a/tests/scope/oracle/bts383.res.oracle b/tests/scope/oracle/bts383.res.oracle
index 975b6c1a98e..267972141e5 100644
--- a/tests/scope/oracle/bts383.res.oracle
+++ b/tests/scope/oracle/bts383.res.oracle
@@ -24,13 +24,13 @@
   Called from bts383.c:60.
 [eva:alarm] bts383.c:20: Warning: out of bounds read. assert \valid_read(p);
 [eva:alarm] bts383.c:22: Warning: out of bounds read. assert \valid_read(p);
-[eva] bts383.c:21: starting to merge loop iterations
+[eva:partition] bts383.c:21: starting to merge loop iterations
 [eva] Recording results for loop1
 [eva] Done for function loop1
 [eva] computing for function loop2 <- main.
   Called from bts383.c:61.
 [eva:alarm] bts383.c:28: Warning: out of bounds read. assert \valid_read(p);
-[eva] bts383.c:27: starting to merge loop iterations
+[eva:partition] bts383.c:27: starting to merge loop iterations
 [eva:alarm] bts383.c:30: Warning: out of bounds read. assert \valid_read(p);
 [eva] Recording results for loop2
 [eva] Done for function loop2
@@ -45,7 +45,7 @@
   Called from bts383.c:36.
 [eva] using specification for function out_char
 [eva] Done for function out_char
-[eva] bts383.c:35: starting to merge loop iterations
+[eva:partition] bts383.c:35: starting to merge loop iterations
 [eva] computing for function out_char <- out_string <- main.
   Called from bts383.c:36.
 [eva] Done for function out_char
diff --git a/tests/scope/oracle/scope.2.res.oracle b/tests/scope/oracle/scope.2.res.oracle
index 6243d609fc1..8c740956e7a 100644
--- a/tests/scope/oracle/scope.2.res.oracle
+++ b/tests/scope/oracle/scope.2.res.oracle
@@ -6,7 +6,7 @@
   S1 ∈ {0}
   S2 ∈ {0}
   T[0..99] ∈ {0}
-[eva] scope.c:67: starting to merge loop iterations
+[eva:partition] scope.c:67: starting to merge loop iterations
 [eva:alarm] scope.c:68: Warning: signed overflow. assert a + 1 ≤ 2147483647;
 [eva:alarm] scope.c:69: Warning: signed overflow. assert b + 1 ≤ 2147483647;
 [eva:alarm] scope.c:70: Warning: signed overflow. assert s + 1 ≤ 2147483647;
diff --git a/tests/slicing/oracle/adpcm.1.res.oracle b/tests/slicing/oracle/adpcm.1.res.oracle
index 3898e3397e1..42d69b1ed60 100644
--- a/tests/slicing/oracle/adpcm.1.res.oracle
+++ b/tests/slicing/oracle/adpcm.1.res.oracle
@@ -378,7 +378,7 @@
   compressed[0..9] ∈ {0}
 [eva] computing for function encode <- main.
   Called from adpcm.c:608.
-[eva] adpcm.c:277: starting to merge loop iterations
+[eva:partition] adpcm.c:277: starting to merge loop iterations
 [eva:alarm] adpcm.c:278: Warning: 
   out of bounds read. assert \valid_read(tmp_3);
                       (tmp_3 from tqmf_ptr++)
@@ -402,7 +402,7 @@
 [eva:alarm] adpcm.c:283: Warning: 
   out of bounds read. assert \valid_read(tmp_9);
                       (tmp_9 from h_ptr++)
-[eva] adpcm.c:288: starting to merge loop iterations
+[eva:partition] adpcm.c:288: starting to merge loop iterations
 [eva:alarm] adpcm.c:288: Warning: 
   out of bounds read. assert \valid_read(tmp_11);
                       (tmp_11 from tqmf_ptr1--)
@@ -415,7 +415,7 @@
 [eva:alarm] adpcm.c:290: Warning: out of bounds write. assert \valid(tqmf_ptr);
 [eva] computing for function filtez <- encode <- main.
   Called from adpcm.c:301.
-[eva] adpcm.c:418: starting to merge loop iterations
+[eva:partition] adpcm.c:418: starting to merge loop iterations
 [eva:alarm] adpcm.c:419: Warning: 
   out of bounds read. assert \valid_read(tmp_1);
                       (tmp_1 from bpl++)
@@ -434,7 +434,7 @@
   Called from adpcm.c:444.
 [eva] Recording results for abs
 [eva] Done for function abs
-[eva] adpcm.c:453: starting to merge loop iterations
+[eva:partition] adpcm.c:453: starting to merge loop iterations
 [eva] Recording results for quantl
 [eva] Done for function quantl
 [eva] computing for function logscl <- encode <- main.
@@ -447,7 +447,7 @@
 [eva] Done for function scalel
 [eva] computing for function upzero <- encode <- main.
   Called from adpcm.c:331.
-[eva] adpcm.c:506: starting to merge loop iterations
+[eva:partition] adpcm.c:506: starting to merge loop iterations
 [eva] Recording results for upzero
 [eva] Done for function upzero
 [eva] computing for function uppol2 <- encode <- main.
@@ -481,7 +481,7 @@
 [eva] adpcm.c:262: function encode: postcondition got status valid.
 [eva] Recording results for encode
 [eva] Done for function encode
-[eva] adpcm.c:607: starting to merge loop iterations
+[eva:partition] adpcm.c:607: starting to merge loop iterations
 [eva] computing for function encode <- main.
   Called from adpcm.c:608.
 [eva:alarm] adpcm.c:278: Warning: 
@@ -547,7 +547,7 @@
 [eva] Done for function scalel
 [eva] computing for function upzero <- encode <- main.
   Called from adpcm.c:331.
-[eva] adpcm.c:512: starting to merge loop iterations
+[eva:partition] adpcm.c:512: starting to merge loop iterations
 [eva:alarm] adpcm.c:514: Warning: 
   signed overflow. assert 255L * (long)*(bli + i) ≤ 2147483647;
 [eva] Recording results for upzero
diff --git a/tests/slicing/oracle/bts1768.res.oracle b/tests/slicing/oracle/bts1768.res.oracle
index 6af07bc4453..5c9f5549e21 100644
--- a/tests/slicing/oracle/bts1768.res.oracle
+++ b/tests/slicing/oracle/bts1768.res.oracle
@@ -73,7 +73,7 @@
   Called from bts1768.i:46.
 [eva] Recording results for fsm_transition
 [eva] Done for function fsm_transition
-[eva] bts1768.i:44: starting to merge loop iterations
+[eva:partition] bts1768.i:44: starting to merge loop iterations
 [eva] bts1768.i:45: Reusing old results for call to lecture
 [eva] computing for function fsm_transition <- main.
   Called from bts1768.i:46.
diff --git a/tests/slicing/oracle/bts336.5.res.oracle b/tests/slicing/oracle/bts336.5.res.oracle
index 47c32321197..7954ece6a64 100644
--- a/tests/slicing/oracle/bts336.5.res.oracle
+++ b/tests/slicing/oracle/bts336.5.res.oracle
@@ -35,7 +35,7 @@
 [from] Computing for function f4
 [from] Done for function f4
 [eva] Done for function f4
-[eva] bts336.i:77: starting to merge loop iterations
+[eva:partition] bts336.i:77: starting to merge loop iterations
 [eva] computing for function f4 <- main4.
   Called from bts336.i:78.
 [eva] Recording results for f4
diff --git a/tests/slicing/oracle/bts336.6.res.oracle b/tests/slicing/oracle/bts336.6.res.oracle
index b8ff3b8765d..30b06e4d5aa 100644
--- a/tests/slicing/oracle/bts336.6.res.oracle
+++ b/tests/slicing/oracle/bts336.6.res.oracle
@@ -35,7 +35,7 @@
 [from] Computing for function f4
 [from] Done for function f4
 [eva] Done for function f4
-[eva] bts336.i:77: starting to merge loop iterations
+[eva:partition] bts336.i:77: starting to merge loop iterations
 [eva] computing for function f4 <- main4.
   Called from bts336.i:78.
 [eva] Recording results for f4
diff --git a/tests/slicing/oracle/bts709.res.oracle b/tests/slicing/oracle/bts709.res.oracle
index 1607e1cc847..c0dce2dda41 100644
--- a/tests/slicing/oracle/bts709.res.oracle
+++ b/tests/slicing/oracle/bts709.res.oracle
@@ -34,7 +34,7 @@
 [eva] Done for function __FC_assert
 [eva] Recording results for func
 [eva] Done for function func
-[eva] bts709.c:46: starting to merge loop iterations
+[eva:partition] bts709.c:46: starting to merge loop iterations
 [eva] bts709.c:47: Reusing old results for call to inputsOf_testcase_func
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/tests/slicing/oracle/call_demo.0.res.oracle b/tests/slicing/oracle/call_demo.0.res.oracle
index a6b181a272f..514c57b3862 100644
--- a/tests/slicing/oracle/call_demo.0.res.oracle
+++ b/tests/slicing/oracle/call_demo.0.res.oracle
@@ -9,7 +9,7 @@
   Called from call_demo.i:23.
 [eva] Recording results for oper
 [eva] Done for function oper
-[eva] call_demo.i:22: starting to merge loop iterations
+[eva:partition] call_demo.i:22: starting to merge loop iterations
 [eva] computing for function oper <- main.
   Called from call_demo.i:23.
 [eva] Recording results for oper
diff --git a/tests/slicing/oracle/call_demo.1.res.oracle b/tests/slicing/oracle/call_demo.1.res.oracle
index ba418bf4634..c0fb77c2c1a 100644
--- a/tests/slicing/oracle/call_demo.1.res.oracle
+++ b/tests/slicing/oracle/call_demo.1.res.oracle
@@ -9,7 +9,7 @@
   Called from call_demo.i:23.
 [eva] Recording results for oper
 [eva] Done for function oper
-[eva] call_demo.i:22: starting to merge loop iterations
+[eva:partition] call_demo.i:22: starting to merge loop iterations
 [eva] computing for function oper <- main.
   Called from call_demo.i:23.
 [eva] Recording results for oper
diff --git a/tests/slicing/oracle/callwise.res.oracle b/tests/slicing/oracle/callwise.res.oracle
index 8ee91a61577..d9140a749e2 100644
--- a/tests/slicing/oracle/callwise.res.oracle
+++ b/tests/slicing/oracle/callwise.res.oracle
@@ -70,7 +70,7 @@
 [from] Computing for function fs163_f
 [from] Done for function fs163_f
 [eva] Done for function fs163_f
-[eva] callwise.i:29: starting to merge loop iterations
+[eva:partition] callwise.i:29: starting to merge loop iterations
 [eva] computing for function fs163_f <- fs163_main <- main.
   Called from callwise.i:30.
 [eva] Recording results for fs163_f
diff --git a/tests/slicing/oracle/csmith.0.res.oracle b/tests/slicing/oracle/csmith.0.res.oracle
index 295eb326ffc..be755594b65 100644
--- a/tests/slicing/oracle/csmith.0.res.oracle
+++ b/tests/slicing/oracle/csmith.0.res.oracle
@@ -45,7 +45,7 @@
 [eva] Done for function bts879b
 [eva] computing for function bts899 <- main.
   Called from csmith.i:243.
-[eva] csmith.i:135: starting to merge loop iterations
+[eva:partition] csmith.i:135: starting to merge loop iterations
 [eva:alarm] csmith.i:141: Warning: signed overflow. assert x + 1 ≤ 2147483647;
 [eva] Recording results for bts899
 [eva] Done for function bts899
@@ -54,8 +54,8 @@
                    (tmp_5 from bts899())
 [eva] computing for function bts906 <- main.
   Called from csmith.i:244.
-[eva] csmith.i:149: starting to merge loop iterations
-[eva] csmith.i:150: starting to merge loop iterations
+[eva:partition] csmith.i:149: starting to merge loop iterations
+[eva:partition] csmith.i:150: starting to merge loop iterations
 [eva] Recording results for bts906
 [eva] Done for function bts906
 [eva:alarm] csmith.i:244: Warning: 
@@ -63,8 +63,8 @@
                    (tmp_6 from bts906())
 [eva] computing for function bts906b <- main.
   Called from csmith.i:245.
-[eva] csmith.i:168: starting to merge loop iterations
-[eva] csmith.i:169: starting to merge loop iterations
+[eva:partition] csmith.i:168: starting to merge loop iterations
+[eva:partition] csmith.i:169: starting to merge loop iterations
 [eva] Recording results for bts906b
 [eva] Done for function bts906b
 [eva:alarm] csmith.i:245: Warning: 
@@ -72,7 +72,7 @@
                    (tmp_7 from bts906b())
 [eva] computing for function bts963 <- main.
   Called from csmith.i:247.
-[eva] csmith.i:211: starting to merge loop iterations
+[eva:partition] csmith.i:211: starting to merge loop iterations
 [eva] Recording results for bts963
 [eva] Done for function bts963
 [eva:alarm] csmith.i:247: Warning: 
@@ -80,7 +80,7 @@
                    (tmp_8 from bts963())
 [eva] computing for function bts963b <- main.
   Called from csmith.i:248.
-[eva] csmith.i:223: starting to merge loop iterations
+[eva:partition] csmith.i:223: starting to merge loop iterations
 [eva] Recording results for bts963b
 [eva] Done for function bts963b
 [eva:alarm] csmith.i:248: Warning: 
diff --git a/tests/slicing/oracle/csmith.1.res.oracle b/tests/slicing/oracle/csmith.1.res.oracle
index 4b6f0d9b8f2..2e2d83f7f3a 100644
--- a/tests/slicing/oracle/csmith.1.res.oracle
+++ b/tests/slicing/oracle/csmith.1.res.oracle
@@ -6,8 +6,8 @@
   G1 ∈ {0}
   G1b ∈ {0}
   G2 ∈ {0}
-[eva] csmith.i:168: starting to merge loop iterations
-[eva] csmith.i:169: starting to merge loop iterations
+[eva:partition] csmith.i:168: starting to merge loop iterations
+[eva:partition] csmith.i:169: starting to merge loop iterations
 [eva] Recording results for bts906b
 [eva] Done for function bts906b
 [pdg] computing for function bts906b
diff --git a/tests/slicing/oracle/csmith.2.res.oracle b/tests/slicing/oracle/csmith.2.res.oracle
index cb88caa67b8..be9e4354f5c 100644
--- a/tests/slicing/oracle/csmith.2.res.oracle
+++ b/tests/slicing/oracle/csmith.2.res.oracle
@@ -6,8 +6,8 @@
   G1 ∈ {0}
   G1b ∈ {0}
   G2 ∈ {0}
-[eva] csmith.i:189: starting to merge loop iterations
-[eva] csmith.i:190: starting to merge loop iterations
+[eva:partition] csmith.i:189: starting to merge loop iterations
+[eva:partition] csmith.i:190: starting to merge loop iterations
 [eva] Recording results for bts906c
 [eva] Done for function bts906c
 [pdg] computing for function bts906c
diff --git a/tests/slicing/oracle/forall_loop_invariant.res.oracle b/tests/slicing/oracle/forall_loop_invariant.res.oracle
index 6ae3838a4a3..9c9fab30299 100644
--- a/tests/slicing/oracle/forall_loop_invariant.res.oracle
+++ b/tests/slicing/oracle/forall_loop_invariant.res.oracle
@@ -9,7 +9,7 @@
 [eva] forall_loop_invariant.i:10: loop invariant got status valid.
 [eva] forall_loop_invariant.i:11: loop invariant got status valid.
 [eva] forall_loop_invariant.i:12: loop invariant got status valid.
-[eva] forall_loop_invariant.i:14: starting to merge loop iterations
+[eva:partition] forall_loop_invariant.i:14: starting to merge loop iterations
 [eva:alarm] forall_loop_invariant.i:11: Warning: 
   loop invariant got status unknown.
 [eva:alarm] forall_loop_invariant.i:12: Warning: 
diff --git a/tests/slicing/oracle/horwitz.res.oracle b/tests/slicing/oracle/horwitz.res.oracle
index 82663aa59e4..fb1ac4790f7 100644
--- a/tests/slicing/oracle/horwitz.res.oracle
+++ b/tests/slicing/oracle/horwitz.res.oracle
@@ -20,7 +20,7 @@
 [eva] Done for function incr
 [eva] Recording results for A
 [eva] Done for function A
-[eva] horwitz.i:26: starting to merge loop iterations
+[eva:partition] horwitz.i:26: starting to merge loop iterations
 [eva] computing for function A <- main.
   Called from horwitz.i:27.
 [eva] computing for function add <- A <- main.
diff --git a/tests/slicing/oracle/if_many_values.res.oracle b/tests/slicing/oracle/if_many_values.res.oracle
index 7aab4ae3048..76d39dae06a 100644
--- a/tests/slicing/oracle/if_many_values.res.oracle
+++ b/tests/slicing/oracle/if_many_values.res.oracle
@@ -5,8 +5,9 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   r ∈ {1}
-[eva] if_many_values.i:8: Trace partitioning superposing up to 100 states
-[eva] if_many_values.i:8: starting to merge loop iterations
+[eva:partition] if_many_values.i:8: 
+  Trace partitioning superposing up to 100 states
+[eva:partition] if_many_values.i:8: starting to merge loop iterations
 [eva:alarm] if_many_values.i:11: Warning: 
   signed overflow. assert r + 1 ≤ 2147483647;
 [eva] Recording results for main
diff --git a/tests/slicing/oracle/keep_annot.0.res.oracle b/tests/slicing/oracle/keep_annot.0.res.oracle
index 3fb1a5f9a13..aa58412131a 100644
--- a/tests/slicing/oracle/keep_annot.0.res.oracle
+++ b/tests/slicing/oracle/keep_annot.0.res.oracle
@@ -7,7 +7,7 @@
   
 [eva] computing for function g <- f.
   Called from keep_annot.i:26.
-[eva] keep_annot.i:15: starting to merge loop iterations
+[eva:partition] keep_annot.i:15: starting to merge loop iterations
 [eva:alarm] keep_annot.i:20: Warning: assertion got status unknown.
 [eva:alarm] keep_annot.i:21: Warning: assertion got status unknown.
 [eva] Recording results for g
diff --git a/tests/slicing/oracle/keep_annot.1.res.oracle b/tests/slicing/oracle/keep_annot.1.res.oracle
index 5cc3e4c67b9..d44b05938b5 100644
--- a/tests/slicing/oracle/keep_annot.1.res.oracle
+++ b/tests/slicing/oracle/keep_annot.1.res.oracle
@@ -7,7 +7,7 @@
   
 [eva] computing for function g <- f.
   Called from keep_annot.i:26.
-[eva] keep_annot.i:15: starting to merge loop iterations
+[eva:partition] keep_annot.i:15: starting to merge loop iterations
 [eva:alarm] keep_annot.i:20: Warning: assertion got status unknown.
 [eva:alarm] keep_annot.i:21: Warning: assertion got status unknown.
 [eva] Recording results for g
diff --git a/tests/slicing/oracle/loop_simple.res.oracle b/tests/slicing/oracle/loop_simple.res.oracle
index ea36836deed..840f60b8dba 100644
--- a/tests/slicing/oracle/loop_simple.res.oracle
+++ b/tests/slicing/oracle/loop_simple.res.oracle
@@ -4,8 +4,8 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] loop_simple.i:10: starting to merge loop iterations
-[eva] loop_simple.i:12: starting to merge loop iterations
+[eva:partition] loop_simple.i:10: starting to merge loop iterations
+[eva:partition] loop_simple.i:12: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [from] Computing for function main
diff --git a/tests/slicing/oracle/loops.0.res.oracle b/tests/slicing/oracle/loops.0.res.oracle
index 195fb9c2e96..f00f0cdc1e8 100644
--- a/tests/slicing/oracle/loops.0.res.oracle
+++ b/tests/slicing/oracle/loops.0.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ [--..--]
   Z ∈ [--..--]
 [eva] loops.i:36: assertion got status valid.
-[eva] loops.i:34: starting to merge loop iterations
+[eva:partition] loops.i:34: starting to merge loop iterations
 [eva:alarm] loops.i:35: Warning: signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for f1
 [eva] Done for function f1
diff --git a/tests/slicing/oracle/loops.1.res.oracle b/tests/slicing/oracle/loops.1.res.oracle
index 51ca636cfd3..aa185d9c4ab 100644
--- a/tests/slicing/oracle/loops.1.res.oracle
+++ b/tests/slicing/oracle/loops.1.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ [--..--]
   Z ∈ [--..--]
 [eva] loops.i:36: assertion got status valid.
-[eva] loops.i:34: starting to merge loop iterations
+[eva:partition] loops.i:34: starting to merge loop iterations
 [eva:alarm] loops.i:35: Warning: signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for f1
 [eva] Done for function f1
diff --git a/tests/slicing/oracle/loops.10.res.oracle b/tests/slicing/oracle/loops.10.res.oracle
index ad29d5d345d..0b25b7d1297 100644
--- a/tests/slicing/oracle/loops.10.res.oracle
+++ b/tests/slicing/oracle/loops.10.res.oracle
@@ -19,7 +19,7 @@
 [eva] computing for function loop <- main.
   Called from loops.i:202.
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.11.res.oracle b/tests/slicing/oracle/loops.11.res.oracle
index 017f79be1e4..f0fa7f07cdd 100644
--- a/tests/slicing/oracle/loops.11.res.oracle
+++ b/tests/slicing/oracle/loops.11.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ {0}
   Z ∈ {0}
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.12.res.oracle b/tests/slicing/oracle/loops.12.res.oracle
index 5b464448a4e..2f876ab222e 100644
--- a/tests/slicing/oracle/loops.12.res.oracle
+++ b/tests/slicing/oracle/loops.12.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ {0}
   Z ∈ {0}
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.13.res.oracle b/tests/slicing/oracle/loops.13.res.oracle
index 989df21adb3..e3f14511d63 100644
--- a/tests/slicing/oracle/loops.13.res.oracle
+++ b/tests/slicing/oracle/loops.13.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ {0}
   Z ∈ {0}
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.14.res.oracle b/tests/slicing/oracle/loops.14.res.oracle
index f00541a8e9a..1c7568cc484 100644
--- a/tests/slicing/oracle/loops.14.res.oracle
+++ b/tests/slicing/oracle/loops.14.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ {0}
   Z ∈ {0}
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.15.res.oracle b/tests/slicing/oracle/loops.15.res.oracle
index 75786cb2220..68c4e6ea61e 100644
--- a/tests/slicing/oracle/loops.15.res.oracle
+++ b/tests/slicing/oracle/loops.15.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ [--..--]
   Z ∈ [--..--]
 [eva] loops.i:68: assertion got status valid.
-[eva] loops.i:66: starting to merge loop iterations
+[eva:partition] loops.i:66: starting to merge loop iterations
 [kernel:annot:missing-spec] loops.i:70: Warning: 
   Neither code nor specification for function stop,
    generating default assigns. See -generated-spec-* options for more info
diff --git a/tests/slicing/oracle/loops.16.res.oracle b/tests/slicing/oracle/loops.16.res.oracle
index 5d4fe926d54..97687bd35dc 100644
--- a/tests/slicing/oracle/loops.16.res.oracle
+++ b/tests/slicing/oracle/loops.16.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ [--..--]
   Z ∈ [--..--]
 [eva] loops.i:68: assertion got status valid.
-[eva] loops.i:66: starting to merge loop iterations
+[eva:partition] loops.i:66: starting to merge loop iterations
 [kernel:annot:missing-spec] loops.i:70: Warning: 
   Neither code nor specification for function stop,
    generating default assigns. See -generated-spec-* options for more info
diff --git a/tests/slicing/oracle/loops.19.res.oracle b/tests/slicing/oracle/loops.19.res.oracle
index 0998264ade1..4fd52276c96 100644
--- a/tests/slicing/oracle/loops.19.res.oracle
+++ b/tests/slicing/oracle/loops.19.res.oracle
@@ -19,7 +19,7 @@
 [eva] computing for function loop <- main.
   Called from loops.i:202.
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.2.res.oracle b/tests/slicing/oracle/loops.2.res.oracle
index 94dc22805dd..5e0f770bf31 100644
--- a/tests/slicing/oracle/loops.2.res.oracle
+++ b/tests/slicing/oracle/loops.2.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ [--..--]
   Z ∈ [--..--]
 [eva:alarm] loops.i:56: Warning: assertion got status unknown.
-[eva] loops.i:50: starting to merge loop iterations
+[eva:partition] loops.i:50: starting to merge loop iterations
 [eva:alarm] loops.i:52: Warning: signed overflow. assert x1 + 1 ≤ 2147483647;
 [eva:alarm] loops.i:54: Warning: signed overflow. assert x2 + 1 ≤ 2147483647;
 [eva] Recording results for f2
diff --git a/tests/slicing/oracle/loops.20.res.oracle b/tests/slicing/oracle/loops.20.res.oracle
index 6e18bd872d2..cc4a302c4f7 100644
--- a/tests/slicing/oracle/loops.20.res.oracle
+++ b/tests/slicing/oracle/loops.20.res.oracle
@@ -19,7 +19,7 @@
 [eva] computing for function loop <- main.
   Called from loops.i:202.
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.21.res.oracle b/tests/slicing/oracle/loops.21.res.oracle
index 198ab85fd70..4493aa02db3 100644
--- a/tests/slicing/oracle/loops.21.res.oracle
+++ b/tests/slicing/oracle/loops.21.res.oracle
@@ -19,7 +19,7 @@
 [eva] computing for function loop <- main.
   Called from loops.i:202.
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.22.res.oracle b/tests/slicing/oracle/loops.22.res.oracle
index f3b6ac451e5..5bf53875e1d 100644
--- a/tests/slicing/oracle/loops.22.res.oracle
+++ b/tests/slicing/oracle/loops.22.res.oracle
@@ -19,7 +19,7 @@
 [eva] computing for function loop <- main.
   Called from loops.i:202.
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.23.res.oracle b/tests/slicing/oracle/loops.23.res.oracle
index ae8f97a78fc..d2ec1471f8a 100644
--- a/tests/slicing/oracle/loops.23.res.oracle
+++ b/tests/slicing/oracle/loops.23.res.oracle
@@ -19,7 +19,7 @@
 [eva] computing for function loop <- main.
   Called from loops.i:202.
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.3.res.oracle b/tests/slicing/oracle/loops.3.res.oracle
index efb7e0e1957..5893f586118 100644
--- a/tests/slicing/oracle/loops.3.res.oracle
+++ b/tests/slicing/oracle/loops.3.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ [--..--]
   Z ∈ [--..--]
 [eva:alarm] loops.i:56: Warning: assertion got status unknown.
-[eva] loops.i:50: starting to merge loop iterations
+[eva:partition] loops.i:50: starting to merge loop iterations
 [eva:alarm] loops.i:52: Warning: signed overflow. assert x1 + 1 ≤ 2147483647;
 [eva:alarm] loops.i:54: Warning: signed overflow. assert x2 + 1 ≤ 2147483647;
 [eva] Recording results for f2
diff --git a/tests/slicing/oracle/loops.5.res.oracle b/tests/slicing/oracle/loops.5.res.oracle
index 3dbe1ba43eb..422db0f3b98 100644
--- a/tests/slicing/oracle/loops.5.res.oracle
+++ b/tests/slicing/oracle/loops.5.res.oracle
@@ -13,7 +13,7 @@
   signed overflow. assert -2147483648 ≤ G + data2;
 [eva:alarm] loops.i:141: Warning: 
   signed overflow. assert G + data2 ≤ 2147483647;
-[eva] loops.i:125: starting to merge loop iterations
+[eva:partition] loops.i:125: starting to merge loop iterations
 [eva:alarm] loops.i:126: Warning: 
   signed overflow. assert -2147483648 ≤ G + data1;
 [eva:alarm] loops.i:126: Warning: 
diff --git a/tests/slicing/oracle/loops.6.res.oracle b/tests/slicing/oracle/loops.6.res.oracle
index 79b46aed029..73708d5ac60 100644
--- a/tests/slicing/oracle/loops.6.res.oracle
+++ b/tests/slicing/oracle/loops.6.res.oracle
@@ -13,7 +13,7 @@
   signed overflow. assert -2147483648 ≤ G + data2;
 [eva:alarm] loops.i:165: Warning: 
   signed overflow. assert G + data2 ≤ 2147483647;
-[eva] loops.i:149: starting to merge loop iterations
+[eva:partition] loops.i:149: starting to merge loop iterations
 [eva:alarm] loops.i:150: Warning: 
   signed overflow. assert -2147483648 ≤ G + data1;
 [eva:alarm] loops.i:150: Warning: 
diff --git a/tests/slicing/oracle/loops.7.res.oracle b/tests/slicing/oracle/loops.7.res.oracle
index 868002c5727..1badedf7784 100644
--- a/tests/slicing/oracle/loops.7.res.oracle
+++ b/tests/slicing/oracle/loops.7.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ {0}
   Z ∈ {0}
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.8.res.oracle b/tests/slicing/oracle/loops.8.res.oracle
index f1d9bbd8669..7c38042f19b 100644
--- a/tests/slicing/oracle/loops.8.res.oracle
+++ b/tests/slicing/oracle/loops.8.res.oracle
@@ -19,7 +19,7 @@
 [eva] computing for function loop <- main.
   Called from loops.i:202.
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.9.res.oracle b/tests/slicing/oracle/loops.9.res.oracle
index 6710802f89b..a7414e76953 100644
--- a/tests/slicing/oracle/loops.9.res.oracle
+++ b/tests/slicing/oracle/loops.9.res.oracle
@@ -19,7 +19,7 @@
 [eva] computing for function loop <- main.
   Called from loops.i:202.
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/select_simple.res.oracle b/tests/slicing/oracle/select_simple.res.oracle
index 153896afaee..e35c0c3bb40 100644
--- a/tests/slicing/oracle/select_simple.res.oracle
+++ b/tests/slicing/oracle/select_simple.res.oracle
@@ -10,14 +10,14 @@
   S2 ∈ {0}
 [eva:alarm] simple_intra_slice.i:99: Warning: 
   signed overflow. assert -2147483648 ≤ uninit - 1;
-[eva] simple_intra_slice.i:98: starting to merge loop iterations
+[eva:partition] simple_intra_slice.i:98: starting to merge loop iterations
 [eva:alarm] simple_intra_slice.i:99: Warning: 
   signed overflow. assert -2147483648 ≤ Unknown - 1;
 [eva:alarm] simple_intra_slice.i:99: Warning: 
   signed overflow. assert Unknown + 1 ≤ 2147483647;
 [eva:alarm] simple_intra_slice.i:101: Warning: 
   signed overflow. assert -2147483648 ≤ uninit2 - 1;
-[eva] simple_intra_slice.i:100: starting to merge loop iterations
+[eva:partition] simple_intra_slice.i:100: starting to merge loop iterations
 [eva:alarm] simple_intra_slice.i:101: Warning: 
   signed overflow. assert S.a + 1 ≤ 2147483647;
 [eva:alarm] simple_intra_slice.i:101: Warning: 
diff --git a/tests/slicing/oracle/simple_intra_slice.res.oracle b/tests/slicing/oracle/simple_intra_slice.res.oracle
index 1c18f00ad9d..1d9e3370f8d 100644
--- a/tests/slicing/oracle/simple_intra_slice.res.oracle
+++ b/tests/slicing/oracle/simple_intra_slice.res.oracle
@@ -10,14 +10,14 @@
   S2 ∈ {0}
 [eva:alarm] simple_intra_slice.i:99: Warning: 
   signed overflow. assert -2147483648 ≤ uninit - 1;
-[eva] simple_intra_slice.i:98: starting to merge loop iterations
+[eva:partition] simple_intra_slice.i:98: starting to merge loop iterations
 [eva:alarm] simple_intra_slice.i:99: Warning: 
   signed overflow. assert -2147483648 ≤ Unknown - 1;
 [eva:alarm] simple_intra_slice.i:99: Warning: 
   signed overflow. assert Unknown + 1 ≤ 2147483647;
 [eva:alarm] simple_intra_slice.i:101: Warning: 
   signed overflow. assert -2147483648 ≤ uninit2 - 1;
-[eva] simple_intra_slice.i:100: starting to merge loop iterations
+[eva:partition] simple_intra_slice.i:100: starting to merge loop iterations
 [eva:alarm] simple_intra_slice.i:101: Warning: 
   signed overflow. assert S.a + 1 ≤ 2147483647;
 [eva:alarm] simple_intra_slice.i:101: Warning: 
diff --git a/tests/slicing/oracle/top.0.res.oracle b/tests/slicing/oracle/top.0.res.oracle
index ed9c2f23149..5836a008c5d 100644
--- a/tests/slicing/oracle/top.0.res.oracle
+++ b/tests/slicing/oracle/top.0.res.oracle
@@ -10,7 +10,7 @@
 [eva] computing for function strlen <- main.
   Called from top.i:27.
 [eva:alarm] top.i:21: Warning: out of bounds read. assert \valid_read(q);
-[eva] top.i:21: starting to merge loop iterations
+[eva:partition] top.i:21: starting to merge loop iterations
 [eva:alarm] top.i:21: Warning: signed overflow. assert k + 1 ≤ 2147483647;
 [eva] Recording results for strlen
 [eva] Done for function strlen
diff --git a/tests/slicing/oracle/top.1.res.oracle b/tests/slicing/oracle/top.1.res.oracle
index 8279a90c0fa..318041ead2c 100644
--- a/tests/slicing/oracle/top.1.res.oracle
+++ b/tests/slicing/oracle/top.1.res.oracle
@@ -10,7 +10,7 @@
 [eva] computing for function strlen <- main.
   Called from top.i:27.
 [eva:alarm] top.i:21: Warning: out of bounds read. assert \valid_read(q);
-[eva] top.i:21: starting to merge loop iterations
+[eva:partition] top.i:21: starting to merge loop iterations
 [eva:alarm] top.i:21: Warning: signed overflow. assert k + 1 ≤ 2147483647;
 [eva] Recording results for strlen
 [eva] Done for function strlen
diff --git a/tests/slicing/oracle/top.2.res.oracle b/tests/slicing/oracle/top.2.res.oracle
index 1318e8f4296..da25ee480e2 100644
--- a/tests/slicing/oracle/top.2.res.oracle
+++ b/tests/slicing/oracle/top.2.res.oracle
@@ -10,7 +10,7 @@
 [eva] computing for function strlen <- main.
   Called from top.i:27.
 [eva:alarm] top.i:21: Warning: out of bounds read. assert \valid_read(q);
-[eva] top.i:21: starting to merge loop iterations
+[eva:partition] top.i:21: starting to merge loop iterations
 [eva:alarm] top.i:21: Warning: signed overflow. assert k + 1 ≤ 2147483647;
 [eva] Recording results for strlen
 [eva] Done for function strlen
diff --git a/tests/slicing/oracle/unravel-flavors.0.res.oracle b/tests/slicing/oracle/unravel-flavors.0.res.oracle
index 9e74fb164a5..4703eba3178 100644
--- a/tests/slicing/oracle/unravel-flavors.0.res.oracle
+++ b/tests/slicing/oracle/unravel-flavors.0.res.oracle
@@ -44,7 +44,7 @@
   signed overflow. assert -2147483648 ≤ red * green;
 [eva:alarm] unravel-flavors.i:52: Warning: 
   signed overflow. assert red * green ≤ 2147483647;
-[eva] unravel-flavors.i:54: starting to merge loop iterations
+[eva:partition] unravel-flavors.i:54: starting to merge loop iterations
 [eva:alarm] unravel-flavors.i:55: Warning: 
   signed overflow. assert -2147483648 ≤ sour + green;
 [eva:alarm] unravel-flavors.i:55: Warning: 
diff --git a/tests/slicing/oracle/unravel-flavors.1.res.oracle b/tests/slicing/oracle/unravel-flavors.1.res.oracle
index f16981aa519..aa8aef834e4 100644
--- a/tests/slicing/oracle/unravel-flavors.1.res.oracle
+++ b/tests/slicing/oracle/unravel-flavors.1.res.oracle
@@ -44,7 +44,7 @@
   signed overflow. assert -2147483648 ≤ red * green;
 [eva:alarm] unravel-flavors.i:52: Warning: 
   signed overflow. assert red * green ≤ 2147483647;
-[eva] unravel-flavors.i:54: starting to merge loop iterations
+[eva:partition] unravel-flavors.i:54: starting to merge loop iterations
 [eva:alarm] unravel-flavors.i:55: Warning: 
   signed overflow. assert -2147483648 ≤ sour + green;
 [eva:alarm] unravel-flavors.i:55: Warning: 
diff --git a/tests/slicing/oracle/unravel-flavors.2.res.oracle b/tests/slicing/oracle/unravel-flavors.2.res.oracle
index a8135ee7087..288b25e3e48 100644
--- a/tests/slicing/oracle/unravel-flavors.2.res.oracle
+++ b/tests/slicing/oracle/unravel-flavors.2.res.oracle
@@ -44,7 +44,7 @@
   signed overflow. assert -2147483648 ≤ red * green;
 [eva:alarm] unravel-flavors.i:52: Warning: 
   signed overflow. assert red * green ≤ 2147483647;
-[eva] unravel-flavors.i:54: starting to merge loop iterations
+[eva:partition] unravel-flavors.i:54: starting to merge loop iterations
 [eva:alarm] unravel-flavors.i:55: Warning: 
   signed overflow. assert -2147483648 ≤ sour + green;
 [eva:alarm] unravel-flavors.i:55: Warning: 
diff --git a/tests/slicing/oracle/unravel-flavors.3.res.oracle b/tests/slicing/oracle/unravel-flavors.3.res.oracle
index 9a83feb26ec..2824c37a555 100644
--- a/tests/slicing/oracle/unravel-flavors.3.res.oracle
+++ b/tests/slicing/oracle/unravel-flavors.3.res.oracle
@@ -44,7 +44,7 @@
   signed overflow. assert -2147483648 ≤ red * green;
 [eva:alarm] unravel-flavors.i:52: Warning: 
   signed overflow. assert red * green ≤ 2147483647;
-[eva] unravel-flavors.i:54: starting to merge loop iterations
+[eva:partition] unravel-flavors.i:54: starting to merge loop iterations
 [eva:alarm] unravel-flavors.i:55: Warning: 
   signed overflow. assert -2147483648 ≤ sour + green;
 [eva:alarm] unravel-flavors.i:55: Warning: 
diff --git a/tests/slicing/oracle/unravel-variance.0.res.oracle b/tests/slicing/oracle/unravel-variance.0.res.oracle
index e9aae04102c..55dc28b10cf 100644
--- a/tests/slicing/oracle/unravel-variance.0.res.oracle
+++ b/tests/slicing/oracle/unravel-variance.0.res.oracle
@@ -23,7 +23,7 @@
   non-finite float value. assert \is_finite(x[i]);
 [eva:alarm] unravel-variance.i:36: Warning: 
   non-finite float value. assert \is_finite(\mul_float(x[i], x[i]));
-[eva] unravel-variance.i:32: starting to merge loop iterations
+[eva:partition] unravel-variance.i:32: starting to merge loop iterations
 [eva] computing for function scanf <- main.
   Called from unravel-variance.i:34.
 [eva] Done for function scanf
@@ -94,7 +94,7 @@
   non-finite float value. assert \is_finite(\sub_float(x[i], avg));
 [eva:alarm] unravel-variance.i:48: Warning: 
   non-finite float value. assert \is_finite(\mul_float(dev, dev));
-[eva] unravel-variance.i:44: starting to merge loop iterations
+[eva:partition] unravel-variance.i:44: starting to merge loop iterations
 [eva:alarm] unravel-variance.i:47: Warning: 
   non-finite float value. assert \is_finite(\add_float(t2, dev));
 [eva:alarm] unravel-variance.i:48: Warning: 
diff --git a/tests/slicing/oracle/unravel-variance.1.res.oracle b/tests/slicing/oracle/unravel-variance.1.res.oracle
index 2deb200cd14..2dcc0d7b5d6 100644
--- a/tests/slicing/oracle/unravel-variance.1.res.oracle
+++ b/tests/slicing/oracle/unravel-variance.1.res.oracle
@@ -23,7 +23,7 @@
   non-finite float value. assert \is_finite(x[i]);
 [eva:alarm] unravel-variance.i:36: Warning: 
   non-finite float value. assert \is_finite(\mul_float(x[i], x[i]));
-[eva] unravel-variance.i:32: starting to merge loop iterations
+[eva:partition] unravel-variance.i:32: starting to merge loop iterations
 [eva] computing for function scanf <- main.
   Called from unravel-variance.i:34.
 [eva] Done for function scanf
@@ -94,7 +94,7 @@
   non-finite float value. assert \is_finite(\sub_float(x[i], avg));
 [eva:alarm] unravel-variance.i:48: Warning: 
   non-finite float value. assert \is_finite(\mul_float(dev, dev));
-[eva] unravel-variance.i:44: starting to merge loop iterations
+[eva:partition] unravel-variance.i:44: starting to merge loop iterations
 [eva:alarm] unravel-variance.i:47: Warning: 
   non-finite float value. assert \is_finite(\add_float(t2, dev));
 [eva:alarm] unravel-variance.i:48: Warning: 
diff --git a/tests/slicing/oracle/unravel-variance.2.res.oracle b/tests/slicing/oracle/unravel-variance.2.res.oracle
index f6734df8ff5..e9c1ef6bff8 100644
--- a/tests/slicing/oracle/unravel-variance.2.res.oracle
+++ b/tests/slicing/oracle/unravel-variance.2.res.oracle
@@ -23,7 +23,7 @@
   non-finite float value. assert \is_finite(x[i]);
 [eva:alarm] unravel-variance.i:36: Warning: 
   non-finite float value. assert \is_finite(\mul_float(x[i], x[i]));
-[eva] unravel-variance.i:32: starting to merge loop iterations
+[eva:partition] unravel-variance.i:32: starting to merge loop iterations
 [eva] computing for function scanf <- main.
   Called from unravel-variance.i:34.
 [eva] Done for function scanf
@@ -94,7 +94,7 @@
   non-finite float value. assert \is_finite(\sub_float(x[i], avg));
 [eva:alarm] unravel-variance.i:48: Warning: 
   non-finite float value. assert \is_finite(\mul_float(dev, dev));
-[eva] unravel-variance.i:44: starting to merge loop iterations
+[eva:partition] unravel-variance.i:44: starting to merge loop iterations
 [eva:alarm] unravel-variance.i:47: Warning: 
   non-finite float value. assert \is_finite(\add_float(t2, dev));
 [eva:alarm] unravel-variance.i:48: Warning: 
diff --git a/tests/slicing/oracle/unravel-variance.3.res.oracle b/tests/slicing/oracle/unravel-variance.3.res.oracle
index dfb4b2c3bd6..3d4d567d252 100644
--- a/tests/slicing/oracle/unravel-variance.3.res.oracle
+++ b/tests/slicing/oracle/unravel-variance.3.res.oracle
@@ -23,7 +23,7 @@
   non-finite float value. assert \is_finite(x[i]);
 [eva:alarm] unravel-variance.i:36: Warning: 
   non-finite float value. assert \is_finite(\mul_float(x[i], x[i]));
-[eva] unravel-variance.i:32: starting to merge loop iterations
+[eva:partition] unravel-variance.i:32: starting to merge loop iterations
 [eva] computing for function scanf <- main.
   Called from unravel-variance.i:34.
 [eva] Done for function scanf
@@ -94,7 +94,7 @@
   non-finite float value. assert \is_finite(\sub_float(x[i], avg));
 [eva:alarm] unravel-variance.i:48: Warning: 
   non-finite float value. assert \is_finite(\mul_float(dev, dev));
-[eva] unravel-variance.i:44: starting to merge loop iterations
+[eva:partition] unravel-variance.i:44: starting to merge loop iterations
 [eva:alarm] unravel-variance.i:47: Warning: 
   non-finite float value. assert \is_finite(\add_float(t2, dev));
 [eva:alarm] unravel-variance.i:48: Warning: 
diff --git a/tests/slicing/oracle/unravel-variance.4.res.oracle b/tests/slicing/oracle/unravel-variance.4.res.oracle
index 60f4918fed8..f30d11287ac 100644
--- a/tests/slicing/oracle/unravel-variance.4.res.oracle
+++ b/tests/slicing/oracle/unravel-variance.4.res.oracle
@@ -23,7 +23,7 @@
   non-finite float value. assert \is_finite(x[i]);
 [eva:alarm] unravel-variance.i:36: Warning: 
   non-finite float value. assert \is_finite(\mul_float(x[i], x[i]));
-[eva] unravel-variance.i:32: starting to merge loop iterations
+[eva:partition] unravel-variance.i:32: starting to merge loop iterations
 [eva] computing for function scanf <- main.
   Called from unravel-variance.i:34.
 [eva] Done for function scanf
@@ -94,7 +94,7 @@
   non-finite float value. assert \is_finite(\sub_float(x[i], avg));
 [eva:alarm] unravel-variance.i:48: Warning: 
   non-finite float value. assert \is_finite(\mul_float(dev, dev));
-[eva] unravel-variance.i:44: starting to merge loop iterations
+[eva:partition] unravel-variance.i:44: starting to merge loop iterations
 [eva:alarm] unravel-variance.i:47: Warning: 
   non-finite float value. assert \is_finite(\add_float(t2, dev));
 [eva:alarm] unravel-variance.i:48: Warning: 
diff --git a/tests/sparecode/oracle/bts324.0.res.oracle b/tests/sparecode/oracle/bts324.0.res.oracle
index 294098788b1..980e5daafee 100644
--- a/tests/sparecode/oracle/bts324.0.res.oracle
+++ b/tests/sparecode/oracle/bts324.0.res.oracle
@@ -18,7 +18,7 @@
 [eva] using specification for function loop_body
 [eva] bts324.i:11: Warning: no \from part for clause 'assigns i0, o0;'
 [eva] Done for function loop_body
-[eva] bts324.i:21: starting to merge loop iterations
+[eva:partition] bts324.i:21: starting to merge loop iterations
 [eva] computing for function loop_body <- main.
   Called from bts324.i:22.
 [eva] Done for function loop_body
diff --git a/tests/sparecode/oracle/bts324.1.res.oracle b/tests/sparecode/oracle/bts324.1.res.oracle
index 777e5eff8ed..08edb8bad3a 100644
--- a/tests/sparecode/oracle/bts324.1.res.oracle
+++ b/tests/sparecode/oracle/bts324.1.res.oracle
@@ -18,7 +18,7 @@
 [eva] using specification for function loop_body
 [eva] bts324.i:11: Warning: no \from part for clause 'assigns i0, o0;'
 [eva] Done for function loop_body
-[eva] bts324.i:28: starting to merge loop iterations
+[eva:partition] bts324.i:28: starting to merge loop iterations
 [eva] computing for function loop_body <- main_bis.
   Called from bts324.i:29.
 [eva] Done for function loop_body
diff --git a/tests/sparecode/oracle/bts324.2.res.oracle b/tests/sparecode/oracle/bts324.2.res.oracle
index 38d7bf094e6..f9473d73830 100644
--- a/tests/sparecode/oracle/bts324.2.res.oracle
+++ b/tests/sparecode/oracle/bts324.2.res.oracle
@@ -18,7 +18,7 @@
 [eva] using specification for function loop_body
 [eva] bts324.i:11: Warning: no \from part for clause 'assigns i0, o0;'
 [eva] Done for function loop_body
-[eva] bts324.i:37: starting to merge loop iterations
+[eva:partition] bts324.i:37: starting to merge loop iterations
 [eva] computing for function loop_body <- main_ter.
   Called from bts324.i:39.
 [eva] Done for function loop_body
diff --git a/tests/sparecode/oracle/bts324_bis.0.res.oracle b/tests/sparecode/oracle/bts324_bis.0.res.oracle
index 963ffef256f..02a0d0fe009 100644
--- a/tests/sparecode/oracle/bts324_bis.0.res.oracle
+++ b/tests/sparecode/oracle/bts324_bis.0.res.oracle
@@ -34,7 +34,7 @@
 [eva] Done for function f
 [eva] Recording results for loop_body
 [eva] Done for function loop_body
-[eva] bts324_bis.i:39: starting to merge loop iterations
+[eva:partition] bts324_bis.i:39: starting to merge loop iterations
 [eva] computing for function loop_body <- main.
   Called from bts324_bis.i:40.
 [eva] computing for function f <- loop_body <- main.
diff --git a/tests/sparecode/oracle/bts324_bis.1.res.oracle b/tests/sparecode/oracle/bts324_bis.1.res.oracle
index ac38ed26163..81a70879b00 100644
--- a/tests/sparecode/oracle/bts324_bis.1.res.oracle
+++ b/tests/sparecode/oracle/bts324_bis.1.res.oracle
@@ -34,7 +34,7 @@
 [eva] Done for function f
 [eva] Recording results for loop_body
 [eva] Done for function loop_body
-[eva] bts324_bis.i:52: starting to merge loop iterations
+[eva:partition] bts324_bis.i:52: starting to merge loop iterations
 [eva] computing for function loop_body <- main_bis.
   Called from bts324_bis.i:53.
 [eva] computing for function f <- loop_body <- main_bis.
diff --git a/tests/sparecode/oracle/bts324_bis.2.res.oracle b/tests/sparecode/oracle/bts324_bis.2.res.oracle
index 963ffef256f..02a0d0fe009 100644
--- a/tests/sparecode/oracle/bts324_bis.2.res.oracle
+++ b/tests/sparecode/oracle/bts324_bis.2.res.oracle
@@ -34,7 +34,7 @@
 [eva] Done for function f
 [eva] Recording results for loop_body
 [eva] Done for function loop_body
-[eva] bts324_bis.i:39: starting to merge loop iterations
+[eva:partition] bts324_bis.i:39: starting to merge loop iterations
 [eva] computing for function loop_body <- main.
   Called from bts324_bis.i:40.
 [eva] computing for function f <- loop_body <- main.
diff --git a/tests/sparecode/oracle/bts334.0.res.oracle b/tests/sparecode/oracle/bts334.0.res.oracle
index e977ab534d0..62c9ca46f75 100644
--- a/tests/sparecode/oracle/bts334.0.res.oracle
+++ b/tests/sparecode/oracle/bts334.0.res.oracle
@@ -43,7 +43,7 @@
 [eva] Done for function f
 [eva] Recording results for loop_body
 [eva] Done for function loop_body
-[eva] bts334.i:53: starting to merge loop iterations
+[eva:partition] bts334.i:53: starting to merge loop iterations
 [eva] computing for function loop_body <- process <- main_init.
   Called from bts334.i:53.
 [eva] computing for function f <- loop_body <- process <- main_init.
diff --git a/tests/sparecode/oracle/bts334.1.res.oracle b/tests/sparecode/oracle/bts334.1.res.oracle
index 2b3b9e69342..06bc529abee 100644
--- a/tests/sparecode/oracle/bts334.1.res.oracle
+++ b/tests/sparecode/oracle/bts334.1.res.oracle
@@ -43,7 +43,7 @@
 [eva] Done for function f
 [eva] Recording results for loop_body
 [eva] Done for function loop_body
-[eva] bts334.i:53: starting to merge loop iterations
+[eva:partition] bts334.i:53: starting to merge loop iterations
 [eva] computing for function loop_body <- process <- main_init.
   Called from bts334.i:53.
 [eva] computing for function f <- loop_body <- process <- main_init.
diff --git a/tests/sparecode/oracle/bts334.2.res.oracle b/tests/sparecode/oracle/bts334.2.res.oracle
index 51b356f150a..a03e12ab714 100644
--- a/tests/sparecode/oracle/bts334.2.res.oracle
+++ b/tests/sparecode/oracle/bts334.2.res.oracle
@@ -48,7 +48,7 @@
 [from] Computing for function loop_body
 [from] Done for function loop_body
 [eva] Done for function loop_body
-[eva] bts334.i:53: starting to merge loop iterations
+[eva:partition] bts334.i:53: starting to merge loop iterations
 [eva] computing for function loop_body <- process <- main_init.
   Called from bts334.i:53.
 [eva] computing for function f <- loop_body <- process <- main_init.
diff --git a/tests/sparecode/oracle/intra.0.res.oracle b/tests/sparecode/oracle/intra.0.res.oracle
index 88889b31a6e..48632804a67 100644
--- a/tests/sparecode/oracle/intra.0.res.oracle
+++ b/tests/sparecode/oracle/intra.0.res.oracle
@@ -38,7 +38,7 @@
   Called from intra.i:86.
 [eva] intra.i:64: assertion got status valid.
 [eva] intra.i:65: loop invariant got status valid.
-[eva] intra.i:67: starting to merge loop iterations
+[eva:partition] intra.i:67: starting to merge loop iterations
 [eva] Recording results for loop
 [eva] Done for function loop
 [eva] computing for function assign <- main.
diff --git a/tests/sparecode/oracle/intra.1.res.oracle b/tests/sparecode/oracle/intra.1.res.oracle
index 340b1dc3072..fba541e38fe 100644
--- a/tests/sparecode/oracle/intra.1.res.oracle
+++ b/tests/sparecode/oracle/intra.1.res.oracle
@@ -37,7 +37,7 @@
   Called from intra.i:86.
 [eva] intra.i:64: assertion got status valid.
 [eva] intra.i:65: loop invariant got status valid.
-[eva] intra.i:67: starting to merge loop iterations
+[eva:partition] intra.i:67: starting to merge loop iterations
 [eva] Recording results for loop
 [eva] Done for function loop
 [eva] computing for function assign <- main.
diff --git a/tests/spec/oracle/behavior_assert.0.res.oracle b/tests/spec/oracle/behavior_assert.0.res.oracle
index fd95af7ccab..5dc57ac9a73 100644
--- a/tests/spec/oracle/behavior_assert.0.res.oracle
+++ b/tests/spec/oracle/behavior_assert.0.res.oracle
@@ -15,7 +15,7 @@
 [eva] computing for function g <- main.
   Called from behavior_assert.c:91.
 [eva] behavior_assert.c:30: assertion got status valid.
-[eva] behavior_assert.c:28: starting to merge loop iterations
+[eva:partition] behavior_assert.c:28: starting to merge loop iterations
 [eva] behavior_assert.c:24: 
   function g, behavior be: postcondition got status valid. (Behavior may be inactive, no reduction performed.)
 [eva] Recording results for g
diff --git a/tests/spec/oracle/behavior_assert.1.res.oracle b/tests/spec/oracle/behavior_assert.1.res.oracle
index 761d14da25e..cbcd1739ea4 100644
--- a/tests/spec/oracle/behavior_assert.1.res.oracle
+++ b/tests/spec/oracle/behavior_assert.1.res.oracle
@@ -15,7 +15,7 @@
 [eva] computing for function g <- main.
   Called from behavior_assert.c:91.
 [eva] behavior_assert.c:30: assertion got status valid.
-[eva] behavior_assert.c:28: starting to merge loop iterations
+[eva:partition] behavior_assert.c:28: starting to merge loop iterations
 [eva] behavior_assert.c:24: 
   function g, behavior be: postcondition got status valid.
 [eva] Recording results for g
diff --git a/tests/spec/oracle/generalized_check.0.res.oracle b/tests/spec/oracle/generalized_check.0.res.oracle
index e168df66f25..0fb9927aa93 100644
--- a/tests/spec/oracle/generalized_check.0.res.oracle
+++ b/tests/spec/oracle/generalized_check.0.res.oracle
@@ -14,7 +14,7 @@
   check 'main_p_content_ko' got status unknown.
 [eva:alarm] generalized_check.i:32: Warning: 
   loop invariant 'false_but_preserved' got status invalid.
-[eva] generalized_check.i:35: starting to merge loop iterations
+[eva:partition] generalized_check.i:35: starting to merge loop iterations
 [eva:alarm] generalized_check.i:36: Warning: 
   check 'implied_by_false_invariant' got status invalid.
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/syntax/oracle/Refresh_visitor.res.oracle b/tests/syntax/oracle/Refresh_visitor.res.oracle
index fe89ff6b502..c8c0fc83c92 100644
--- a/tests/syntax/oracle/Refresh_visitor.res.oracle
+++ b/tests/syntax/oracle/Refresh_visitor.res.oracle
@@ -10,8 +10,8 @@ Start
 [eva] Refresh_visitor.i:24: loop invariant got status valid.
 [eva] Refresh_visitor.i:29: loop invariant got status valid.
 [eva] Refresh_visitor.i:30: loop invariant got status valid.
-[eva] Refresh_visitor.i:32: starting to merge loop iterations
-[eva] Refresh_visitor.i:26: starting to merge loop iterations
+[eva:partition] Refresh_visitor.i:32: starting to merge loop iterations
+[eva:partition] Refresh_visitor.i:26: starting to merge loop iterations
 [eva:alarm] Refresh_visitor.i:14: Warning: 
   function main: postcondition got status unknown.
 [eva] Recording results for main
diff --git a/tests/syntax/oracle/unroll_labels.0.res.oracle b/tests/syntax/oracle/unroll_labels.0.res.oracle
index b4bf202e019..6b2b34c5356 100644
--- a/tests/syntax/oracle/unroll_labels.0.res.oracle
+++ b/tests/syntax/oracle/unroll_labels.0.res.oracle
@@ -4,10 +4,10 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   foo ∈ [--..--]
-[eva] unroll_labels.i:25: starting to merge loop iterations
-[eva] unroll_labels.i:39: starting to merge loop iterations
-[eva] unroll_labels.i:33: starting to merge loop iterations
-[eva] unroll_labels.i:53: starting to merge loop iterations
+[eva:partition] unroll_labels.i:25: starting to merge loop iterations
+[eva:partition] unroll_labels.i:39: starting to merge loop iterations
+[eva:partition] unroll_labels.i:33: starting to merge loop iterations
+[eva:partition] unroll_labels.i:53: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/syntax/oracle/unroll_visit.res.oracle b/tests/syntax/oracle/unroll_visit.res.oracle
index 4768a2906b4..9ce3d2d18b7 100644
--- a/tests/syntax/oracle/unroll_visit.res.oracle
+++ b/tests/syntax/oracle/unroll_visit.res.oracle
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   
 [eva] unroll_visit.i:12: assertion got status valid.
-[eva] unroll_visit.i:10: starting to merge loop iterations
+[eva:partition] unroll_visit.i:10: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/FP5.res.oracle b/tests/value/oracle/FP5.res.oracle
index 5a7c0dda594..bf8ae5840b6 100644
--- a/tests/value/oracle/FP5.res.oracle
+++ b/tests/value/oracle/FP5.res.oracle
@@ -9,7 +9,7 @@
 [eva:alarm] FP5.i:2: Warning: 
   function main: precondition \valid(c) got status unknown.
 [eva] FP5.i:3: function main: precondition \valid(&a) got status valid.
-[eva] FP5.i:23: starting to merge loop iterations
+[eva:partition] FP5.i:23: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/abs_addr.res.oracle b/tests/value/oracle/abs_addr.res.oracle
index ed36262dd94..7c6e21d7023 100644
--- a/tests/value/oracle/abs_addr.res.oracle
+++ b/tests/value/oracle/abs_addr.res.oracle
@@ -7,8 +7,8 @@
   AutoTest[0..999] ∈ {0}
 [eva] computing for function TstRomUcmm <- main.
   Called from abs_addr.i:46.
-[eva] abs_addr.i:18: starting to merge loop iterations
-[eva] abs_addr.i:32: starting to merge loop iterations
+[eva:partition] abs_addr.i:18: starting to merge loop iterations
+[eva:partition] abs_addr.i:32: starting to merge loop iterations
 [eva] Recording results for TstRomUcmm
 [eva] Done for function TstRomUcmm
 [eva] Recording results for main
diff --git a/tests/value/oracle/addr2.res.oracle b/tests/value/oracle/addr2.res.oracle
index 9cab734d542..2553bbc5816 100644
--- a/tests/value/oracle/addr2.res.oracle
+++ b/tests/value/oracle/addr2.res.oracle
@@ -6,7 +6,7 @@
   x ∈ {0}
   t[0..12] ∈ {0}
 [eva] addr2.i:19: Frama_C_show_each_F: {0}
-[eva] addr2.i:13: starting to merge loop iterations
+[eva:partition] addr2.i:13: starting to merge loop iterations
 [eva] addr2.i:19: Frama_C_show_each_F: {0; 1}
 [eva] addr2.i:19: Frama_C_show_each_F: {0; 1; 2}
 [eva] addr2.i:19: Frama_C_show_each_F: [0..12]
diff --git a/tests/value/oracle/alias.4.res.oracle b/tests/value/oracle/alias.4.res.oracle
index 45b3de2ebba..3b44162286d 100644
--- a/tests/value/oracle/alias.4.res.oracle
+++ b/tests/value/oracle/alias.4.res.oracle
@@ -57,7 +57,7 @@
   U ∈ {0}
   char1 ∈ {0}
   ll1 ∈ {0}
-[eva] alias.i:185: starting to merge loop iterations
+[eva:partition] alias.i:185: starting to merge loop iterations
 [eva:alarm] alias.i:191: Warning: 
   pointer comparison. assert \pointer_comparable((void *)PTR2, (void *)PTR1);
 [eva:alarm] alias.i:199: Warning: signed overflow. assert c + 1 ≤ 2147483647;
diff --git a/tests/value/oracle/alias.5.res.oracle b/tests/value/oracle/alias.5.res.oracle
index 3e2bababd75..c4f24dbc834 100644
--- a/tests/value/oracle/alias.5.res.oracle
+++ b/tests/value/oracle/alias.5.res.oracle
@@ -127,11 +127,11 @@
 [eva] Done for function f2
 [eva:alarm] alias.i:271: Warning: signed overflow. assert c2 + 1 ≤ 2147483647;
 [eva:alarm] alias.i:273: Warning: signed overflow. assert c2 + 2 ≤ 2147483647;
-[eva] alias.i:279: starting to merge loop iterations
+[eva:partition] alias.i:279: starting to merge loop iterations
 [eva:alarm] alias.i:285: Warning: 
   pointer comparison. assert \pointer_comparable((void *)PTR2, (void *)PTR1);
 [eva:alarm] alias.i:292: Warning: signed overflow. assert c1 + 1 ≤ 2147483647;
-[eva] alias.i:292: starting to merge loop iterations
+[eva:partition] alias.i:292: starting to merge loop iterations
 [eva] Recording results for main11
 [eva] Done for function main11
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/any_int.res.oracle b/tests/value/oracle/any_int.res.oracle
index d372d85ec22..56c3da3692a 100644
--- a/tests/value/oracle/any_int.res.oracle
+++ b/tests/value/oracle/any_int.res.oracle
@@ -7,7 +7,7 @@
 [eva:alarm] any_int.c:9: Warning: signed overflow. assert y + 1 ≤ 2147483647;
 [eva:alarm] any_int.c:9: Warning: signed overflow. assert y + 1 ≤ 2147483647;
 [eva:alarm] any_int.c:9: Warning: signed overflow. assert -2147483648 ≤ y - 1;
-[eva] any_int.c:9: starting to merge loop iterations
+[eva:partition] any_int.c:9: starting to merge loop iterations
 [eva:alarm] any_int.c:9: Warning: signed overflow. assert x + 1 ≤ 2147483647;
 [eva:alarm] any_int.c:9: Warning: signed overflow. assert -2147483648 ≤ x - 1;
 [eva] Recording results for main
diff --git a/tests/value/oracle/array_bounds.0.res.oracle b/tests/value/oracle/array_bounds.0.res.oracle
index 06b7105be5c..db715daa628 100644
--- a/tests/value/oracle/array_bounds.0.res.oracle
+++ b/tests/value/oracle/array_bounds.0.res.oracle
@@ -33,12 +33,12 @@
    .T[11] ∈ {11}
    .b ∈ {20}
 [eva] array_bounds.i:15: Frama_C_show_each: {0}
-[eva] array_bounds.i:14: starting to merge loop iterations
+[eva:partition] array_bounds.i:14: starting to merge loop iterations
 [eva] array_bounds.i:15: Frama_C_show_each: {0; 1}
 [eva] array_bounds.i:15: Frama_C_show_each: {0; 1; 2}
 [eva] array_bounds.i:15: Frama_C_show_each: [0..11]
 [eva] array_bounds.i:15: Frama_C_show_each: [0..11]
-[eva] array_bounds.i:19: starting to merge loop iterations
+[eva:partition] array_bounds.i:19: starting to merge loop iterations
 [eva:alarm] array_bounds.i:20: Warning: 
   accessing out of bounds index. assert j < 12;
 [eva] Recording results for main
diff --git a/tests/value/oracle/array_bounds.1.res.oracle b/tests/value/oracle/array_bounds.1.res.oracle
index 4afd0bfd450..3f7966b951a 100644
--- a/tests/value/oracle/array_bounds.1.res.oracle
+++ b/tests/value/oracle/array_bounds.1.res.oracle
@@ -33,12 +33,12 @@
    .T[11] ∈ {11}
    .b ∈ {20}
 [eva] array_bounds.i:15: Frama_C_show_each: {0}
-[eva] array_bounds.i:14: starting to merge loop iterations
+[eva:partition] array_bounds.i:14: starting to merge loop iterations
 [eva] array_bounds.i:15: Frama_C_show_each: {0; 1}
 [eva] array_bounds.i:15: Frama_C_show_each: {0; 1; 2}
 [eva] array_bounds.i:15: Frama_C_show_each: [0..11]
 [eva] array_bounds.i:15: Frama_C_show_each: [0..11]
-[eva] array_bounds.i:19: starting to merge loop iterations
+[eva:partition] array_bounds.i:19: starting to merge loop iterations
 [eva:alarm] array_bounds.i:19: Warning: 
   signed overflow. assert j + 5 ≤ 2147483647;
 [eva] Recording results for main
diff --git a/tests/value/oracle/array_degenerating_loop.res.oracle b/tests/value/oracle/array_degenerating_loop.res.oracle
index 92469746912..61ea24cc722 100644
--- a/tests/value/oracle/array_degenerating_loop.res.oracle
+++ b/tests/value/oracle/array_degenerating_loop.res.oracle
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   t[0..1] ∈ {1}
    [2..99] ∈ {0}
-[eva] array_degenerating_loop.i:8: starting to merge loop iterations
+[eva:partition] array_degenerating_loop.i:8: starting to merge loop iterations
 [eva:alarm] array_degenerating_loop.i:9: Warning: 
   accessing out of bounds index. assert i < 100;
 [eva:alarm] array_degenerating_loop.i:9: Warning: 
diff --git a/tests/value/oracle/array_loop.res.oracle b/tests/value/oracle/array_loop.res.oracle
index 284fe6dad45..76788423548 100644
--- a/tests/value/oracle/array_loop.res.oracle
+++ b/tests/value/oracle/array_loop.res.oracle
@@ -23,7 +23,7 @@
     [7] ∈ {24}
     [8..17] ∈ {1}
     [18..19] ∈ {0}
-[eva] array_loop.i:7: starting to merge loop iterations
+[eva:partition] array_loop.i:7: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/assigns.res.oracle b/tests/value/oracle/assigns.res.oracle
index 5f6d7ad67fb..a0290280a5f 100644
--- a/tests/value/oracle/assigns.res.oracle
+++ b/tests/value/oracle/assigns.res.oracle
@@ -31,7 +31,7 @@
   Called from assigns.i:49.
 [eva] using specification for function f
 [eva] Done for function f
-[eva] assigns.i:48: starting to merge loop iterations
+[eva:partition] assigns.i:48: starting to merge loop iterations
 [eva] computing for function f <- main1 <- main.
   Called from assigns.i:49.
 [eva] Done for function f
diff --git a/tests/value/oracle/assigns_from.res.oracle b/tests/value/oracle/assigns_from.res.oracle
index be60cecebed..d992ce375d0 100644
--- a/tests/value/oracle/assigns_from.res.oracle
+++ b/tests/value/oracle/assigns_from.res.oracle
@@ -193,7 +193,7 @@
   Called from assigns_from.i:152.
 [eva] using specification for function c
 [eva] Done for function c
-[eva] assigns_from.i:152: starting to merge loop iterations
+[eva:partition] assigns_from.i:152: starting to merge loop iterations
 [eva] computing for function c <- main10 <- main.
   Called from assigns_from.i:152.
 [eva] Done for function c
@@ -265,7 +265,7 @@
 [eva] Done for function main13
 [eva] computing for function main14 <- main.
   Called from assigns_from.i:250.
-[eva] assigns_from.i:183: starting to merge loop iterations
+[eva:partition] assigns_from.i:183: starting to merge loop iterations
 [eva] Recording results for main14
 [from] Computing for function main14
 [from] Done for function main14
@@ -275,7 +275,7 @@
 [eva] Done for function main14
 [eva] computing for function main16 <- main.
   Called from assigns_from.i:251.
-[eva] assigns_from.i:188: starting to merge loop iterations
+[eva:partition] assigns_from.i:188: starting to merge loop iterations
 [eva] Recording results for main16
 [from] Computing for function main16
 [from] Done for function main16
@@ -285,7 +285,7 @@
 [eva] Done for function main16
 [eva] computing for function main17 <- main.
   Called from assigns_from.i:252.
-[eva] assigns_from.i:195: starting to merge loop iterations
+[eva:partition] assigns_from.i:195: starting to merge loop iterations
 [eva] Recording results for main17
 [from] Computing for function main17
 [from] Done for function main17
diff --git a/tests/value/oracle/auto_loop_unroll.0.res.oracle b/tests/value/oracle/auto_loop_unroll.0.res.oracle
index 8bc2593b977..432a17f44ae 100644
--- a/tests/value/oracle/auto_loop_unroll.0.res.oracle
+++ b/tests/value/oracle/auto_loop_unroll.0.res.oracle
@@ -7,37 +7,38 @@
   g ∈ {0}
 [eva] computing for function simple_loops <- main.
   Called from auto_loop_unroll.c:428.
-[eva] auto_loop_unroll.c:24: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:24: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:25: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:27: Frama_C_show_each_auto: [0..2147483647]
-[eva] auto_loop_unroll.c:30: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:30: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:31: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:33: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:38: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:38: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:39: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:46: Trace partitioning superposing up to 100 states
+[eva:partition] auto_loop_unroll.c:46: 
+  Trace partitioning superposing up to 100 states
 [eva] auto_loop_unroll.c:49: Frama_C_show_each_singleton: {100}
 [eva] Recording results for simple_loops
 [eva] Done for function simple_loops
 [eva] computing for function various_loops <- main.
   Called from auto_loop_unroll.c:429.
-[eva] auto_loop_unroll.c:57: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:57: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:58: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:59: Frama_C_show_each_64: [0..2147483647]
-[eva] auto_loop_unroll.c:62: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:62: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:63: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:64: Frama_C_show_each_40: [0..2147483647]
-[eva] auto_loop_unroll.c:67: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:67: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:69: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:72: Frama_C_show_each_80: [0..2147483647]
-[eva] auto_loop_unroll.c:75: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:75: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:76: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:82: Frama_C_show_each_32_80: [0..2147483647]
@@ -47,11 +48,11 @@
 [eva] auto_loop_unroll.c:86: 
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
-[eva] auto_loop_unroll.c:87: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:87: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:88: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:89: Frama_C_show_each_40_50: [0..2147483647]
-[eva] auto_loop_unroll.c:92: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:92: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:93: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:95: Frama_C_show_each_101: [0..2147483647]
@@ -64,7 +65,7 @@
 [eva] Recording results for incr
 [eva] Done for function incr
 [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
-[eva] auto_loop_unroll.c:98: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:98: starting to merge loop iterations
 [eva] computing for function incr_g <- various_loops <- main.
   Called from auto_loop_unroll.c:99.
 [eva] Recording results for incr_g
@@ -119,20 +120,20 @@
 [eva] Done for function incr
 [eva] auto_loop_unroll.c:103: Frama_C_show_each_25: [0..2147483647]
 [eva:loop-unroll:auto] auto_loop_unroll.c:108: Automatic loop unrolling.
-[eva] auto_loop_unroll.c:107: starting to merge loop iterations
-[eva] auto_loop_unroll.c:108: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:107: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:108: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:109: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:112: Frama_C_show_each_120: [0..2147483647]
-[eva] auto_loop_unroll.c:115: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:115: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:120: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:122: Frama_C_show_each_32_64: [0..2147483647]
-[eva] auto_loop_unroll.c:125: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:125: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:130: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:132: Frama_C_show_each_1_28: [0..2147483647]
-[eva] auto_loop_unroll.c:134: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:134: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:139: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:141: Frama_C_show_each_top: [0..2147483647]
@@ -140,21 +141,21 @@
 [eva] Done for function various_loops
 [eva] computing for function complex_loops <- main.
   Called from auto_loop_unroll.c:430.
-[eva] auto_loop_unroll.c:152: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:152: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:154: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:156: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:160: starting to merge loop iterations
-[eva] auto_loop_unroll.c:161: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:160: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:161: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:165: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:168: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:171: starting to merge loop iterations
-[eva] auto_loop_unroll.c:172: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:171: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:172: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:176: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:179: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:183: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:183: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:186: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:188: Frama_C_show_each_imprecise: [0..2147483647]
@@ -162,7 +163,7 @@
   Called from auto_loop_unroll.c:193.
 [eva] Recording results for incr_g
 [eva] Done for function incr_g
-[eva] auto_loop_unroll.c:192: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:192: starting to merge loop iterations
 [eva] computing for function incr_g <- complex_loops <- main.
   Called from auto_loop_unroll.c:193.
 [eva] Recording results for incr_g
@@ -180,11 +181,11 @@
 [eva:alarm] auto_loop_unroll.c:195: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:197: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:202: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:202: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:204: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:210: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:210: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:212: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:211: Warning: 
@@ -194,35 +195,35 @@
 [eva] Done for function complex_loops
 [eva] computing for function various_conditions <- main.
   Called from auto_loop_unroll.c:431.
-[eva] auto_loop_unroll.c:223: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:223: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:224: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:226: Frama_C_show_each_11: [0..2147483647]
-[eva] auto_loop_unroll.c:228: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:228: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:229: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:231: Frama_C_show_each_12: [0..2147483647]
-[eva] auto_loop_unroll.c:234: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:234: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:235: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:234: Warning: 
   signed overflow. assert -2147483648 ≤ i_0 - 1;
 [eva] auto_loop_unroll.c:237: Frama_C_show_each_0_13: [0..2147483647]
-[eva] auto_loop_unroll.c:239: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:239: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:240: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:239: Warning: 
   signed overflow. assert -2147483648 ≤ i_1 - 1;
 [eva] auto_loop_unroll.c:242: Frama_C_show_each_0_14: [0..2147483647]
-[eva] auto_loop_unroll.c:245: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:245: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:248: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:250: Frama_C_show_each_0_15: [0..2147483647]
-[eva] auto_loop_unroll.c:252: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:252: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:253: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:257: Frama_C_show_each_11_111: [0..2147483647]
-[eva] auto_loop_unroll.c:262: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:262: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:263: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:265: Frama_C_show_each_16: [0..2147483647]
@@ -230,31 +231,31 @@
 [eva] Done for function various_conditions
 [eva] computing for function temporary_variables <- main.
   Called from auto_loop_unroll.c:432.
-[eva] auto_loop_unroll.c:274: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:274: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:274: Warning: 
   signed overflow. assert i + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:275: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:277: Frama_C_show_each_20: [0..2147483647]
-[eva] auto_loop_unroll.c:279: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:279: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:280: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:279: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] auto_loop_unroll.c:282: Frama_C_show_each_21: [0..2147483647]
-[eva] auto_loop_unroll.c:284: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:284: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:286: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:284: Warning: 
   signed overflow. assert i + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:288: Frama_C_show_each_22: [0..2147483647]
-[eva] auto_loop_unroll.c:291: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:291: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:294: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:291: Warning: 
   signed overflow. assert i + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:296: Frama_C_show_each_23: [0..2147483647]
-[eva] auto_loop_unroll.c:299: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:299: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:302: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:299: Warning: 
@@ -264,39 +265,39 @@
 [eva] Done for function temporary_variables
 [eva] computing for function loops_with_goto <- main.
   Called from auto_loop_unroll.c:433.
-[eva] auto_loop_unroll.c:310: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:310: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:311: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:315: Frama_C_show_each_30: [0..2147483647]
 [eva:alarm] auto_loop_unroll.c:320: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
-[eva] auto_loop_unroll.c:319: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:319: starting to merge loop iterations
 [eva] auto_loop_unroll.c:324: Frama_C_show_each_top: [0..2147483647]
-[eva] auto_loop_unroll.c:327: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:327: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:328: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:333: Frama_C_show_each_32: [0..2147483647]
 [eva:alarm] auto_loop_unroll.c:337: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
-[eva] auto_loop_unroll.c:336: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:336: starting to merge loop iterations
 [eva] auto_loop_unroll.c:341: Frama_C_show_each_33_inf: [0..2147483647]
 [eva:alarm] auto_loop_unroll.c:345: Warning: 
   signed overflow. assert i + 1 ≤ 2147483647;
-[eva] auto_loop_unroll.c:344: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:344: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:344: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:349: Frama_C_show_each_top: [0..2147483647]
-[eva] auto_loop_unroll.c:352: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:352: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:355: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:357: Frama_C_show_each_0_35: [0..2147483647]
-[eva] auto_loop_unroll.c:360: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:360: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:360: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:360: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] auto_loop_unroll.c:364: Frama_C_show_each_36: [0..2147483647]
-[eva] auto_loop_unroll.c:367: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:367: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:370: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:372: Frama_C_show_each_27: [0..2147483647]
@@ -316,19 +317,19 @@
 [eva] Done for function non_natural_loops
 [eva] computing for function following_loops <- main.
   Called from auto_loop_unroll.c:435.
-[eva] auto_loop_unroll.c:402: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:402: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:404: Warning: 
   signed overflow. assert j + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:408: Warning: 
   signed overflow. assert j + 1 ≤ 2147483647;
-[eva] auto_loop_unroll.c:406: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:406: starting to merge loop iterations
 [eva] auto_loop_unroll.c:410: Frama_C_show_each_30: [0..2147483647]
-[eva] auto_loop_unroll.c:413: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:413: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:415: Warning: 
   signed overflow. assert j + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:419: Warning: 
   signed overflow. assert j + 1 ≤ 2147483647;
-[eva] auto_loop_unroll.c:417: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:417: starting to merge loop iterations
 [eva] auto_loop_unroll.c:424: Frama_C_show_each_30: [0..2147483647]
 [eva] Recording results for following_loops
 [eva] Done for function following_loops
diff --git a/tests/value/oracle/auto_loop_unroll.1.res.oracle b/tests/value/oracle/auto_loop_unroll.1.res.oracle
index 006afbecfc6..26f830368c3 100644
--- a/tests/value/oracle/auto_loop_unroll.1.res.oracle
+++ b/tests/value/oracle/auto_loop_unroll.1.res.oracle
@@ -8,13 +8,14 @@
 [eva] computing for function simple_loops <- main.
   Called from auto_loop_unroll.c:428.
 [eva:loop-unroll:auto] auto_loop_unroll.c:24: Automatic loop unrolling.
-[eva] auto_loop_unroll.c:24: Trace partitioning superposing up to 100 states
+[eva:partition] auto_loop_unroll.c:24: 
+  Trace partitioning superposing up to 100 states
 [eva] auto_loop_unroll.c:27: Frama_C_show_each_auto: {100}
-[eva] auto_loop_unroll.c:30: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:30: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:31: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:33: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:38: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:38: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:39: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: [0..2147483647]
@@ -30,7 +31,8 @@
 [eva:loop-unroll:auto] auto_loop_unroll.c:67: Automatic loop unrolling.
 [eva] auto_loop_unroll.c:72: Frama_C_show_each_80: {80}
 [eva:loop-unroll:auto] auto_loop_unroll.c:75: Automatic loop unrolling.
-[eva] auto_loop_unroll.c:75: Trace partitioning superposing up to 100 states
+[eva:partition] auto_loop_unroll.c:75: 
+  Trace partitioning superposing up to 100 states
 [eva] auto_loop_unroll.c:82: Frama_C_show_each_32_80: [32..80]
 [eva] computing for function Frama_C_interval <- various_loops <- main.
   Called from auto_loop_unroll.c:86.
@@ -276,7 +278,7 @@
 [eva] auto_loop_unroll.c:122: Frama_C_show_each_32_64: [32..64]
 [eva:loop-unroll:auto] auto_loop_unroll.c:125: Automatic loop unrolling.
 [eva] auto_loop_unroll.c:132: Frama_C_show_each_1_28: [1..28]
-[eva] auto_loop_unroll.c:134: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:134: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:139: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:141: Frama_C_show_each_top: [0..2147483647]
@@ -284,21 +286,21 @@
 [eva] Done for function various_loops
 [eva] computing for function complex_loops <- main.
   Called from auto_loop_unroll.c:430.
-[eva] auto_loop_unroll.c:152: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:152: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:154: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:156: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:160: starting to merge loop iterations
-[eva] auto_loop_unroll.c:161: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:160: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:161: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:165: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:168: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:171: starting to merge loop iterations
-[eva] auto_loop_unroll.c:172: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:171: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:172: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:176: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:179: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:183: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:183: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:186: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:188: Frama_C_show_each_imprecise: [0..2147483647]
@@ -306,7 +308,7 @@
   Called from auto_loop_unroll.c:193.
 [eva] Recording results for incr_g
 [eva] Done for function incr_g
-[eva] auto_loop_unroll.c:192: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:192: starting to merge loop iterations
 [eva] computing for function incr_g <- complex_loops <- main.
   Called from auto_loop_unroll.c:193.
 [eva] Recording results for incr_g
@@ -324,11 +326,11 @@
 [eva:alarm] auto_loop_unroll.c:195: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:197: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:202: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:202: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:204: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:210: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:210: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:212: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:211: Warning: 
@@ -349,7 +351,8 @@
 [eva:loop-unroll:auto] auto_loop_unroll.c:245: Automatic loop unrolling.
 [eva] auto_loop_unroll.c:250: Frama_C_show_each_0_15: [0..15]
 [eva:loop-unroll:auto] auto_loop_unroll.c:252: Automatic loop unrolling.
-[eva] auto_loop_unroll.c:252: Trace partitioning superposing up to 100 states
+[eva:partition] auto_loop_unroll.c:252: 
+  Trace partitioning superposing up to 100 states
 [eva] auto_loop_unroll.c:257: Frama_C_show_each_11_111: [11..111]
 [eva:loop-unroll:auto] auto_loop_unroll.c:262: Automatic loop unrolling.
 [eva] auto_loop_unroll.c:265: Frama_C_show_each_16: {16}
@@ -365,7 +368,7 @@
 [eva] auto_loop_unroll.c:288: Frama_C_show_each_22: {22}
 [eva:loop-unroll:auto] auto_loop_unroll.c:291: Automatic loop unrolling.
 [eva] auto_loop_unroll.c:296: Frama_C_show_each_23: {23}
-[eva] auto_loop_unroll.c:299: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:299: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:302: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:299: Warning: 
@@ -378,10 +381,11 @@
 [eva:loop-unroll:auto] auto_loop_unroll.c:310: Automatic loop unrolling.
 [eva] auto_loop_unroll.c:315: Frama_C_show_each_30: {30}
 [eva:loop-unroll:auto] auto_loop_unroll.c:319: Automatic loop unrolling.
-[eva] auto_loop_unroll.c:319: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:319: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:320: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
-[eva] auto_loop_unroll.c:319: Trace partitioning superposing up to 100 states
+[eva:partition] auto_loop_unroll.c:319: 
+  Trace partitioning superposing up to 100 states
 [eva] auto_loop_unroll.c:324: Frama_C_show_each_top: [31..2147483647]
 [eva:loop-unroll:auto] auto_loop_unroll.c:327: Automatic loop unrolling.
 [eva] auto_loop_unroll.c:333: Frama_C_show_each_32: {32}
@@ -391,7 +395,7 @@
 [eva] auto_loop_unroll.c:341: Frama_C_show_each_33_inf: [33..2147483647]
 [eva:alarm] auto_loop_unroll.c:345: Warning: 
   signed overflow. assert i + 1 ≤ 2147483647;
-[eva] auto_loop_unroll.c:344: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:344: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:344: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:349: Frama_C_show_each_top: [0..2147483647]
diff --git a/tests/value/oracle/bad_loop.res.oracle b/tests/value/oracle/bad_loop.res.oracle
index 98dd94aeb40..579252b20f5 100644
--- a/tests/value/oracle/bad_loop.res.oracle
+++ b/tests/value/oracle/bad_loop.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   c ∈ [--..--]
-[eva] bad_loop.i:6: starting to merge loop iterations
+[eva:partition] bad_loop.i:6: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/bitfield.res.oracle b/tests/value/oracle/bitfield.res.oracle
index 13d02bf5fac..201d37bfdae 100644
--- a/tests/value/oracle/bitfield.res.oracle
+++ b/tests/value/oracle/bitfield.res.oracle
@@ -118,7 +118,7 @@
   .bitf ∈ {0}
   .[bits 65 to 95] ∈
   {{ garbled mix of &{b} (origin: Misaligned read {bitfield.i:70}) }}
-[eva] bitfield.i:69: starting to merge loop iterations
+[eva:partition] bitfield.i:69: starting to merge loop iterations
 [eva] computing for function leaf <- imprecise_bts_1671 <- main.
   Called from bitfield.i:70.
 [eva] Done for function leaf
diff --git a/tests/value/oracle/branch2.res.oracle b/tests/value/oracle/branch2.res.oracle
index 0a917d9922b..f83396e9d17 100644
--- a/tests/value/oracle/branch2.res.oracle
+++ b/tests/value/oracle/branch2.res.oracle
@@ -9,7 +9,7 @@
   plein ∈ {0}
   NumFonct ∈ {0}
   NumSsPage ∈ {0}
-[eva] branch2.i:14: starting to merge loop iterations
+[eva:partition] branch2.i:14: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/buffer_overflow.0.res.oracle b/tests/value/oracle/buffer_overflow.0.res.oracle
index 43a3466b7dd..2c1f3b4b750 100644
--- a/tests/value/oracle/buffer_overflow.0.res.oracle
+++ b/tests/value/oracle/buffer_overflow.0.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] buffer_overflow.i:15: starting to merge loop iterations
+[eva:partition] buffer_overflow.i:15: starting to merge loop iterations
 [eva:alarm] buffer_overflow.i:18: Warning: 
   accessing out of bounds index. assert loop_counter < 10;
 [eva] Recording results for main
diff --git a/tests/value/oracle/bug0196.res.oracle b/tests/value/oracle/bug0196.res.oracle
index 6c1b298cc4c..72f5d95bf1f 100644
--- a/tests/value/oracle/bug0196.res.oracle
+++ b/tests/value/oracle/bug0196.res.oracle
@@ -9,7 +9,7 @@
 [eva] bug0196.c:8: assertion got status valid.
 [eva] bug0196.c:11: cannot evaluate ACSL term, \at() on a C label is unsupported
 [eva:alarm] bug0196.c:11: Warning: assertion got status unknown.
-[eva] bug0196.c:7: starting to merge loop iterations
+[eva:partition] bug0196.c:7: starting to merge loop iterations
 [eva:alarm] bug0196.c:10: Warning: 
   signed overflow. assert r * tmp ≤ 2147483647;
                    (tmp from n--)
diff --git a/tests/value/oracle/bug_0244.res.oracle b/tests/value/oracle/bug_0244.res.oracle
index 029360c90b6..dbdb8416660 100644
--- a/tests/value/oracle/bug_0244.res.oracle
+++ b/tests/value/oracle/bug_0244.res.oracle
@@ -7,7 +7,7 @@
   p ∈ {0}
 [eva:locals-escaping] bug_0244.i:10: Warning: 
   locals {u} escaping the scope of a block of main through p
-[eva] bug_0244.i:7: starting to merge loop iterations
+[eva:partition] bug_0244.i:7: starting to merge loop iterations
 [eva:alarm] bug_0244.i:12: Warning: 
   accessing left-value that contains escaping addresses.
   assert ¬\dangling(&p);
diff --git a/tests/value/oracle/call.res.oracle b/tests/value/oracle/call.res.oracle
index c81599c1696..c61a564254c 100644
--- a/tests/value/oracle/call.res.oracle
+++ b/tests/value/oracle/call.res.oracle
@@ -26,7 +26,7 @@
   Called from call.i:20.
 [eva] using specification for function leaf_fun_charp
 [eva] Done for function leaf_fun_charp
-[eva] call.i:23: starting to merge loop iterations
+[eva:partition] call.i:23: starting to merge loop iterations
 [eva] computing for function f <- main.
   Called from call.i:39.
 [eva] Recording results for f
diff --git a/tests/value/oracle/cast.res.oracle b/tests/value/oracle/cast.res.oracle
index 8f632c2773c..e1a20de8e94 100644
--- a/tests/value/oracle/cast.res.oracle
+++ b/tests/value/oracle/cast.res.oracle
@@ -42,7 +42,7 @@
 [eva:alarm] cast.i:67: Warning: 
   function printf_va_2: precondition got status unknown.
 [eva] Done for function printf_va_2
-[eva] cast.i:64: starting to merge loop iterations
+[eva:partition] cast.i:64: starting to merge loop iterations
 [eva] computing for function printf_va_2 <- main2 <- main.
   Called from cast.i:67.
 [eva] Done for function printf_va_2
diff --git a/tests/value/oracle/cast1.res.oracle b/tests/value/oracle/cast1.res.oracle
index 0d5e247003e..0d585a7e625 100644
--- a/tests/value/oracle/cast1.res.oracle
+++ b/tests/value/oracle/cast1.res.oracle
@@ -9,8 +9,8 @@
    [1..4] ∈ {0}
   I[0] ∈ {1}
    [1..4] ∈ {0}
-[eva] cast1.i:7: starting to merge loop iterations
-[eva] cast1.i:8: starting to merge loop iterations
+[eva:partition] cast1.i:7: starting to merge loop iterations
+[eva:partition] cast1.i:8: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/cond2.0.res.oracle b/tests/value/oracle/cond2.0.res.oracle
index db0959a7127..79bea542ba1 100644
--- a/tests/value/oracle/cond2.0.res.oracle
+++ b/tests/value/oracle/cond2.0.res.oracle
@@ -14,9 +14,9 @@
   s ∈ {0}
   t ∈ {0}
   u ∈ {0}
-[eva] cond2.i:26: starting to merge loop iterations
+[eva:partition] cond2.i:26: starting to merge loop iterations
 [eva:alarm] cond2.i:26: Warning: signed overflow. assert x + 2 ≤ 2147483647;
-[eva] cond2.i:27: starting to merge loop iterations
+[eva:partition] cond2.i:27: starting to merge loop iterations
 [eva:alarm] cond2.i:27: Warning: signed overflow. assert y + 5 ≤ 2147483647;
 [eva] Recording results for zero_ou_un_0
 [eva] Done for function zero_ou_un_0
diff --git a/tests/value/oracle/cond2.1.res.oracle b/tests/value/oracle/cond2.1.res.oracle
index d8a9fd6e107..31530dfb624 100644
--- a/tests/value/oracle/cond2.1.res.oracle
+++ b/tests/value/oracle/cond2.1.res.oracle
@@ -14,17 +14,17 @@
   s ∈ {0}
   t ∈ {0}
   u ∈ {0}
-[eva] cond2.i:52: starting to merge loop iterations
+[eva:partition] cond2.i:52: starting to merge loop iterations
 [eva:alarm] cond2.i:52: Warning: signed overflow. assert x + 2 ≤ 2147483647;
-[eva] cond2.i:53: starting to merge loop iterations
+[eva:partition] cond2.i:53: starting to merge loop iterations
 [eva:alarm] cond2.i:53: Warning: signed overflow. assert y + 2 ≤ 2147483647;
-[eva] cond2.i:59: starting to merge loop iterations
+[eva:partition] cond2.i:59: starting to merge loop iterations
 [eva:alarm] cond2.i:59: Warning: signed overflow. assert x + 4 ≤ 2147483647;
-[eva] cond2.i:60: starting to merge loop iterations
+[eva:partition] cond2.i:60: starting to merge loop iterations
 [eva:alarm] cond2.i:60: Warning: signed overflow. assert y + 4 ≤ 2147483647;
-[eva] cond2.i:66: starting to merge loop iterations
+[eva:partition] cond2.i:66: starting to merge loop iterations
 [eva:alarm] cond2.i:66: Warning: out of bounds write. assert \valid(px);
-[eva] cond2.i:67: starting to merge loop iterations
+[eva:partition] cond2.i:67: starting to merge loop iterations
 [eva:alarm] cond2.i:67: Warning: out of bounds write. assert \valid(py);
 [eva] Recording results for un_1
 [eva] Done for function un_1
diff --git a/tests/value/oracle/control.res.oracle b/tests/value/oracle/control.res.oracle
index b68b69e450d..0397f939a37 100644
--- a/tests/value/oracle/control.res.oracle
+++ b/tests/value/oracle/control.res.oracle
@@ -7,7 +7,7 @@
   y ∈ {0}
   c ∈ {0}
   d ∈ {0}
-[eva] control.i:11: starting to merge loop iterations
+[eva:partition] control.i:11: starting to merge loop iterations
 [eva:alarm] control.i:14: Warning: signed overflow. assert x + 1 ≤ 2147483647;
 [eva] Recording results for f
 [eva] Done for function f
diff --git a/tests/value/oracle/dataflow_order.res.oracle b/tests/value/oracle/dataflow_order.res.oracle
index fcd9f17f732..a5c1cb38356 100644
--- a/tests/value/oracle/dataflow_order.res.oracle
+++ b/tests/value/oracle/dataflow_order.res.oracle
@@ -17,7 +17,7 @@
   Called from dataflow_order.i:25.
 [eva] Recording results for g
 [eva] Done for function g
-[eva] dataflow_order.i:17: starting to merge loop iterations
+[eva:partition] dataflow_order.i:17: starting to merge loop iterations
 [eva] dataflow_order.i:18: Frama_C_show_each_1: {0; 1}, {0; 1}
 [eva] dataflow_order.i:21: Frama_C_show_each_then: {1; 2}, {0; 1}
 [eva] computing for function f <- main.
diff --git a/tests/value/oracle/degeneration2.res.oracle b/tests/value/oracle/degeneration2.res.oracle
index eff8a7e0599..065540b5f67 100644
--- a/tests/value/oracle/degeneration2.res.oracle
+++ b/tests/value/oracle/degeneration2.res.oracle
@@ -18,7 +18,7 @@
   accessing uninitialized left-value. assert \initialized((int *)A);
 [eva:alarm] degeneration2.i:17: Warning: 
   out of bounds read. assert \valid_read((int *)A);
-[eva] degeneration2.i:16: starting to merge loop iterations
+[eva:partition] degeneration2.i:16: starting to merge loop iterations
 [eva:alarm] degeneration2.i:25: Warning: 
   accessing uninitialized left-value. assert \initialized(&offset_uninit);
 [eva] Recording results for main
diff --git a/tests/value/oracle/descending.res.oracle b/tests/value/oracle/descending.res.oracle
index 2f7ccf301ed..f3c39b15c9c 100644
--- a/tests/value/oracle/descending.res.oracle
+++ b/tests/value/oracle/descending.res.oracle
@@ -8,7 +8,7 @@
   Called from descending.i:33.
 [eva] computing for function f <- test1 <- main.
   Called from descending.i:12.
-[eva] descending.i:4: starting to merge loop iterations
+[eva:partition] descending.i:4: starting to merge loop iterations
 [eva] Recording results for f
 [eva] Done for function f
 [eva:alarm] descending.i:13: Warning: 
@@ -19,7 +19,7 @@
 [eva] Done for function test1
 [eva] computing for function test2 <- main.
   Called from descending.i:34.
-[eva] descending.i:22: starting to merge loop iterations
+[eva:partition] descending.i:22: starting to merge loop iterations
 [eva:alarm] descending.i:28: Warning: 
   accessing out of bounds index. assert j < 33;
 [eva] Recording results for test2
diff --git a/tests/value/oracle/div.res.oracle b/tests/value/oracle/div.res.oracle
index 4b8b6e318ca..f76cd1db5c6 100644
--- a/tests/value/oracle/div.res.oracle
+++ b/tests/value/oracle/div.res.oracle
@@ -29,7 +29,7 @@
   Called from div.i:86.
 [eva:alarm] div.i:14: Warning: signed overflow. assert c + 1 ≤ 2147483647;
 [eva:alarm] div.i:17: Warning: signed overflow. assert c + 2 ≤ 2147483647;
-[eva] div.i:14: starting to merge loop iterations
+[eva:partition] div.i:14: starting to merge loop iterations
 [eva:alarm] div.i:17: Warning: signed overflow. assert -2147483648 ≤ X - 1;
 [eva:alarm] div.i:16: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva:alarm] div.i:32: Warning: division by zero. assert Z2 ≢ 0;
diff --git a/tests/value/oracle/domains.res.oracle b/tests/value/oracle/domains.res.oracle
index 12c8078fc90..5bb482d01c2 100644
--- a/tests/value/oracle/domains.res.oracle
+++ b/tests/value/oracle/domains.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] domains.i:19: starting to merge loop iterations
+[eva:partition] domains.i:19: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/domains_function.0.res.oracle b/tests/value/oracle/domains_function.0.res.oracle
index b0dcbe8be76..3ebb92bf40b 100644
--- a/tests/value/oracle/domains_function.0.res.oracle
+++ b/tests/value/oracle/domains_function.0.res.oracle
@@ -7,7 +7,7 @@
   i ∈ {0}
   result ∈ {0}
   t[0..9] ∈ {0}
-[eva] domains_function.c:118: starting to merge loop iterations
+[eva:partition] domains_function.c:118: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- main.
   Called from domains_function.c:120.
 [eva] using specification for function Frama_C_interval
diff --git a/tests/value/oracle/downcast.0.res.oracle b/tests/value/oracle/downcast.0.res.oracle
index 23099a0dc22..3adff23c540 100644
--- a/tests/value/oracle/downcast.0.res.oracle
+++ b/tests/value/oracle/downcast.0.res.oracle
@@ -87,7 +87,7 @@
 [eva] Done for function main9_bitfield
 [eva] computing for function main10_loop <- main.
   Called from downcast.c:187.
-[eva] downcast.c:171: starting to merge loop iterations
+[eva:partition] downcast.c:171: starting to merge loop iterations
 [eva] Recording results for main10_loop
 [eva] Done for function main10_loop
 [eva] Recording results for main
diff --git a/tests/value/oracle/downcast.1.res.oracle b/tests/value/oracle/downcast.1.res.oracle
index a5144e5f1ef..ef0a6465f00 100644
--- a/tests/value/oracle/downcast.1.res.oracle
+++ b/tests/value/oracle/downcast.1.res.oracle
@@ -102,7 +102,7 @@
 [eva] computing for function main10_loop <- main.
   Called from downcast.c:187.
 [eva:alarm] downcast.c:173: Warning: signed downcast. assert bf.b ≤ 127;
-[eva] downcast.c:171: starting to merge loop iterations
+[eva:partition] downcast.c:171: starting to merge loop iterations
 [eva] Recording results for main10_loop
 [eva] Done for function main10_loop
 [eva] Recording results for main
diff --git a/tests/value/oracle/downcast.2.res.oracle b/tests/value/oracle/downcast.2.res.oracle
index ba2c67d65b6..15c85130ec8 100644
--- a/tests/value/oracle/downcast.2.res.oracle
+++ b/tests/value/oracle/downcast.2.res.oracle
@@ -96,7 +96,7 @@
   Called from downcast.c:187.
 [eva:alarm] downcast.c:172: Warning: unsigned downcast. assert 0 ≤ v;
 [eva:alarm] downcast.c:172: Warning: unsigned downcast. assert v ≤ 1023;
-[eva] downcast.c:171: starting to merge loop iterations
+[eva:partition] downcast.c:171: starting to merge loop iterations
 [eva] Recording results for main10_loop
 [eva] Done for function main10_loop
 [eva] Recording results for main
diff --git a/tests/value/oracle/downcast.3.res.oracle b/tests/value/oracle/downcast.3.res.oracle
index 1a72c7891a6..30a3b438f9b 100644
--- a/tests/value/oracle/downcast.3.res.oracle
+++ b/tests/value/oracle/downcast.3.res.oracle
@@ -98,7 +98,7 @@
   Called from downcast.c:187.
 [eva:alarm] downcast.c:173: Warning: signed downcast. assert -128 ≤ (int)bf.b;
 [eva:alarm] downcast.c:173: Warning: signed downcast. assert (int)bf.b ≤ 127;
-[eva] downcast.c:171: starting to merge loop iterations
+[eva:partition] downcast.c:171: starting to merge loop iterations
 [eva] Recording results for main10_loop
 [eva] Done for function main10_loop
 [eva] Recording results for main
diff --git a/tests/value/oracle/downcast.4.res.oracle b/tests/value/oracle/downcast.4.res.oracle
index 7d3e9e83658..67f02815d87 100644
--- a/tests/value/oracle/downcast.4.res.oracle
+++ b/tests/value/oracle/downcast.4.res.oracle
@@ -76,7 +76,7 @@
 [eva] Done for function main9_bitfield
 [eva] computing for function main10_loop <- main.
   Called from downcast.c:187.
-[eva] downcast.c:171: starting to merge loop iterations
+[eva:partition] downcast.c:171: starting to merge loop iterations
 [eva] Recording results for main10_loop
 [eva] Done for function main10_loop
 [eva] Recording results for main
diff --git a/tests/value/oracle/dur.res.oracle b/tests/value/oracle/dur.res.oracle
index 5e56c435fdf..629a0d1f9a8 100644
--- a/tests/value/oracle/dur.res.oracle
+++ b/tests/value/oracle/dur.res.oracle
@@ -155,7 +155,7 @@
     {.M92[5]{.M2; .M3}; .M93[0..4]} ∈ [--..--]
   G6 ∈ [--..--]
   G7[0..160] ∈ [--..--]
-[eva] dur.i:167: starting to merge loop iterations
+[eva:partition] dur.i:167: starting to merge loop iterations
 [eva] Recording results for F2
 [eva] Done for function F2
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/empty_struct.5.res.oracle b/tests/value/oracle/empty_struct.5.res.oracle
index 1d42b062fb7..70ae8e15a83 100644
--- a/tests/value/oracle/empty_struct.5.res.oracle
+++ b/tests/value/oracle/empty_struct.5.res.oracle
@@ -13,7 +13,7 @@
 [eva] empty_struct.c:79: 
   function realloc: precondition 'freeable' got status valid.
 [eva:malloc:new] empty_struct.c:79: allocating variable __realloc_main3_l79
-[eva] empty_struct.c:81: starting to merge loop iterations
+[eva:partition] empty_struct.c:81: starting to merge loop iterations
 [eva] empty_struct.c:86: Call to builtin free
 [eva] empty_struct.c:86: 
   function free: precondition 'freeable' got status valid.
diff --git a/tests/value/oracle/enum.res.oracle b/tests/value/oracle/enum.res.oracle
index 880bfa879ba..be3fff05020 100644
--- a/tests/value/oracle/enum.res.oracle
+++ b/tests/value/oracle/enum.res.oracle
@@ -7,7 +7,7 @@
    [1..2] ∈ {0}
   u[0] ∈ {2}
    [1..2] ∈ {0}
-[eva] enum.i:16: starting to merge loop iterations
+[eva:partition] enum.i:16: starting to merge loop iterations
 [eva] enum.i:20: assertion got status valid.
 [eva] Recording results for f
 [eva] Done for function f
diff --git a/tests/value/oracle/exit_paths.res.oracle b/tests/value/oracle/exit_paths.res.oracle
index 11df2b9e88a..1deaa00e4a2 100644
--- a/tests/value/oracle/exit_paths.res.oracle
+++ b/tests/value/oracle/exit_paths.res.oracle
@@ -8,7 +8,7 @@
   Called from exit_paths.i:71.
 [eva] exit_paths.i:11: Frama_C_show_each_1: {{ "On exit path" }}, {0}
 [eva] exit_paths.i:16: Frama_C_show_each_3: {{ "Not on exit path" }}, {0}
-[eva] exit_paths.i:10: starting to merge loop iterations
+[eva:partition] exit_paths.i:10: starting to merge loop iterations
 [eva] exit_paths.i:11: Frama_C_show_each_1: {{ "On exit path" }}, {0; 1}
 [eva] exit_paths.i:16: Frama_C_show_each_3: {{ "Not on exit path" }}, {0; 1}
 [eva] exit_paths.i:11: Frama_C_show_each_1: {{ "On exit path" }}, {0; 1; 2}
@@ -25,7 +25,7 @@
 [eva] exit_paths.i:25: Frama_C_show_each_4: {{ "On exit path" }}, {0}
 [eva] exit_paths.i:28: Frama_C_show_each_5: {{ "On exit path" }}, {0}, {0}
 [eva] exit_paths.i:37: Frama_C_show_each_8: {{ "Not on exit path" }}, {0}, {0}
-[eva] exit_paths.i:27: starting to merge loop iterations
+[eva:partition] exit_paths.i:27: starting to merge loop iterations
 [eva] exit_paths.i:28: Frama_C_show_each_5: {{ "On exit path" }}, {0}, {0; 1}
 [eva] exit_paths.i:37: 
   Frama_C_show_each_8: {{ "Not on exit path" }}, {0}, {0; 1}
@@ -39,7 +39,7 @@
 [eva] exit_paths.i:30: 
   Frama_C_show_each_6: {{ "Not on exit path" }}, {0}, [10..2147483647]
 [eva] exit_paths.i:40: Frama_C_show_each_9: {{ "Not on exit path" }}, {0}
-[eva] exit_paths.i:24: starting to merge loop iterations
+[eva:partition] exit_paths.i:24: starting to merge loop iterations
 [eva] exit_paths.i:25: Frama_C_show_each_4: {{ "On exit path" }}, {0; 1}
 [eva] exit_paths.i:28: 
   Frama_C_show_each_5: {{ "On exit path" }}, {0; 1}, [0..2147483647]
@@ -80,7 +80,7 @@
 [eva] exit_paths.i:49: Frama_C_show_each_10: {{ "On exit path" }}, {0}
 [eva] exit_paths.i:52: Frama_C_show_each_11: {{ "On exit path" }}, {0}, {0}
 [eva] exit_paths.i:57: Frama_C_show_each_13: {{ "On exit path" }}, {0}, {0}
-[eva] exit_paths.i:51: starting to merge loop iterations
+[eva:partition] exit_paths.i:51: starting to merge loop iterations
 [eva] exit_paths.i:52: Frama_C_show_each_11: {{ "On exit path" }}, {0}, {0; 1}
 [eva] exit_paths.i:57: Frama_C_show_each_13: {{ "On exit path" }}, {0}, {0; 1}
 [eva] exit_paths.i:52: 
@@ -93,7 +93,7 @@
 [eva] exit_paths.i:54: 
   Frama_C_show_each_12: {{ "On exit path" }}, {0}, [10..2147483647]
 [eva] exit_paths.i:64: Frama_C_show_each_15: {{ "Not on exit path" }}, {0}
-[eva] exit_paths.i:48: starting to merge loop iterations
+[eva:partition] exit_paths.i:48: starting to merge loop iterations
 [eva] exit_paths.i:49: Frama_C_show_each_10: {{ "On exit path" }}, {0; 1}
 [eva] exit_paths.i:52: 
   Frama_C_show_each_11: {{ "On exit path" }}, {0; 1}, [0..2147483647]
diff --git a/tests/value/oracle/find_ivaltop.res.oracle b/tests/value/oracle/find_ivaltop.res.oracle
index e14c0b6156a..617d28d6670 100644
--- a/tests/value/oracle/find_ivaltop.res.oracle
+++ b/tests/value/oracle/find_ivaltop.res.oracle
@@ -23,7 +23,7 @@
    [17] ∈ {8}
    [18] ∈ {9}
    [19] ∈ {0}
-[eva] find_ivaltop.i:6: starting to merge loop iterations
+[eva:partition] find_ivaltop.i:6: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/for_loops.0.res.oracle b/tests/value/oracle/for_loops.0.res.oracle
index 62c79becea6..a1b79c2e23a 100644
--- a/tests/value/oracle/for_loops.0.res.oracle
+++ b/tests/value/oracle/for_loops.0.res.oracle
@@ -11,8 +11,8 @@
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
 [eva] for_loops.c:30: Frama_C_show_each_F: {0}
-[eva] for_loops.c:27: starting to merge loop iterations
-[eva] for_loops.c:29: starting to merge loop iterations
+[eva:partition] for_loops.c:27: starting to merge loop iterations
+[eva:partition] for_loops.c:29: starting to merge loop iterations
 [eva] for_loops.c:30: Frama_C_show_each_F: {0; 1}
 [eva] for_loops.c:30: Frama_C_show_each_F: {0; 1; 2}
 [eva] for_loops.c:30: Frama_C_show_each_F: [0..2147483647]
diff --git a/tests/value/oracle/for_loops.1.res.oracle b/tests/value/oracle/for_loops.1.res.oracle
index ea0a97f74b1..2364e21e490 100644
--- a/tests/value/oracle/for_loops.1.res.oracle
+++ b/tests/value/oracle/for_loops.1.res.oracle
@@ -16,7 +16,7 @@
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
 [eva] for_loops.c:17: Frama_C_show_each_F: {0; 1}
-[eva] for_loops.c:16: starting to merge loop iterations
+[eva:partition] for_loops.c:16: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- main_2.
   Called from for_loops.c:16.
 [eva] Done for function Frama_C_interval
diff --git a/tests/value/oracle/for_loops.2.res.oracle b/tests/value/oracle/for_loops.2.res.oracle
index dee160a2e94..fe463f694c5 100644
--- a/tests/value/oracle/for_loops.2.res.oracle
+++ b/tests/value/oracle/for_loops.2.res.oracle
@@ -21,7 +21,7 @@
   nSelectors ∈ [0..1000]
   w ∈ {0}
   ==END OF DUMP==
-[eva] for_loops.c:40: starting to merge loop iterations
+[eva:partition] for_loops.c:40: starting to merge loop iterations
 [eva] for_loops.c:41: 
   Frama_C_dump_each:
   # cvalue:
@@ -35,7 +35,7 @@
   ==END OF DUMP==
 [eva:alarm] for_loops.c:42: Warning: 
   accessing uninitialized left-value. assert \initialized(&T[j]);
-[eva] for_loops.c:42: starting to merge loop iterations
+[eva:partition] for_loops.c:42: starting to merge loop iterations
 [eva:alarm] for_loops.c:42: Warning: 
   signed overflow. assert w + T[j] ≤ 2147483647;
 [eva] for_loops.c:43: Frama_C_show_each: [0..2147483647]
diff --git a/tests/value/oracle/for_loops.3.res.oracle b/tests/value/oracle/for_loops.3.res.oracle
index 0909a535a53..d8e1d99a7d7 100644
--- a/tests/value/oracle/for_loops.3.res.oracle
+++ b/tests/value/oracle/for_loops.3.res.oracle
@@ -5,8 +5,8 @@
 [eva:initial-state] Values of globals at initialization
   x ∈ {0}
 [eva] for_loops.c:55: Frama_C_show_each_F: {0}, {0}
-[eva] for_loops.c:50: starting to merge loop iterations
-[eva] for_loops.c:52: starting to merge loop iterations
+[eva:partition] for_loops.c:50: starting to merge loop iterations
+[eva:partition] for_loops.c:52: starting to merge loop iterations
 [eva] for_loops.c:55: Frama_C_show_each_F: {0; 1}, [0..2147483647]
 [eva] for_loops.c:55: Frama_C_show_each_F: {0; 1; 2}, [0..2147483647]
 [eva] for_loops.c:55: Frama_C_show_each_F: {0; 1; 2; 3; 4; 5}, [0..2147483647]
diff --git a/tests/value/oracle/fptr.0.res.oracle b/tests/value/oracle/fptr.0.res.oracle
index e45c8911889..da2a48f2d8e 100644
--- a/tests/value/oracle/fptr.0.res.oracle
+++ b/tests/value/oracle/fptr.0.res.oracle
@@ -46,7 +46,7 @@
 [eva] Recording results for f
 [eva] Done for function f
 [eva] fptr.i:52: Frama_C_show_each: {0}
-[eva] fptr.i:50: starting to merge loop iterations
+[eva:partition] fptr.i:50: starting to merge loop iterations
 [eva] fptr.i:51: Frama_C_show_each_F: {{ &h ; &hh }}
 [eva] computing for function f <- main.
   Called from fptr.i:52.
diff --git a/tests/value/oracle/fptr.1.res.oracle b/tests/value/oracle/fptr.1.res.oracle
index fcaefec6fb2..7ddaa7b99e8 100644
--- a/tests/value/oracle/fptr.1.res.oracle
+++ b/tests/value/oracle/fptr.1.res.oracle
@@ -31,7 +31,7 @@
 [eva] Done for function h
 [eva] Recording results for f
 [eva] Done for function f
-[eva] fptr.i:66: starting to merge loop iterations
+[eva:partition] fptr.i:66: starting to merge loop iterations
 [eva] fptr.i:67: Frama_C_show_each_F: {{ &h ; &hh }}
 [eva] computing for function f <- main_uninit.
   Called from fptr.i:68.
diff --git a/tests/value/oracle/gauges.res.oracle b/tests/value/oracle/gauges.res.oracle
index 05ebd53c77a..413ec90c54a 100644
--- a/tests/value/oracle/gauges.res.oracle
+++ b/tests/value/oracle/gauges.res.oracle
@@ -11,7 +11,7 @@
   Called from gauges.c:350.
 [eva] gauges.c:19: Frama_C_show_each_0: {{ "in" }}
 [eva] gauges.c:21: Frama_C_show_each_1: {{ "in" }}
-[eva] gauges.c:18: starting to merge loop iterations
+[eva:partition] gauges.c:18: starting to merge loop iterations
 [eva] gauges.c:19: Frama_C_show_each_0: {{ "in" }}
 [eva] gauges.c:21: Frama_C_show_each_1: {{ "in" }}
 [eva] gauges.c:19: Frama_C_show_each_0: {{ "in" }}
@@ -23,7 +23,7 @@
 [eva] gauges.c:19: Frama_C_show_each_0: {{ "in" }}
 [eva] gauges.c:21: Frama_C_show_each_1: {{ "in" }}
 [eva:alarm] gauges.c:23: Warning: signed overflow. assert -2147483648 ≤ j - 4;
-[eva] gauges.c:16: starting to merge loop iterations
+[eva:partition] gauges.c:16: starting to merge loop iterations
 [eva] gauges.c:19: Frama_C_show_each_0: {{ "in" }}
 [eva] gauges.c:21: Frama_C_show_each_1: {{ "in" }}
 [eva] gauges.c:19: Frama_C_show_each_0: {{ "in" }}
@@ -41,7 +41,7 @@
   Called from gauges.c:351.
 [eva] gauges.c:41: Frama_C_show_each_0: {{ "in" }}
 [eva] gauges.c:43: Frama_C_show_each_1: {{ "in" }}
-[eva] gauges.c:40: starting to merge loop iterations
+[eva:partition] gauges.c:40: starting to merge loop iterations
 [eva] gauges.c:41: Frama_C_show_each_0: {{ "in" }}
 [eva] gauges.c:43: Frama_C_show_each_1: {{ "in" }}
 [eva] gauges.c:41: Frama_C_show_each_0: {{ "in" }}
@@ -53,7 +53,7 @@
 [eva] gauges.c:41: Frama_C_show_each_0: {{ "in" }}
 [eva] gauges.c:43: Frama_C_show_each_1: {{ "in" }}
 [eva:alarm] gauges.c:45: Warning: signed overflow. assert -2147483648 ≤ j - 4;
-[eva] gauges.c:38: starting to merge loop iterations
+[eva:partition] gauges.c:38: starting to merge loop iterations
 [eva] gauges.c:41: Frama_C_show_each_0: {{ "in" }}
 [eva] gauges.c:43: Frama_C_show_each_1: {{ "in" }}
 [eva] gauges.c:41: Frama_C_show_each_0: {{ "in" }}
@@ -70,7 +70,7 @@
 [eva] computing for function main1 <- main.
   Called from gauges.c:352.
 [eva] gauges.c:59: Frama_C_show_each: {{ "in" }}
-[eva] gauges.c:57: starting to merge loop iterations
+[eva:partition] gauges.c:57: starting to merge loop iterations
 [eva] gauges.c:59: Frama_C_show_each: {{ "in" }}
 [eva] gauges.c:59: Frama_C_show_each: {{ "in" }}
 [eva] gauges.c:59: Frama_C_show_each: {{ "in" }}
@@ -83,7 +83,7 @@
 [eva] computing for function main2 <- main.
   Called from gauges.c:353.
 [eva] gauges.c:72: Frama_C_show_each:
-[eva] gauges.c:70: starting to merge loop iterations
+[eva:partition] gauges.c:70: starting to merge loop iterations
 [eva] gauges.c:72: Frama_C_show_each:
 [eva] gauges.c:72: Frama_C_show_each:
 [eva] gauges.c:72: Frama_C_show_each:
@@ -99,7 +99,7 @@
 [eva] computing for function main3 <- main.
   Called from gauges.c:354.
 [eva] gauges.c:80: Frama_C_show_each: {{ "inner" }}
-[eva] gauges.c:79: starting to merge loop iterations
+[eva:partition] gauges.c:79: starting to merge loop iterations
 [eva] gauges.c:80: Frama_C_show_each: {{ "inner" }}
 [eva] gauges.c:80: Frama_C_show_each: {{ "inner" }}
 [eva] gauges.c:80: Frama_C_show_each: {{ "inner" }}
@@ -108,7 +108,7 @@
 [eva:alarm] gauges.c:81: Warning: signed overflow. assert k + 1 ≤ 2147483647;
 [eva] gauges.c:83: Frama_C_show_each: {{ "outer" }}
 [eva:alarm] gauges.c:84: Warning: signed overflow. assert k + 1 ≤ 2147483647;
-[eva] gauges.c:78: starting to merge loop iterations
+[eva:partition] gauges.c:78: starting to merge loop iterations
 [eva] gauges.c:80: Frama_C_show_each: {{ "inner" }}
 [eva] gauges.c:83: Frama_C_show_each: {{ "outer" }}
 [eva] gauges.c:80: Frama_C_show_each: {{ "inner" }}
@@ -123,7 +123,7 @@
 [eva] computing for function main4_search <- main4 <- main.
   Called from gauges.c:107.
 [eva] gauges.c:97: Frama_C_show_each:
-[eva] gauges.c:96: starting to merge loop iterations
+[eva:partition] gauges.c:96: starting to merge loop iterations
 [eva] gauges.c:97: Frama_C_show_each:
 [eva] gauges.c:97: Frama_C_show_each:
 [eva] gauges.c:97: Frama_C_show_each:
@@ -137,7 +137,7 @@
 [eva] computing for function main5 <- main.
   Called from gauges.c:356.
 [eva] gauges.c:116: Frama_C_show_each: {{ &x }}
-[eva] gauges.c:113: starting to merge loop iterations
+[eva:partition] gauges.c:113: starting to merge loop iterations
 [eva] gauges.c:116: Frama_C_show_each: {{ &x + {0; 4} }}
 [eva] gauges.c:116: Frama_C_show_each: {{ &x + {0; 4; 8} }}
 [eva] gauges.c:116: Frama_C_show_each: {{ &x + {0; 4; 8; 12} ; &y }}
@@ -159,7 +159,7 @@
 [eva] gauges.c:129: Frama_C_show_each: {{ &x + {8} }}
 [eva] gauges.c:129: Frama_C_show_each: {{ &y }}
 [eva] gauges.c:129: Frama_C_show_each: {{ &y + {4} }}
-[eva] gauges.c:126: starting to merge loop iterations
+[eva:partition] gauges.c:126: starting to merge loop iterations
 [eva] gauges.c:129: Frama_C_show_each: {{ &y + {4; 8} }}
 [eva] gauges.c:129: Frama_C_show_each: {{ &y + {4; 8; 12} }}
 [eva] gauges.c:129: Frama_C_show_each: {{ &y + {4; 8; 12; 16} }}
@@ -171,7 +171,7 @@
 [eva] Done for function main5_bis
 [eva] computing for function main6 <- main.
   Called from gauges.c:358.
-[eva] gauges.c:138: starting to merge loop iterations
+[eva:partition] gauges.c:138: starting to merge loop iterations
 [eva:alarm] gauges.c:140: Warning: signed overflow. assert j + 1 ≤ 2147483647;
 [eva] Recording results for main6
 [eva] Done for function main6
@@ -180,7 +180,7 @@
 [eva] computing for function main7_aux <- main7 <- main.
   Called from gauges.c:164.
 [eva] gauges.c:145: Frama_C_show_each:
-[eva] gauges.c:147: starting to merge loop iterations
+[eva:partition] gauges.c:147: starting to merge loop iterations
 [eva:alarm] gauges.c:149: Warning: 
   out of bounds write. assert \valid(tmp);
                        (tmp from p--)
@@ -189,7 +189,7 @@
 [eva] computing for function main7_aux2 <- main7 <- main.
   Called from gauges.c:165.
 [eva] gauges.c:154: Frama_C_show_each:
-[eva] gauges.c:156: starting to merge loop iterations
+[eva:partition] gauges.c:156: starting to merge loop iterations
 [eva:alarm] gauges.c:158: Warning: 
   out of bounds write. assert \valid(tmp);
                        (tmp from p--)
@@ -206,7 +206,7 @@
 [eva] gauges.c:172: Frama_C_show_each: {0}
 [eva] gauges.c:172: Frama_C_show_each: {4294967295}
 [eva] gauges.c:172: Frama_C_show_each: {4294967294}
-[eva] gauges.c:171: starting to merge loop iterations
+[eva:partition] gauges.c:171: starting to merge loop iterations
 [eva] gauges.c:172: Frama_C_show_each: {4294967293; 4294967294}
 [eva] gauges.c:172: Frama_C_show_each: {4294967292; 4294967293; 4294967294}
 [eva] gauges.c:172: Frama_C_show_each: [2147483647..4294967294]
@@ -225,7 +225,7 @@
 [eva] Done for function main8
 [eva] computing for function main9 <- main.
   Called from gauges.c:361.
-[eva] gauges.c:186: starting to merge loop iterations
+[eva:partition] gauges.c:186: starting to merge loop iterations
 [eva:alarm] gauges.c:188: Warning: 
   pointer downcast. assert (unsigned int)p ≤ 2147483647;
 [eva:alarm] gauges.c:188: Warning: 
@@ -245,7 +245,7 @@
   Called from gauges.c:362.
 [eva] computing for function main10_aux <- main10 <- main.
   Called from gauges.c:211.
-[eva] gauges.c:201: starting to merge loop iterations
+[eva:partition] gauges.c:201: starting to merge loop iterations
 [eva:alarm] gauges.c:202: Warning: 
   out of bounds read. assert \valid_read(tmp);
                       (tmp from A++)
@@ -269,7 +269,7 @@
 [eva] computing for function main11 <- main.
   Called from gauges.c:363.
 [eva] gauges.c:218: Frama_C_show_each:
-[eva] gauges.c:217: starting to merge loop iterations
+[eva:partition] gauges.c:217: starting to merge loop iterations
 [eva] gauges.c:218: Frama_C_show_each:
 [eva] gauges.c:218: Frama_C_show_each:
 [eva] gauges.c:218: Frama_C_show_each:
@@ -284,7 +284,7 @@
 [eva] Done for function main11
 [eva] computing for function main12 <- main.
   Called from gauges.c:364.
-[eva] gauges.c:225: starting to merge loop iterations
+[eva:partition] gauges.c:225: starting to merge loop iterations
 [eva:alarm] gauges.c:225: Warning: signed overflow. assert i + 1 ≤ 2147483647;
 [eva] Recording results for main12
 [eva] Done for function main12
@@ -292,7 +292,7 @@
   Called from gauges.c:365.
 [eva] computing for function main13_1 <- main13 <- main.
   Called from gauges.c:280.
-[eva] gauges.c:238: starting to merge loop iterations
+[eva:partition] gauges.c:238: starting to merge loop iterations
 [eva:alarm] gauges.c:240: Warning: signed overflow. assert j + 1 ≤ 2147483647;
 [eva] gauges.c:242: 
   Frama_C_show_each: {45; 46; 47; 48; 49; 50; 51}, [0..2147483647]
@@ -300,7 +300,7 @@
 [eva] Done for function main13_1
 [eva] computing for function main13_2 <- main13 <- main.
   Called from gauges.c:281.
-[eva] gauges.c:249: starting to merge loop iterations
+[eva:partition] gauges.c:249: starting to merge loop iterations
 [eva:alarm] gauges.c:251: Warning: signed overflow. assert j + 1 ≤ 2147483647;
 [eva] gauges.c:254: 
   Frama_C_show_each: {48; 49; 50; 51; 52; 53; 54}, [0..2147483647]
@@ -308,7 +308,7 @@
 [eva] Done for function main13_2
 [eva] computing for function main13_3 <- main13 <- main.
   Called from gauges.c:282.
-[eva] gauges.c:261: starting to merge loop iterations
+[eva:partition] gauges.c:261: starting to merge loop iterations
 [eva:alarm] gauges.c:263: Warning: signed overflow. assert j + 1 ≤ 2147483647;
 [eva] gauges.c:265: 
   Frama_C_show_each: {-59; -58; -57; -56; -55; -54; -53}, [0..2147483647]
@@ -316,7 +316,7 @@
 [eva] Done for function main13_3
 [eva] computing for function main13_4 <- main13 <- main.
   Called from gauges.c:283.
-[eva] gauges.c:272: starting to merge loop iterations
+[eva:partition] gauges.c:272: starting to merge loop iterations
 [eva:alarm] gauges.c:274: Warning: signed overflow. assert j + 1 ≤ 2147483647;
 [eva] gauges.c:276: 
   Frama_C_show_each: {-64; -63; -62; -61; -60; -59; -58}, [0..2147483647]
@@ -326,7 +326,7 @@
 [eva] Done for function main13
 [eva] computing for function main14 <- main.
   Called from gauges.c:366.
-[eva] gauges.c:291: starting to merge loop iterations
+[eva:partition] gauges.c:291: starting to merge loop iterations
 [eva:alarm] gauges.c:293: Warning: signed overflow. assert j + 1 ≤ 2147483647;
 [eva] gauges.c:297: 
   Frama_C_show_each: {-593; -592; -591; -590; -589; -588}, [0..2147483647]
@@ -395,7 +395,7 @@
   S_0___fc_env[0..1] ∈ [--..--]
   S_1___fc_env[0..1] ∈ [--..--]
   ==END OF DUMP==
-[eva] gauges.c:304: starting to merge loop iterations
+[eva:partition] gauges.c:304: starting to merge loop iterations
 [eva] gauges.c:306: 
   Frama_C_dump_each:
   # cvalue:
@@ -583,8 +583,8 @@
 [eva] Done for function main15
 [eva] computing for function main16 <- main.
   Called from gauges.c:368.
-[eva] gauges.c:323: starting to merge loop iterations
-[eva] gauges.c:324: starting to merge loop iterations
+[eva:partition] gauges.c:323: starting to merge loop iterations
+[eva:partition] gauges.c:324: starting to merge loop iterations
 [eva] gauges.c:325: 
   Frama_C_dump_each:
   # cvalue:
@@ -646,8 +646,8 @@
   S_0___fc_env[0..1] ∈ [--..--]
   S_1___fc_env[0..1] ∈ [--..--]
   ==END OF DUMP==
-[eva] gauges.c:326: starting to merge loop iterations
-[eva] gauges.c:321: starting to merge loop iterations
+[eva:partition] gauges.c:326: starting to merge loop iterations
+[eva:partition] gauges.c:321: starting to merge loop iterations
 [eva] gauges.c:325: 
   Frama_C_dump_each:
   # cvalue:
@@ -709,14 +709,14 @@
   S_0___fc_env[0..1] ∈ [--..--]
   S_1___fc_env[0..1] ∈ [--..--]
   ==END OF DUMP==
-[eva] gauges.c:327: starting to merge loop iterations
+[eva:partition] gauges.c:327: starting to merge loop iterations
 [eva] Recording results for main16
 [eva] Done for function main16
 [eva] computing for function main17 <- main.
   Called from gauges.c:369.
 [eva] gauges.c:343: Call to builtin malloc
 [eva:malloc:new] gauges.c:343: allocating variable __malloc_main17_l343
-[eva] gauges.c:342: starting to merge loop iterations
+[eva:partition] gauges.c:342: starting to merge loop iterations
 [eva] gauges.c:343: Call to builtin malloc
 [eva] Recording results for main17
 [eva] Done for function main17
diff --git a/tests/value/oracle/ghost.res.oracle b/tests/value/oracle/ghost.res.oracle
index a4786e45575..188e80759a5 100644
--- a/tests/value/oracle/ghost.res.oracle
+++ b/tests/value/oracle/ghost.res.oracle
@@ -6,7 +6,7 @@
   G ∈ {0}
   GHOST ∈ {0}
   H ∈ {0}
-[eva] ghost.i:16: starting to merge loop iterations
+[eva:partition] ghost.i:16: starting to merge loop iterations
 [eva:alarm] ghost.i:17: Warning: signed overflow. assert G + 1 ≤ 2147483647;
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/tests/value/oracle/hierarchical_convergence.res.oracle b/tests/value/oracle/hierarchical_convergence.res.oracle
index 624c9b0b38a..e839e52b751 100644
--- a/tests/value/oracle/hierarchical_convergence.res.oracle
+++ b/tests/value/oracle/hierarchical_convergence.res.oracle
@@ -7,10 +7,10 @@
 [eva] computing for function f <- main.
   Called from hierarchical_convergence.c:19.
 [eva] hierarchical_convergence.c:8: Frama_C_show_each: {0}
-[eva] hierarchical_convergence.c:7: starting to merge loop iterations
+[eva:partition] hierarchical_convergence.c:7: starting to merge loop iterations
 [eva] hierarchical_convergence.c:8: Frama_C_show_each: {0; 1}
 [eva] hierarchical_convergence.c:10: Frama_C_show_each: {1}, {0}
-[eva] hierarchical_convergence.c:9: starting to merge loop iterations
+[eva:partition] hierarchical_convergence.c:9: starting to merge loop iterations
 [eva] hierarchical_convergence.c:8: Frama_C_show_each: {0; 1; 2}
 [eva] hierarchical_convergence.c:10: Frama_C_show_each: {1; 2}, {0}
 [eva] hierarchical_convergence.c:10: Frama_C_show_each: {1; 2}, {0; 1}
diff --git a/tests/value/oracle/ilevel.0.res.oracle b/tests/value/oracle/ilevel.0.res.oracle
index d6704892c67..59bf19b0276 100644
--- a/tests/value/oracle/ilevel.0.res.oracle
+++ b/tests/value/oracle/ilevel.0.res.oracle
@@ -8,8 +8,8 @@
   j ∈ {0}
   k ∈ {0}
   l ∈ {0}
-[eva] ilevel.c:15: starting to merge loop iterations
-[eva] ilevel.c:18: starting to merge loop iterations
+[eva:partition] ilevel.c:15: starting to merge loop iterations
+[eva:partition] ilevel.c:18: starting to merge loop iterations
 [eva:alarm] ilevel.c:26: Warning: assertion got status unknown.
 [eva:alarm] ilevel.c:28: Warning: assertion got status unknown.
 [eva] ilevel.c:30: Frama_C_show_each: [0..9]
@@ -48,8 +48,8 @@
   j ∈ {0}
   k ∈ {0}
   l ∈ {0}
-[eva] ilevel.c:15: starting to merge loop iterations
-[eva] ilevel.c:18: starting to merge loop iterations
+[eva:partition] ilevel.c:15: starting to merge loop iterations
+[eva:partition] ilevel.c:18: starting to merge loop iterations
 [eva:alarm] ilevel.c:32: Warning: 
   signed overflow. assert (int)((int)(i + j) + k) + l ≤ 2147483647;
 [eva] Recording results for main
diff --git a/tests/value/oracle/initialized.res.oracle b/tests/value/oracle/initialized.res.oracle
index 36b383499c8..ea945a5ebf1 100644
--- a/tests/value/oracle/initialized.res.oracle
+++ b/tests/value/oracle/initialized.res.oracle
@@ -14,7 +14,7 @@
   i6 ∈ [--..--]
 [eva] computing for function g1 <- main.
   Called from initialized.c:193.
-[eva] initialized.c:19: starting to merge loop iterations
+[eva:partition] initialized.c:19: starting to merge loop iterations
 [eva:alarm] initialized.c:21: Warning: assertion got status unknown.
 [eva:alarm] initialized.c:22: Warning: assertion got status unknown.
 [eva] computing for function Frama_C_interval <- g1 <- main.
@@ -159,7 +159,7 @@
   accessing uninitialized left-value. assert \initialized(&x3);
 [eva] computing for function f <- g3 <- main.
   Called from initialized.c:98.
-[eva] initialized.c:11: starting to merge loop iterations
+[eva:partition] initialized.c:11: starting to merge loop iterations
 [eva:alarm] initialized.c:8: Warning: 
   function f: postcondition got status invalid.
 [eva:alarm] initialized.c:8: Warning: 
@@ -226,7 +226,7 @@
 [eva:alarm] initialized.c:178: Warning: check 'unknown' got status unknown.
 [eva:alarm] initialized.c:182: Warning: assertion got status unknown.
 [eva:alarm] initialized.c:183: Warning: check 'invalid' got status unknown.
-[eva] initialized.c:186: starting to merge loop iterations
+[eva:partition] initialized.c:186: starting to merge loop iterations
 [eva:alarm] initialized.c:188: Warning: assertion got status unknown.
 [eva:alarm] initialized.c:189: Warning: check 'unknown' got status unknown.
 [eva] Recording results for reduce_by_negation
diff --git a/tests/value/oracle/inout.1.res.oracle b/tests/value/oracle/inout.1.res.oracle
index 9c5de406f42..b0b8c0a4008 100644
--- a/tests/value/oracle/inout.1.res.oracle
+++ b/tests/value/oracle/inout.1.res.oracle
@@ -20,7 +20,7 @@
       [6] ∈ {25}
       [7] ∈ {40}
   I5_nt ∈ {0}
-[eva] inout.i:37: starting to merge loop iterations
+[eva:partition] inout.i:37: starting to merge loop iterations
 [eva:alarm] inout.i:42: Warning: 
   accessing uninitialized left-value. assert \initialized(&r);
 [eva] Recording results for inout_11_3
diff --git a/tests/value/oracle/interpol.res.oracle b/tests/value/oracle/interpol.res.oracle
index 9c7a7e8e460..708dc39a8fa 100644
--- a/tests/value/oracle/interpol.res.oracle
+++ b/tests/value/oracle/interpol.res.oracle
@@ -12,7 +12,7 @@
    [6] ∈ {64}
    [7] ∈ {128}
 [eva] interpol.c:16: Frama_C_show_each_ok: {0}, {-1}
-[eva] interpol.c:10: starting to merge loop iterations
+[eva:partition] interpol.c:10: starting to merge loop iterations
 [eva] interpol.c:16: Frama_C_show_each_ok: {0; 1}, {-2; -1}
 [eva] interpol.c:16: Frama_C_show_each_ok: {0; 1; 2}, {-4; -2; -1}
 [eva] interpol.c:16: 
diff --git a/tests/value/oracle/invalid_pointer.0.res.oracle b/tests/value/oracle/invalid_pointer.0.res.oracle
index affe7ba3244..55aebb84ce4 100644
--- a/tests/value/oracle/invalid_pointer.0.res.oracle
+++ b/tests/value/oracle/invalid_pointer.0.res.oracle
@@ -38,7 +38,8 @@
 [eva] Done for function pointer_computation
 [eva] computing for function pointer_in_loops <- main.
   Called from invalid_pointer.c:191.
-[eva] invalid_pointer.c:43: Trace partitioning superposing up to 100 states
+[eva:partition] invalid_pointer.c:43: 
+  Trace partitioning superposing up to 100 states
 [eva:alarm] invalid_pointer.c:52: Warning: 
   invalid pointer creation. assert \object_pointer(q - 1);
 [eva] Recording results for pointer_in_loops
diff --git a/tests/value/oracle/invalid_pointer.1.res.oracle b/tests/value/oracle/invalid_pointer.1.res.oracle
index 31b3c971172..cf4c5c84091 100644
--- a/tests/value/oracle/invalid_pointer.1.res.oracle
+++ b/tests/value/oracle/invalid_pointer.1.res.oracle
@@ -24,7 +24,8 @@
 [eva] Done for function pointer_computation
 [eva] computing for function pointer_in_loops <- main.
   Called from invalid_pointer.c:191.
-[eva] invalid_pointer.c:43: Trace partitioning superposing up to 100 states
+[eva:partition] invalid_pointer.c:43: 
+  Trace partitioning superposing up to 100 states
 [eva] invalid_pointer.c:54: Frama_C_show_each_bottom: {{ &t + {-4} }}
 [eva] Recording results for pointer_in_loops
 [eva] Done for function pointer_in_loops
diff --git a/tests/value/oracle/inversion.res.oracle b/tests/value/oracle/inversion.res.oracle
index 44ada0692f4..8b60c8e9f12 100644
--- a/tests/value/oracle/inversion.res.oracle
+++ b/tests/value/oracle/inversion.res.oracle
@@ -22,8 +22,8 @@
     [2].p ∈ {{ &px }}
     [3..4] ∈ {0}
   ii[0..1] ∈ {0}
-[eva] inversion.i:23: starting to merge loop iterations
-[eva] inversion.i:30: starting to merge loop iterations
+[eva:partition] inversion.i:23: starting to merge loop iterations
+[eva:partition] inversion.i:30: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/inversion2.res.oracle b/tests/value/oracle/inversion2.res.oracle
index a58c2639c6f..36021c572ae 100644
--- a/tests/value/oracle/inversion2.res.oracle
+++ b/tests/value/oracle/inversion2.res.oracle
@@ -13,8 +13,8 @@
     [2][0..1] ∈ {2}
     [2][2..4] ∈ {0}
   G ∈ {99}
-[eva] inversion2.i:11: starting to merge loop iterations
-[eva] inversion2.i:10: starting to merge loop iterations
+[eva:partition] inversion2.i:11: starting to merge loop iterations
+[eva:partition] inversion2.i:10: starting to merge loop iterations
 [eva:alarm] inversion2.i:12: Warning: division by zero. assert TT[i][j] ≢ 0;
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/tests/value/oracle/local_slevel.res.oracle b/tests/value/oracle/local_slevel.res.oracle
index cb2e9dae5e0..b98525e706e 100644
--- a/tests/value/oracle/local_slevel.res.oracle
+++ b/tests/value/oracle/local_slevel.res.oracle
@@ -9,7 +9,7 @@
 [eva] computing for function main1 <- main.
   Called from local_slevel.i:48.
 [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0}
-[eva] local_slevel.i:10: starting to merge loop iterations
+[eva:partition] local_slevel.i:10: starting to merge loop iterations
 [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1}
 [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0; 1}
 [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1; 2}
@@ -78,7 +78,8 @@
 [eva] local_slevel.i:37: Frama_C_show_each: {47}
 [eva] local_slevel.i:37: Frama_C_show_each: {48}
 [eva] local_slevel.i:37: Frama_C_show_each: {49}
-[eva] local_slevel.i:42: Trace partitioning superposing up to 100 states
+[eva:partition] local_slevel.i:42: 
+  Trace partitioning superposing up to 100 states
 [eva] local_slevel.i:37: Frama_C_show_each: {50}
 [eva] local_slevel.i:37: Frama_C_show_each: {51}
 [eva] local_slevel.i:37: Frama_C_show_each: {52}
@@ -129,7 +130,8 @@
 [eva] local_slevel.i:37: Frama_C_show_each: {97}
 [eva] local_slevel.i:37: Frama_C_show_each: {98}
 [eva] local_slevel.i:37: Frama_C_show_each: {99}
-[eva] local_slevel.i:42: Trace partitioning superposing up to 200 states
+[eva:partition] local_slevel.i:42: 
+  Trace partitioning superposing up to 200 states
 [eva] Recording results for main2
 [eva] Done for function main2
 [eva] Recording results for main
@@ -377,7 +379,7 @@ void main(void)
 [eva] computing for function main1 <- main.
   Called from local_slevel.i:48.
 [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0}
-[eva] local_slevel.i:10: starting to merge loop iterations
+[eva:partition] local_slevel.i:10: starting to merge loop iterations
 [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1}
 [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0; 1}
 [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1; 2}
@@ -446,7 +448,8 @@ void main(void)
 [eva] local_slevel.i:37: Frama_C_show_each: {47}
 [eva] local_slevel.i:37: Frama_C_show_each: {48}
 [eva] local_slevel.i:37: Frama_C_show_each: {49}
-[eva] local_slevel.i:42: Trace partitioning superposing up to 100 states
+[eva:partition] local_slevel.i:42: 
+  Trace partitioning superposing up to 100 states
 [eva] local_slevel.i:37: Frama_C_show_each: {50}
 [eva] local_slevel.i:37: Frama_C_show_each: {51}
 [eva] local_slevel.i:37: Frama_C_show_each: {52}
@@ -497,7 +500,8 @@ void main(void)
 [eva] local_slevel.i:37: Frama_C_show_each: {97}
 [eva] local_slevel.i:37: Frama_C_show_each: {98}
 [eva] local_slevel.i:37: Frama_C_show_each: {99}
-[eva] local_slevel.i:42: Trace partitioning superposing up to 200 states
+[eva:partition] local_slevel.i:42: 
+  Trace partitioning superposing up to 200 states
 [eva] Recording results for main2
 [eva] Done for function main2
 [eva] Recording results for main
diff --git a/tests/value/oracle/local_variables.res.oracle b/tests/value/oracle/local_variables.res.oracle
index 441104cedc7..e47f4236348 100644
--- a/tests/value/oracle/local_variables.res.oracle
+++ b/tests/value/oracle/local_variables.res.oracle
@@ -37,7 +37,7 @@
 [eva] Done for function v
 [eva:locals-escaping] local_variables.i:35: Warning: 
   locals {x} escaping the scope of a block of main through p
-[eva] local_variables.i:43: starting to merge loop iterations
+[eva:partition] local_variables.i:43: starting to merge loop iterations
 [eva:alarm] local_variables.i:47: Warning: 
   accessing left-value that contains escaping addresses.
   assert ¬\dangling(&p);
diff --git a/tests/value/oracle/long.res.oracle b/tests/value/oracle/long.res.oracle
index 72468dec39d..af844538b54 100644
--- a/tests/value/oracle/long.res.oracle
+++ b/tests/value/oracle/long.res.oracle
@@ -8,10 +8,10 @@
   k ∈ {0}
 [eva] computing for function f <- main.
   Called from long.i:12.
-[eva] long.i:6: starting to merge loop iterations
+[eva:partition] long.i:6: starting to merge loop iterations
 [eva] Recording results for f
 [eva] Done for function f
-[eva] long.i:11: starting to merge loop iterations
+[eva:partition] long.i:11: starting to merge loop iterations
 [eva] long.i:12: Reusing old results for call to f
 [eva] long.i:12: Reusing old results for call to f
 [eva] long.i:12: Reusing old results for call to f
diff --git a/tests/value/oracle/loop.res.oracle b/tests/value/oracle/loop.res.oracle
index 889aa41fadc..4953385a85f 100644
--- a/tests/value/oracle/loop.res.oracle
+++ b/tests/value/oracle/loop.res.oracle
@@ -10,7 +10,7 @@
   r ∈ {0}
   G ∈ {0}
 [eva] loop.i:8: Frama_C_show_each_F: {0}
-[eva] loop.i:7: starting to merge loop iterations
+[eva:partition] loop.i:7: starting to merge loop iterations
 [eva] loop.i:8: Frama_C_show_each_F: {0; 2}
 [eva] loop.i:8: Frama_C_show_each_F: {0; 2; 4}
 [eva] loop.i:8: Frama_C_show_each_F: [0..48],0%2
diff --git a/tests/value/oracle/loop1.res.oracle b/tests/value/oracle/loop1.res.oracle
index a924515ae9f..0678343c393 100644
--- a/tests/value/oracle/loop1.res.oracle
+++ b/tests/value/oracle/loop1.res.oracle
@@ -15,12 +15,12 @@
 [eva] loop1.i:9: 
   cannot evaluate ACSL term, no environment to evaluate \at(_,LoopEntry)
 [eva:alarm] loop1.i:9: Warning: assertion got status unknown.
-[eva] loop1.i:5: starting to merge loop iterations
+[eva:partition] loop1.i:5: starting to merge loop iterations
 [eva] Recording results for main1
 [eva] Done for function main1
 [eva] computing for function main2 <- main.
   Called from loop1.i:26.
-[eva] loop1.i:17: starting to merge loop iterations
+[eva:partition] loop1.i:17: starting to merge loop iterations
 [eva:alarm] loop1.i:19: Warning: accessing out of bounds index. assert i < 100;
 [eva] Recording results for main2
 [eva] Done for function main2
diff --git a/tests/value/oracle/loop2.res.oracle b/tests/value/oracle/loop2.res.oracle
index 209de0a7033..446fc15da7c 100644
--- a/tests/value/oracle/loop2.res.oracle
+++ b/tests/value/oracle/loop2.res.oracle
@@ -11,7 +11,7 @@
   r ∈ {0}
   G[0..4] ∈ {0}
   Reg5 ∈ {0}
-[eva] loop2.i:8: starting to merge loop iterations
+[eva:partition] loop2.i:8: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/loop3.res.oracle b/tests/value/oracle/loop3.res.oracle
index 857b1fbef23..8b9b53e3d5a 100644
--- a/tests/value/oracle/loop3.res.oracle
+++ b/tests/value/oracle/loop3.res.oracle
@@ -10,7 +10,7 @@
   Called from loop3.c:8.
 [eva] using specification for function any_int
 [eva] Done for function any_int
-[eva] loop3.c:11: starting to merge loop iterations
+[eva:partition] loop3.c:11: starting to merge loop iterations
 [eva:alarm] loop3.c:11: Warning: signed overflow. assert j + 3 ≤ 2147483647;
 [eva:alarm] loop3.c:11: Warning: signed overflow. assert k + 8 ≤ 2147483647;
 [eva] Recording results for main
diff --git a/tests/value/oracle/loop_array.res.oracle b/tests/value/oracle/loop_array.res.oracle
index 4cc2d647c7e..105ab8a9199 100644
--- a/tests/value/oracle/loop_array.res.oracle
+++ b/tests/value/oracle/loop_array.res.oracle
@@ -5,9 +5,9 @@
 [eva:initial-state] Values of globals at initialization
   T[0..9999] ∈ {0}
   U[0..9999] ∈ {0}
-[eva] loop_array.i:5: starting to merge loop iterations
-[eva] loop_array.i:8: starting to merge loop iterations
-[eva] loop_array.i:12: starting to merge loop iterations
+[eva:partition] loop_array.i:5: starting to merge loop iterations
+[eva:partition] loop_array.i:8: starting to merge loop iterations
+[eva:partition] loop_array.i:12: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/loop_join.res.oracle b/tests/value/oracle/loop_join.res.oracle
index 46a1bd4035b..5b681f6493d 100644
--- a/tests/value/oracle/loop_join.res.oracle
+++ b/tests/value/oracle/loop_join.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   U[0..9999] ∈ {0}
-[eva] loop_join.i:5: starting to merge loop iterations
+[eva:partition] loop_join.i:5: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/loop_long.res.oracle b/tests/value/oracle/loop_long.res.oracle
index 0d6902b182a..8588ffc07d2 100644
--- a/tests/value/oracle/loop_long.res.oracle
+++ b/tests/value/oracle/loop_long.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   T[0..368199] ∈ {0}
-[eva] loop_long.i:5: starting to merge loop iterations
+[eva:partition] loop_long.i:5: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/loop_simple.res.oracle b/tests/value/oracle/loop_simple.res.oracle
index 9fa8feb4c1c..54f6cb55934 100644
--- a/tests/value/oracle/loop_simple.res.oracle
+++ b/tests/value/oracle/loop_simple.res.oracle
@@ -8,14 +8,14 @@
   k ∈ {0}
   n ∈ {0}
   r ∈ {0}
-[eva] loop_simple.i:26: starting to merge loop iterations
+[eva:partition] loop_simple.i:26: starting to merge loop iterations
 [eva:alarm] loop_simple.i:27: Warning: 
   signed overflow. assert (int)((int)(i + j) + k) + r ≤ 2147483647;
 [eva:alarm] loop_simple.i:27: Warning: 
   signed overflow.
   assert (int)((int)((int)(i + j) + k) + r) + 1 ≤ 2147483647;
-[eva] loop_simple.i:25: starting to merge loop iterations
-[eva] loop_simple.i:24: starting to merge loop iterations
+[eva:partition] loop_simple.i:25: starting to merge loop iterations
+[eva:partition] loop_simple.i:24: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/loop_test.0.res.oracle b/tests/value/oracle/loop_test.0.res.oracle
index 4e7daee98e6..bc88778640a 100644
--- a/tests/value/oracle/loop_test.0.res.oracle
+++ b/tests/value/oracle/loop_test.0.res.oracle
@@ -25,52 +25,52 @@
   c9 ∈ {0}
 [eva] computing for function onze_0 <- test_onzes.
   Called from loop_test.i:43.
-[eva] loop_test.i:9: starting to merge loop iterations
+[eva:partition] loop_test.i:9: starting to merge loop iterations
 [eva] Recording results for onze_0
 [eva] Done for function onze_0
 [eva] computing for function onze_1 <- test_onzes.
   Called from loop_test.i:44.
-[eva] loop_test.i:12: starting to merge loop iterations
+[eva:partition] loop_test.i:12: starting to merge loop iterations
 [eva] Recording results for onze_1
 [eva] Done for function onze_1
 [eva] computing for function onze_2 <- test_onzes.
   Called from loop_test.i:45.
-[eva] loop_test.i:15: starting to merge loop iterations
+[eva:partition] loop_test.i:15: starting to merge loop iterations
 [eva] Recording results for onze_2
 [eva] Done for function onze_2
 [eva] computing for function onze_3 <- test_onzes.
   Called from loop_test.i:46.
-[eva] loop_test.i:18: starting to merge loop iterations
+[eva:partition] loop_test.i:18: starting to merge loop iterations
 [eva] Recording results for onze_3
 [eva] Done for function onze_3
 [eva] computing for function onze_4 <- test_onzes.
   Called from loop_test.i:47.
-[eva] loop_test.i:21: starting to merge loop iterations
+[eva:partition] loop_test.i:21: starting to merge loop iterations
 [eva] Recording results for onze_4
 [eva] Done for function onze_4
 [eva] computing for function onze_5 <- test_onzes.
   Called from loop_test.i:48.
-[eva] loop_test.i:25: starting to merge loop iterations
+[eva:partition] loop_test.i:25: starting to merge loop iterations
 [eva] Recording results for onze_5
 [eva] Done for function onze_5
 [eva] computing for function onze_6 <- test_onzes.
   Called from loop_test.i:49.
-[eva] loop_test.i:28: starting to merge loop iterations
+[eva:partition] loop_test.i:28: starting to merge loop iterations
 [eva] Recording results for onze_6
 [eva] Done for function onze_6
 [eva] computing for function onze_7 <- test_onzes.
   Called from loop_test.i:50.
-[eva] loop_test.i:31: starting to merge loop iterations
+[eva:partition] loop_test.i:31: starting to merge loop iterations
 [eva] Recording results for onze_7
 [eva] Done for function onze_7
 [eva] computing for function onze_8 <- test_onzes.
   Called from loop_test.i:51.
-[eva] loop_test.i:34: starting to merge loop iterations
+[eva:partition] loop_test.i:34: starting to merge loop iterations
 [eva] Recording results for onze_8
 [eva] Done for function onze_8
 [eva] computing for function onze_9 <- test_onzes.
   Called from loop_test.i:52.
-[eva] loop_test.i:37: starting to merge loop iterations
+[eva:partition] loop_test.i:37: starting to merge loop iterations
 [eva] Recording results for onze_9
 [eva] Done for function onze_9
 [eva] Recording results for test_onzes
diff --git a/tests/value/oracle/loop_test.1.res.oracle b/tests/value/oracle/loop_test.1.res.oracle
index f3abdc54f35..e2d5e19baa1 100644
--- a/tests/value/oracle/loop_test.1.res.oracle
+++ b/tests/value/oracle/loop_test.1.res.oracle
@@ -25,52 +25,52 @@
   c9 ∈ {0}
 [eva] computing for function cent_onze_0 <- test_cent_onzes.
   Called from loop_test.i:101.
-[eva] loop_test.i:57: starting to merge loop iterations
+[eva:partition] loop_test.i:57: starting to merge loop iterations
 [eva] Recording results for cent_onze_0
 [eva] Done for function cent_onze_0
 [eva] computing for function cent_onze_1 <- test_cent_onzes.
   Called from loop_test.i:102.
-[eva] loop_test.i:60: starting to merge loop iterations
+[eva:partition] loop_test.i:60: starting to merge loop iterations
 [eva] Recording results for cent_onze_1
 [eva] Done for function cent_onze_1
 [eva] computing for function cent_onze_2 <- test_cent_onzes.
   Called from loop_test.i:103.
-[eva] loop_test.i:64: starting to merge loop iterations
+[eva:partition] loop_test.i:64: starting to merge loop iterations
 [eva] Recording results for cent_onze_2
 [eva] Done for function cent_onze_2
 [eva] computing for function cent_onze_3 <- test_cent_onzes.
   Called from loop_test.i:104.
-[eva] loop_test.i:68: starting to merge loop iterations
+[eva:partition] loop_test.i:68: starting to merge loop iterations
 [eva] Recording results for cent_onze_3
 [eva] Done for function cent_onze_3
 [eva] computing for function cent_onze_4 <- test_cent_onzes.
   Called from loop_test.i:105.
-[eva] loop_test.i:72: starting to merge loop iterations
+[eva:partition] loop_test.i:72: starting to merge loop iterations
 [eva] Recording results for cent_onze_4
 [eva] Done for function cent_onze_4
 [eva] computing for function cent_onze_5 <- test_cent_onzes.
   Called from loop_test.i:106.
-[eva] loop_test.i:77: starting to merge loop iterations
+[eva:partition] loop_test.i:77: starting to merge loop iterations
 [eva] Recording results for cent_onze_5
 [eva] Done for function cent_onze_5
 [eva] computing for function cent_onze_6 <- test_cent_onzes.
   Called from loop_test.i:107.
-[eva] loop_test.i:80: starting to merge loop iterations
+[eva:partition] loop_test.i:80: starting to merge loop iterations
 [eva] Recording results for cent_onze_6
 [eva] Done for function cent_onze_6
 [eva] computing for function cent_onze_7 <- test_cent_onzes.
   Called from loop_test.i:108.
-[eva] loop_test.i:84: starting to merge loop iterations
+[eva:partition] loop_test.i:84: starting to merge loop iterations
 [eva] Recording results for cent_onze_7
 [eva] Done for function cent_onze_7
 [eva] computing for function cent_onze_8 <- test_cent_onzes.
   Called from loop_test.i:109.
-[eva] loop_test.i:88: starting to merge loop iterations
+[eva:partition] loop_test.i:88: starting to merge loop iterations
 [eva] Recording results for cent_onze_8
 [eva] Done for function cent_onze_8
 [eva] computing for function cent_onze_9 <- test_cent_onzes.
   Called from loop_test.i:110.
-[eva] loop_test.i:92: starting to merge loop iterations
+[eva:partition] loop_test.i:92: starting to merge loop iterations
 [eva] Recording results for cent_onze_9
 [eva] Done for function cent_onze_9
 [eva] Recording results for test_cent_onzes
diff --git a/tests/value/oracle/loop_wvar.0.res.oracle b/tests/value/oracle/loop_wvar.0.res.oracle
index e68a02c1d64..e2c2f28eec1 100644
--- a/tests/value/oracle/loop_wvar.0.res.oracle
+++ b/tests/value/oracle/loop_wvar.0.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] loop_wvar.i:13: starting to merge loop iterations
+[eva:partition] loop_wvar.i:13: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
@@ -18,7 +18,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] loop_wvar.i:13: starting to merge loop iterations
+[eva:partition] loop_wvar.i:13: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/loop_wvar.1.res.oracle b/tests/value/oracle/loop_wvar.1.res.oracle
index edafe26a894..c0e0d89a7a4 100644
--- a/tests/value/oracle/loop_wvar.1.res.oracle
+++ b/tests/value/oracle/loop_wvar.1.res.oracle
@@ -6,7 +6,7 @@
   
 [eva] computing for function main_unhelpful <- main3.
   Called from loop_wvar.i:80.
-[eva] loop_wvar.i:48: starting to merge loop iterations
+[eva:partition] loop_wvar.i:48: starting to merge loop iterations
 [eva:alarm] loop_wvar.i:53: Warning: 
   signed overflow. assert next + 1 ≤ 2147483647;
 [eva] Recording results for main_unhelpful
@@ -14,7 +14,7 @@
 [eva] computing for function main_multiple_hints <- main3.
   Called from loop_wvar.i:81.
 [eva] loop_wvar.i:67: Frama_C_show_each: {0}, {0}, {0}
-[eva] loop_wvar.i:65: starting to merge loop iterations
+[eva:partition] loop_wvar.i:65: starting to merge loop iterations
 [eva] loop_wvar.i:67: Frama_C_show_each: {0; 1}, {0; 1}, {0; 1}
 [eva] loop_wvar.i:67: Frama_C_show_each: {0; 1; 2}, {0; 1; 2}, {0; 1; 2}
 [eva] loop_wvar.i:67: Frama_C_show_each: [0..9], {0; 1; 2; 3}, {0; 1; 2; 3}
diff --git a/tests/value/oracle/loop_wvar.2.res.oracle b/tests/value/oracle/loop_wvar.2.res.oracle
index 082af63bc95..d1c103025d4 100644
--- a/tests/value/oracle/loop_wvar.2.res.oracle
+++ b/tests/value/oracle/loop_wvar.2.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] loop_wvar.i:24: starting to merge loop iterations
+[eva:partition] loop_wvar.i:24: starting to merge loop iterations
 [eva] Recording results for main_err1
 [eva] Done for function main_err1
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/loop_wvar.3.res.oracle b/tests/value/oracle/loop_wvar.3.res.oracle
index 720baa6ea24..ac7b44f2bdb 100644
--- a/tests/value/oracle/loop_wvar.3.res.oracle
+++ b/tests/value/oracle/loop_wvar.3.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] loop_wvar.i:35: starting to merge loop iterations
+[eva:partition] loop_wvar.i:35: starting to merge loop iterations
 [eva] Recording results for main_err2
 [eva] Done for function main_err2
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/loopinv.res.oracle b/tests/value/oracle/loopinv.res.oracle
index f48234fc45c..8e463e483a7 100644
--- a/tests/value/oracle/loopinv.res.oracle
+++ b/tests/value/oracle/loopinv.res.oracle
@@ -11,7 +11,7 @@
 [eva] loopinv.c:22: function init: precondition 'valid' got status valid.
 [eva] loopinv.c:22: function init: precondition 'c' got status valid.
 [eva] loopinv.c:9: loop invariant got status valid.
-[eva] loopinv.c:10: starting to merge loop iterations
+[eva:partition] loopinv.c:10: starting to merge loop iterations
 [eva] Recording results for init
 [eva] Done for function init
 [eva] computing for function init <- main1 <- main.
@@ -35,7 +35,7 @@
   Called from loopinv.c:82.
 [eva] loopinv.c:42: loop invariant got status valid.
 [eva] loopinv.c:46: Frama_C_show_each: {0}, {0}
-[eva] loopinv.c:43: starting to merge loop iterations
+[eva:partition] loopinv.c:43: starting to merge loop iterations
 [eva] loopinv.c:46: Frama_C_show_each: {0; 1}, {0; 1}
 [eva:alarm] loopinv.c:42: Warning: loop invariant got status unknown.
 [eva] loopinv.c:46: Frama_C_show_each: {0; 1; 2}, {0; 1; 2}
@@ -48,7 +48,7 @@
 [eva] computing for function main4 <- main.
   Called from loopinv.c:83.
 [eva] loopinv.c:58: loop invariant got status valid.
-[eva] loopinv.c:59: starting to merge loop iterations
+[eva:partition] loopinv.c:59: starting to merge loop iterations
 [eva:alarm] loopinv.c:58: Warning: loop invariant got status unknown.
 [eva] Recording results for main4
 [eva] Done for function main4
@@ -56,7 +56,7 @@
   Called from loopinv.c:84.
 [eva] loopinv.c:69: loop invariant got status valid.
 [eva] loopinv.c:71: Frama_C_show_each: {0}, {1}
-[eva] loopinv.c:70: starting to merge loop iterations
+[eva:partition] loopinv.c:70: starting to merge loop iterations
 [eva] loopinv.c:71: Frama_C_show_each: {0; 2}, {1; 2}
 [eva] loopinv.c:71: Frama_C_show_each: {0; 2; 4}, {1; 2; 3}
 [eva] loopinv.c:71: Frama_C_show_each: {0; 2; 4; 6}, [1..106]
diff --git a/tests/value/oracle/multidim-relations.res.oracle b/tests/value/oracle/multidim-relations.res.oracle
index 7db1f31483f..7a7b7e857cc 100644
--- a/tests/value/oracle/multidim-relations.res.oracle
+++ b/tests/value/oracle/multidim-relations.res.oracle
@@ -9,7 +9,7 @@
   h ∈ {1}
 [eva] computing for function init_array <- main.
   Called from multidim-relations.c:35.
-[eva] multidim-relations.c:18: starting to merge loop iterations
+[eva:partition] multidim-relations.c:18: starting to merge loop iterations
 [kernel:approximation] multidim-relations.c:19: 
   more than 1(350) locations to update in array. Approximating.
 [kernel:approximation] multidim-relations.c:20: 
diff --git a/tests/value/oracle/multidim.res.oracle b/tests/value/oracle/multidim.res.oracle
index bde20fa2538..8c6db35d834 100644
--- a/tests/value/oracle/multidim.res.oracle
+++ b/tests/value/oracle/multidim.res.oracle
@@ -85,7 +85,7 @@
 [eva] Done for function main1
 [eva] computing for function main2 <- main.
   Called from multidim.c:188.
-[eva] multidim.c:55: starting to merge loop iterations
+[eva:partition] multidim.c:55: starting to merge loop iterations
 [eva:alarm] multidim.c:58: Warning: check got status unknown.
 [eva] multidim.c:59: 
   Frama_C_domain_show_each:
@@ -95,8 +95,8 @@
 [eva] Done for function main2
 [eva] computing for function main3 <- main.
   Called from multidim.c:189.
-[eva] multidim.c:65: starting to merge loop iterations
-[eva] multidim.c:64: starting to merge loop iterations
+[eva:partition] multidim.c:65: starting to merge loop iterations
+[eva:partition] multidim.c:64: starting to merge loop iterations
 [kernel:approximation] multidim.c:66: 
   more than 1(20) locations to update in array. Approximating.
 [kernel:approximation] multidim.c:67: 
@@ -135,8 +135,8 @@
 [eva] computing for function main4 <- main.
   Called from multidim.c:190.
 [eva:loop-unroll:partial] multidim.c:81: loop not completely unrolled
-[eva] multidim.c:81: starting to merge loop iterations
-[eva] multidim.c:83: starting to merge loop iterations
+[eva:partition] multidim.c:81: starting to merge loop iterations
+[eva:partition] multidim.c:83: starting to merge loop iterations
 [eva] multidim.c:88: 
   Frama_C_domain_show_each:
   t : # cvalue: {42}
@@ -145,7 +145,7 @@
 [eva] Done for function main4
 [eva] computing for function main5 <- main.
   Called from multidim.c:191.
-[eva] multidim.c:96: starting to merge loop iterations
+[eva:partition] multidim.c:96: starting to merge loop iterations
 [eva] multidim.c:104: 
   Frama_C_domain_show_each:
   t : # cvalue: [0..9] ∈ {0; 1}
@@ -155,7 +155,7 @@
 [eva] Done for function main5
 [eva] computing for function main6 <- main.
   Called from multidim.c:192.
-[eva] multidim.c:114: Trace partitioning superposing up to 100 states
+[eva:partition] multidim.c:114: Trace partitioning superposing up to 100 states
 [eva] multidim.c:118: 
   Frama_C_domain_show_each:
   t : # cvalue: {0}
@@ -173,7 +173,7 @@
 [eva] Done for function main6
 [eva] computing for function main7 <- main.
   Called from multidim.c:193.
-[eva] multidim.c:134: starting to merge loop iterations
+[eva:partition] multidim.c:134: starting to merge loop iterations
 [kernel:approximation] multidim.c:136: 
   more than 1(1000) locations to update in array. Approximating.
 [kernel:approximation] multidim.c:137: 
@@ -201,7 +201,7 @@
 [eva] Done for function main7
 [eva] computing for function main8 <- main.
   Called from multidim.c:194.
-[eva] multidim.c:165: starting to merge loop iterations
+[eva:partition] multidim.c:165: starting to merge loop iterations
 [eva] multidim.c:169: 
   Frama_C_domain_show_each:
   t : # cvalue: {0; 1}
@@ -210,7 +210,7 @@
 [eva] Done for function main8
 [eva] computing for function main9 <- main.
   Called from multidim.c:195.
-[eva] multidim.c:176: starting to merge loop iterations
+[eva:partition] multidim.c:176: starting to merge loop iterations
 [eva] multidim.c:182: 
   Frama_C_domain_show_each:
   t1 : # cvalue: {0} or UNINITIALIZED
diff --git a/tests/value/oracle/no_results.res.oracle b/tests/value/oracle/no_results.res.oracle
index 5d599508d15..e3d9cae0b38 100644
--- a/tests/value/oracle/no_results.res.oracle
+++ b/tests/value/oracle/no_results.res.oracle
@@ -6,36 +6,57 @@
   t[0..2999] ∈ {0}
 [eva] computing for function init <- main.
   Called from no_results.c:19.
-[eva] no_results.c:10: Trace partitioning superposing up to 100 states
-[eva] no_results.c:10: Trace partitioning superposing up to 200 states
-[eva] no_results.c:10: Trace partitioning superposing up to 300 states
-[eva] no_results.c:10: Trace partitioning superposing up to 400 states
-[eva] no_results.c:10: Trace partitioning superposing up to 500 states
-[eva] no_results.c:10: Trace partitioning superposing up to 600 states
-[eva] no_results.c:10: Trace partitioning superposing up to 700 states
-[eva] no_results.c:10: Trace partitioning superposing up to 800 states
-[eva] no_results.c:10: Trace partitioning superposing up to 900 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1000 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1100 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1200 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1300 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1400 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1500 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1600 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1700 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1800 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1900 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2000 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2100 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2200 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2300 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2400 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2500 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2600 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2700 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2800 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2900 states
-[eva] no_results.c:10: Trace partitioning superposing up to 3000 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 100 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 200 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 300 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 400 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 500 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 600 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 700 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 800 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 900 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1000 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1100 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1200 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1300 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1400 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1500 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1600 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1700 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1800 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1900 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2000 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2100 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2200 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2300 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2400 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2500 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2600 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2700 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2800 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2900 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 3000 states
 [eva] Recording results for init
 [eva] Done for function init
 [eva] computing for function f <- main.
diff --git a/tests/value/oracle/non_natural.res.oracle b/tests/value/oracle/non_natural.res.oracle
index 740a2e0c5bb..421a73d7304 100644
--- a/tests/value/oracle/non_natural.res.oracle
+++ b/tests/value/oracle/non_natural.res.oracle
@@ -49,7 +49,7 @@
   accessing uninitialized left-value.
   assert \initialized(tmp_14);
   (tmp_14 from from++)
-[eva] non_natural.i:21: starting to merge loop iterations
+[eva:partition] non_natural.i:21: starting to merge loop iterations
 [eva] non_natural.i:22: Frama_C_show_each: {{ &p2 + {0; 32} }}
 [eva] non_natural.i:22: Frama_C_show_each: {{ &p2 + {0; 32; 64} }}
 [eva] non_natural.i:22: Frama_C_show_each: {{ &p2 + {0; 32; 64; 96} }}
diff --git a/tests/value/oracle/nonlin.res.oracle b/tests/value/oracle/nonlin.res.oracle
index ea7094541b9..bedfb713ef6 100644
--- a/tests/value/oracle/nonlin.res.oracle
+++ b/tests/value/oracle/nonlin.res.oracle
@@ -123,7 +123,7 @@
 [eva] computing for function subdivide_table <- main.
   Called from nonlin.c:128.
 [eva] nonlin.c:93: loop invariant got status valid.
-[eva] nonlin.c:94: starting to merge loop iterations
+[eva:partition] nonlin.c:94: starting to merge loop iterations
 [eva:nonlin] nonlin.c:95: non-linear '(4 + ((x >> 2) * 3 << 2)) + x % 4', lv 'x'
 [eva:nonlin] nonlin.c:95: subdividing on x
 [eva] Recording results for subdivide_table
diff --git a/tests/value/oracle/octagons-pointers-intermediate.res.oracle b/tests/value/oracle/octagons-pointers-intermediate.res.oracle
index 1e07542dcc3..66b96ce427a 100644
--- a/tests/value/oracle/octagons-pointers-intermediate.res.oracle
+++ b/tests/value/oracle/octagons-pointers-intermediate.res.oracle
@@ -8,7 +8,8 @@
   nondet ∈ [--..--]
 [eva] computing for function init <- main.
   Called from octagons-pointers-intermediate.c:38.
-[eva] octagons-pointers-intermediate.c:18: starting to merge loop iterations
+[eva:partition] octagons-pointers-intermediate.c:18: 
+  starting to merge loop iterations
 [eva] Recording results for init
 [eva] Done for function init
 [eva] computing for function cmdRead <- main.
diff --git a/tests/value/oracle/octagons-pointers-simple.res.oracle b/tests/value/oracle/octagons-pointers-simple.res.oracle
index d6690c7dd63..c7821da4688 100644
--- a/tests/value/oracle/octagons-pointers-simple.res.oracle
+++ b/tests/value/oracle/octagons-pointers-simple.res.oracle
@@ -8,7 +8,7 @@
   nondet ∈ [--..--]
 [eva] computing for function init <- main.
   Called from octagons-pointers-simple.c:38.
-[eva] octagons-pointers-simple.c:18: starting to merge loop iterations
+[eva:partition] octagons-pointers-simple.c:18: starting to merge loop iterations
 [eva] Recording results for init
 [eva] Done for function init
 [eva] octagons-pointers-simple.c:46: 
diff --git a/tests/value/oracle/octagons-pointers.res.oracle b/tests/value/oracle/octagons-pointers.res.oracle
index dfbb7337f64..0c781d4eb9e 100644
--- a/tests/value/oracle/octagons-pointers.res.oracle
+++ b/tests/value/oracle/octagons-pointers.res.oracle
@@ -8,7 +8,7 @@
   nondet ∈ [--..--]
 [eva] computing for function init <- main.
   Called from octagons-pointers.c:39.
-[eva] octagons-pointers.c:18: starting to merge loop iterations
+[eva:partition] octagons-pointers.c:18: starting to merge loop iterations
 [eva] Recording results for init
 [eva] Done for function init
 [eva] octagons-pointers.c:46: 
diff --git a/tests/value/oracle/octagons.res.oracle b/tests/value/oracle/octagons.res.oracle
index 4c101ae36a0..f6f2e7a8594 100644
--- a/tests/value/oracle/octagons.res.oracle
+++ b/tests/value/oracle/octagons.res.oracle
@@ -149,7 +149,7 @@
 [eva] octagons.c:129: 
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
-[eva] octagons.c:133: starting to merge loop iterations
+[eva:partition] octagons.c:133: starting to merge loop iterations
 [eva:alarm] octagons.c:134: Warning: 
   signed overflow. assert a + 2 ≤ 2147483647;
 [eva:alarm] octagons.c:135: Warning: 
@@ -292,20 +292,20 @@
 [eva] octagons.c:250: 
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
-[eva] octagons.c:251: starting to merge loop iterations
+[eva:partition] octagons.c:251: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- arrays <- main.
   Called from octagons.c:256.
 [eva] octagons.c:256: 
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
-[eva] octagons.c:258: starting to merge loop iterations
+[eva:partition] octagons.c:258: starting to merge loop iterations
 [eva] computing for function Frama_C_float_interval <- arrays <- main.
   Called from octagons.c:265.
 [eva] using specification for function Frama_C_float_interval
 [eva] octagons.c:265: 
   function Frama_C_float_interval, behavior finite: precondition 'order' got status valid.
 [eva] Done for function Frama_C_float_interval
-[eva] octagons.c:267: starting to merge loop iterations
+[eva:partition] octagons.c:267: starting to merge loop iterations
 [eva] Recording results for arrays
 [eva] Done for function arrays
 [eva] Recording results for main
diff --git a/tests/value/oracle/offsetmap.0.res.oracle b/tests/value/oracle/offsetmap.0.res.oracle
index 06aae55336a..894cc00cd75 100644
--- a/tests/value/oracle/offsetmap.0.res.oracle
+++ b/tests/value/oracle/offsetmap.0.res.oracle
@@ -25,8 +25,8 @@
   s[0..9999999] ∈ {0}
 [eva] computing for function f <- main.
   Called from offsetmap.i:108.
-[eva] offsetmap.i:19: starting to merge loop iterations
-[eva] offsetmap.i:29: starting to merge loop iterations
+[eva:partition] offsetmap.i:19: starting to merge loop iterations
+[eva:partition] offsetmap.i:29: starting to merge loop iterations
 [eva:alarm] offsetmap.i:51: Warning: 
   pointer downcast. assert (unsigned int)(&x2) ≤ 2147483647;
 [eva] Recording results for f
diff --git a/tests/value/oracle/offsetmap.1.res.oracle b/tests/value/oracle/offsetmap.1.res.oracle
index 6dc51d73f9d..64ad61af1a7 100644
--- a/tests/value/oracle/offsetmap.1.res.oracle
+++ b/tests/value/oracle/offsetmap.1.res.oracle
@@ -25,8 +25,8 @@
   s[0..9999999] ∈ {0}
 [eva] computing for function f <- main.
   Called from offsetmap.i:108.
-[eva] offsetmap.i:19: starting to merge loop iterations
-[eva] offsetmap.i:29: starting to merge loop iterations
+[eva:partition] offsetmap.i:19: starting to merge loop iterations
+[eva:partition] offsetmap.i:29: starting to merge loop iterations
 [eva:alarm] offsetmap.i:51: Warning: 
   pointer downcast. assert (unsigned int)(&x2) ≤ 2147483647;
 [eva] Recording results for f
diff --git a/tests/value/oracle/offsetmap.2.res.oracle b/tests/value/oracle/offsetmap.2.res.oracle
index da25a3bf694..c1d35ddae83 100644
--- a/tests/value/oracle/offsetmap.2.res.oracle
+++ b/tests/value/oracle/offsetmap.2.res.oracle
@@ -25,8 +25,8 @@
   s[0..9999999] ∈ {0}
 [eva] computing for function f <- main.
   Called from offsetmap.i:108.
-[eva] offsetmap.i:19: starting to merge loop iterations
-[eva] offsetmap.i:29: starting to merge loop iterations
+[eva:partition] offsetmap.i:19: starting to merge loop iterations
+[eva:partition] offsetmap.i:29: starting to merge loop iterations
 [eva:alarm] offsetmap.i:51: Warning: 
   pointer downcast. assert (unsigned int)(&x2) ≤ 2147483647;
 [eva] Recording results for f
diff --git a/tests/value/oracle/partitioning-annots.0.res.oracle b/tests/value/oracle/partitioning-annots.0.res.oracle
index 3294c2b093f..4677319e05c 100644
--- a/tests/value/oracle/partitioning-annots.0.res.oracle
+++ b/tests/value/oracle/partitioning-annots.0.res.oracle
@@ -7,21 +7,21 @@
   k ∈ {0}
 [eva] computing for function test_slevel <- main.
   Called from partitioning-annots.c:289.
-[eva] partitioning-annots.c:243: starting to merge loop iterations
-[eva] partitioning-annots.c:248: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:243: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:248: starting to merge loop iterations
 [eva] Recording results for test_slevel
 [eva] Done for function test_slevel
 [eva] computing for function test_unroll <- main.
   Called from partitioning-annots.c:290.
 [eva:loop-unroll:partial] partitioning-annots.c:26: loop not completely unrolled
-[eva] partitioning-annots.c:26: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:26: starting to merge loop iterations
 [eva:loop-unroll:partial] partitioning-annots.c:34: loop not completely unrolled
-[eva] partitioning-annots.c:34: starting to merge loop iterations
-[eva] partitioning-annots.c:36: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:34: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:36: starting to merge loop iterations
 [eva:loop-unroll:partial] partitioning-annots.c:49: loop not completely unrolled
-[eva] partitioning-annots.c:49: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:49: starting to merge loop iterations
 [eva:loop-unroll:partial] partitioning-annots.c:54: loop not completely unrolled
-[eva] partitioning-annots.c:54: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:54: starting to merge loop iterations
 [eva] Recording results for test_unroll
 [eva] Done for function test_unroll
 [eva] computing for function test_split <- main.
@@ -91,7 +91,7 @@
 [eva] Done for function test_dynamic_split
 [eva] computing for function test_dynamic_split_predicate <- main.
   Called from partitioning-annots.c:293.
-[eva] partitioning-annots.c:124: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:124: starting to merge loop iterations
 [eva] Recording results for test_dynamic_split_predicate
 [eva] Done for function test_dynamic_split_predicate
 [eva] computing for function test_splits_post_call <- main.
@@ -122,7 +122,7 @@
 [eva] computing for function test_auto_limit <- main.
   Called from partitioning-annots.c:295.
 [eva:loop-unroll:auto] partitioning-annots.c:280: Automatic loop unrolling.
-[eva] partitioning-annots.c:284: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:284: starting to merge loop iterations
 [eva] Recording results for test_auto_limit
 [eva] Done for function test_auto_limit
 [eva] Recording results for main
diff --git a/tests/value/oracle/partitioning-annots.2.res.oracle b/tests/value/oracle/partitioning-annots.2.res.oracle
index ac1dd0928fa..3d4a38d3445 100644
--- a/tests/value/oracle/partitioning-annots.2.res.oracle
+++ b/tests/value/oracle/partitioning-annots.2.res.oracle
@@ -14,7 +14,7 @@
 [eva] computing for function Frama_C_interval <- test_loop_split.
   Called from partitioning-annots.c:145.
 [eva] Done for function Frama_C_interval
-[eva] partitioning-annots.c:143: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:143: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- test_loop_split.
   Called from partitioning-annots.c:145.
 [eva] Done for function Frama_C_interval
diff --git a/tests/value/oracle/pointer4.res.oracle b/tests/value/oracle/pointer4.res.oracle
index 32dae30299a..effa4f8a361 100644
--- a/tests/value/oracle/pointer4.res.oracle
+++ b/tests/value/oracle/pointer4.res.oracle
@@ -7,7 +7,7 @@
   d ∈ {0}
   e[0..9] ∈ {0}
   c ∈ {0}
-[eva] pointer4.i:12: starting to merge loop iterations
+[eva:partition] pointer4.i:12: starting to merge loop iterations
 [eva:alarm] pointer4.i:15: Warning: 
   out of bounds write. assert \valid((int *)0x0 + c);
 [eva] Recording results for main
diff --git a/tests/value/oracle/pointer_comparison.0.res.oracle b/tests/value/oracle/pointer_comparison.0.res.oracle
index ad9eee41858..9a4075e1c52 100644
--- a/tests/value/oracle/pointer_comparison.0.res.oracle
+++ b/tests/value/oracle/pointer_comparison.0.res.oracle
@@ -27,7 +27,7 @@
 [eva:pointer-comparison] pointer_comparison.c:23: 
   invalid pointer comparison: invalid pointer(s)
 [eva] pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20} }}
-[eva] pointer_comparison.c:23: starting to merge loop iterations
+[eva:partition] pointer_comparison.c:23: starting to merge loop iterations
 [eva] pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20; 24} }}
 [eva] pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20; 24; 28} }}
 [eva] pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + [20..--],0%4 }}
diff --git a/tests/value/oracle/pointer_comparison.1.res.oracle b/tests/value/oracle/pointer_comparison.1.res.oracle
index e92341d4ebc..4e8c479e6fd 100644
--- a/tests/value/oracle/pointer_comparison.1.res.oracle
+++ b/tests/value/oracle/pointer_comparison.1.res.oracle
@@ -44,7 +44,7 @@
 [eva:pointer-comparison] pointer_comparison.c:23: 
   evaluating condition to {0; 1} instead of {0} because of UPCPA
 [eva] pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20} }}
-[eva] pointer_comparison.c:23: starting to merge loop iterations
+[eva:partition] pointer_comparison.c:23: starting to merge loop iterations
 [eva] pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20; 24} }}
 [eva] pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20; 24; 28} }}
 [eva] pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + [20..--],0%4 }}
diff --git a/tests/value/oracle/pointer_loop.res.oracle b/tests/value/oracle/pointer_loop.res.oracle
index ed5040576f0..6ae8253711a 100644
--- a/tests/value/oracle/pointer_loop.res.oracle
+++ b/tests/value/oracle/pointer_loop.res.oracle
@@ -15,7 +15,7 @@
       [1] ∈ {0}
   ACtrl[0] ∈ {{ &Ctrl[0] }}
        [1] ∈ {{ &Ctrl[1] }}
-[eva] pointer_loop.i:13: starting to merge loop iterations
+[eva:partition] pointer_loop.i:13: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/postcondition.res.oracle b/tests/value/oracle/postcondition.res.oracle
index fcfd148f70a..618629470fa 100644
--- a/tests/value/oracle/postcondition.res.oracle
+++ b/tests/value/oracle/postcondition.res.oracle
@@ -24,7 +24,7 @@
   Called from postcondition.i:20.
 [eva] using specification for function u
 [eva] Done for function u
-[eva] postcondition.i:18: starting to merge loop iterations
+[eva:partition] postcondition.i:18: starting to merge loop iterations
 [eva] computing for function u <- get_index <- main.
   Called from postcondition.i:20.
 [eva] Done for function u
diff --git a/tests/value/oracle/precise_locations.res.oracle b/tests/value/oracle/precise_locations.res.oracle
index 872e081060b..d46c5437dcd 100644
--- a/tests/value/oracle/precise_locations.res.oracle
+++ b/tests/value/oracle/precise_locations.res.oracle
@@ -8,8 +8,8 @@
   j ∈ {0}
   q ∈ {0}
   r ∈ {0}
-[eva] precise_locations.i:29: starting to merge loop iterations
-[eva] precise_locations.i:28: starting to merge loop iterations
+[eva:partition] precise_locations.i:29: starting to merge loop iterations
+[eva:partition] precise_locations.i:28: starting to merge loop iterations
 [eva] precise_locations.i:33: 
   Frama_C_dump_each:
   # cvalue:
@@ -23,17 +23,17 @@
   v ∈ [--..--]
   __retres ∈ UNINITIALIZED
   ==END OF DUMP==
-[eva] precise_locations.i:34: starting to merge loop iterations
+[eva:partition] precise_locations.i:34: starting to merge loop iterations
 [eva] computing for function ct <- main.
   Called from precise_locations.i:39.
 [eva] Recording results for ct
 [eva] Done for function ct
-[eva] precise_locations.i:38: starting to merge loop iterations
+[eva:partition] precise_locations.i:38: starting to merge loop iterations
 [eva] precise_locations.i:39: Reusing old results for call to ct
 [eva] precise_locations.i:39: Reusing old results for call to ct
 [eva] precise_locations.i:39: Reusing old results for call to ct
 [eva] precise_locations.i:39: Reusing old results for call to ct
-[eva] precise_locations.i:37: starting to merge loop iterations
+[eva:partition] precise_locations.i:37: starting to merge loop iterations
 [eva] precise_locations.i:39: Reusing old results for call to ct
 [eva] precise_locations.i:39: Reusing old results for call to ct
 [eva] precise_locations.i:39: Reusing old results for call to ct
@@ -162,7 +162,7 @@
 [eva] using specification for function g
 [eva] precise_locations.i:49: function g: precondition got status valid.
 [eva] Done for function g
-[eva] precise_locations.i:45: starting to merge loop iterations
+[eva:partition] precise_locations.i:45: starting to merge loop iterations
 [eva] computing for function f <- main.
   Called from precise_locations.i:48.
 [eva] Done for function f
@@ -181,7 +181,7 @@
 [eva] computing for function g <- main.
   Called from precise_locations.i:49.
 [eva] Done for function g
-[eva] precise_locations.i:44: starting to merge loop iterations
+[eva:partition] precise_locations.i:44: starting to merge loop iterations
 [eva] computing for function f <- main.
   Called from precise_locations.i:48.
 [eva] Done for function f
diff --git a/tests/value/oracle/raz.res.oracle b/tests/value/oracle/raz.res.oracle
index c17ddaa0725..1fbe1111bb3 100644
--- a/tests/value/oracle/raz.res.oracle
+++ b/tests/value/oracle/raz.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   h ∈ [--..--]
-[eva] raz.i:8: starting to merge loop iterations
+[eva:partition] raz.i:8: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/reading_null.res.oracle b/tests/value/oracle/reading_null.res.oracle
index fc1f29a182a..559416ef96d 100644
--- a/tests/value/oracle/reading_null.res.oracle
+++ b/tests/value/oracle/reading_null.res.oracle
@@ -19,7 +19,7 @@
   S_0_T[0..1] ∈ [--..--]
   S_1_T[0..1] ∈ [--..--]
 [eva] reading_null.i:25: Frama_C_show_each_F: [-2147483648..2147483647], {0}
-[eva] reading_null.i:24: starting to merge loop iterations
+[eva:partition] reading_null.i:24: starting to merge loop iterations
 [eva] reading_null.i:25: Frama_C_show_each_F: [-2147483648..2147483647], {0; 1}
 [eva] reading_null.i:25: 
   Frama_C_show_each_F: [-2147483648..2147483647], {0; 1; 2}
diff --git a/tests/value/oracle/red_alarms.res.oracle b/tests/value/oracle/red_alarms.res.oracle
index 01af779f31d..6b67ce68a5b 100644
--- a/tests/value/oracle/red_alarms.res.oracle
+++ b/tests/value/oracle/red_alarms.res.oracle
@@ -51,16 +51,16 @@
   Called from red_alarms.i:97.
 [eva:alarm] red_alarms.i:45: Warning: 
   accessing out of bounds index. assert i < 32;
-[eva] red_alarms.i:47: starting to merge loop iterations
+[eva:partition] red_alarms.i:47: starting to merge loop iterations
 [eva:alarm] red_alarms.i:48: Warning: out of bounds write. assert \valid(p);
-[eva] red_alarms.i:52: starting to merge loop iterations
+[eva:partition] red_alarms.i:52: starting to merge loop iterations
 [eva:alarm] red_alarms.i:53: Warning: 
   accessing out of bounds index. assert i < 32;
 [eva:alarm] red_alarms.i:57: Warning: 
   accessing out of bounds index. assert i < 32;
 [kernel] red_alarms.i:57: Warning: 
   all target addresses were invalid. This path is assumed to be dead.
-[eva] red_alarms.i:60: starting to merge loop iterations
+[eva:partition] red_alarms.i:60: starting to merge loop iterations
 [eva:alarm] red_alarms.i:61: Warning: 
   accessing out of bounds index. assert i < 32;
 [kernel] red_alarms.i:61: Warning: 
diff --git a/tests/value/oracle/reevaluate_alarms.res.oracle b/tests/value/oracle/reevaluate_alarms.res.oracle
index 9a0cf69cf4a..b31ac29c076 100644
--- a/tests/value/oracle/reevaluate_alarms.res.oracle
+++ b/tests/value/oracle/reevaluate_alarms.res.oracle
@@ -8,7 +8,7 @@
   n ∈ {1}
 [eva] computing for function loop <- main.
   Called from reevaluate_alarms.i:34.
-[eva] reevaluate_alarms.i:13: starting to merge loop iterations
+[eva:partition] reevaluate_alarms.i:13: starting to merge loop iterations
 [eva:alarm] reevaluate_alarms.i:14: Warning: 
   signed overflow. assert S + i ≤ 2147483647;
 [eva:alarm] reevaluate_alarms.i:14: Warning: 
@@ -18,7 +18,7 @@
 [eva] Done for function loop
 [eva] computing for function compute_n <- main.
   Called from reevaluate_alarms.i:36.
-[eva] reevaluate_alarms.i:19: starting to merge loop iterations
+[eva:partition] reevaluate_alarms.i:19: starting to merge loop iterations
 [eva:alarm] reevaluate_alarms.i:20: Warning: 
   signed overflow. assert n * i ≤ 2147483647;
 [eva] Recording results for compute_n
diff --git a/tests/value/oracle/relations2.res.oracle b/tests/value/oracle/relations2.res.oracle
index f3cd5fc0df7..6a5c925a9e5 100644
--- a/tests/value/oracle/relations2.res.oracle
+++ b/tests/value/oracle/relations2.res.oracle
@@ -69,7 +69,7 @@
 [eva:alarm] relations2.i:34: Warning: 
   accessing out of bounds index.
   assert (unsigned int)(i - (unsigned int)(t + 1)) < 514;
-[eva] relations2.i:32: starting to merge loop iterations
+[eva:partition] relations2.i:32: starting to merge loop iterations
 [eva] relations2.i:33: 
   Frama_C_dump_each:
   # cvalue:
diff --git a/tests/value/oracle/semaphore.res.oracle b/tests/value/oracle/semaphore.res.oracle
index 12339ab0661..a3272cd7fc6 100644
--- a/tests/value/oracle/semaphore.res.oracle
+++ b/tests/value/oracle/semaphore.res.oracle
@@ -12,7 +12,7 @@
   Called from semaphore.i:31.
 [eva] using specification for function V
 [eva] Done for function V
-[eva] semaphore.i:29: starting to merge loop iterations
+[eva:partition] semaphore.i:29: starting to merge loop iterations
 [eva] computing for function V <- g.
   Called from semaphore.i:31.
 [eva] Done for function V
@@ -22,7 +22,7 @@
 [eva] computing for function V <- g.
   Called from semaphore.i:31.
 [eva] Done for function V
-[eva] semaphore.i:28: starting to merge loop iterations
+[eva:partition] semaphore.i:28: starting to merge loop iterations
 [kernel:annot:missing-spec] semaphore.i:34: Warning: 
   Neither code nor specification for function P,
    generating default assigns. See -generated-spec-* options for more info
diff --git a/tests/value/oracle/shift_big.res.oracle b/tests/value/oracle/shift_big.res.oracle
index de17c12780c..4cc1d32546e 100644
--- a/tests/value/oracle/shift_big.res.oracle
+++ b/tests/value/oracle/shift_big.res.oracle
@@ -25,7 +25,7 @@
                    (tmp_0 from t2())
 [eva] computing for function t3 <- main.
   Called from shift_big.i:65.
-[eva] shift_big.i:22: starting to merge loop iterations
+[eva:partition] shift_big.i:22: starting to merge loop iterations
 [eva] shift_big.i:25: assertion got status valid.
 [eva] Recording results for t3
 [eva] Done for function t3
@@ -36,7 +36,7 @@
 [eva] Done for function t4
 [eva] computing for function t5 <- main.
   Called from shift_big.i:67.
-[eva] shift_big.i:37: starting to merge loop iterations
+[eva:partition] shift_big.i:37: starting to merge loop iterations
 [eva] shift_big.i:40: assertion got status valid.
 [eva] Recording results for t5
 [eva] Done for function t5
diff --git a/tests/value/oracle/statistics.res.oracle b/tests/value/oracle/statistics.res.oracle
index a2a50eb222a..e53aa31daa8 100644
--- a/tests/value/oracle/statistics.res.oracle
+++ b/tests/value/oracle/statistics.res.oracle
@@ -10,7 +10,7 @@
   Called from statistics.i:13.
 [eva] Recording results for g
 [eva] Done for function g
-[eva] statistics.i:12: starting to merge loop iterations
+[eva:partition] statistics.i:12: starting to merge loop iterations
 [eva] computing for function g <- f <- main.
   Called from statistics.i:13.
 [eva] Recording results for g
diff --git a/tests/value/oracle/strings_cond.res.oracle b/tests/value/oracle/strings_cond.res.oracle
index 432a970ebd4..1247b21c549 100644
--- a/tests/value/oracle/strings_cond.res.oracle
+++ b/tests/value/oracle/strings_cond.res.oracle
@@ -12,7 +12,7 @@
   s ∈ {{ "Bla" }}
   ==END OF DUMP==
 [eva] strings_cond.i:4: Frama_C_show_each_s: {{ "Bla" }}
-[eva] strings_cond.i:4: starting to merge loop iterations
+[eva:partition] strings_cond.i:4: starting to merge loop iterations
 [eva] strings_cond.i:4: Frama_C_show_each_s: {{ "Bla" + {0; 1} }}
 [eva] strings_cond.i:4: Frama_C_show_each_s: {{ "Bla" + {0; 1; 2} }}
 [eva] Recording results for foo
diff --git a/tests/value/oracle/symbolic_locs.res.oracle b/tests/value/oracle/symbolic_locs.res.oracle
index fe83515c3c3..10b61d5e68a 100644
--- a/tests/value/oracle/symbolic_locs.res.oracle
+++ b/tests/value/oracle/symbolic_locs.res.oracle
@@ -181,7 +181,7 @@
 [eva] Done for function main6_ghost_dep
 [eva] computing for function main7_widening <- main.
   Called from symbolic_locs.i:124.
-[eva] symbolic_locs.i:110: starting to merge loop iterations
+[eva:partition] symbolic_locs.i:110: starting to merge loop iterations
 [eva] symbolic_locs.i:113: Frama_C_show_each: [10001..2147483647]
 [eva] Recording results for main7_widening
 [eva] Done for function main7_widening
diff --git a/tests/value/oracle/taint.res.oracle b/tests/value/oracle/taint.res.oracle
index ef918aac811..38bc4e3efe5 100644
--- a/tests/value/oracle/taint.res.oracle
+++ b/tests/value/oracle/taint.res.oracle
@@ -171,7 +171,7 @@
   Called from taint.c:215.
 [eva:loop-unroll:auto] taint.c:157: Automatic loop unrolling.
 [eva:loop-unroll:partial] taint.c:157: loop not completely unrolled
-[eva] taint.c:157: starting to merge loop iterations
+[eva:partition] taint.c:157: starting to merge loop iterations
 [eva:alarm] taint.c:157: Warning: signed overflow. assert i + 1 ≤ 2147483647;
 [eva] taint.c:165: 
   Frama_C_dump_each:
diff --git a/tests/value/oracle/test.0.res.oracle b/tests/value/oracle/test.0.res.oracle
index 9f847abc20d..8480c5f752c 100644
--- a/tests/value/oracle/test.0.res.oracle
+++ b/tests/value/oracle/test.0.res.oracle
@@ -11,11 +11,11 @@
   out of bounds read. assert \valid_read(v + (int)(j + ecart));
 [eva:alarm] test.i:14: Warning: 
   out of bounds write. assert \valid(v + (int)(j + ecart));
-[eva] test.i:11: starting to merge loop iterations
-[eva] test.i:10: starting to merge loop iterations
+[eva:partition] test.i:11: starting to merge loop iterations
+[eva:partition] test.i:10: starting to merge loop iterations
 [eva:alarm] test.i:11: Warning: 
   signed overflow. assert j + ecart ≤ 2147483647;
-[eva] test.i:9: starting to merge loop iterations
+[eva:partition] test.i:9: starting to merge loop iterations
 [eva] Recording results for inst_F6
 [eva] Done for function inst_F6
 [scope:rm_asserts] removing 1 assertion(s)
diff --git a/tests/value/oracle/threat_redundant.res.oracle b/tests/value/oracle/threat_redundant.res.oracle
index 6426a9027bc..96e3f3ce0c9 100644
--- a/tests/value/oracle/threat_redundant.res.oracle
+++ b/tests/value/oracle/threat_redundant.res.oracle
@@ -16,7 +16,7 @@
   x ∈ {0}
 [eva] computing for function strchr <- main.
   Called from threat_redundant.c:19.
-[eva] threat_redundant.c:8: starting to merge loop iterations
+[eva:partition] threat_redundant.c:8: starting to merge loop iterations
 [eva:alarm] threat_redundant.c:8: Warning: 
   out of bounds read. assert \valid_read(s);
 [eva] Recording results for strchr
diff --git a/tests/value/oracle/ulongvslonglong.0.res.oracle b/tests/value/oracle/ulongvslonglong.0.res.oracle
index 90e641cc4a3..899fe67e4a7 100644
--- a/tests/value/oracle/ulongvslonglong.0.res.oracle
+++ b/tests/value/oracle/ulongvslonglong.0.res.oracle
@@ -6,8 +6,8 @@
   x ∈ {0}
   x2 ∈ {0}
   x9[0..5][0..1] ∈ {0}
-[eva] ulongvslonglong.i:14: starting to merge loop iterations
-[eva] ulongvslonglong.i:12: starting to merge loop iterations
+[eva:partition] ulongvslonglong.i:14: starting to merge loop iterations
+[eva:partition] ulongvslonglong.i:12: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/ulongvslonglong.1.res.oracle b/tests/value/oracle/ulongvslonglong.1.res.oracle
index f27ee0082e8..1f841f65473 100644
--- a/tests/value/oracle/ulongvslonglong.1.res.oracle
+++ b/tests/value/oracle/ulongvslonglong.1.res.oracle
@@ -6,8 +6,8 @@
   x ∈ {0}
   x2 ∈ {0}
   x9[0..5][0..1] ∈ {0}
-[eva] ulongvslonglong.i:14: starting to merge loop iterations
-[eva] ulongvslonglong.i:12: starting to merge loop iterations
+[eva:partition] ulongvslonglong.i:14: starting to merge loop iterations
+[eva:partition] ulongvslonglong.i:12: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/undefined_sequence.0.res.oracle b/tests/value/oracle/undefined_sequence.0.res.oracle
index d2d2868494e..fd2f9bff453 100644
--- a/tests/value/oracle/undefined_sequence.0.res.oracle
+++ b/tests/value/oracle/undefined_sequence.0.res.oracle
@@ -84,9 +84,9 @@
   H ∈ {0}
 [eva:alarm] undefined_sequence.i:35: Warning: 
   undefined multiple accesses in expression. assert \separated(&x, y);
-[eva] undefined_sequence.i:36: starting to merge loop iterations
-[eva] undefined_sequence.i:38: starting to merge loop iterations
-[eva] undefined_sequence.i:40: starting to merge loop iterations
+[eva:partition] undefined_sequence.i:36: starting to merge loop iterations
+[eva:partition] undefined_sequence.i:38: starting to merge loop iterations
+[eva:partition] undefined_sequence.i:40: starting to merge loop iterations
 [eva:alarm] undefined_sequence.i:40: Warning: 
   signed overflow.
   assert G[tmp_2] + G[tmp_3] ≤ 2147483647;
diff --git a/tests/value/oracle/undefined_sequence.1.res.oracle b/tests/value/oracle/undefined_sequence.1.res.oracle
index b9c2b08d563..fc00901135d 100644
--- a/tests/value/oracle/undefined_sequence.1.res.oracle
+++ b/tests/value/oracle/undefined_sequence.1.res.oracle
@@ -7,21 +7,21 @@
   c ∈ [--..--]
   r ∈ {0}
   H ∈ {0}
-[eva] undefined_sequence.i:36: starting to merge loop iterations
-[eva] undefined_sequence.i:38: starting to merge loop iterations
-[eva] undefined_sequence.i:40: starting to merge loop iterations
+[eva:partition] undefined_sequence.i:36: starting to merge loop iterations
+[eva:partition] undefined_sequence.i:38: starting to merge loop iterations
+[eva:partition] undefined_sequence.i:40: starting to merge loop iterations
 [eva:alarm] undefined_sequence.i:40: Warning: 
   signed overflow.
   assert G[tmp_2] + G[tmp_3] ≤ 2147483647;
   (tmp_2 from j++, tmp_3 from i++)
-[eva] undefined_sequence.i:43: starting to merge loop iterations
+[eva:partition] undefined_sequence.i:43: starting to merge loop iterations
 [eva:alarm] undefined_sequence.i:50: Warning: 
   signed overflow. assert G[j] + G[tmp_6] ≤ 2147483647;
                    (tmp_6 from j++)
 [eva:alarm] undefined_sequence.i:51: Warning: 
   signed overflow. assert G[tmp_7] + G[i] ≤ 2147483647;
                    (tmp_7 from i++)
-[eva] undefined_sequence.i:49: starting to merge loop iterations
+[eva:partition] undefined_sequence.i:49: starting to merge loop iterations
 [eva] computing for function g <- main.
   Called from undefined_sequence.i:53.
 [eva] Recording results for g
diff --git a/tests/value/oracle/unroll.res.oracle b/tests/value/oracle/unroll.res.oracle
index c36bdf2bce1..8ef0f44695a 100644
--- a/tests/value/oracle/unroll.res.oracle
+++ b/tests/value/oracle/unroll.res.oracle
@@ -9,7 +9,7 @@
   t_biosmap[0..9] ∈ {0}
   g_biosmap ∈ {{ &t_biosmap[0] }}
   biosmap ∈ {0}
-[eva] unroll.i:31: starting to merge loop iterations
+[eva:partition] unroll.i:31: starting to merge loop iterations
 [eva:alarm] unroll.i:34: Warning: signed overflow. assert -2147483648 ≤ j - 1;
 [eva:alarm] unroll.i:32: Warning: signed overflow. assert G + i ≤ 2147483647;
 [eva] Recording results for main
diff --git a/tests/value/oracle/unroll_simple.res.oracle b/tests/value/oracle/unroll_simple.res.oracle
index 503c58f70d4..83ff93f306a 100644
--- a/tests/value/oracle/unroll_simple.res.oracle
+++ b/tests/value/oracle/unroll_simple.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] unroll_simple.i:8: starting to merge loop iterations
+[eva:partition] unroll_simple.i:8: starting to merge loop iterations
 [eva:alarm] unroll_simple.i:11: Warning: 
   signed overflow. assert -2147483648 ≤ j - 1;
 [eva:alarm] unroll_simple.i:9: Warning: 
diff --git a/tests/value/oracle/user_assertion_uninit_var.res.oracle b/tests/value/oracle/user_assertion_uninit_var.res.oracle
index 50cab91e31c..71513eb7d12 100644
--- a/tests/value/oracle/user_assertion_uninit_var.res.oracle
+++ b/tests/value/oracle/user_assertion_uninit_var.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] user_assertion_uninit_var.i:3: starting to merge loop iterations
+[eva:partition] user_assertion_uninit_var.i:3: starting to merge loop iterations
 [eva:alarm] user_assertion_uninit_var.i:4: Warning: 
   assertion got status unknown.
 [eva:alarm] user_assertion_uninit_var.i:6: Warning: 
diff --git a/tests/value/oracle/va_list2.0.res.oracle b/tests/value/oracle/va_list2.0.res.oracle
index c957328829e..7ea1da5637a 100644
--- a/tests/value/oracle/va_list2.0.res.oracle
+++ b/tests/value/oracle/va_list2.0.res.oracle
@@ -26,7 +26,7 @@
                           (tmp_0 from vararg)
 [eva] va_list2.c:21: 
   Frama_C_show_each_f: {{ garbled mix of &{S_0_S___va_params} (origin: Well) }}
-[eva] va_list2.c:12: starting to merge loop iterations
+[eva:partition] va_list2.c:12: starting to merge loop iterations
 [eva:alarm] va_list2.c:13: Warning: out of bounds read. assert \valid_read(fmt);
 [eva] va_list2.c:16: 
   Frama_C_show_each_i:
diff --git a/tests/value/oracle/va_list2.1.res.oracle b/tests/value/oracle/va_list2.1.res.oracle
index ca15a17bee8..134e514df9b 100644
--- a/tests/value/oracle/va_list2.1.res.oracle
+++ b/tests/value/oracle/va_list2.1.res.oracle
@@ -30,7 +30,7 @@
                           (tmp_0 from vararg)
 [eva] va_list2.c:21: 
   Frama_C_show_each_f: [-3.40282346639e+38 .. 3.40282346639e+38]
-[eva] va_list2.c:12: starting to merge loop iterations
+[eva:partition] va_list2.c:12: starting to merge loop iterations
 [eva:alarm] va_list2.c:13: Warning: out of bounds read. assert \valid_read(fmt);
 [eva] computing for function __builtin_va_arg <- main.
   Called from va_list2.c:15.
diff --git a/tests/value/oracle/widen_non_constant.res.oracle b/tests/value/oracle/widen_non_constant.res.oracle
index a731f49ad08..f6467037e84 100644
--- a/tests/value/oracle/widen_non_constant.res.oracle
+++ b/tests/value/oracle/widen_non_constant.res.oracle
@@ -13,11 +13,11 @@
   Called from widen_non_constant.i:97.
 [eva] widen_non_constant.i:11: Frama_C_show_each_out: {0}
 [eva] widen_non_constant.i:13: Frama_C_show_each_in: {0}, {1}
-[eva] widen_non_constant.i:12: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:12: starting to merge loop iterations
 [eva] widen_non_constant.i:13: Frama_C_show_each_in: {0}, {1; 2}
 [eva] widen_non_constant.i:13: Frama_C_show_each_in: {0}, {1; 2; 3}
 [eva] widen_non_constant.i:13: Frama_C_show_each_in: {0}, [1..23]
-[eva] widen_non_constant.i:10: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:10: starting to merge loop iterations
 [eva] widen_non_constant.i:11: Frama_C_show_each_out: {0; 1}
 [eva] widen_non_constant.i:13: Frama_C_show_each_in: {0; 1}, [1..23]
 [eva] widen_non_constant.i:11: Frama_C_show_each_out: {0; 1; 2}
@@ -30,11 +30,11 @@
   Called from widen_non_constant.i:98.
 [eva] widen_non_constant.i:27: Frama_C_show_each_out: {0}
 [eva] widen_non_constant.i:29: Frama_C_show_each_in: {0}, {1}
-[eva] widen_non_constant.i:28: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:28: starting to merge loop iterations
 [eva] widen_non_constant.i:29: Frama_C_show_each_in: {0}, {1; 2}
 [eva] widen_non_constant.i:29: Frama_C_show_each_in: {0}, {1; 2; 3}
 [eva] widen_non_constant.i:29: Frama_C_show_each_in: {0}, [1..23]
-[eva] widen_non_constant.i:26: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:26: starting to merge loop iterations
 [eva] widen_non_constant.i:27: Frama_C_show_each_out: {0; 1}
 [eva] widen_non_constant.i:29: Frama_C_show_each_in: {0; 1}, [1..23]
 [eva] widen_non_constant.i:27: Frama_C_show_each_out: {0; 1; 2}
@@ -47,11 +47,11 @@
   Called from widen_non_constant.i:99.
 [eva] widen_non_constant.i:46: Frama_C_show_each_out: {0}
 [eva] widen_non_constant.i:48: Frama_C_show_each_in: {0}, {1}
-[eva] widen_non_constant.i:47: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:47: starting to merge loop iterations
 [eva] widen_non_constant.i:48: Frama_C_show_each_in: {0}, {1; 2}
 [eva] widen_non_constant.i:48: Frama_C_show_each_in: {0}, {1; 2; 3}
 [eva] widen_non_constant.i:48: Frama_C_show_each_in: {0}, [1..23]
-[eva] widen_non_constant.i:45: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:45: starting to merge loop iterations
 [eva] widen_non_constant.i:46: Frama_C_show_each_out: {0; 1}
 [eva] widen_non_constant.i:48: Frama_C_show_each_in: {0; 1}, [1..23]
 [eva] widen_non_constant.i:46: Frama_C_show_each_out: {0; 1; 2}
@@ -62,17 +62,17 @@
 [eva] Done for function main3
 [eva] computing for function main4 <- main.
   Called from widen_non_constant.i:100.
-[eva] widen_non_constant.i:63: starting to merge loop iterations
-[eva] widen_non_constant.i:69: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:63: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:69: starting to merge loop iterations
 [eva] widen_non_constant.i:72: Frama_C_show_each: {43}
-[eva] widen_non_constant.i:75: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:75: starting to merge loop iterations
 [eva] widen_non_constant.i:78: 
   Frama_C_show_each: {35; 36; 37; 38; 39; 40; 41; 42}
 [eva] Recording results for main4
 [eva] Done for function main4
 [eva] computing for function main5 <- main.
   Called from widen_non_constant.i:101.
-[eva] widen_non_constant.i:90: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:90: starting to merge loop iterations
 [eva] Recording results for main5
 [eva] Done for function main5
 [eva] Recording results for main
diff --git a/tests/value/oracle/widen_on_non_monotonic.res.oracle b/tests/value/oracle/widen_on_non_monotonic.res.oracle
index 8e040db5b0c..c1948c37c5f 100644
--- a/tests/value/oracle/widen_on_non_monotonic.res.oracle
+++ b/tests/value/oracle/widen_on_non_monotonic.res.oracle
@@ -18,9 +18,9 @@
   k ∈ {0}
 [eva] computing for function main1 <- main.
   Called from widen_on_non_monotonic.i:71.
-[eva] widen_on_non_monotonic.i:25: starting to merge loop iterations
-[eva] widen_on_non_monotonic.i:23: starting to merge loop iterations
-[eva] widen_on_non_monotonic.i:26: starting to merge loop iterations
+[eva:partition] widen_on_non_monotonic.i:25: starting to merge loop iterations
+[eva:partition] widen_on_non_monotonic.i:23: starting to merge loop iterations
+[eva:partition] widen_on_non_monotonic.i:26: starting to merge loop iterations
 [eva:alarm] widen_on_non_monotonic.i:27: Warning: 
   signed overflow. assert -2147483648 ≤ b - 1;
 [eva] Recording results for main1
diff --git a/tests/value/oracle/widen_overflow.res.oracle b/tests/value/oracle/widen_overflow.res.oracle
index 6601f0800a9..72f23a8c5c4 100644
--- a/tests/value/oracle/widen_overflow.res.oracle
+++ b/tests/value/oracle/widen_overflow.res.oracle
@@ -14,7 +14,7 @@
   Called from widen_overflow.i:9.
 [eva] using specification for function u
 [eva] Done for function u
-[eva] widen_overflow.i:9: starting to merge loop iterations
+[eva:partition] widen_overflow.i:9: starting to merge loop iterations
 [eva] computing for function u <- main.
   Called from widen_overflow.i:9.
 [eva] Done for function u
diff --git a/tests/value/oracle/widening_thresholds.res.oracle b/tests/value/oracle/widening_thresholds.res.oracle
index 27a216ec20a..9c06a0c9331 100644
--- a/tests/value/oracle/widening_thresholds.res.oracle
+++ b/tests/value/oracle/widening_thresholds.res.oracle
@@ -11,7 +11,7 @@
   Called from widening_thresholds.i:21.
 [eva] Recording results for incr_modulo
 [eva] Done for function incr_modulo
-[eva] widening_thresholds.i:18: starting to merge loop iterations
+[eva:partition] widening_thresholds.i:18: starting to merge loop iterations
 [eva] computing for function incr_modulo <- modulo <- main.
   Called from widening_thresholds.i:21.
 [eva] Recording results for incr_modulo
diff --git a/tests/value/oracle/with_comment.res.oracle b/tests/value/oracle/with_comment.res.oracle
index 32d3b2dde24..27692476ab9 100644
--- a/tests/value/oracle/with_comment.res.oracle
+++ b/tests/value/oracle/with_comment.res.oracle
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   HHH ∈ {0}
   G ∈ {0}
-[eva] with_comment.i:20: starting to merge loop iterations
+[eva:partition] with_comment.i:20: starting to merge loop iterations
 [eva:alarm] with_comment.i:21: Warning: 
   signed overflow. assert G + 1 ≤ 2147483647;
 [eva] Recording results for main2
diff --git a/tests/value/oracle_apron/auto_loop_unroll.0.res.oracle b/tests/value/oracle_apron/auto_loop_unroll.0.res.oracle
index 252285814d7..3942f902379 100644
--- a/tests/value/oracle_apron/auto_loop_unroll.0.res.oracle
+++ b/tests/value/oracle_apron/auto_loop_unroll.0.res.oracle
@@ -16,119 +16,119 @@
 < [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: {100}
-29,31c23
+30,32c24
 < [eva:alarm] auto_loop_unroll.c:58: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:59: Frama_C_show_each_64: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:59: Frama_C_show_each_64: {64}
-33,35c25
+34,36c26
 < [eva:alarm] auto_loop_unroll.c:63: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:64: Frama_C_show_each_40: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:64: Frama_C_show_each_40: [0..120]
-37,39c27
+38,40c28
 < [eva:alarm] auto_loop_unroll.c:69: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:72: Frama_C_show_each_80: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:72: Frama_C_show_each_80: [0..160]
-41,43c29
+42,44c30
 < [eva:alarm] auto_loop_unroll.c:76: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:82: Frama_C_show_each_32_80: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:82: Frama_C_show_each_32_80: [0..164]
-51,52d36
+52,53d37
 < [eva:alarm] auto_loop_unroll.c:88: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-55,57c39
+56,58c40
 < [eva:alarm] auto_loop_unroll.c:93: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:95: Frama_C_show_each_101: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:95: Frama_C_show_each_101: {101}
-66c48,51
+67c49,52
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-76c61,64
+77c62,65
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-85c73,76
+86c74,77
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-102c93,96
+103c94,97
 < [eva] auto_loop_unroll.c:100: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:100.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-109,110d102
+110,111d103
 < [eva:alarm] auto_loop_unroll.c:14: Warning: 
 <   signed overflow. assert g + 1 ≤ 2147483647;
-113c105,108
+114c106,109
 < [eva] auto_loop_unroll.c:100: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:100.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-116,117d110
+117,118d111
 < [eva:alarm] auto_loop_unroll.c:18: Warning: 
 <   signed overflow. assert i + 1 ≤ 2147483647;
-120c113
+121c114
 < [eva] auto_loop_unroll.c:103: Frama_C_show_each_25: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:103: Frama_C_show_each_25: {25}
-126c119
+127c120
 < [eva] auto_loop_unroll.c:112: Frama_C_show_each_120: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:112: Frama_C_show_each_120: [15..2147483647]
-128,130c121
+129,131c122
 < [eva:alarm] auto_loop_unroll.c:120: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:122: Frama_C_show_each_32_64: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:122: Frama_C_show_each_32_64: [0..65]
-132,134c123
+133,135c124
 < [eva:alarm] auto_loop_unroll.c:130: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:132: Frama_C_show_each_1_28: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:132: Frama_C_show_each_1_28: [0..29]
-138c127
+139c128
 < [eva] auto_loop_unroll.c:141: Frama_C_show_each_top: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:141: Frama_C_show_each_top: [3..2147483647]
-149,151c138
+150,152c139
 < [eva:alarm] auto_loop_unroll.c:165: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:168: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:168: Frama_C_show_each_imprecise: [0..65]
-156c143
+157c144
 < [eva] auto_loop_unroll.c:179: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:179: Frama_C_show_each_imprecise: [64..2147483647]
-160c147
+161c148
 < [eva] auto_loop_unroll.c:188: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:188: Frama_C_show_each_imprecise: [10..2147483647]
-178,182c165,173
+179,183c166,174
 < [eva] auto_loop_unroll.c:193: Reusing old results for call to incr_g
 < [eva] auto_loop_unroll.c:193: Reusing old results for call to incr_g
 < [eva:alarm] auto_loop_unroll.c:195: Warning: 
@@ -144,82 +144,82 @@
 > [eva] Recording results for incr_g
 > [eva] Done for function incr_g
 > [eva] auto_loop_unroll.c:197: Frama_C_show_each_imprecise: [0..64]
-184,186c175
+185,187c176
 < [eva:alarm] auto_loop_unroll.c:204: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [0..9]
-188,189d176
+189,190d177
 < [eva:alarm] auto_loop_unroll.c:212: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-192c179
+193c180
 < [eva] auto_loop_unroll.c:214: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:214: Frama_C_show_each_imprecise: [64..2147483647]
-198,200c185
+199,201c186
 < [eva:alarm] auto_loop_unroll.c:224: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:226: Frama_C_show_each_11: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:226: Frama_C_show_each_11: {11}
-202,204c187
+203,205c188
 < [eva:alarm] auto_loop_unroll.c:229: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:231: Frama_C_show_each_12: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:231: Frama_C_show_each_12: {12}
-206,207d188
+207,208d189
 < [eva:alarm] auto_loop_unroll.c:235: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-209a191,192
+210a192,193
 > [eva:alarm] auto_loop_unroll.c:235: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
-212,213d194
+213,214d195
 < [eva:alarm] auto_loop_unroll.c:240: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-215a197,198
+216a198,199
 > [eva:alarm] auto_loop_unroll.c:240: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
-218,219d200
+219,220d201
 < [eva:alarm] auto_loop_unroll.c:248: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-222,224c203
+223,225c204
 < [eva:alarm] auto_loop_unroll.c:253: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:257: Frama_C_show_each_11_111: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:257: Frama_C_show_each_11_111: [11..111]
-226,228c205
+227,229c206
 < [eva:alarm] auto_loop_unroll.c:263: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:265: Frama_C_show_each_16: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:265: Frama_C_show_each_16: [16..2147483647]
-236,238c213
+237,239c214
 < [eva:alarm] auto_loop_unroll.c:275: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:277: Frama_C_show_each_20: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:277: Frama_C_show_each_20: [20..2147483646]
-240,241d214
+241,242d215
 < [eva:alarm] auto_loop_unroll.c:280: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-244,246c217
+245,247c218
 < [eva] auto_loop_unroll.c:282: Frama_C_show_each_21: [0..2147483647]
-< [eva] auto_loop_unroll.c:284: starting to merge loop iterations
+< [eva:partition] auto_loop_unroll.c:284: starting to merge loop iterations
 < [eva:alarm] auto_loop_unroll.c:286: Warning: 
 ---
 > [eva:alarm] auto_loop_unroll.c:280: Warning: 
-248,250c219,221
+249,251c220,222
 < [eva:alarm] auto_loop_unroll.c:284: Warning: 
 <   signed overflow. assert i + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:288: Frama_C_show_each_22: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:282: Frama_C_show_each_21: {21}
-> [eva] auto_loop_unroll.c:284: starting to merge loop iterations
+> [eva:partition] auto_loop_unroll.c:284: starting to merge loop iterations
 > [eva] auto_loop_unroll.c:288: Frama_C_show_each_22: {21; 22}
-252,256c223
+253,257c224
 < [eva:alarm] auto_loop_unroll.c:294: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva:alarm] auto_loop_unroll.c:291: Warning: 
@@ -227,94 +227,94 @@
 < [eva] auto_loop_unroll.c:296: Frama_C_show_each_23: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:296: Frama_C_show_each_23: {22; 23}
-260,262c227
+261,263c228
 < [eva:alarm] auto_loop_unroll.c:299: Warning: 
 <   signed overflow. assert i + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:304: Frama_C_show_each_top: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:304: Frama_C_show_each_top: [23..2147483647]
-268,270c233,234
+269,271c234,235
 < [eva:alarm] auto_loop_unroll.c:311: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:315: Frama_C_show_each_30: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:315: Frama_C_show_each_30: {30}
-> [eva] auto_loop_unroll.c:319: starting to merge loop iterations
-273,274c237
-< [eva] auto_loop_unroll.c:319: starting to merge loop iterations
+> [eva:partition] auto_loop_unroll.c:319: starting to merge loop iterations
+274,275c238
+< [eva:partition] auto_loop_unroll.c:319: starting to merge loop iterations
 < [eva] auto_loop_unroll.c:324: Frama_C_show_each_top: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:324: Frama_C_show_each_top: [31..2147483647]
-276,278c239
+277,279c240
 < [eva:alarm] auto_loop_unroll.c:328: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:333: Frama_C_show_each_32: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:333: Frama_C_show_each_32: {32}
-282c243
+283c244
 < [eva] auto_loop_unroll.c:341: Frama_C_show_each_33_inf: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:341: Frama_C_show_each_33_inf: [33..2147483647]
-286,287d246
+287,288d247
 < [eva:alarm] auto_loop_unroll.c:344: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-290,292c249
+291,293c250
 < [eva:alarm] auto_loop_unroll.c:355: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:357: Frama_C_show_each_0_35: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:357: Frama_C_show_each_0_35: [0..35]
-295,296d251
+296,297d252
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva:alarm] auto_loop_unroll.c:360: Warning: 
-298,300c253
+299,301c254
 < [eva] auto_loop_unroll.c:364: Frama_C_show_each_36: [0..2147483647]
-< [eva] auto_loop_unroll.c:367: starting to merge loop iterations
+< [eva:partition] auto_loop_unroll.c:367: starting to merge loop iterations
 < [eva:alarm] auto_loop_unroll.c:370: Warning: 
 ---
 > [eva:alarm] auto_loop_unroll.c:360: Warning: 
-302c255,257
+303c256,258
 < [eva] auto_loop_unroll.c:372: Frama_C_show_each_27: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:364: Frama_C_show_each_36: {36}
-> [eva] auto_loop_unroll.c:367: starting to merge loop iterations
+> [eva:partition] auto_loop_unroll.c:367: starting to merge loop iterations
 > [eva] auto_loop_unroll.c:372: Frama_C_show_each_27: [0..37]
-307,309c262
+308,310c263
 < [eva:alarm] auto_loop_unroll.c:383: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:387: Frama_C_show_each_50: [1..2147483647]
 ---
 > [eva] auto_loop_unroll.c:387: Frama_C_show_each_50: {50}
-312,313d264
+313,314d265
 < [eva:alarm] auto_loop_unroll.c:392: Warning: 
 <   signed overflow. assert -2147483648 ≤ i - 1;
-320,323d270
+321,324d271
 < [eva:alarm] auto_loop_unroll.c:404: Warning: 
 <   signed overflow. assert j + 1 ≤ 2147483647;
 < [eva:alarm] auto_loop_unroll.c:408: Warning: 
 <   signed overflow. assert j + 1 ≤ 2147483647;
-325c272
+326c273
 < [eva] auto_loop_unroll.c:410: Frama_C_show_each_30: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:410: Frama_C_show_each_30: {30}
-327,330d273
+328,331d274
 < [eva:alarm] auto_loop_unroll.c:415: Warning: 
 <   signed overflow. assert j + 1 ≤ 2147483647;
 < [eva:alarm] auto_loop_unroll.c:419: Warning: 
 <   signed overflow. assert j + 1 ≤ 2147483647;
-332c275
+333c276
 < [eva] auto_loop_unroll.c:424: Frama_C_show_each_30: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:424: Frama_C_show_each_30: {30}
-342c285
+343c286
 <   __retres ∈ [1..2147483647]
 ---
 >   __retres ∈ [1..25]
-344c287
+345c288
 <   g ∈ [1..2147483647]
 ---
 >   g ∈ [1..126]
-372c315
+373c316
 <   k ∈ [22..2147483647]
 ---
 >   k ∈ {22}
diff --git a/tests/value/oracle_apron/auto_loop_unroll.1.res.oracle b/tests/value/oracle_apron/auto_loop_unroll.1.res.oracle
index 6fca7af402c..7b08aa986c0 100644
--- a/tests/value/oracle_apron/auto_loop_unroll.1.res.oracle
+++ b/tests/value/oracle_apron/auto_loop_unroll.1.res.oracle
@@ -1,209 +1,209 @@
-14,16c14
+15,17c15
 < [eva:alarm] auto_loop_unroll.c:31: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:33: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:33: Frama_C_show_each_imprecise: {1000}
-18,20c16
+19,21c17
 < [eva:alarm] auto_loop_unroll.c:39: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: {100}
-54c50,53
+56c52,55
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-63c62,65
+65c64,67
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-72c74,77
+74c76,79
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-81c86,89
+83c88,91
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-90c98,101
+92c100,103
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-99c110,113
+101c112,115
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-108c122,125
+110c124,127
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-117c134,137
+119c136,139
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-126c146,149
+128c148,151
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-135c158,161
+137c160,163
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-144c170,173
+146c172,175
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-153c182,185
+155c184,187
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-162c194,197
+164c196,199
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-171c206,209
+173c208,211
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-180c218,221
+182c220,223
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-189c230,233
+191c232,235
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-198c242,245
+200c244,247
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-207c254,257
+209c256,259
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-216c266,269
+218c268,271
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-225c278,281
+227c280,283
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-234c290,293
+236c292,295
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-243c302,305
+245c304,307
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-252c314,317
+254c316,319
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-261c326,329
+263c328,331
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-270c338,341
+272c340,343
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-282c353
+284c355
 < [eva] auto_loop_unroll.c:141: Frama_C_show_each_top: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:141: Frama_C_show_each_top: [3..2147483647]
-293,295c364
+295,297c366
 < [eva:alarm] auto_loop_unroll.c:165: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:168: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:168: Frama_C_show_each_imprecise: [0..65]
-300c369
+302c371
 < [eva] auto_loop_unroll.c:179: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:179: Frama_C_show_each_imprecise: [64..2147483647]
-304c373
+306c375
 < [eva] auto_loop_unroll.c:188: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:188: Frama_C_show_each_imprecise: [10..2147483647]
-322,326c391,399
+324,328c393,401
 < [eva] auto_loop_unroll.c:193: Reusing old results for call to incr_g
 < [eva] auto_loop_unroll.c:193: Reusing old results for call to incr_g
 < [eva:alarm] auto_loop_unroll.c:195: Warning: 
@@ -219,28 +219,28 @@
 > [eva] Recording results for incr_g
 > [eva] Done for function incr_g
 > [eva] auto_loop_unroll.c:197: Frama_C_show_each_imprecise: [0..64]
-328,330c401
+330,332c403
 < [eva:alarm] auto_loop_unroll.c:204: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [0..9]
-332,333d402
+334,335d404
 < [eva:alarm] auto_loop_unroll.c:212: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-336c405
+338c407
 < [eva] auto_loop_unroll.c:214: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:214: Frama_C_show_each_imprecise: [64..2147483647]
-341c410
+343c412
 < [eva:loop-unroll:auto] auto_loop_unroll.c:223: Automatic loop unrolling.
 ---
-> [eva] auto_loop_unroll.c:223: starting to merge loop iterations
-343c412
+> [eva:partition] auto_loop_unroll.c:223: starting to merge loop iterations
+345c414
 < [eva:loop-unroll:auto] auto_loop_unroll.c:228: Automatic loop unrolling.
 ---
-> [eva] auto_loop_unroll.c:228: starting to merge loop iterations
-345,350c414,427
+> [eva:partition] auto_loop_unroll.c:228: starting to merge loop iterations
+347,352c416,429
 < [eva:loop-unroll:auto] auto_loop_unroll.c:234: Automatic loop unrolling.
 < [eva] auto_loop_unroll.c:237: Frama_C_show_each_0_13: [0..13]
 < [eva:loop-unroll:auto] auto_loop_unroll.c:239: Automatic loop unrolling.
@@ -248,61 +248,61 @@
 < [eva:loop-unroll:auto] auto_loop_unroll.c:245: Automatic loop unrolling.
 < [eva] auto_loop_unroll.c:250: Frama_C_show_each_0_15: [0..15]
 ---
-> [eva] auto_loop_unroll.c:234: starting to merge loop iterations
+> [eva:partition] auto_loop_unroll.c:234: starting to merge loop iterations
 > [eva:alarm] auto_loop_unroll.c:234: Warning: 
 >   signed overflow. assert -2147483648 ≤ i_0 - 1;
 > [eva:alarm] auto_loop_unroll.c:235: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
 > [eva] auto_loop_unroll.c:237: Frama_C_show_each_0_13: [0..2147483647]
-> [eva] auto_loop_unroll.c:239: starting to merge loop iterations
+> [eva:partition] auto_loop_unroll.c:239: starting to merge loop iterations
 > [eva:alarm] auto_loop_unroll.c:239: Warning: 
 >   signed overflow. assert -2147483648 ≤ i_1 - 1;
 > [eva:alarm] auto_loop_unroll.c:240: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
 > [eva] auto_loop_unroll.c:242: Frama_C_show_each_0_14: [0..2147483647]
-> [eva] auto_loop_unroll.c:245: starting to merge loop iterations
+> [eva:partition] auto_loop_unroll.c:245: starting to merge loop iterations
 > [eva] auto_loop_unroll.c:250: Frama_C_show_each_0_15: [0..2147483647]
-362c439,443
+365c442,446
 < [eva:loop-unroll:auto] auto_loop_unroll.c:279: Automatic loop unrolling.
 ---
-> [eva] auto_loop_unroll.c:279: starting to merge loop iterations
+> [eva:partition] auto_loop_unroll.c:279: starting to merge loop iterations
 > [eva:alarm] auto_loop_unroll.c:279: Warning: 
 >   signed overflow. assert -2147483648 ≤ i - 1;
 > [eva:alarm] auto_loop_unroll.c:280: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
-371,373c452
+374,376c455
 < [eva:alarm] auto_loop_unroll.c:299: Warning: 
 <   signed overflow. assert i + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:304: Frama_C_show_each_top: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:304: Frama_C_show_each_top: [23..2147483647]
-395,396d473
+399,400d477
 < [eva:alarm] auto_loop_unroll.c:344: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-400c477,481
+404c481,485
 < [eva:loop-unroll:auto] auto_loop_unroll.c:360: Automatic loop unrolling.
 ---
-> [eva] auto_loop_unroll.c:360: starting to merge loop iterations
+> [eva:partition] auto_loop_unroll.c:360: starting to merge loop iterations
 > [eva:alarm] auto_loop_unroll.c:360: Warning: 
 >   signed overflow. assert -2147483648 ≤ i - 1;
 > [eva:alarm] auto_loop_unroll.c:360: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
-410,411c491,493
+414,415c495,497
 < [eva:loop-unroll:auto] auto_loop_unroll.c:391: Automatic loop unrolling.
 < [eva] auto_loop_unroll.c:395: Frama_C_show_each_1_51: [1..51]
 ---
 > [eva:alarm] auto_loop_unroll.c:391: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
 > [eva] auto_loop_unroll.c:395: Frama_C_show_each_1_51: [1..2147483647]
-421c503
+425c507
 < [eva] auto_loop_unroll.c:424: Frama_C_show_each_30: [15..45]
 ---
 > [eva] auto_loop_unroll.c:424: Frama_C_show_each_30: {30}
-429c511
+433c515
 <   j ∈ [15..45]
 ---
 >   j ∈ [15..30]
-454c536
+458c540
 <   i ∈ [-1..50]
 ---
 >   i ∈ [-2147483648..50]
diff --git a/tests/value/oracle_apron/local_slevel.res.oracle b/tests/value/oracle_apron/local_slevel.res.oracle
index 7dc46e0160a..d51410f599c 100644
--- a/tests/value/oracle_apron/local_slevel.res.oracle
+++ b/tests/value/oracle_apron/local_slevel.res.oracle
@@ -24,11 +24,11 @@
 ---
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, [1..79]
 > [eva] local_slevel.i:18: Frama_C_show_each: {-1}, [0..78],0%2, [0..78]
-140c136
+142c138
 <   r ∈ [--..--]
 ---
 >   r ∈ [0..2147483647]
-381,383c377,379
+383,385c379,381
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1}
 < [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0; 1}
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1; 2}
@@ -36,15 +36,15 @@
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {1}
 > [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0}
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {1}
-385c381
+387c383
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, {0; 1; 2; 3}
 ---
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, {1; 2; 3}
-387c383
+389c385
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, {0; 1; 2; 3; 4}
 ---
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, {1; 2; 3; 4}
-389,394c385,386
+391,396c387,388
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, [0..2147483647]
 < [eva] local_slevel.i:18: Frama_C_show_each: {-1}, [0..78],0%2, [0..2147483647]
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, [0..2147483648]
@@ -54,7 +54,7 @@
 ---
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, [1..79]
 > [eva] local_slevel.i:18: Frama_C_show_each: {-1}, [0..78],0%2, [0..78]
-508c500
+512c504
 <   r ∈ [--..--]
 ---
 >   r ∈ [0..2147483647]
diff --git a/tests/value/oracle_apron/octagons-pointers-simple.res.oracle b/tests/value/oracle_apron/octagons-pointers-simple.res.oracle
index c976f8080e0..8a2d258b9f9 100644
--- a/tests/value/oracle_apron/octagons-pointers-simple.res.oracle
+++ b/tests/value/oracle_apron/octagons-pointers-simple.res.oracle
@@ -1,5 +1,5 @@
 39a40,53
-> [eva] octagons-pointers-simple.c:43: starting to merge loop iterations
+> [eva:partition] octagons-pointers-simple.c:43: starting to merge loop iterations
 > [eva] octagons-pointers-simple.c:46: 
 >   Frama_C_dump_each:
 >   # octagon:
diff --git a/tests/value/oracle_apron/widen_on_non_monotonic.res.oracle b/tests/value/oracle_apron/widen_on_non_monotonic.res.oracle
index 4d6e687c993..3b20bdeaea6 100644
--- a/tests/value/oracle_apron/widen_on_non_monotonic.res.oracle
+++ b/tests/value/oracle_apron/widen_on_non_monotonic.res.oracle
@@ -1,2 +1,2 @@
 25a26
-> [eva] widen_on_non_monotonic.i:21: starting to merge loop iterations
+> [eva:partition] widen_on_non_monotonic.i:21: starting to merge loop iterations
diff --git a/tests/value/oracle_equality/alias.5.res.oracle b/tests/value/oracle_equality/alias.5.res.oracle
index 7e9d6756cbb..ed9bb3d7582 100644
--- a/tests/value/oracle_equality/alias.5.res.oracle
+++ b/tests/value/oracle_equality/alias.5.res.oracle
@@ -1,5 +1,5 @@
 59a60
-> [eva] alias.i:260: starting to merge loop iterations
+> [eva:partition] alias.i:260: starting to merge loop iterations
 167c168
 <   y ∈ {0; 3; 77}
 ---
diff --git a/tests/value/oracle_equality/auto_loop_unroll.0.res.oracle b/tests/value/oracle_equality/auto_loop_unroll.0.res.oracle
index 73c9dc2735a..8f94c123dd3 100644
--- a/tests/value/oracle_equality/auto_loop_unroll.0.res.oracle
+++ b/tests/value/oracle_equality/auto_loop_unroll.0.res.oracle
@@ -1,11 +1,11 @@
-76c76,79
+77c77,80
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-85c88,91
+86c89,92
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
diff --git a/tests/value/oracle_equality/from_termin.res.oracle b/tests/value/oracle_equality/from_termin.res.oracle
index d03d84f92d5..1de4a7cee68 100644
--- a/tests/value/oracle_equality/from_termin.res.oracle
+++ b/tests/value/oracle_equality/from_termin.res.oracle
@@ -1,2 +1,2 @@
 9a10
-> [eva] from_termin.i:8: starting to merge loop iterations
+> [eva:partition] from_termin.i:8: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/alias.5.res.oracle b/tests/value/oracle_gauges/alias.5.res.oracle
index 59d7dd3d0fc..88f57b327ff 100644
--- a/tests/value/oracle_gauges/alias.5.res.oracle
+++ b/tests/value/oracle_gauges/alias.5.res.oracle
@@ -1,2 +1,2 @@
 59a60
-> [eva] alias.i:260: starting to merge loop iterations
+> [eva:partition] alias.i:260: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/auto_loop_unroll.0.res.oracle b/tests/value/oracle_gauges/auto_loop_unroll.0.res.oracle
index e78e2ecb55c..4650202d458 100644
--- a/tests/value/oracle_gauges/auto_loop_unroll.0.res.oracle
+++ b/tests/value/oracle_gauges/auto_loop_unroll.0.res.oracle
@@ -16,172 +16,172 @@
 < [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: {100}
-29,31c23
+30,32c24
 < [eva:alarm] auto_loop_unroll.c:58: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:59: Frama_C_show_each_64: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:59: Frama_C_show_each_64: {64}
-33,35c25
+34,36c26
 < [eva:alarm] auto_loop_unroll.c:63: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:64: Frama_C_show_each_40: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:64: Frama_C_show_each_40: {40}
-37,39c27
+38,40c28
 < [eva:alarm] auto_loop_unroll.c:69: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:72: Frama_C_show_each_80: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:72: Frama_C_show_each_80: {80}
-41,43c29
+42,44c30
 < [eva:alarm] auto_loop_unroll.c:76: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:82: Frama_C_show_each_32_80: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:82: Frama_C_show_each_32_80: [32..83]
-51,53c37
+52,54c38
 < [eva:alarm] auto_loop_unroll.c:88: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:89: Frama_C_show_each_40_50: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:89: Frama_C_show_each_40_50: [40..1073741861]
-128,130c112
+129,131c113
 < [eva:alarm] auto_loop_unroll.c:120: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:122: Frama_C_show_each_32_64: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:122: Frama_C_show_each_32_64: [32..65]
-184,186c166
+185,187c167
 < [eva:alarm] auto_loop_unroll.c:204: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [1..9]
-188,189d167
+189,190d168
 < [eva:alarm] auto_loop_unroll.c:212: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-192c170
+193c171
 < [eva] auto_loop_unroll.c:214: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:214: Frama_C_show_each_imprecise: [64..2147483647]
-198,200c176
+199,201c177
 < [eva:alarm] auto_loop_unroll.c:224: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:226: Frama_C_show_each_11: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:226: Frama_C_show_each_11: {11}
-202,204c178
+203,205c179
 < [eva:alarm] auto_loop_unroll.c:229: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:231: Frama_C_show_each_12: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:231: Frama_C_show_each_12: {12}
-206,207d179
+207,208d180
 < [eva:alarm] auto_loop_unroll.c:235: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-209a182,183
+210a183,184
 > [eva:alarm] auto_loop_unroll.c:235: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
-212,213d185
+213,214d186
 < [eva:alarm] auto_loop_unroll.c:240: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-215a188,189
+216a189,190
 > [eva:alarm] auto_loop_unroll.c:240: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
-218,219d191
+219,220d192
 < [eva:alarm] auto_loop_unroll.c:248: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-222,224c194
+223,225c195
 < [eva:alarm] auto_loop_unroll.c:253: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:257: Frama_C_show_each_11_111: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:257: Frama_C_show_each_11_111: [11..111]
-226,228c196
+227,229c197
 < [eva:alarm] auto_loop_unroll.c:263: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:265: Frama_C_show_each_16: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:265: Frama_C_show_each_16: [16..2147483647]
-236,238c204
+237,239c205
 < [eva:alarm] auto_loop_unroll.c:275: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:277: Frama_C_show_each_20: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:277: Frama_C_show_each_20: [20..2147483646]
-240,241d205
+241,242d206
 < [eva:alarm] auto_loop_unroll.c:280: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-244c208,210
+245c209,211
 < [eva] auto_loop_unroll.c:282: Frama_C_show_each_21: [0..2147483647]
 ---
 > [eva:alarm] auto_loop_unroll.c:280: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
 > [eva] auto_loop_unroll.c:282: Frama_C_show_each_21: {21}
-248,249d213
+249,250d214
 < [eva:alarm] auto_loop_unroll.c:284: Warning: 
 <   signed overflow. assert i + 1 ≤ 2147483647;
-254,255d217
+255,256d218
 < [eva:alarm] auto_loop_unroll.c:291: Warning: 
 <   signed overflow. assert i + 1 ≤ 2147483647;
-260,261d221
+261,262d222
 < [eva:alarm] auto_loop_unroll.c:299: Warning: 
 <   signed overflow. assert i + 1 ≤ 2147483647;
-268,270c228,229
+269,271c229,230
 < [eva:alarm] auto_loop_unroll.c:311: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:315: Frama_C_show_each_30: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:315: Frama_C_show_each_30: {30}
-> [eva] auto_loop_unroll.c:319: starting to merge loop iterations
-273d231
-< [eva] auto_loop_unroll.c:319: starting to merge loop iterations
-276,278c234
+> [eva:partition] auto_loop_unroll.c:319: starting to merge loop iterations
+274d232
+< [eva:partition] auto_loop_unroll.c:319: starting to merge loop iterations
+277,279c235
 < [eva:alarm] auto_loop_unroll.c:328: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:333: Frama_C_show_each_32: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:333: Frama_C_show_each_32: {32}
-290,292c246
+291,293c247
 < [eva:alarm] auto_loop_unroll.c:355: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:357: Frama_C_show_each_0_35: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:357: Frama_C_show_each_0_35: [0..35]
-295,296d248
+296,297d249
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva:alarm] auto_loop_unroll.c:360: Warning: 
-298c250,252
+299c251,253
 < [eva] auto_loop_unroll.c:364: Frama_C_show_each_36: [0..2147483647]
 ---
 > [eva:alarm] auto_loop_unroll.c:360: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
 > [eva] auto_loop_unroll.c:364: Frama_C_show_each_36: {36}
-307,309c261
+308,310c262
 < [eva:alarm] auto_loop_unroll.c:383: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:387: Frama_C_show_each_50: [1..2147483647]
 ---
 > [eva] auto_loop_unroll.c:387: Frama_C_show_each_50: {50}
-312,313d263
+313,314d264
 < [eva:alarm] auto_loop_unroll.c:392: Warning: 
 <   signed overflow. assert -2147483648 ≤ i - 1;
-320,323d269
+321,324d270
 < [eva:alarm] auto_loop_unroll.c:404: Warning: 
 <   signed overflow. assert j + 1 ≤ 2147483647;
 < [eva:alarm] auto_loop_unroll.c:408: Warning: 
 <   signed overflow. assert j + 1 ≤ 2147483647;
-325c271
+326c272
 < [eva] auto_loop_unroll.c:410: Frama_C_show_each_30: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:410: Frama_C_show_each_30: {30}
-327,330d272
+328,331d273
 < [eva:alarm] auto_loop_unroll.c:415: Warning: 
 <   signed overflow. assert j + 1 ≤ 2147483647;
 < [eva:alarm] auto_loop_unroll.c:419: Warning: 
 <   signed overflow. assert j + 1 ≤ 2147483647;
-332c274
+333c275
 < [eva] auto_loop_unroll.c:424: Frama_C_show_each_30: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:424: Frama_C_show_each_30: [15..45]
diff --git a/tests/value/oracle_gauges/auto_loop_unroll.1.res.oracle b/tests/value/oracle_gauges/auto_loop_unroll.1.res.oracle
index ba58b4d3a7f..a2813299938 100644
--- a/tests/value/oracle_gauges/auto_loop_unroll.1.res.oracle
+++ b/tests/value/oracle_gauges/auto_loop_unroll.1.res.oracle
@@ -1,28 +1,28 @@
-14,16c14
+15,17c15
 < [eva:alarm] auto_loop_unroll.c:31: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:33: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:33: Frama_C_show_each_imprecise: {1000}
-18,20c16
+19,21c17
 < [eva:alarm] auto_loop_unroll.c:39: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: {100}
-328,330c324
+330,332c326
 < [eva:alarm] auto_loop_unroll.c:204: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [1..9]
-332,333d325
+334,335d327
 < [eva:alarm] auto_loop_unroll.c:212: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-336c328
+338c330
 < [eva] auto_loop_unroll.c:214: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:214: Frama_C_show_each_imprecise: [64..2147483647]
-371,372d362
+374,375d365
 < [eva:alarm] auto_loop_unroll.c:299: Warning: 
 <   signed overflow. assert i + 1 ≤ 2147483647;
diff --git a/tests/value/oracle_gauges/bad_loop.res.oracle b/tests/value/oracle_gauges/bad_loop.res.oracle
index ad785fb3df8..d4c3c78aa6e 100644
--- a/tests/value/oracle_gauges/bad_loop.res.oracle
+++ b/tests/value/oracle_gauges/bad_loop.res.oracle
@@ -1,2 +1,2 @@
 6a7
-> [eva] bad_loop.i:12: starting to merge loop iterations
+> [eva:partition] bad_loop.i:12: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/cast2.res.oracle b/tests/value/oracle_gauges/cast2.res.oracle
index 4ec53f7330a..ec440dbddff 100644
--- a/tests/value/oracle_gauges/cast2.res.oracle
+++ b/tests/value/oracle_gauges/cast2.res.oracle
@@ -1,2 +1,2 @@
 25a26
-> [eva] cast2.i:24: starting to merge loop iterations
+> [eva:partition] cast2.i:24: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/from_termin.res.oracle b/tests/value/oracle_gauges/from_termin.res.oracle
index d03d84f92d5..1de4a7cee68 100644
--- a/tests/value/oracle_gauges/from_termin.res.oracle
+++ b/tests/value/oracle_gauges/from_termin.res.oracle
@@ -1,2 +1,2 @@
 9a10
-> [eva] from_termin.i:8: starting to merge loop iterations
+> [eva:partition] from_termin.i:8: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/infinite.res.oracle b/tests/value/oracle_gauges/infinite.res.oracle
index 703e902f87d..bb1a293eb73 100644
--- a/tests/value/oracle_gauges/infinite.res.oracle
+++ b/tests/value/oracle_gauges/infinite.res.oracle
@@ -1,5 +1,5 @@
 13a14,23
-> [eva] infinite.i:6: starting to merge loop iterations
+> [eva:partition] infinite.i:6: starting to merge loop iterations
 > [eva] computing for function pause <- main.
 >   Called from infinite.i:9.
 > [eva] Done for function pause
diff --git a/tests/value/oracle_gauges/inout.2.res.oracle b/tests/value/oracle_gauges/inout.2.res.oracle
index f97cf8babc5..cea5b35bae2 100644
--- a/tests/value/oracle_gauges/inout.2.res.oracle
+++ b/tests/value/oracle_gauges/inout.2.res.oracle
@@ -1,2 +1,2 @@
 22a23
-> [eva] inout.i:50: starting to merge loop iterations
+> [eva:partition] inout.i:50: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/inout.3.res.oracle b/tests/value/oracle_gauges/inout.3.res.oracle
index 2da5177ccaf..1f3694e8048 100644
--- a/tests/value/oracle_gauges/inout.3.res.oracle
+++ b/tests/value/oracle_gauges/inout.3.res.oracle
@@ -1,2 +1,2 @@
 22a23
-> [eva] inout.i:60: starting to merge loop iterations
+> [eva:partition] inout.i:60: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/inout.4.res.oracle b/tests/value/oracle_gauges/inout.4.res.oracle
index b5f3d9689ac..2c21be599a8 100644
--- a/tests/value/oracle_gauges/inout.4.res.oracle
+++ b/tests/value/oracle_gauges/inout.4.res.oracle
@@ -1,2 +1,2 @@
 24a25
-> [eva] inout.i:60: starting to merge loop iterations
+> [eva:partition] inout.i:60: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/local_slevel.res.oracle b/tests/value/oracle_gauges/local_slevel.res.oracle
index 7dc46e0160a..d51410f599c 100644
--- a/tests/value/oracle_gauges/local_slevel.res.oracle
+++ b/tests/value/oracle_gauges/local_slevel.res.oracle
@@ -24,11 +24,11 @@
 ---
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, [1..79]
 > [eva] local_slevel.i:18: Frama_C_show_each: {-1}, [0..78],0%2, [0..78]
-140c136
+142c138
 <   r ∈ [--..--]
 ---
 >   r ∈ [0..2147483647]
-381,383c377,379
+383,385c379,381
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1}
 < [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0; 1}
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1; 2}
@@ -36,15 +36,15 @@
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {1}
 > [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0}
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {1}
-385c381
+387c383
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, {0; 1; 2; 3}
 ---
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, {1; 2; 3}
-387c383
+389c385
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, {0; 1; 2; 3; 4}
 ---
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, {1; 2; 3; 4}
-389,394c385,386
+391,396c387,388
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, [0..2147483647]
 < [eva] local_slevel.i:18: Frama_C_show_each: {-1}, [0..78],0%2, [0..2147483647]
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, [0..2147483648]
@@ -54,7 +54,7 @@
 ---
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, [1..79]
 > [eva] local_slevel.i:18: Frama_C_show_each: {-1}, [0..78],0%2, [0..78]
-508c500
+512c504
 <   r ∈ [--..--]
 ---
 >   r ∈ [0..2147483647]
diff --git a/tests/value/oracle_gauges/loop_no_var.res.oracle b/tests/value/oracle_gauges/loop_no_var.res.oracle
index ac1b0adeee3..a8723781a68 100644
--- a/tests/value/oracle_gauges/loop_no_var.res.oracle
+++ b/tests/value/oracle_gauges/loop_no_var.res.oracle
@@ -1,2 +1,2 @@
 6a7
-> [eva] loop_no_var.i:3: starting to merge loop iterations
+> [eva:partition] loop_no_var.i:3: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/loopfun.1.res.oracle b/tests/value/oracle_gauges/loopfun.1.res.oracle
index e88ee84b778..507aa8af5df 100644
--- a/tests/value/oracle_gauges/loopfun.1.res.oracle
+++ b/tests/value/oracle_gauges/loopfun.1.res.oracle
@@ -1,8 +1,8 @@
 8a9,11
-> [eva] loopfun.i:23: starting to merge loop iterations
+> [eva:partition] loopfun.i:23: starting to merge loop iterations
 > [eva:loop-unroll:partial] loopfun.i:25: loop not completely unrolled
-> [eva] loopfun.i:25: starting to merge loop iterations
+> [eva:partition] loopfun.i:25: starting to merge loop iterations
 10a14
-> [eva] loopfun.i:26: starting to merge loop iterations
+> [eva:partition] loopfun.i:26: starting to merge loop iterations
 11a16
-> [eva] loopfun.i:27: starting to merge loop iterations
+> [eva:partition] loopfun.i:27: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/memexec.res.oracle b/tests/value/oracle_gauges/memexec.res.oracle
index 58b6132e70d..cf9d2ea819b 100644
--- a/tests/value/oracle_gauges/memexec.res.oracle
+++ b/tests/value/oracle_gauges/memexec.res.oracle
@@ -1,2 +1,2 @@
 100a101
-> [eva] memexec.c:98: starting to merge loop iterations
+> [eva:partition] memexec.c:98: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/modulo.res.oracle b/tests/value/oracle_gauges/modulo.res.oracle
index 9d8376876db..b26f03be5fa 100644
--- a/tests/value/oracle_gauges/modulo.res.oracle
+++ b/tests/value/oracle_gauges/modulo.res.oracle
@@ -172,5 +172,5 @@
 >   Frama_C_show_each_3: {-3; -2; -1; 1; 2; 3}, {-2; -1; 1; 2}, {-1; 0; 1}
 > [eva] modulo.i:64: Frama_C_show_each_3: {-2; -1; 1; 2}, {-1; 1}, {0}
 73a244,245
-> [eva] modulo.i:95: starting to merge loop iterations
-> [eva] modulo.i:82: starting to merge loop iterations
+> [eva:partition] modulo.i:95: starting to merge loop iterations
+> [eva:partition] modulo.i:82: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/noreturn.res.oracle b/tests/value/oracle_gauges/noreturn.res.oracle
index 7851d62f17e..14624bc7bb1 100644
--- a/tests/value/oracle_gauges/noreturn.res.oracle
+++ b/tests/value/oracle_gauges/noreturn.res.oracle
@@ -1,8 +1,8 @@
 8a9
-> [eva] noreturn.i:20: starting to merge loop iterations
+> [eva:partition] noreturn.i:20: starting to merge loop iterations
 16a18
-> [eva] noreturn.i:16: starting to merge loop iterations
+> [eva:partition] noreturn.i:16: starting to merge loop iterations
 20a23
-> [eva] noreturn.i:13: starting to merge loop iterations
+> [eva:partition] noreturn.i:13: starting to merge loop iterations
 30a34
-> [eva] noreturn.i:7: starting to merge loop iterations
+> [eva:partition] noreturn.i:7: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/octagons-pointers-intermediate.res.oracle b/tests/value/oracle_gauges/octagons-pointers-intermediate.res.oracle
index 993825158c7..c041b933f16 100644
--- a/tests/value/oracle_gauges/octagons-pointers-intermediate.res.oracle
+++ b/tests/value/oracle_gauges/octagons-pointers-intermediate.res.oracle
@@ -1,5 +1,6 @@
-23a24,30
-> [eva] octagons-pointers-intermediate.c:42: starting to merge loop iterations
+24a25,32
+> [eva:partition] octagons-pointers-intermediate.c:42: 
+>   starting to merge loop iterations
 > [eva] octagons-pointers-intermediate.c:45: 
 >   Reusing old results for call to cmdRead
 > [eva] octagons-pointers-intermediate.c:45: 
diff --git a/tests/value/oracle_gauges/octagons-pointers-simple.res.oracle b/tests/value/oracle_gauges/octagons-pointers-simple.res.oracle
index 1f0784eedc6..1c305433ed0 100644
--- a/tests/value/oracle_gauges/octagons-pointers-simple.res.oracle
+++ b/tests/value/oracle_gauges/octagons-pointers-simple.res.oracle
@@ -1,5 +1,5 @@
 39a40,70
-> [eva] octagons-pointers-simple.c:43: starting to merge loop iterations
+> [eva:partition] octagons-pointers-simple.c:43: starting to merge loop iterations
 > [eva] octagons-pointers-simple.c:46: 
 >   Frama_C_dump_each:
 >   # octagon:
diff --git a/tests/value/oracle_gauges/octagons-pointers.res.oracle b/tests/value/oracle_gauges/octagons-pointers.res.oracle
index 2c58a7bd206..6a3f3dcf6bb 100644
--- a/tests/value/oracle_gauges/octagons-pointers.res.oracle
+++ b/tests/value/oracle_gauges/octagons-pointers.res.oracle
@@ -1,5 +1,5 @@
 83a84,108
-> [eva] octagons-pointers.c:43: starting to merge loop iterations
+> [eva:partition] octagons-pointers.c:43: starting to merge loop iterations
 > [eva] octagons-pointers.c:46: 
 >   Frama_C_dump_each:
 >   # octagon:
diff --git a/tests/value/oracle_gauges/reduce_formals.res.oracle b/tests/value/oracle_gauges/reduce_formals.res.oracle
index 792f4612704..4a0873c51e7 100644
--- a/tests/value/oracle_gauges/reduce_formals.res.oracle
+++ b/tests/value/oracle_gauges/reduce_formals.res.oracle
@@ -1,2 +1,2 @@
 9a10
-> [eva] reduce_formals.i:5: starting to merge loop iterations
+> [eva:partition] reduce_formals.i:5: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/redundant_alarms.res.oracle b/tests/value/oracle_gauges/redundant_alarms.res.oracle
index 913f8ab9f77..7e5b750f485 100644
--- a/tests/value/oracle_gauges/redundant_alarms.res.oracle
+++ b/tests/value/oracle_gauges/redundant_alarms.res.oracle
@@ -1,2 +1,2 @@
 46a47
-> [eva] redundant_alarms.c:39: starting to merge loop iterations
+> [eva:partition] redundant_alarms.c:39: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/symbolic_locs.res.oracle b/tests/value/oracle_gauges/symbolic_locs.res.oracle
index 21b68fc6866..92cd15bf03d 100644
--- a/tests/value/oracle_gauges/symbolic_locs.res.oracle
+++ b/tests/value/oracle_gauges/symbolic_locs.res.oracle
@@ -1,2 +1,2 @@
 179a180
-> [eva] symbolic_locs.i:93: starting to merge loop iterations
+> [eva:partition] symbolic_locs.i:93: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/taint.res.oracle b/tests/value/oracle_gauges/taint.res.oracle
index 9f5e0363bf2..7f23b681cf1 100644
--- a/tests/value/oracle_gauges/taint.res.oracle
+++ b/tests/value/oracle_gauges/taint.res.oracle
@@ -1,2 +1,2 @@
 171a172
-> [eva] taint.c:147: starting to merge loop iterations
+> [eva:partition] taint.c:147: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/undefined_sequence.0.res.oracle b/tests/value/oracle_gauges/undefined_sequence.0.res.oracle
index 46a1b756d0e..0ee1abcac75 100644
--- a/tests/value/oracle_gauges/undefined_sequence.0.res.oracle
+++ b/tests/value/oracle_gauges/undefined_sequence.0.res.oracle
@@ -1,4 +1,4 @@
 97a98
-> [eva] undefined_sequence.i:43: starting to merge loop iterations
+> [eva:partition] undefined_sequence.i:43: starting to merge loop iterations
 101a103
-> [eva] undefined_sequence.i:49: starting to merge loop iterations
+> [eva:partition] undefined_sequence.i:49: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/unroll.res.oracle b/tests/value/oracle_gauges/unroll.res.oracle
index 08cf552adc2..0d7ed0fa4e2 100644
--- a/tests/value/oracle_gauges/unroll.res.oracle
+++ b/tests/value/oracle_gauges/unroll.res.oracle
@@ -1,7 +1,7 @@
 13d12
 < [eva:alarm] unroll.i:34: Warning: signed overflow. assert -2147483648 ≤ j - 1;
 14a14
-> [eva] unroll.i:39: starting to merge loop iterations
+> [eva:partition] unroll.i:39: starting to merge loop iterations
 24c24
 <   j ∈ [-2147483648..-123]
 ---
diff --git a/tests/value/oracle_gauges/unroll_simple.res.oracle b/tests/value/oracle_gauges/unroll_simple.res.oracle
index b61eb32c15e..7ddf9dd5efe 100644
--- a/tests/value/oracle_gauges/unroll_simple.res.oracle
+++ b/tests/value/oracle_gauges/unroll_simple.res.oracle
@@ -2,7 +2,7 @@
 < [eva:alarm] unroll_simple.i:11: Warning: 
 <   signed overflow. assert -2147483648 ≤ j - 1;
 11a10
-> [eva] unroll_simple.i:16: starting to merge loop iterations
+> [eva:partition] unroll_simple.i:16: starting to merge loop iterations
 21c20
 <   j ∈ [-2147483648..-126]
 ---
diff --git a/tests/value/oracle_gauges/widen_on_non_monotonic.res.oracle b/tests/value/oracle_gauges/widen_on_non_monotonic.res.oracle
index 2310b4cf818..15640f703e3 100644
--- a/tests/value/oracle_gauges/widen_on_non_monotonic.res.oracle
+++ b/tests/value/oracle_gauges/widen_on_non_monotonic.res.oracle
@@ -1,3 +1,3 @@
 25a26,27
-> [eva] widen_on_non_monotonic.i:21: starting to merge loop iterations
-> [eva] widen_on_non_monotonic.i:18: starting to merge loop iterations
+> [eva:partition] widen_on_non_monotonic.i:21: starting to merge loop iterations
+> [eva:partition] widen_on_non_monotonic.i:18: starting to merge loop iterations
diff --git a/tests/value/oracle_multidim/alias.5.res.oracle b/tests/value/oracle_multidim/alias.5.res.oracle
index 59d7dd3d0fc..88f57b327ff 100644
--- a/tests/value/oracle_multidim/alias.5.res.oracle
+++ b/tests/value/oracle_multidim/alias.5.res.oracle
@@ -1,2 +1,2 @@
 59a60
-> [eva] alias.i:260: starting to merge loop iterations
+> [eva:partition] alias.i:260: starting to merge loop iterations
diff --git a/tests/value/oracle_octagon/alias.5.res.oracle b/tests/value/oracle_octagon/alias.5.res.oracle
index 59d7dd3d0fc..88f57b327ff 100644
--- a/tests/value/oracle_octagon/alias.5.res.oracle
+++ b/tests/value/oracle_octagon/alias.5.res.oracle
@@ -1,2 +1,2 @@
 59a60
-> [eva] alias.i:260: starting to merge loop iterations
+> [eva:partition] alias.i:260: starting to merge loop iterations
diff --git a/tests/value/oracle_octagon/auto_loop_unroll.0.res.oracle b/tests/value/oracle_octagon/auto_loop_unroll.0.res.oracle
index e6769c39a09..8aac50f0709 100644
--- a/tests/value/oracle_octagon/auto_loop_unroll.0.res.oracle
+++ b/tests/value/oracle_octagon/auto_loop_unroll.0.res.oracle
@@ -1,23 +1,23 @@
-208,209d207
+209,210d208
 < [eva:alarm] auto_loop_unroll.c:234: Warning: 
 <   signed overflow. assert -2147483648 ≤ i_0 - 1;
-214,215d211
+215,216d212
 < [eva:alarm] auto_loop_unroll.c:239: Warning: 
 <   signed overflow. assert -2147483648 ≤ i_1 - 1;
-242,243d237
+243,244d238
 < [eva:alarm] auto_loop_unroll.c:279: Warning: 
 <   signed overflow. assert -2147483648 ≤ i - 1;
-296,297d289
+297,298d290
 < [eva:alarm] auto_loop_unroll.c:360: Warning: 
 <   signed overflow. assert -2147483648 ≤ i - 1;
-312,313d303
+313,314d304
 < [eva:alarm] auto_loop_unroll.c:392: Warning: 
 <   signed overflow. assert -2147483648 ≤ i - 1;
-365c355
+366c356
 <   i ∈ [-2147483648..50]
 ---
 >   i ∈ [-1..50]
-370,372c360,362
+371,373c361,363
 <   i ∈ [0..2147483647]
 <   j ∈ [23..2147483647]
 <   k ∈ [22..2147483647]
diff --git a/tests/value/oracle_octagon/auto_loop_unroll.1.res.oracle b/tests/value/oracle_octagon/auto_loop_unroll.1.res.oracle
index f161cc5e9e2..0044c4a10be 100644
--- a/tests/value/oracle_octagon/auto_loop_unroll.1.res.oracle
+++ b/tests/value/oracle_octagon/auto_loop_unroll.1.res.oracle
@@ -1,4 +1,4 @@
-459,460c459,460
+463,464c463,464
 <   i ∈ [0..2147483647]
 <   j ∈ [23..2147483647]
 ---
diff --git a/tests/value/oracle_octagon/from_termin.res.oracle b/tests/value/oracle_octagon/from_termin.res.oracle
index d03d84f92d5..1de4a7cee68 100644
--- a/tests/value/oracle_octagon/from_termin.res.oracle
+++ b/tests/value/oracle_octagon/from_termin.res.oracle
@@ -1,2 +1,2 @@
 9a10
-> [eva] from_termin.i:8: starting to merge loop iterations
+> [eva:partition] from_termin.i:8: starting to merge loop iterations
diff --git a/tests/value/oracle_octagon/redundant_alarms.res.oracle b/tests/value/oracle_octagon/redundant_alarms.res.oracle
index 913f8ab9f77..7e5b750f485 100644
--- a/tests/value/oracle_octagon/redundant_alarms.res.oracle
+++ b/tests/value/oracle_octagon/redundant_alarms.res.oracle
@@ -1,2 +1,2 @@
 46a47
-> [eva] redundant_alarms.c:39: starting to merge loop iterations
+> [eva:partition] redundant_alarms.c:39: starting to merge loop iterations
diff --git a/tests/value/oracle_octagon/unroll.res.oracle b/tests/value/oracle_octagon/unroll.res.oracle
index b0b04dfe12a..fcbfa5a8e76 100644
--- a/tests/value/oracle_octagon/unroll.res.oracle
+++ b/tests/value/oracle_octagon/unroll.res.oracle
@@ -1,5 +1,5 @@
 14a15
-> [eva] unroll.i:39: starting to merge loop iterations
+> [eva:partition] unroll.i:39: starting to merge loop iterations
 20c21
 <   G ∈ [17739..2147483647]
 ---
diff --git a/tests/value/oracle_octagon/unroll_simple.res.oracle b/tests/value/oracle_octagon/unroll_simple.res.oracle
index 0aead1b2497..a92ed225b7f 100644
--- a/tests/value/oracle_octagon/unroll_simple.res.oracle
+++ b/tests/value/oracle_octagon/unroll_simple.res.oracle
@@ -1,5 +1,5 @@
 11a12
-> [eva] unroll_simple.i:16: starting to merge loop iterations
+> [eva:partition] unroll_simple.i:16: starting to merge loop iterations
 17c18
 <   G ∈ [8772..2147483647]
 ---
diff --git a/tests/value/traces/oracle/test4.res.oracle b/tests/value/traces/oracle/test4.res.oracle
index 8a9b74fa1e3..46acec6e327 100644
--- a/tests/value/traces/oracle/test4.res.oracle
+++ b/tests/value/traces/oracle/test4.res.oracle
@@ -5,7 +5,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] test4.i:9: starting to merge loop iterations
+[eva:partition] test4.i:9: starting to merge loop iterations
 [eva:alarm] test4.i:11: Warning: signed overflow. assert tmp + 1 ≤ 2147483647;
 [eva:alarm] test4.i:14: Warning: signed overflow. assert tmp + 1 ≤ 2147483647;
 [eva:alarm] test4.i:17: Warning: signed overflow. assert tmp + 1 ≤ 2147483647;
diff --git a/tests/value/traces/oracle/test5.res.oracle b/tests/value/traces/oracle/test5.res.oracle
index 24b44691ad3..e4b10bdd97b 100644
--- a/tests/value/traces/oracle/test5.res.oracle
+++ b/tests/value/traces/oracle/test5.res.oracle
@@ -49,7 +49,7 @@
 [eva] computing for function my_switch <- main.
   Called from test5.i:21.
 [eva] Done for function my_switch
-[eva] test5.i:20: starting to merge loop iterations
+[eva:partition] test5.i:20: starting to merge loop iterations
 [eva] computing for function my_switch <- main.
   Called from test5.i:21.
 [eva] Done for function my_switch
@@ -89,7 +89,7 @@
 [eva] computing for function my_switch <- main.
   Called from test5.i:21.
 [eva] Done for function my_switch
-[eva] test5.i:19: starting to merge loop iterations
+[eva:partition] test5.i:19: starting to merge loop iterations
 [eva] computing for function my_switch <- main.
   Called from test5.i:21.
 [eva] Done for function my_switch
-- 
GitLab