From 8eb32fb2d79699ffc429f3bd355958da185cb6d9 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 23 Nov 2022 00:32:45 -0800 Subject: feat(tvix/eval): crude caching builtins.import Before this, tvix was spending most of its time furiously re-parsing and re-compiling nixpkgs, each time hoping to get a different result... Change-Id: I1c0cfbf9af622c276275b1f2fb8d4e976f1b5533 Signed-off-by: Adam Joseph Reviewed-on: https://cl.tvl.fyi/c/depot/+/7361 Reviewed-by: tazjin Tested-by: BuildkiteCI --- tvix/eval/src/vm.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tvix/eval/src/vm.rs') diff --git a/tvix/eval/src/vm.rs b/tvix/eval/src/vm.rs index f6605940a38c..b5f948a96a55 100644 --- a/tvix/eval/src/vm.rs +++ b/tvix/eval/src/vm.rs @@ -2,7 +2,7 @@ //! Tvix bytecode. use serde_json::json; -use std::{cmp::Ordering, ops::DerefMut, path::PathBuf, rc::Rc}; +use std::{cmp::Ordering, collections::BTreeMap, ops::DerefMut, path::PathBuf, rc::Rc}; use crate::{ chunk::Chunk, @@ -60,6 +60,8 @@ pub struct VM<'o> { /// Runtime warnings collected during evaluation. warnings: Vec, + pub import_cache: Box>, + nix_search_path: NixSearchPath, observer: &'o mut dyn RuntimeObserver, @@ -164,6 +166,7 @@ impl<'o> VM<'o> { stack: vec![], with_stack: vec![], warnings: vec![], + import_cache: Default::default(), } } -- cgit 1.4.1