internal/core/adt: cache reqSets in nodeContext

mpvl · mvdan · commit fac9a305d0db · 2025-04-17T09:28:20.000Z
This should reduce the amount of work done by a factor of the depth of a tree. This doesn't change the essence of the algorithm. Issue #3881 Signed-off-by: Marcel van Lohuizen <mpvl@gmail.com> Change-Id: I2ad81c04b28b64b9736463489039806a4493e5bd Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1213607 Reviewed-by: Matthew Sackman <matthew@cue.works> Unity-Result: CUE porcuepine <cue.porcuepine@gmail.com> TryBot-Result: CUEcueckoo <cueckoo@cuelang.org>
diff --git a/cue/testdata/benchmarks/issue1684.txtar b/cue/testdata/benchmarks/issue1684.txtar
@@ -72,7 +72,7 @@ Unifications: 5541
 Conjuncts:    25871
 Disjuncts:    6534
 
-CloseIDElems: 123173
+CloseIDElems: 85815
 NumCloseIDs: 4115
 -- out/evalalpha --
 (struct){
@@ -159,7 +159,7 @@ diff old new
 +Conjuncts:    25871
 +Disjuncts:    6534
 +
-+CloseIDElems: 123173
++CloseIDElems: 85815
 +NumCloseIDs: 4115
 -- diff/-out/evalalpha<==>+out/eval --
 diff old new
diff --git a/cue/testdata/benchmarks/issue2176.txtar b/cue/testdata/benchmarks/issue2176.txtar
@@ -69,7 +69,7 @@ Unifications: 377
 Conjuncts:    1527
 Disjuncts:    8
 
-CloseIDElems: 137
+CloseIDElems: 134
 NumCloseIDs: 731
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
@@ -95,7 +95,7 @@ diff old new
 +Conjuncts:    1527
 +Disjuncts:    8
 +
-+CloseIDElems: 137
++CloseIDElems: 134
 +NumCloseIDs: 731
 -- out/eval/stats --
 Leaks:  90
diff --git a/cue/testdata/benchmarks/issue3514.txtar b/cue/testdata/benchmarks/issue3514.txtar
@@ -46,7 +46,7 @@ Unifications: 69
 Conjuncts:    7053
 Disjuncts:    2386
 
-CloseIDElems: 6
+CloseIDElems: 3
 NumCloseIDs: 6876
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
@@ -72,7 +72,7 @@ diff old new
 +Conjuncts:    7053
 +Disjuncts:    2386
 +
-+CloseIDElems: 6
++CloseIDElems: 3
 +NumCloseIDs: 6876
 -- out/eval/stats --
 Leaks:  27
diff --git a/cue/testdata/benchmarks/issue3517.txtar b/cue/testdata/benchmarks/issue3517.txtar
@@ -64,7 +64,7 @@ Unifications: 49
 Conjuncts:    123
 Disjuncts:    0
 
-CloseIDElems: 34
+CloseIDElems: 32
 NumCloseIDs: 13
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
@@ -90,7 +90,7 @@ diff old new
 +Conjuncts:    123
 +Disjuncts:    0
 +
-+CloseIDElems: 34
++CloseIDElems: 32
 +NumCloseIDs: 13
 -- out/eval/stats --
 Leaks:  2
diff --git a/cue/testdata/benchmarks/listdedup.txtar b/cue/testdata/benchmarks/listdedup.txtar
@@ -43,7 +43,7 @@ Unifications: 40
 Conjuncts:    98
 Disjuncts:    24
 
-CloseIDElems: 599
+CloseIDElems: 281
 NumCloseIDs: 22
 -- out/evalalpha --
 (struct){
@@ -486,7 +486,7 @@ diff old new
 +Conjuncts:    98
 +Disjuncts:    24
 +
-+CloseIDElems: 599
++CloseIDElems: 281
 +NumCloseIDs: 22
 -- out/eval/stats --
 Leaks:  0
diff --git a/cue/testdata/benchmarks/typocheck.txtar b/cue/testdata/benchmarks/typocheck.txtar
@@ -31,7 +31,7 @@ Unifications: 703
 Conjuncts:    1305
 Disjuncts:    0
 
-CloseIDElems: 133991
+CloseIDElems: 31712
 NumCloseIDs: 210
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
@@ -57,7 +57,7 @@ diff old new
 +Conjuncts:    1305
 +Disjuncts:    0
 +
-+CloseIDElems: 133991
++CloseIDElems: 31712
 +NumCloseIDs: 210
 -- out/eval/stats --
 Leaks:  0
diff --git a/cue/testdata/comprehensions/issue837.txtar b/cue/testdata/comprehensions/issue837.txtar
@@ -74,7 +74,7 @@ Unifications: 61
 Conjuncts:    101
 Disjuncts:    8
 
-CloseIDElems: 19
+CloseIDElems: 17
 NumCloseIDs: 17
 -- out/evalalpha --
 Errors:
@@ -406,7 +406,7 @@ diff old new
 +Conjuncts:    101
 +Disjuncts:    8
 +
-+CloseIDElems: 19
++CloseIDElems: 17
 +NumCloseIDs: 17
 -- out/eval/stats --
 Leaks:  16
diff --git a/cue/testdata/comprehensions/pushdown.txtar b/cue/testdata/comprehensions/pushdown.txtar
@@ -2132,7 +2132,7 @@ Unifications: 578
 Conjuncts:    965
 Disjuncts:    32
 
-CloseIDElems: 237
+CloseIDElems: 210
 NumCloseIDs: 176
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
@@ -2158,7 +2158,7 @@ diff old new
 +Conjuncts:    965
 +Disjuncts:    32
 +
-+CloseIDElems: 237
++CloseIDElems: 210
 +NumCloseIDs: 176
 -- out/eval/stats --
 Leaks:  63
diff --git a/cue/testdata/cycle/builtins.txtar b/cue/testdata/cycle/builtins.txtar
@@ -265,7 +265,7 @@ Unifications: 399
 Conjuncts:    731
 Disjuncts:    38
 
-CloseIDElems: 162
+CloseIDElems: 116
 NumCloseIDs: 189
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
@@ -291,7 +291,7 @@ diff old new
 +Conjuncts:    731
 +Disjuncts:    38
 +
-+CloseIDElems: 162
++CloseIDElems: 116
 +NumCloseIDs: 189
 -- out/eval/stats --
 Leaks:  25
diff --git a/cue/testdata/cycle/chain.txtar b/cue/testdata/cycle/chain.txtar
@@ -1705,7 +1705,7 @@ Unifications: 931
 Conjuncts:    4994
 Disjuncts:    1615
 
-CloseIDElems: 47735
+CloseIDElems: 20288
 NumCloseIDs: 1535
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
@@ -1731,7 +1731,7 @@ diff old new
 +Conjuncts:    4994
 +Disjuncts:    1615
 +
-+CloseIDElems: 47735
++CloseIDElems: 20288
 +NumCloseIDs: 1535
 -- out/eval/stats --
 Leaks:  56
diff --git a/cue/testdata/cycle/comprehension.txtar b/cue/testdata/cycle/comprehension.txtar
@@ -320,7 +320,7 @@ Unifications: 401
 Conjuncts:    1104
 Disjuncts:    190
 
-CloseIDElems: 930
+CloseIDElems: 750
 NumCloseIDs: 488
 -- out/evalalpha --
 Errors:
@@ -813,7 +813,7 @@ diff old new
 +Conjuncts:    1104
 +Disjuncts:    190
 +
-+CloseIDElems: 930
++CloseIDElems: 750
 +NumCloseIDs: 488
 -- out/eval/stats --
 Leaks:  50
diff --git a/cue/testdata/cycle/inline.txtar b/cue/testdata/cycle/inline.txtar
@@ -405,7 +405,7 @@ Unifications: 253
 Conjuncts:    639
 Disjuncts:    0
 
-CloseIDElems: 410
+CloseIDElems: 329
 NumCloseIDs: 229
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
@@ -431,7 +431,7 @@ diff old new
 +Conjuncts:    639
 +Disjuncts:    0
 +
-+CloseIDElems: 410
++CloseIDElems: 329
 +NumCloseIDs: 229
 -- out/eval/stats --
 Leaks:  286
diff --git a/cue/testdata/cycle/inline_non_recursive.txtar b/cue/testdata/cycle/inline_non_recursive.txtar
@@ -104,7 +104,7 @@ Unifications: 135
 Conjuncts:    354
 Disjuncts:    0
 
-CloseIDElems: 18
+CloseIDElems: 14
 NumCloseIDs: 167
 -- out/evalalpha --
 Errors:
@@ -268,7 +268,7 @@ diff old new
 +Conjuncts:    354
 +Disjuncts:    0
 +
-+CloseIDElems: 18
++CloseIDElems: 14
 +NumCloseIDs: 167
 -- diff/-out/evalalpha<==>+out/eval --
 diff old new
diff --git a/cue/testdata/cycle/issue502.txtar b/cue/testdata/cycle/issue502.txtar
@@ -49,7 +49,7 @@ Unifications: 211
 Conjuncts:    441
 Disjuncts:    0
 
-CloseIDElems: 1801
+CloseIDElems: 1003
 NumCloseIDs: 85
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
@@ -73,7 +73,7 @@ diff old new
 +Conjuncts:    441
 +Disjuncts:    0
 +
-+CloseIDElems: 1801
++CloseIDElems: 1003
 +NumCloseIDs: 85
 -- out/eval/stats --
 Leaks:  0
diff --git a/cue/testdata/cycle/issue990.txtar b/cue/testdata/cycle/issue990.txtar
@@ -90,7 +90,7 @@ Unifications: 389
 Conjuncts:    1464
 Disjuncts:    110
 
-CloseIDElems: 30307
+CloseIDElems: 15467
 NumCloseIDs: 407
 -- out/evalalpha --
 (struct){
@@ -345,7 +345,7 @@ diff old new
 +Conjuncts:    1464
 +Disjuncts:    110
 +
-+CloseIDElems: 30307
++CloseIDElems: 15467
 +NumCloseIDs: 407
 -- diff/-out/evalalpha<==>+out/eval --
 diff old new
diff --git a/cue/testdata/cycle/structural.txtar b/cue/testdata/cycle/structural.txtar
@@ -587,7 +587,7 @@ Unifications: 581
 Conjuncts:    1044
 Disjuncts:    149
 
-CloseIDElems: 396
+CloseIDElems: 276
 NumCloseIDs: 175
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
@@ -613,7 +613,7 @@ diff old new
 +Conjuncts:    1044
 +Disjuncts:    149
 +
-+CloseIDElems: 396
++CloseIDElems: 276
 +NumCloseIDs: 175
 -- out/eval/stats --
 Leaks:  16
diff --git a/cue/testdata/definitions/typocheck.txtar b/cue/testdata/definitions/typocheck.txtar
@@ -401,7 +401,7 @@ Unifications: 544
 Conjuncts:    1058
 Disjuncts:    34
 
-CloseIDElems: 2028
+CloseIDElems: 1535
 NumCloseIDs: 358
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
@@ -427,7 +427,7 @@ diff old new
 +Conjuncts:    1058
 +Disjuncts:    34
 +
-+CloseIDElems: 2028
++CloseIDElems: 1535
 +NumCloseIDs: 358
 -- out/eval/stats --
 Leaks:  115
diff --git a/cue/testdata/disjunctions/elimination.txtar b/cue/testdata/disjunctions/elimination.txtar
@@ -2632,7 +2632,7 @@ Unifications: 686
 Conjuncts:    2767
 Disjuncts:    1290
 
-CloseIDElems: 5818
+CloseIDElems: 5666
 NumCloseIDs: 317
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
@@ -2658,7 +2658,7 @@ diff old new
 +Conjuncts:    2767
 +Disjuncts:    1290
 +
-+CloseIDElems: 5818
++CloseIDElems: 5666
 +NumCloseIDs: 317
 -- out/eval/stats --
 Leaks:  9
diff --git a/cue/testdata/disjunctions/issue3850.txtar b/cue/testdata/disjunctions/issue3850.txtar
@@ -66,7 +66,7 @@ Unifications: 66
 Conjuncts:    131
 Disjuncts:    22
 
-CloseIDElems: 83
+CloseIDElems: 58
 NumCloseIDs: 24
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
@@ -92,7 +92,7 @@ diff old new
 +Conjuncts:    131
 +Disjuncts:    22
 +
-+CloseIDElems: 83
++CloseIDElems: 58
 +NumCloseIDs: 24
 -- out/eval/stats --
 Leaks:  0
diff --git a/cue/testdata/disjunctions/nested.txtar b/cue/testdata/disjunctions/nested.txtar
@@ -56,7 +56,7 @@ Unifications: 63
 Conjuncts:    143
 Disjuncts:    44
 
-CloseIDElems: 11
+CloseIDElems: 10
 NumCloseIDs: 21
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
@@ -82,7 +82,7 @@ diff old new
 +Conjuncts:    143
 +Disjuncts:    44
 +
-+CloseIDElems: 11
++CloseIDElems: 10
 +NumCloseIDs: 21
 -- out/eval/stats --
 Leaks:  0
diff --git a/cue/testdata/eval/closedness.txtar b/cue/testdata/eval/closedness.txtar
@@ -693,7 +693,7 @@ Unifications: 885
 Conjuncts:    1935
 Disjuncts:    2
 
-CloseIDElems: 6426
+CloseIDElems: 4693
 NumCloseIDs: 660
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
@@ -719,7 +719,7 @@ diff old new
 +Conjuncts:    1935
 +Disjuncts:    2
 +
-+CloseIDElems: 6426
++CloseIDElems: 4693
 +NumCloseIDs: 660
 -- out/eval/stats --
 Leaks:  14
diff --git a/cue/testdata/eval/conjuncts.txtar b/cue/testdata/eval/conjuncts.txtar
@@ -79,7 +79,7 @@ Unifications: 40
 Conjuncts:    254
 Disjuncts:    152
 
-CloseIDElems: 122
+CloseIDElems: 121
 NumCloseIDs: 48
 -- out/evalalpha --
 Errors:
@@ -180,7 +180,7 @@ diff old new
 +Conjuncts:    254
 +Disjuncts:    152
 +
-+CloseIDElems: 122
++CloseIDElems: 121
 +NumCloseIDs: 48
 -- diff/-out/evalalpha<==>+out/eval --
 diff old new
diff --git a/cue/testdata/eval/counters.txtar b/cue/testdata/eval/counters.txtar
diff --git a/cue/testdata/eval/issue2146.txtar b/cue/testdata/eval/issue2146.txtar
diff --git a/cue/testdata/eval/issue3672.txtar b/cue/testdata/eval/issue3672.txtar
diff --git a/cue/testdata/eval/issue3801.txtar b/cue/testdata/eval/issue3801.txtar
diff --git a/cue/testdata/eval/issue3805.txtar b/cue/testdata/eval/issue3805.txtar
diff --git a/cue/testdata/eval/issue545.txtar b/cue/testdata/eval/issue545.txtar
diff --git a/cue/testdata/eval/letjoin.txtar b/cue/testdata/eval/letjoin.txtar
diff --git a/cue/testdata/eval/v0.7.txtar b/cue/testdata/eval/v0.7.txtar
diff --git a/internal/core/adt/eval.go b/internal/core/adt/eval.go
diff --git a/internal/core/adt/typocheck.go b/internal/core/adt/typocheck.go
