Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run tests from casm #1626

Merged
merged 7 commits into from
Feb 5, 2024
Merged

Run tests from casm #1626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5291704
Remove copied sierra_casm_runner
drknzz Jan 30, 2024
a4bf9d3
Run from casm
drknzz Jan 30, 2024
d83e907
Remove sierra_casm_runner_gas
drknzz Jan 30, 2024
3a4f8b7
Merge branch 'master' into 1140-run-tests-from-casm
drknzz Jan 30, 2024
3b3cdff
Merge branch 'master' into 1140-run-tests-from-casm
Arcticae Feb 1, 2024
c04fa95
`syscall_ptr` with `SegmentArena` fix (#1639)
Arcticae Feb 2, 2024
8bc7bd7
Review
drknzz Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 102 additions & 25 deletions crates/forge-runner/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,25 @@ use crate::compiled_runnable::{CompiledTestCrateRunnable, FuzzerConfig, TestCase
use crate::fuzzer::RandomFuzzer;
use crate::printing::print_test_result;
use crate::running::{run_fuzz_test, run_test};
use crate::sierra_casm_runner::SierraCasmRunner;
use crate::test_case_summary::TestCaseSummary;
use crate::test_crate_summary::TestCrateSummary;
use anyhow::{anyhow, Context, Result};
use anyhow::{anyhow, Result};

use cairo_lang_runner::RunnerError;
use cairo_lang_sierra::extensions::core::{CoreLibfunc, CoreType};
use cairo_lang_sierra::ids::ConcreteTypeId;
use cairo_lang_sierra::program::Function;
use cairo_lang_sierra_to_casm::metadata::MetadataComputationConfig;
use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
use cairo_lang_sierra::program::{Function, Program};
use cairo_lang_sierra::program_registry::ProgramRegistry;
use cairo_lang_sierra_to_casm::compiler::CairoProgram;
use cairo_lang_sierra_to_casm::metadata::{calc_metadata, MetadataComputationConfig};
use cairo_lang_sierra_type_size::get_type_size_map;
use camino::Utf8PathBuf;

use futures::stream::FuturesUnordered;
use futures::StreamExt;

use once_cell::sync::Lazy;
use running::TestDetails;
use scarb_api::StarknetContractArtifacts;
use smol_str::SmolStr;
use trace_data::save_trace_data;
Expand All @@ -38,8 +42,6 @@ mod fuzzer;
mod gas;
mod printing;
mod running;
mod sierra_casm_runner;
mod sierra_casm_runner_gas;

pub const CACHE_DIR: &str = ".snfoundry_cache";

Expand Down Expand Up @@ -132,21 +134,69 @@ pub enum TestCrateRunResult {
Interrupted(TestCrateSummary),
}

fn build_test_details(test_name: &str, sierra_program: &Program) -> TestDetails {
let sierra_program_registry =
ProgramRegistry::<CoreType, CoreLibfunc>::new(sierra_program).unwrap();
let type_sizes = get_type_size_map(sierra_program, &sierra_program_registry).unwrap();
let func = sierra_program
.funcs
.iter()
.find(|f| f.id.debug_name.clone().unwrap().ends_with(test_name))
.unwrap();

let parameter_types = func
.signature
.param_types
.iter()
.map(|pt| {
let td = sierra_program
.type_declarations
.iter()
.find(|td| &td.id == pt)
.unwrap();
let generic_id = &td.long_id.generic_id;
let size = type_sizes[&td.id];
(generic_id.clone(), size)
})
.collect::<Vec<_>>();

let return_types = func
.signature
.ret_types
.iter()
.map(|pt| {
let td = sierra_program
.type_declarations
.iter()
.find(|td| &td.id == pt)
.unwrap();
let generic_id = &td.long_id.generic_id;
let size = type_sizes[&td.id];
(generic_id.clone(), size)
})
.collect::<Vec<_>>();

TestDetails {
entry_point_offset: func.entry_point.0,
parameter_types,
return_types,
}
}

fn compile_sierra_to_casm(sierra_program: &Program) -> CairoProgram {
let metadata_config = MetadataComputationConfig::default();
let metadata = calc_metadata(sierra_program, metadata_config).unwrap();
cairo_lang_sierra_to_casm::compiler::compile(sierra_program, &metadata, true).unwrap()
}

pub async fn run_tests_from_crate(
tests: Arc<CompiledTestCrateRunnable>,
runner_config: Arc<RunnerConfig>,
runner_params: Arc<RunnerParams>,
tests_filter: &impl TestCaseFilter,
) -> Result<TestCrateRunResult> {
let runner = Arc::new(
SierraCasmRunner::new(
tests.sierra_program.clone(),
Some(MetadataComputationConfig::default()),
OrderedHashMap::default(),
false,
)
.context("Failed setting up runner.")?,
);
let sierra_program = &tests.sierra_program;
let casm_program = Arc::new(compile_sierra_to_casm(sierra_program));

let mut tasks = FuturesUnordered::new();
let test_cases = &tests.test_cases;
Expand All @@ -170,17 +220,25 @@ pub async fn run_tests_from_crate(
continue;
};

let function = runner.find_function(&case_name)?;
let function = sierra_program
.funcs
.iter()
.find(|f| f.id.debug_name.clone().unwrap().ends_with(&case_name))
.ok_or_else(|| RunnerError::MissingFunction {
suffix: case_name.clone(),
})?;

let args = function_args(function, &BUILTINS);

let case = Arc::new(case.clone());
let args: Vec<ConcreteTypeId> = args.into_iter().cloned().collect();
let runner = runner.clone();
let test_details = Arc::new(build_test_details(&case.name, sierra_program));

tasks.push(choose_test_strategy_and_run(
args,
case.clone(),
runner,
casm_program.clone(),
test_details.clone(),
runner_config.clone(),
runner_params.clone(),
send.clone(),
Expand Down Expand Up @@ -225,20 +283,37 @@ pub async fn run_tests_from_crate(
fn choose_test_strategy_and_run(
args: Vec<ConcreteTypeId>,
case: Arc<TestCaseRunnable>,
runner: Arc<SierraCasmRunner>,
casm_program: Arc<CairoProgram>,
test_details: Arc<TestDetails>,
runner_config: Arc<RunnerConfig>,
runner_params: Arc<RunnerParams>,
send: Sender<()>,
) -> JoinHandle<Result<AnyTestCaseSummary>> {
if args.is_empty() {
tokio::task::spawn(async move {
let res = run_test(case, runner, runner_config, runner_params, send).await??;
let res = run_test(
case,
casm_program,
test_details,
runner_config,
runner_params,
send,
)
.await??;
Ok(AnyTestCaseSummary::Single(res))
})
} else {
tokio::task::spawn(async move {
let res =
run_with_fuzzing(args, case, runner, runner_config, runner_params, send).await??;
let res = run_with_fuzzing(
args,
case,
casm_program,
test_details,
runner_config,
runner_params,
send,
)
.await??;
Ok(AnyTestCaseSummary::Fuzzing(res))
})
}
Expand All @@ -247,7 +322,8 @@ fn choose_test_strategy_and_run(
fn run_with_fuzzing(
args: Vec<ConcreteTypeId>,
case: Arc<TestCaseRunnable>,
runner: Arc<SierraCasmRunner>,
casm_program: Arc<CairoProgram>,
test_details: Arc<TestDetails>,
runner_config: Arc<RunnerConfig>,
runner_params: Arc<RunnerParams>,
send: Sender<()>,
Expand Down Expand Up @@ -285,7 +361,8 @@ fn run_with_fuzzing(
tasks.push(run_fuzz_test(
args,
case.clone(),
runner.clone(),
casm_program.clone(),
test_details.clone(),
runner_config.clone(),
runner_params.clone(),
send.clone(),
Expand Down
Loading
Loading