Wip/nk/icfgbuilder #690

Heizmann · 2024-10-23T13:47:43Z

Commits for switching from RCFGBuilder to IcfgBuilder are missing in this branch. But Frank convinced me to already start a pull request.

Otherwise the StepInfo is reset, since mutable sets are used.

… when we build the new block

We need that BooleanLiteral have a type. We now ensure this by using the ExpressionFactory#createBooleanLiteral

This reverts commit f13a388.

… startet when we build the new block" This reverts commit ba104cf.

Bugfix for cases where atomic blocks end with an IfStatement.

* Rename identifiers * Add documentation * Make method void (returned object is an argument of method)

* extract method for building IcfgLocations * remove method that became obsolete

* Bugfix: Do not merge loop entry and location after invariant. * Rename identifiers

Do not copy annotations directly from original statements to edges but only to auxiliary statements. (Because annotations are copied from all statements to edges anyway.)

Unify code for prepending statements

Use assumption that mapping returns singleton except for calls.

schuessf

Thanks for your work! I did not have a detailed look yet, but here are already some more general comments.

schuessf · 2024-10-23T14:06:22Z

trunk/examples/settings/automizer/ForwardPredicates_IcfgBuilder.epf

@@ -0,0 +1,27 @@
+#Thu Jan 30 13:20:28 CET 2014


These settings can be removed, once IcfgBuilder is the default.

schuessf · 2024-10-23T14:06:32Z

trunk/examples/toolchains/AutomizerBpl_IcfgBuilder.xml

@@ -0,0 +1,10 @@
+<rundefinition>


This toolchain can be removed, once IcfgBuilder is the default.

schuessf · 2024-10-23T14:07:39Z

trunk/examples/Backtranslation/regression/bpl/Pointer.errorpath

