Upstream fpr #2234

nmanthey · 2018-05-24T07:31:40Z

The first commit of this series addresses #1783
The second one should allow to make function pointer removal somewhat faster.

tautschnig · 2018-05-24T07:35:28Z

src/goto-programs/compute_called_functions.cpp

@@ -91,11 +90,10 @@ std::set<irep_idt> compute_called_functions(
    irep_idt id=*working_queue.begin();
    working_queue.erase(working_queue.begin());

-    if(done.find(id)!=done.end())
+    if(functions.find(id)!=functions.end())


A few nit picks (placing them here for github doesn't feature commenting on commit messages):

Right here: clang-format preferred spacing: add spaces around !=.

You might actually do:

if(!functions.insert(id).second) continue;

and thereby further improve performance by not duplicating the log-time search of the separate find+insert steps.
2) Commit message 1: Please add "Fixes: #1783" to auto-close the issue.
3) Commit message 2: Please spell out "Function-pointer" (instead of fp) to avoid confusion, e.g., with "floating-point."

tautschnig · 2018-05-24T07:43:38Z

src/goto-analyzer/unreachable_instructions.cpp

 static void list_functions(
  const goto_modelt &goto_model,
-  const std::set<irep_idt> called,
+  const T called,


I'm aware this will cause more changes, but I'd insist that the template is unnecessary here and everyone should be using the updated interface.

tautschnig · 2018-05-24T07:45:26Z

src/goto-analyzer/unreachable_instructions.cpp

@@ -167,7 +167,7 @@ void unreachable_instructions(
 {
  json_arrayt json_result;

-  std::set<irep_idt> called=
+  std::unordered_set<irep_idt> called=


Nit pick: introduce a space before = to converge towards clang-format's suggested style.

tautschnig · 2018-05-24T07:46:11Z

src/goto-programs/link_to_library.cpp

@@ -45,7 +45,7 @@ void link_to_library(

  while(true)
  {
-    std::set<irep_idt> called_functions=
+    std::unordered_set<irep_idt> called_functions=


Nit pick as above: introduce a space before =

hannes-steffenhagen-diffblue · 2018-05-24T12:11:43Z

Please use git-clang-format-3.8 HEAD~2 to apply clang-format to these changes.

kroening · 2018-05-25T06:28:33Z

Looks good; the template is indeed not necessary, as changing set -> unordered_set isn't a massive burden on users of this API.

The compute_called_functions method maintains two sets, 'done' and 'functions'. The set 'done' is only used to determine whether an element can be skipped. Since the content of the two sets is the same, the set 'done' can be dropped, and 'functions' can be used instead. Hence, this commit drops the set 'done'. Furthermore, the return value of insert includes a bool that indicates the success of the insert operation. In case insertion failed, the element has been present already, so that we can merge the find+insert into a single insert operation. Fixes: diffblue#1783

Instead of using an ordered set, use a faster unordered set. This way, running the algorithms against larger code bases should result in decreased run times, while on small programs the run time might slightly increase. As this function is used in function pointer removal, and in code that computes unreachable functions, the type change had to be propagated to the related classes as well.

nmanthey · 2018-05-29T14:08:56Z

I updated and rebased.

I fixed the raised concerns, and formatted the code with clang-format. I furthermore removed the template and propagated the unordered_set change further.

8de6a33 Merge pull request diffblue#2006 from tautschnig/opt-no-self-loops 6605699 Merge pull request diffblue#2217 from diffblue/c-preprocessing-cleanout f1d787b Merge pull request diffblue#2166 from tautschnig/out-of-bounds 25339d5 Add option not to transform self-loops into assumes 5e6a3af Merge pull request diffblue#2249 from tautschnig/attribute-used d3d888b Bounds check for flexible array members 41003e8 Handle negative byte_extract offsets efea5c4 Fix flattening of access beyond type-specified bounds 0ec87c8 Merge pull request diffblue#2271 from diffblue/letification 090790a Interpret GCC's attribute __used__ 7985716 Merge pull request diffblue#2252 from tautschnig/fresh-symbol-cleanup 022846a letify: use irep_hash_mapt when hashing is expensive 15dff7d Merge pull request diffblue#2260 from antlechner/antonia/annotation-class-value 9a0ffae added irep_hash_mapt da0adfe bugfix: irep_hash_containert now keeps a copy of the contained ireps 45436ce use std::size_t for container sizes 0c26a53 let_count_idt is now a struct e0a5142 Merge pull request diffblue#2206 from diffblue/use-get_identifier e0ad069 Add support for Java annotations with Class value 3817341 Merge pull request diffblue#2237 from smowton/smowton/feature/initialize-class-literals 25c097e use get_identifier() instead of get(ID_identifier) on symbols 4eda8ad Java class literals: init using a library hook when possible 70f13f3 Merge pull request diffblue#1906 from tautschnig/missing-return-semantics 57885a5 Merge pull request diffblue#1868 from tautschnig/fix-1867 b49822e Merge pull request diffblue#2028 from tautschnig/regression-fix 2815e84 Merge pull request diffblue#2259 from smowton/smowton/feature/note-abstract-methods 09b8cf7 Merge pull request diffblue#2014 from tautschnig/cadical-experiment f50237b Merge pull request diffblue#1967 from romainbrenguier/refactor/drop-constraint-inheritance2 3f951dd Merge pull request diffblue#2234 from nmanthey/upstream-fpr c6c2928 Drop inheritance from constraint on exprt 0ffd0ae Replace negation of constraint by a method f653dec use compiler defaults for gcc defines a31f530 remove need to do preprocessing on 16-bit test 24210e9 enable AWS Codebuild to do -m32 bfae4e3 enable Travis to do -m32 34a3d85 Merge pull request diffblue#2247 from antlechner/antonia/annotation-conversion 15ed961 Note when symbol-table entries are abstract methods 3a7135a Add module_dependencies.txt in test folder 1fa0b97 Generalize and rename does_annotation_exist 1db0af4 Define inverse function of convert_annotations ff25b2c get_max: do not parse every symbol name in the symbol table b603703 Add missing override 70da606 Merge pull request diffblue#2251 from tautschnig/rename-cleanup 49429cf Merge pull request diffblue#2257 from owen-jones-diffblue/owen-jones-diffblue/fix-cmake-macro 4b7a195 Improve naming of annotation variables 57d96e5 Fix CMake macro f9058e7 Merge pull request diffblue#2246 from diffblue/z3-fpa 6b0f265 Merge pull request diffblue#2248 from thk123/bugfix/doxygen-including-jbmc 72e99a0 Merge pull request diffblue#2201 from diffblue/remove-incomplete-type-constructors d4abbea smt2 implementation for popcount_exprt e8fa1c9 bswap_exprt now knows how many bits a byte has a6652d2 Merge pull request diffblue#2255 from tautschnig/speedup-no-pointer-check 4b0a2d6 goto_check: do not unnecessarily build size-of expressions 1fe7cd7 remove mathematical_typet() constructor, which produces an incomplete object 25d393b remove vector_typet() constructor, which produces an incomplete object e7c52e4 remove range_typet() constructor, which produces an incomplete object f92083d remove array_typet() constructor, which produces an incomplete object 72f63f3 remove tag_typet() constructor, which produces an incomplete object 516ed14 remove symbol_typet() constructor, which produces an incomplete object 4215f21 Consistently use get_fresh_aux_symbol instead of local implementations e6cd488 Remove unused goto_symext::new_name c24b820 Remove goto_convertt::lookup a816b26 Do not include rename.h when not using its functions 52ab088 called_functions: use unordered_set 157a12c Fix doxyfile to include JBMC documentation 026e93f function-pointer-removal: drop unused set b75fcbc smt2 implementation for bswap_exprt e276b27 Avoid extern/parameter name collisions in show-goto-functions/dump-c output 87c5948 C front-end: Record extern declarations in current scope a47941d perf-test: add -W/--witness-check to validate SV-COMP witness checking 5b0395f perf-test: Update Ubuntu AMI ids for latest version 1288ec7 perf-test: speed up builds just like e7bb127 did afccaec Provide goto-cc in performance tests f802d87 Support CaDiCaL in performance tests, remove redundant script 7872f7c Replace a missing return value by nondet 829068f Don't require the simplifier to solve this regression test git-subtree-dir: cbmc git-subtree-split: 8de6a33

nmanthey requested review from chrisr-diffblue, kroening, martin-cs, peterschrammel, smowton and tautschnig as code owners May 24, 2018 07:31

tautschnig reviewed May 24, 2018

View reviewed changes

kroening approved these changes May 25, 2018

View reviewed changes

nmanthey added 2 commits May 29, 2018 15:15

nmanthey force-pushed the upstream-fpr branch from 7e83556 to 52ab088 Compare May 29, 2018 14:08

tautschnig assigned peterschrammel, martin-cs and chrisr-diffblue May 29, 2018

peterschrammel approved these changes Jun 1, 2018

View reviewed changes

tautschnig merged commit 3f951dd into diffblue:develop Jun 1, 2018

nmanthey deleted the upstream-fpr branch August 22, 2018 07:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upstream fpr #2234

Upstream fpr #2234

nmanthey commented May 24, 2018

tautschnig May 24, 2018

tautschnig May 24, 2018

tautschnig May 24, 2018

tautschnig May 24, 2018

hannes-steffenhagen-diffblue commented May 24, 2018

kroening commented May 25, 2018

nmanthey commented May 29, 2018

Upstream fpr #2234

Upstream fpr #2234

Conversation

nmanthey commented May 24, 2018

tautschnig May 24, 2018

Choose a reason for hiding this comment

tautschnig May 24, 2018

Choose a reason for hiding this comment

tautschnig May 24, 2018

Choose a reason for hiding this comment

tautschnig May 24, 2018

Choose a reason for hiding this comment

hannes-steffenhagen-diffblue commented May 24, 2018

kroening commented May 25, 2018

nmanthey commented May 29, 2018