Implement caching + add integration test

lib/cli/src/commands/create_exe.rs

@@ -199,6 +199,7 @@ impl CreateExe {
                 object_format,
                 &self.precompiled_atom,
                 AllowMultiWasm::Allow,
+                self.debug_dir.is_some(),
             )?;
             get_module_infos(&tempdir, &atoms)?;
             let mut entrypoint = get_entrypoint(&tempdir)?;
@@ -228,6 +229,7 @@ impl CreateExe {
                 &self.cpu_features,
                 object_format,
                 &self.precompiled_atom,
+                self.debug_dir.is_some(),
             )?;
             get_module_infos(&tempdir, &atoms)?;
             let mut entrypoint = get_entrypoint(&tempdir)?;
@@ -317,6 +319,7 @@ pub(super) fn compile_pirita_into_directory(
     object_format: ObjectFormat,
     prefixes: &[String],
     allow_multi_wasm: AllowMultiWasm,
+    debug: bool,
 ) -> anyhow::Result<Vec<(String, Vec<u8>)>> {
     let all_atoms = match &allow_multi_wasm {
         AllowMultiWasm::Allow | AllowMultiWasm::Reject(None) => {
@@ -420,6 +423,7 @@ pub(super) fn compile_pirita_into_directory(
         target,
         object_format,
         &prefix_map,
+        debug,
     )?;
 
     // target_dir
@@ -678,6 +682,7 @@ fn conpile_atoms(
     target: &Target,
     object_format: ObjectFormat,
     prefixes: &PrefixMapCompilation,
+    debug: bool,
 ) -> Result<BTreeMap<String, ModuleInfo>, anyhow::Error> {
     use std::fs::File;
     use std::io::BufWriter;
@@ -688,9 +693,17 @@ fn conpile_atoms(
         let prefix = prefixes
             .get_prefix_for_atom(a)
             .ok_or_else(|| anyhow::anyhow!("no prefix given for atom {a}"))?;
-        let (store, _) = compiler.get_store_for_target(target.clone())?;
         let atom_name = utils::normalize_atom_name(a);
         let output_object_path = output_dir.join(format!("{atom_name}.o"));
+        if let Some(atom) = prefixes.get_compilation_object_for_atom(a) {
+            std::fs::write(&output_object_path, atom)
+                .map_err(|e| anyhow::anyhow!("{}: {e}", output_object_path.display()))?;
+            if debug {
+                println!("cache hit for atom {a:?}");
+            }
+            continue;
+        }
+        let (store, _) = compiler.get_store_for_target(target.clone())?;
         let module_name = format!("WASMER_{}_METADATA", prefix.to_uppercase());
         match object_format {
             ObjectFormat::Symbols => {
@@ -829,6 +842,7 @@ pub(super) fn prepare_directory_from_single_wasm_file(
     cpu_features: &[CpuFeature],
     object_format: ObjectFormat,
     prefix: &[String],
+    debug: bool,
 ) -> anyhow::Result<Vec<(String, Vec<u8>)>, anyhow::Error> {
     let bytes = std::fs::read(wasm_file)?;
     let target = &utils::target_triple_to_target(triple, cpu_features);
@@ -870,6 +884,7 @@ pub(super) fn prepare_directory_from_single_wasm_file(
         target,
         object_format,
         &prefix_map,
+        debug,
     )?;
 
     let mut atoms = Vec::new();

lib/cli/src/commands/create_obj.rs

@@ -109,6 +109,7 @@ impl CreateObj {
                     object_format,
                     &prefix,
                     crate::commands::AllowMultiWasm::Reject(self.atom.clone()),
+                    self.debug_dir.is_some(),
                 )
             } else {
                 crate::commands::create_exe::prepare_directory_from_single_wasm_file(
@@ -119,6 +120,7 @@ impl CreateObj {
                     &self.cpu_features,
                     object_format,
                     &prefix,
+                    self.debug_dir.is_some(),
                 )
             }?;
 

tests/integration/cli/tests/create_exe.rs

@@ -421,7 +421,7 @@ fn create_exe_with_object_input(mut args: Vec<String>) -> anyhow::Result<()> {
     #[cfg(windows)]
     let executable_path = operating_dir.join("wasm.exe");
 
-    WasmerCreateExe {
+    let create_exe_stdout = WasmerCreateExe {
         current_dir: std::env::current_dir().unwrap(),
         wasm_path,
         native_executable_path: executable_path.clone(),
@@ -435,6 +435,12 @@ fn create_exe_with_object_input(mut args: Vec<String>) -> anyhow::Result<()> {
     .run()
     .context("Failed to create-exe wasm with Wasmer")?;
 
+    let create_exe_stdout = std::str::from_utf8(&create_exe_stdout).unwrap();
+    assert!(
+        create_exe_stdout.contains("cache hit for atom \"qjs\""),
+        "missed cache hit"
+    );
+
     let result = run_code(
         &operating_dir,
         &executable_path,