Skip to content

Commit 633e6b4

Browse files
authored
Cleanup timers module: remove Sum and Typer constructors (#1275)
1 parent afe6a7e commit 633e6b4

File tree

5 files changed

+1
-20
lines changed

5 files changed

+1
-20
lines changed

src/lib/structures/profiling.ml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -454,12 +454,6 @@ let columns : (string * string * int * bool option * 'a) list =
454454
Format.sprintf "%s~%s"
455455
(float_resize curr (sz - 5)) (string_resize (percent gtime curr) 4));
456456

457-
"Sum", "Time spent in Sum module(s)", 16, Some false,
458-
(fun _ gtime sz ->
459-
let curr = Timers.get_sum (get_timers ()) Timers.M_Sum in
460-
Format.sprintf "%s~%s"
461-
(float_resize curr (sz - 5)) (string_resize (percent gtime curr) 4));
462-
463457
"Records", "Time spent in Records module(s)", 16, Some false,
464458
(fun _ gtime sz ->
465459
let curr = Timers.get_sum (get_timers ()) Timers.M_Records in
@@ -480,10 +474,9 @@ let columns : (string * string * int * bool option * 'a) list =
480474
let tcc = Timers.get_sum timers Timers.M_CC in
481475
let tarith = Timers.get_sum timers Timers.M_Arith in
482476
let tarrays = Timers.get_sum timers Timers.M_Arrays in
483-
let tsum = Timers.get_sum timers Timers.M_Sum in
484477
let trecs = Timers.get_sum timers Timers.M_Records in
485478
let tac = Timers.get_sum timers Timers.M_AC in
486-
let total = tsat+.tmatch+.tcc+.tarith+.tarrays+.tsum+.trecs+.tac in
479+
let total = tsat+.tmatch+.tcc+.tarith+.tarrays+.trecs+.tac in
487480
float_resize total sz);
488481
]
489482

src/lib/util/timers.ml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,12 @@
3232
type ty_module =
3333
| M_None
3434
| M_Combine
35-
| M_Typing
3635
| M_Sat
3736
| M_Match
3837
| M_CC
3938
| M_UF
4039
| M_Arith
4140
| M_Arrays
42-
| M_Sum
4341
| M_Records
4442
| M_Adt
4543
| M_Bitv
@@ -54,14 +52,12 @@ let all_modules =
5452
let l = [
5553
M_None;
5654
M_Combine;
57-
M_Typing;
5855
M_Sat;
5956
M_Match;
6057
M_CC;
6158
M_UF;
6259
M_Arith;
6360
M_Arrays;
64-
M_Sum;
6561
M_Records;
6662
M_Adt;
6763
M_Bitv;
@@ -129,14 +125,12 @@ let all_functions =
129125
let string_of_ty_module k = match k with
130126
| M_None -> "None"
131127
| M_Combine -> "Combine"
132-
| M_Typing -> "Typing"
133128
| M_Sat -> "Sat"
134129
| M_Match -> "Match"
135130
| M_CC -> "CC"
136131
| M_UF -> "UF"
137132
| M_Arith -> "Arith"
138133
| M_Arrays -> "Arrays"
139-
| M_Sum -> "Sum"
140134
| M_Records -> "Records"
141135
| M_Adt -> "Adt"
142136
| M_Bitv -> "Bitv"

src/lib/util/timers.mli

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@
2828
type ty_module =
2929
| M_None
3030
| M_Combine
31-
| M_Typing
3231
| M_Sat
3332
| M_Match
3433
| M_CC
3534
| M_UF
3635
| M_Arith
3736
| M_Arrays
38-
| M_Sum
3937
| M_Records
4038
| M_Adt
4139
| M_Bitv

src/lib/util/util.ml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ let pp_sat_solver ppf = function
7777
| CDCL_Tableaux -> Format.fprintf ppf "CDCL-Tableaux"
7878

7979
type theories_extensions =
80-
| Sum
8180
| Adt
8281
| Arrays
8382
| Records
@@ -116,7 +115,6 @@ let equal_mode x y = match x, y with
116115

117116
let th_ext_of_string ext =
118117
match ext with
119-
| "Sum" -> Some Sum
120118
| "Adt" -> Some Adt
121119
| "Arrays" -> Some Arrays
122120
| "Records" -> Some Records
@@ -131,7 +129,6 @@ let th_ext_of_string ext =
131129

132130
let string_of_th_ext ext =
133131
match ext with
134-
| Sum -> "Sum"
135132
| Adt -> "Adt"
136133
| Arrays -> "Arrays"
137134
| Records -> "Records"

src/lib/util/util.mli

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ type sat_solver =
5959
val pp_sat_solver : Format.formatter -> sat_solver -> unit
6060

6161
type theories_extensions =
62-
| Sum
6362
| Adt
6463
| Arrays
6564
| Records

0 commit comments

Comments
 (0)