Skip to content

Commit 610761e

Browse files
authored
Merge pull request #5539 from thomasspriggs/tas/arrays_optimisation
Performance optimisation - Use `unordered_map` in `numbering` instead of `map`
2 parents d14e078 + 2bf69bf commit 610761e

17 files changed

+37
-44
lines changed

src/analyses/custom_bitvector_analysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class custom_bitvector_analysist:public ait<custom_bitvector_domaint>
163163

164164
unsigned get_bit_nr(const exprt &);
165165

166-
typedef numbering<irep_idt> bitst;
166+
typedef numberingt<irep_idt> bitst;
167167
bitst bits;
168168

169169
protected:

src/analyses/escape_analysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class escape_analysist:public ait<escape_domaint>
120120
{
121121
}
122122

123-
numbering<irep_idt> bits;
123+
numberingt<irep_idt> bits;
124124

125125
void insert_cleanup(
126126
goto_functionst::goto_functiont &,

src/analyses/invariant_set.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class inv_object_storet
5555
protected:
5656
const namespacet &ns;
5757

58-
typedef hash_numbering<irep_idt, irep_id_hash> mapt;
58+
typedef numberingt<irep_idt> mapt;
5959
mapt map;
6060

6161
struct entryt

src/analyses/local_bitvector_analysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ class local_bitvector_analysist
183183

184184
typedef std::stack<unsigned> work_queuet;
185185

186-
numbering<irep_idt> pointers;
186+
numberingt<irep_idt> pointers;
187187

188188
// pointers -> flagst
189189
// This is a vector, so it's fast.

src/analyses/local_may_alias.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class local_may_aliast
6060

6161
typedef std::stack<local_cfgt::node_nrt> work_queuet;
6262

63-
mutable numbering<exprt> objects;
63+
mutable numberingt<exprt, irep_hash> objects;
6464

6565
typedef unsigned_union_find alias_sett;
6666

src/goto-programs/vcd_goto_trace.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void output_vcd(
8282

8383
// we first collect all variables that are assigned
8484

85-
numbering<irep_idt> n;
85+
numberingt<irep_idt> n;
8686

8787
for(const auto &step : goto_trace.steps)
8888
{

src/pointer-analysis/object_numbering.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ Author: Daniel Kroening, [email protected]
2525
#include <util/expr.h>
2626
#include <util/numbering.h>
2727

28-
typedef hash_numbering<exprt, irep_hash> object_numberingt;
28+
typedef numberingt<exprt, irep_hash> object_numberingt;
2929

3030
#endif // CPROVER_POINTER_ANALYSIS_OBJECT_NUMBERING_H

src/pointer-analysis/value_set_fi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Author: Daniel Kroening, [email protected]
2929
const value_set_fit::object_map_dt value_set_fit::object_map_dt::blank{};
3030

3131
object_numberingt value_set_fit::object_numbering;
32-
hash_numbering<irep_idt, irep_id_hash> value_set_fit::function_numbering;
32+
numberingt<irep_idt> value_set_fit::function_numbering;
3333

3434
static const char *alloc_adapter_prefix="alloc_adaptor::";
3535

src/pointer-analysis/value_set_fi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class value_set_fit
3939
unsigned to_function, from_function;
4040
unsigned to_target_index, from_target_index;
4141
static object_numberingt object_numbering;
42-
static hash_numbering<irep_idt, irep_id_hash> function_numbering;
42+
static numberingt<irep_idt> function_numbering;
4343

4444
void set_from(const irep_idt &function, unsigned inx)
4545
{

src/pointer-analysis/value_set_fivr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class value_set_fivrt
3636
unsigned to_function, from_function;
3737
unsigned to_target_index, from_target_index;
3838
static object_numberingt object_numbering;
39-
static hash_numbering<irep_idt, irep_id_hash> function_numbering;
39+
static numberingt<irep_idt> function_numbering;
4040

4141
void set_from(const irep_idt &function, unsigned inx)
4242
{

0 commit comments

Comments
 (0)