Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
eval: parallelize environment loading
These changes add support for loading environments in parallel. Parallelization is breadth-first, then depth-first. For example, given the following environments: ```yaml imports: # env a - b - c -- imports; # env b - e -- imports: # env c - f - g ``` Environments `b` and `c` would be loaded in parallel, then environment `e` would be loaded, then environments `f` and `g` would be loaded in parallel. This simplifies the detection of cyclic imports and the collection of diagnostics. This improves performance for scenarios that are dominated by environment load time (e.g. import graphs with high degrees of fanout). Local benchmark results: ``` goos: darwin goarch: arm64 pkg: github.com/pulumi/esc/eval cpu: Apple M1 Max BenchmarkEval-10 559 2016141 ns/op 2212786 B/op 18971 allocs/op BenchmarkEval-10 591 1987670 ns/op 2212689 B/op 18970 allocs/op BenchmarkEval-10 614 1977314 ns/op 2212625 B/op 18970 allocs/op BenchmarkEval-10 596 1970144 ns/op 2212937 B/op 18971 allocs/op BenchmarkEval-10 607 1989940 ns/op 2212754 B/op 18970 allocs/op BenchmarkEval-10 628 1934108 ns/op 2212601 B/op 18970 allocs/op BenchmarkEval-10 574 1984031 ns/op 2212765 B/op 18970 allocs/op BenchmarkEval-10 646 1944632 ns/op 2212531 B/op 18970 allocs/op BenchmarkEval-10 631 1954274 ns/op 2212848 B/op 18970 allocs/op BenchmarkEval-10 614 1906139 ns/op 2212780 B/op 18970 allocs/op BenchmarkEvalOpen-10 9 116069278 ns/op 2212690 B/op 18982 allocs/op BenchmarkEvalOpen-10 9 117032264 ns/op 2213604 B/op 18984 allocs/op BenchmarkEvalOpen-10 9 118545838 ns/op 2214613 B/op 18986 allocs/op BenchmarkEvalOpen-10 9 117469657 ns/op 2212854 B/op 18983 allocs/op BenchmarkEvalOpen-10 9 115962963 ns/op 2212275 B/op 18981 allocs/op BenchmarkEvalOpen-10 9 116431745 ns/op 2212888 B/op 18982 allocs/op BenchmarkEvalOpen-10 9 116677569 ns/op 2212040 B/op 18983 allocs/op BenchmarkEvalOpen-10 9 117092157 ns/op 2211416 B/op 18981 allocs/op BenchmarkEvalOpen-10 9 117164181 ns/op 2213941 B/op 18985 allocs/op BenchmarkEvalOpen-10 9 118046199 ns/op 2215542 B/op 18982 allocs/op BenchmarkEvalEnvLoad-10 81 15394315 ns/op 2215076 B/op 18997 allocs/op BenchmarkEvalEnvLoad-10 84 15028452 ns/op 2214531 B/op 18996 allocs/op BenchmarkEvalEnvLoad-10 80 14744255 ns/op 2214963 B/op 18997 allocs/op BenchmarkEvalEnvLoad-10 90 15100905 ns/op 2214574 B/op 18997 allocs/op BenchmarkEvalEnvLoad-10 84 15125639 ns/op 2215519 B/op 18998 allocs/op BenchmarkEvalEnvLoad-10 84 14868314 ns/op 2214583 B/op 18997 allocs/op BenchmarkEvalEnvLoad-10 81 14827542 ns/op 2214839 B/op 18995 allocs/op BenchmarkEvalEnvLoad-10 88 14948501 ns/op 2214839 B/op 18997 allocs/op BenchmarkEvalEnvLoad-10 88 15037255 ns/op 2215109 B/op 18997 allocs/op BenchmarkEvalEnvLoad-10 84 14695667 ns/op 2215256 B/op 18998 allocs/op BenchmarkEvalAll-10 8 127500182 ns/op 2214674 B/op 19009 allocs/op BenchmarkEvalAll-10 8 127734964 ns/op 2215176 B/op 19006 allocs/op BenchmarkEvalAll-10 9 128855694 ns/op 2215416 B/op 19010 allocs/op BenchmarkEvalAll-10 8 128633870 ns/op 2215320 B/op 19009 allocs/op BenchmarkEvalAll-10 9 129122597 ns/op 2215123 B/op 19007 allocs/op BenchmarkEvalAll-10 8 129013708 ns/op 2213784 B/op 19004 allocs/op BenchmarkEvalAll-10 9 127839343 ns/op 2214552 B/op 19007 allocs/op BenchmarkEvalAll-10 9 129212421 ns/op 2214800 B/op 19006 allocs/op BenchmarkEvalAll-10 9 128671162 ns/op 2215864 B/op 19009 allocs/op BenchmarkEvalAll-10 9 127706639 ns/op 2214455 B/op 19006 allocs/op ```
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| // Copyright 2024, Pulumi Corporation. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package eval | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/pulumi/esc/ast" | ||
| "github.com/pulumi/esc/syntax" | ||
| ) | ||
|
|
||
| type loadedEnvironment struct { | ||
| done <-chan bool | ||
|
|
||
| name string | ||
| env *ast.EnvironmentDecl | ||
| dec Decrypter | ||
| diags syntax.Diagnostics | ||
| err error | ||
| } | ||
|
|
||
| type loader struct { | ||
| ctx context.Context | ||
| environments EnvironmentLoader | ||
| loaded map[string]*loadedEnvironment | ||
| } | ||
|
|
||
| func newLoader(ctx context.Context, environments EnvironmentLoader) *loader { | ||
| return &loader{ | ||
| ctx: ctx, | ||
| environments: environments, | ||
| loaded: map[string]*loadedEnvironment{}, | ||
| } | ||
| } | ||
|
|
||
| func (l *loader) load(name string) *loadedEnvironment { | ||
| if loaded, ok := l.loaded[name]; ok { | ||
| return loaded | ||
| } | ||
|
|
||
| done := make(chan bool) | ||
| result := &loadedEnvironment{done: done, name: name} | ||
| go func() { | ||
| defer close(done) | ||
|
|
||
| bytes, dec, err := l.environments.LoadEnvironment(l.ctx, name) | ||
| if err != nil { | ||
| result.err = err | ||
| return | ||
| } | ||
| result.dec = dec | ||
|
|
||
| result.env, result.diags, result.err = LoadYAMLBytes(name, bytes) | ||
| return | ||
| }() | ||
|
|
||
| l.loaded[name] = result | ||
| return result | ||
| } | ||
Oops, something went wrong.