-       VAL        [#NULL!base=0, #NULL!offset=0]
-[L31]             assert false;
-       VAL        [#NULL!base=0, #NULL!offset=0]
+[L49]  CALL       call ULTIMATE.init();


What has changed in the backtranslation that is relevant for this test?

Could you fix this?

I was just wondering why you changed already this path and not the others.

schuessf · 2024-10-23T14:11:18Z

...informatik/ultimate/plugins/generator/icfgbuilder/preferences/IcfgPreferenceInitializer.java

+import de.uni_freiburg.informatik.ultimate.lib.smtlibutils.solverbuilder.SolverBuilder.SolverMode;
+import de.uni_freiburg.informatik.ultimate.plugins.generator.icfgbuilder.Activator;
+
+public class IcfgPreferenceInitializer extends UltimatePreferenceInitializer {


Please make sure that these settings are actually the same as for RCFGBuilder (this was at least not the case in the past for CodeBlockSize).

Could you fix this?

I am not sure, if there is a problem in the current version. I just remember that there was some issue in the past. So this comment is more of a reminder 😉

schuessf · 2024-10-23T14:18:23Z

...c/de/uni_freiburg/informatik/ultimate/plugins/generator/icfgbuilder/WeakestPrecondition.java

+import de.uni_freiburg.informatik.ultimate.boogie.ast.VarList;
+import de.uni_freiburg.informatik.ultimate.core.model.models.ModelUtils;
+
+public class WeakestPrecondition extends BoogieTransformer {


I suppose this class (along with some others) was simply copied from RCFGBuilder without any change? I think we should rather have another plugin Library-CFG with such classes, s.t. RCFGBuilder could be safely deleted.

Plan is to move the classes to from RCFGBuilder to IcfgBuilder if we want to get rid of the RCFGBuilder.

I see, this class is really just used in IcfgBuilder / RCFGBuilder, so it makes sense to keep it there. But there are some other classes (e.g. TransFormulaAdder) that are also used in other Plugins. So it would make sense to move them to some library, also to reduce the dependencies to IcfgBuilder / RCFGBuilder.

schuessf · 2024-10-23T14:20:13Z

trunk/examples/settings/automizer/ForwardPredicates_IcfgBuilder.epf

+#Tue Mar 19 19:15:08 CET 2024
+file_export_version=3.0
+\!/instance/de.uni_freiburg.informatik.ultimate.boogie.preprocessor=
+/instance/de.uni_freiburg.informatik.ultimate.boogie.preprocessor/Replace\ while\ statements\ and\ if-then-else\ statements=false


This should be our new default now, maybe you can simply change it in BoogiePreprocessor.

...e/uni_freiburg/informatik/ultimate/plugins/generator/rcfgbuilder/cfg/LargeBlockEncoding.java

The setting "Only consider context switches at boundaries of atomic blocks" (aka the nodatarace-LBE) is only meant to affect concurrent programs. It performs a kind of large-block encoding (LBE) that is usually not desirable for sequential programs.

NiklasKult and others added 30 commits October 23, 2024 15:45

wip IcfgBuilder Plugin

f76f02f

wip 2 IcfgBuilder Plugin

e4e6751

moving of classes into old RCFGBuilder & invariants

afd47ca

Backtranslation wip

f63d07f

Backtranslation

6b83a13

cleanup

48fb60b

Rename license header

7977a97

comment and delete useless file

1b32922

add author info

69b461e

Fix for new ICFG in WitnessPrinter

4fbadc5

Bugfix: Do not just reuse ateBuilder

60133c0

Otherwise the StepInfo is reset, since mutable sets are used.

fix label last statement in procedure

8f22093

Add IcfgBuilder to feature.xml

c326db7

fix Label last Statement of While/If

7221acf

Fix plugin name

3dd2e48

Require plugin instead of require package

cf743b7

Add icfgbuilder to UltimateRegressionTest

b5143fd

add icfgbuilder as valid generator for abstract interpretation plugin

27559cb

Adapt to Dominik's move of AtomicBlockInfo

3a17067

CC fixes

c5a3b6a

Simplify code: more explicit case distinction

59a5ca3

Bugfix: We need the target location, new StatementSequence is startet…

9dd3bef

… when we build the new block

Inline method

b64ab3d

Bugfix BooleanLiteral

6af4bc2

We need that BooleanLiteral have a type. We now ensure this by using the ExpressionFactory#createBooleanLiteral

move CfgBuilder.LargeBlockEncoding to own file

ac8b946

avoid duplicating CFG LargeBlockEncoding

42f8381

Fix backtranslation of IfStatement and WhileStatement

42d29b0

Revert "Inline method"

fb3e695

This reverts commit f13a388.

Revert "Bugfix: We need the target location, new StatementSequence is…

205d403

… startet when we build the new block" This reverts commit ba104cf.

Bugfix atomic blocks in IcfgBuilder

88fdebe

Bugfix for cases where atomic blocks end with an IfStatement.

Heizmann and others added 17 commits October 23, 2024 15:45

Explicit case distinction, cast to StatementSequence

20a3f29

Refactor private method of IcfgBuilder

06d30e6

* Rename identifiers * Add documentation * Make method void (returned object is an argument of method)

Refactor private method of IcfgBuilder

dce0e82

* Rename identifiers * Add documentation * Make method void (returned object is an argument of method)

Refactor IcfgBuilder

940b556

* extract method for building IcfgLocations * remove method that became obsolete

Bugfix and refactoring IcfgBuilder

6baa753

* Bugfix: Do not merge loop entry and location after invariant. * Rename identifiers

Add backtranslation for free invariants

fa8780b

Bugfix: Support for backtranslation of loop invariants

3ac0fcc

Update errorpath

cfd9245

Refactoring IcfgBuilder

446a351

Do not copy annotations directly from original statements to edges but only to auxiliary statements. (Because annotations are copied from all statements to edges anyway.)

Refactoring IcfgBuilder

01b4db6

Unify code for prepending statements

Remove origin

8f18815

Add documentation and assert

7d53953

Add auxiliary edges for labels

688a5d9

Refactoring IcfgBacktranslator

4783b0e

Use assumption that mapping returns singleton except for calls.

Omit labels in backtranslation

492d0f1

Bugfix backtranslation

5c41f9e

Remove XnfConversionTechnique

201c4b8

Heizmann self-assigned this Oct 23, 2024

Heizmann requested review from maul-esel, bahnwaerter, danieldietsch and schuessf October 23, 2024 13:47

schuessf reviewed Oct 23, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Wip/nk/icfgbuilder #690

Wip/nk/icfgbuilder #690

Heizmann commented Oct 23, 2024

schuessf left a comment

schuessf Oct 23, 2024

schuessf Oct 23, 2024

schuessf Oct 23, 2024

Heizmann Oct 23, 2024

schuessf Oct 23, 2024

schuessf Oct 23, 2024

Heizmann Oct 23, 2024

schuessf Oct 23, 2024

schuessf Oct 23, 2024

Heizmann Oct 23, 2024

schuessf Oct 23, 2024

schuessf Oct 23, 2024

Wip/nk/icfgbuilder #690

Are you sure you want to change the base?

Wip/nk/icfgbuilder #690

Conversation

Heizmann commented Oct 23, 2024

schuessf left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment