diff --git a/evm/src/cpu/kernel/aggregator.rs b/evm/src/cpu/kernel/aggregator.rs index 2b96aaf3..04d57e75 100644 --- a/evm/src/cpu/kernel/aggregator.rs +++ b/evm/src/cpu/kernel/aggregator.rs @@ -36,6 +36,7 @@ mod tests { use anyhow::Result; use ethereum_types::U256; + use log::debug; use rand::{thread_rng, Rng}; use crate::cpu::kernel::aggregator::combined_kernel; @@ -43,9 +44,13 @@ mod tests { #[test] fn make_kernel() { + let _ = env_logger::Builder::from_default_env() + .format_timestamp(None) + .try_init(); + // Make sure we can parse and assemble the entire kernel. let kernel = combined_kernel(); - println!("Kernel size: {} bytes", kernel.code.len()); + debug!("Total kernel size: {} bytes", kernel.code.len()); } fn u256ify<'a>(hexes: impl IntoIterator) -> Result> { diff --git a/evm/src/cpu/kernel/assembler.rs b/evm/src/cpu/kernel/assembler.rs index bef01d85..bdc8ded4 100644 --- a/evm/src/cpu/kernel/assembler.rs +++ b/evm/src/cpu/kernel/assembler.rs @@ -2,6 +2,7 @@ use std::collections::HashMap; use ethereum_types::U256; use itertools::izip; +use log::debug; use super::ast::PushTarget; use crate::cpu::kernel::ast::Literal; @@ -49,7 +50,10 @@ pub(crate) fn assemble(files: Vec, constants: HashMap) -> Ke } let mut code = vec![]; for (file, locals) in izip!(expanded_files, local_labels) { + let prev_len = code.len(); assemble_file(file, &mut code, locals, &global_labels); + let file_len = code.len() - prev_len; + debug!("Assembled file size: {} bytes", file_len); } assert_eq!(code.len(), offset, "Code length doesn't match offset."); Kernel {