internal/core/adt: add stats for new closedness algo

Signed-off-by: Marcel van Lohuizen <[email protected]>
Change-Id: I0af85c9b78ee95558d5273eae7a8a2bb72ddb044
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1213605
Reviewed-by: Matthew Sackman <[email protected]>
Unity-Result: CUE porcuepine <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>

Author: mpvl

Diff for: cmd/cue/cmd/testdata/script/stats.txtar

@@ -49,6 +49,8 @@ contents overwritten
         "Unifications": 4,
         "Disjuncts": 2,
         "Conjuncts": 8,
+        "CloseIDElems": 0,
+        "NumCloseIDs": 2,
         "Freed": 0,
         "Reused": 0,
         "Allocs": 6,
@@ -65,6 +67,8 @@ CUE: {
 	Unifications: 4
 	Disjuncts:    2
 	Conjuncts:    8
+	CloseIDElems: 0
+	NumCloseIDs:  2
 	Freed:        0
 	Reused:       0
 	Allocs:       6
@@ -80,6 +84,8 @@ CUE:
   Unifications: 4
   Disjuncts: 2
   Conjuncts: 8
+  CloseIDElems: 0
+  NumCloseIDs: 2
   Freed: 0
   Reused: 0
   Allocs: 6
@@ -94,6 +100,8 @@ Go:
         "Unifications": 4,
         "Disjuncts": 2,
         "Conjuncts": 8,
+        "CloseIDElems": 0,
+        "NumCloseIDs": 2,
         "Freed": 0,
         "Reused": 0,
         "Allocs": 6,

Diff for: cue/stats/stats.go

@@ -63,6 +63,9 @@ type Counts struct {
 	// algorithmic behavior.
 	Conjuncts int64
 
+	CloseIDElems int64
+	NumCloseIDs  int64
+
 	// Buffer counters
 	//
 	// Each unification and disjunct operation is associated with an object
@@ -100,6 +103,9 @@ func (c *Counts) Add(other Counts) {
 	c.Conjuncts += other.Conjuncts
 	c.Disjuncts += other.Disjuncts
 
+	c.CloseIDElems += other.CloseIDElems
+	c.NumCloseIDs += other.NumCloseIDs
+
 	c.Freed += other.Freed
 	c.Retained += other.Retained
 	c.Reused += other.Reused
@@ -110,6 +116,8 @@ func (c Counts) Since(start Counts) Counts {
 	c.Unifications -= start.Unifications
 	c.Conjuncts -= start.Conjuncts
 	c.Disjuncts -= start.Disjuncts
+	c.CloseIDElems -= start.CloseIDElems
+	c.NumCloseIDs -= start.NumCloseIDs
 
 	c.Freed -= start.Freed
 	c.Retained -= start.Retained
@@ -139,7 +147,10 @@ Retain: {{.Retained}}
 
 Unifications: {{.Unifications}}
 Conjuncts:    {{.Conjuncts}}
-Disjuncts:    {{.Disjuncts}}`))
+Disjuncts:    {{.Disjuncts}}{{if .NumCloseIDs}}
+
+CloseIDElems: {{.CloseIDElems}}
+NumCloseIDs: {{.NumCloseIDs}}{{end}}`))
 })
 
 func (s Counts) String() string {

Diff for: cue/testdata/basicrewrite/018_self-reference_cycles.txtar

@@ -146,28 +146,35 @@ Retain: 0
 Unifications: 47
 Conjuncts:    91
 Disjuncts:    10
+
+CloseIDElems: 16
+NumCloseIDs: 10
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
 --- old
 +++ new
-@@ -1,9 +1,9 @@
+@@ -1,9 +1,12 @@
 -Leaks:  1
 -Freed:  57
 -Reused: 46
 -Allocs: 12
 -Retain: 166
+-
+-Unifications: 48
+-Conjuncts:    285
+-Disjuncts:    88
 +Leaks:  59
 +Freed:  0
 +Reused: 0
 +Allocs: 59
 +Retain: 0
- 
--Unifications: 48
--Conjuncts:    285
--Disjuncts:    88
++
 +Unifications: 47
 +Conjuncts:    91
 +Disjuncts:    10
++
++CloseIDElems: 16
++NumCloseIDs: 10
 -- out/eval/stats --
 Leaks:  1
 Freed:  57

Diff for: cue/testdata/benchmarks/cycleshare.txtar

@@ -35,28 +35,35 @@ Retain: 0
 Unifications: 43
 Conjuncts:    70
 Disjuncts:    21
+
+CloseIDElems: 6
+NumCloseIDs: 1
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
 --- old
 +++ new
-@@ -1,9 +1,9 @@
+@@ -1,9 +1,12 @@
 -Leaks:  8
 -Freed:  965
 -Reused: 951
 -Allocs: 22
 -Retain: 17
+-
+-Unifications: 559
+-Conjuncts:    1046
+-Disjuncts:    976
 +Leaks:  64
 +Freed:  0
 +Reused: 0
 +Allocs: 64
 +Retain: 0
- 
--Unifications: 559
--Conjuncts:    1046
--Disjuncts:    976
++
 +Unifications: 43
 +Conjuncts:    70
 +Disjuncts:    21
++
++CloseIDElems: 6
++NumCloseIDs: 1
 -- out/eval/stats --
 Leaks:  8
 Freed:  965

Diff for: cue/testdata/benchmarks/disjunctelim.txtar

@@ -49,11 +49,14 @@ Retain: 0
 Unifications: 22
 Conjuncts:    843
 Disjuncts:    618
+
+CloseIDElems: 49
+NumCloseIDs: 4
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
 --- old
 +++ new
-@@ -1,9 +1,9 @@
+@@ -1,9 +1,12 @@
 -Leaks:  0
 -Freed:  367
 -Reused: 356
@@ -70,6 +73,9 @@ diff old new
 +Unifications: 22
 +Conjuncts:    843
 +Disjuncts:    618
++
++CloseIDElems: 49
++NumCloseIDs: 4
 -- out/eval/stats --
 Leaks:  0
 Freed:  367

Diff for: cue/testdata/benchmarks/inlinedisjunction.txtar

@@ -23,6 +23,9 @@ Retain: 0
 Unifications: 16
 Conjuncts:    113
 Disjuncts:    58
+
+CloseIDElems: 10
+NumCloseIDs: 3
 -- out/eval --
 (struct){
   #def: (#struct){ |((#struct){
@@ -45,7 +48,7 @@ Disjuncts:    58
 diff old new
 --- old
 +++ new
-@@ -1,9 +1,9 @@
+@@ -1,9 +1,12 @@
 -Leaks:  0
 -Freed:  4674
 -Reused: 3903
@@ -62,6 +65,9 @@ diff old new
 +Unifications: 16
 +Conjuncts:    113
 +Disjuncts:    58
++
++CloseIDElems: 10
++NumCloseIDs: 3
 -- out/eval/stats --
 Leaks:  0
 Freed:  4674

Diff for: cue/testdata/benchmarks/issue1684.txtar

@@ -71,6 +71,9 @@ Retain: 0
 Unifications: 5541
 Conjuncts:    25871
 Disjuncts:    6534
+
+CloseIDElems: 123173
+NumCloseIDs: 4115
 -- out/evalalpha --
 (struct){
   #Secret: (#struct){
@@ -138,7 +141,7 @@ Disjuncts:    6534
 diff old new
 --- old
 +++ new
-@@ -1,9 +1,9 @@
+@@ -1,9 +1,12 @@
 -Leaks:  0
 -Freed:  1064333
 -Reused: 1064282
@@ -155,6 +158,9 @@ diff old new
 +Unifications: 5541
 +Conjuncts:    25871
 +Disjuncts:    6534
++
++CloseIDElems: 123173
++NumCloseIDs: 4115
 -- diff/-out/evalalpha<==>+out/eval --
 diff old new
 --- old

Diff for: cue/testdata/benchmarks/issue2176.txtar

@@ -68,28 +68,35 @@ Retain: 0
 Unifications: 377
 Conjuncts:    1527
 Disjuncts:    8
+
+CloseIDElems: 137
+NumCloseIDs: 731
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
 --- old
 +++ new
-@@ -1,9 +1,9 @@
+@@ -1,9 +1,12 @@
 -Leaks:  90
 -Freed:  746
 -Reused: 742
 -Allocs: 94
 -Retain: 1363
+-
+-Unifications: 828
+-Conjuncts:    3306
+-Disjuncts:    1475
 +Leaks:  449
 +Freed:  0
 +Reused: 0
 +Allocs: 449
 +Retain: 0
- 
--Unifications: 828
--Conjuncts:    3306
--Disjuncts:    1475
++
 +Unifications: 377
 +Conjuncts:    1527
 +Disjuncts:    8
++
++CloseIDElems: 137
++NumCloseIDs: 731
 -- out/eval/stats --
 Leaks:  90
 Freed:  746

Diff for: cue/testdata/benchmarks/issue3514.txtar

@@ -45,28 +45,35 @@ Retain: 0
 Unifications: 69
 Conjuncts:    7053
 Disjuncts:    2386
+
+CloseIDElems: 6
+NumCloseIDs: 6876
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
 --- old
 +++ new
-@@ -1,9 +1,9 @@
+@@ -1,9 +1,12 @@
 -Leaks:  27
 -Freed:  31092
 -Reused: 30511
 -Allocs: 608
 -Retain: 47
+-
+-Unifications: 189
+-Conjuncts:    92950
+-Disjuncts:    31139
 +Leaks:  3645
 +Freed:  0
 +Reused: 0
 +Allocs: 3645
 +Retain: 0
- 
--Unifications: 189
--Conjuncts:    92950
--Disjuncts:    31139
++
 +Unifications: 69
 +Conjuncts:    7053
 +Disjuncts:    2386
++
++CloseIDElems: 6
++NumCloseIDs: 6876
 -- out/eval/stats --
 Leaks:  27
 Freed:  31092

Diff for: cue/testdata/benchmarks/issue3517.txtar

@@ -63,28 +63,35 @@ Retain: 0
 Unifications: 49
 Conjuncts:    123
 Disjuncts:    0
+
+CloseIDElems: 34
+NumCloseIDs: 13
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
 --- old
 +++ new
-@@ -1,9 +1,9 @@
+@@ -1,9 +1,12 @@
 -Leaks:  2
 -Freed:  49
 -Reused: 39
 -Allocs: 12
 -Retain: 608
+-
+-Unifications: 51
+-Conjuncts:    801
+-Disjuncts:    73
 +Leaks:  49
 +Freed:  0
 +Reused: 0
 +Allocs: 49
 +Retain: 0
- 
--Unifications: 51
--Conjuncts:    801
--Disjuncts:    73
++
 +Unifications: 49
 +Conjuncts:    123
 +Disjuncts:    0
++
++CloseIDElems: 34
++NumCloseIDs: 13
 -- out/eval/stats --
 Leaks:  2
 Freed:  49