Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@rahxephon89
rahxephon89 committed Jun 21, 2024
1 parent 153133b commit 2f9f5c2
Show file tree
Hide file tree
Showing 10 changed files with 173 additions and 45 deletions.
2 changes: 2 additions & 0 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions aptos-move/aptos-e2e-comparison-testing/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ bcs = { workspace = true }
clap = { workspace = true }
futures = { workspace = true }
itertools = { workspace = true }
move-command-line-common = { workspace = true }
move-compiler = { workspace = true }
move-compiler-v2 = { workspace = true }
move-core-types = { workspace = true }
move-model = { workspace = true }
move-package = { workspace = true }
Expand Down
47 changes: 38 additions & 9 deletions aptos-move/aptos-e2e-comparison-testing/src/execution.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
use crate::{
check_aptos_packages_availability, compile_aptos_packages, compile_package,
data_state_view::DataStateView, generate_compiled_blob, is_aptos_package, CompilationCache,
DataManager, IndexReader, PackageInfo, TxnIndex, APTOS_COMMONS,
DataManager, IndexReader, PackageInfo, TxnIndex, APTOS_COMMONS, DISABLE_REF_CHECK,
DISABLE_SPEC_CHECK, ENABLE_REF_CHECK,
};
use anyhow::Result;
use aptos_framework::APTOS_PACKAGES;
Expand All @@ -22,7 +23,7 @@ use clap::ValueEnum;
use itertools::Itertools;
use move_core_types::{account_address::AccountAddress, language_storage::ModuleId};
use move_model::metadata::CompilerVersion;
use std::{cmp, collections::HashMap, path::PathBuf, sync::Arc};
use std::{cmp, collections::HashMap, env, path::PathBuf, sync::Arc};

fn load_packages_to_executor(
executor: &mut FakeExecutor,
Expand Down Expand Up @@ -91,18 +92,34 @@ pub struct Execution {
input_path: PathBuf,
pub execution_mode: ExecutionMode,
pub bytecode_version: u32,
pub skip_ref_packages: Option<String>,
}

impl Execution {
pub fn check_package_skip(&self, package_name: &str) -> bool {
println!("package name:{}", package_name);
if let Some(p) = &self.skip_ref_packages {
let packages = p.split(',').collect_vec();
packages.contains(&package_name)
} else {
false
}
}

pub fn output_result_str(&self, msg: String) {
eprintln!("{}", msg);
}

pub fn new(input_path: PathBuf, execution_mode: ExecutionMode) -> Self {
pub fn new(
input_path: PathBuf,
execution_mode: ExecutionMode,
skip_ref_packages: Option<String>,
) -> Self {
Self {
input_path,
execution_mode,
bytecode_version: 6,
skip_ref_packages,
}
}

Expand Down Expand Up @@ -221,6 +238,17 @@ impl Execution {
if compiled_cache.failed_packages_v2.contains(&package_info) {
v2_failed = true;
} else {
if self.check_package_skip(&package_info.package_name) {
env::set_var(
"MOVE_COMPILER_EXP",
format!("{},{}", DISABLE_SPEC_CHECK, DISABLE_REF_CHECK),
);
} else {
env::set_var(
"MOVE_COMPILER_EXP",
format!("{},{}", DISABLE_SPEC_CHECK, ENABLE_REF_CHECK),
);
}
let compiled_res_v2 =
compile_package(package_dir, &package_info, Some(CompilerVersion::V2_0));
if let Ok(compiled_res) = compiled_res_v2 {
Expand All @@ -238,7 +266,10 @@ impl Execution {
}
}
if v1_failed || v2_failed {
let mut err_msg = "compilation failed at ".to_string();
let mut err_msg = format!(
"compilation for the package {} failed at",
package_info.package_name
);
if v1_failed {
err_msg = format!("{} v1", err_msg);
}
Expand All @@ -263,11 +294,9 @@ impl Execution {
{
let compiled_result = self.compile_code(&txn_idx, compiled_cache);
if compiled_result.is_err() {
self.output_result_str(format!(
"compilation failed for the package:{} at version:{}",
txn_idx.package_info.package_name, cur_version
));
return compiled_result;
let err = compiled_result.unwrap_err();
self.output_result_str(format!("{} at version:{}", err, cur_version));
return Err(err);
}
}
// read the state data;
Expand Down
43 changes: 33 additions & 10 deletions aptos-move/aptos-e2e-comparison-testing/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ const ERR_LOG: &str = "err_log.txt";
const ROCKS_INDEX_DB: &str = "rocks_txn_idx_db";
pub const APTOS_COMMONS: &str = "aptos-commons";
const MAX_TO_FLUSH: usize = 50000;
pub const DISABLE_SPEC_CHECK: &str = "spec-check=off";
pub const DISABLE_REF_CHECK: &str = "reference-safety=off";
pub const ENABLE_REF_CHECK: &str = "reference-safety=on";

struct IndexWriter {
index_writer: BufWriter<File>,
Expand Down Expand Up @@ -436,10 +439,10 @@ fn compile_aptos_packages(
fn compile_package(
root_dir: PathBuf,
package_info: &PackageInfo,
compiler_verion: Option<CompilerVersion>,
compiler_version: Option<CompilerVersion>,
) -> anyhow::Result<CompiledPackage> {
let mut build_options = aptos_framework::BuildOptions {
compiler_version: compiler_verion,
compiler_version,
..Default::default()
};
build_options
Expand All @@ -450,8 +453,9 @@ fn compile_package(
Ok(built_package.package)
} else {
Err(anyhow::Error::msg(format!(
"compilation failed for compiler: {:?}",
compiler_verion
"compilation failed for the package:{} when using compiler: {:?}",
package_info.package_name.clone(),
compiler_version
)))
}
}
Expand All @@ -465,7 +469,16 @@ fn dump_and_compile_from_package_metadata(
) -> anyhow::Result<()> {
let root_package_dir = root_dir.join(format!("{}", package_info,));
if compilation_cache.failed_packages_v1.contains(&package_info) {
return Err(anyhow::Error::msg("compilation failed"));
return Err(anyhow::Error::msg(format!(
"compilation failed for the package:{} when using compiler v1",
package_info.package_name
)));
}
if compilation_cache.failed_packages_v2.contains(&package_info) {
return Err(anyhow::Error::msg(format!(
"compilation failed for the package:{} when using compiler v2",
package_info.package_name
)));
}
if !root_package_dir.exists() {
std::fs::create_dir_all(root_package_dir.as_path())?;
Expand Down Expand Up @@ -570,9 +583,14 @@ fn dump_and_compile_from_package_metadata(
.insert(package_info.clone(), built_package);
} else {
if !compilation_cache.failed_packages_v1.contains(&package_info) {
compilation_cache.failed_packages_v1.insert(package_info);
compilation_cache
.failed_packages_v1
.insert(package_info.clone());
}
return Err(anyhow::Error::msg("compilation failed at v1"));
return Err(anyhow::Error::msg(format!(
"compilation failed for the package:{} when using compiler v1",
package_info.package_name
)));
}
if execution_mode.is_some_and(|mode| mode.is_v2_or_compare()) {
let package_v2 =
Expand All @@ -584,10 +602,15 @@ fn dump_and_compile_from_package_metadata(
&mut compilation_cache.compiled_package_cache_v2,
);
} else {
if !compilation_cache.failed_packages_v1.contains(&package_info) {
compilation_cache.failed_packages_v1.insert(package_info);
if !compilation_cache.failed_packages_v2.contains(&package_info) {
compilation_cache
.failed_packages_v2
.insert(package_info.clone());
}
return Err(anyhow::Error::msg("compilation failed at v2"));
return Err(anyhow::Error::msg(format!(
"compilation failed for the package:{} when using compiler v2",
package_info.package_name
)));
}
}
}
Expand Down
29 changes: 25 additions & 4 deletions aptos-move/aptos-e2e-comparison-testing/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@

use anyhow::Result;
use aptos_comparison_testing::{
prepare_aptos_packages, DataCollection, Execution, ExecutionMode, OnlineExecutor, APTOS_COMMONS,
prepare_aptos_packages, DataCollection, Execution, ExecutionMode, OnlineExecutor,
APTOS_COMMONS, DISABLE_SPEC_CHECK,
};
use aptos_rest_client::Client;
use clap::{Parser, Subcommand};
use move_command_line_common::env::OVERRIDE_EXP_CACHE;
use move_compiler_v2::Experiment;
use move_core_types::account_address::AccountAddress;
use std::path::PathBuf;
use std::{env, path::PathBuf};
use url::Url;

const BATCH_SIZE: u64 = 500;
Expand Down Expand Up @@ -58,6 +61,9 @@ pub enum Cmd {
/// Used when execution_only is true
#[clap(long)]
execution_mode: Option<ExecutionMode>,
/// Packages to be skipped for reference safety check
#[clap(long)]
skip_ref_packages: Option<String>,
},
/// Execution of txns
Execute {
Expand All @@ -66,6 +72,9 @@ pub enum Cmd {
/// Whether to execute against V1, V2 alone or both compilers for comparison
#[clap(long)]
execution_mode: Option<ExecutionMode>,
/// Packages to be skipped for reference safety check
#[clap(long)]
skip_ref_packages: Option<String>,
},
}

Expand All @@ -86,7 +95,15 @@ pub struct Argument {
#[tokio::main]
async fn main() -> Result<()> {
let args = Argument::parse();

env::set_var(
OVERRIDE_EXP_CACHE,
format!(
"{},{}",
Experiment::SPEC_CHECK,
Experiment::REFERENCE_SAFETY
),
);
env::set_var("MOVE_COMPILER_EXP", DISABLE_SPEC_CHECK);
match args.cmd {
Cmd::Dump {
endpoint,
Expand Down Expand Up @@ -129,6 +146,7 @@ async fn main() -> Result<()> {
skip_failed_txns,
skip_publish_txns,
execution_mode,
skip_ref_packages,
} => {
let batch_size = BATCH_SIZE;
let output = if let Some(path) = output_path {
Expand All @@ -148,20 +166,23 @@ async fn main() -> Result<()> {
skip_publish_txns,
execution_mode.unwrap_or_default(),
endpoint,
skip_ref_packages,
)?;
online.execute(args.begin_version, args.limit).await?;
},
Cmd::Execute {
input_path,
execution_mode,
skip_ref_packages,
} => {
let input = if let Some(path) = input_path {
path
} else {
PathBuf::from(".")
};
prepare_aptos_packages(input.join(APTOS_COMMONS)).await;
let executor = Execution::new(input, execution_mode.unwrap_or_default());
let executor =
Execution::new(input, execution_mode.unwrap_or_default(), skip_ref_packages);
executor
.execute_txns(args.begin_version, args.limit)
.await?;
Expand Down
27 changes: 25 additions & 2 deletions aptos-move/aptos-e2e-comparison-testing/src/online_execution.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
use crate::{
compile_aptos_packages, dump_and_compile_from_package_metadata, is_aptos_package,
CompilationCache, ExecutionMode, IndexWriter, PackageInfo, TxnIndex, APTOS_COMMONS,
DISABLE_REF_CHECK, DISABLE_SPEC_CHECK, ENABLE_REF_CHECK,
};
use anyhow::Result;
use aptos_framework::natives::code::PackageMetadata;
Expand All @@ -14,6 +15,7 @@ use aptos_validator_interface::{AptosValidatorInterface, FilterCondition, RestDe
use move_core_types::account_address::AccountAddress;
use std::{
collections::HashMap,
env,
path::PathBuf,
sync::{Arc, Mutex},
};
Expand All @@ -26,6 +28,7 @@ pub struct OnlineExecutor {
filter_condition: FilterCondition,
execution_mode: ExecutionMode,
endpoint: String,
skip_ref_packages: Option<String>,
}

impl OnlineExecutor {
Expand All @@ -37,6 +40,7 @@ impl OnlineExecutor {
skip_publish_txns: bool,
execution_mode: ExecutionMode,
endpoint: String,
skip_ref_packages: Option<String>,
) -> Self {
Self {
debugger,
Expand All @@ -50,6 +54,7 @@ impl OnlineExecutor {
},
execution_mode,
endpoint,
skip_ref_packages,
}
}

Expand All @@ -61,6 +66,7 @@ impl OnlineExecutor {
skip_publish_txns: bool,
execution_mode: ExecutionMode,
endpoint: String,
skip_ref_packages: Option<String>,
) -> Result<Self> {
Ok(Self::new(
Arc::new(RestDebuggerInterface::new(rest_client)),
Expand All @@ -70,6 +76,7 @@ impl OnlineExecutor {
skip_publish_txns,
execution_mode,
endpoint,
skip_ref_packages,
))
}

Expand Down Expand Up @@ -176,10 +183,15 @@ impl OnlineExecutor {
let current_dir = self.current_dir.clone();
let execution_mode = self.execution_mode;
let endpoint = self.endpoint.clone();
let skip_ref_packages = self.skip_ref_packages.clone();

let txn_execution_thread = tokio::task::spawn_blocking(move || {
let executor = crate::Execution::new(current_dir.clone(), execution_mode);

println!("skip packages:{:?}", skip_ref_packages);
let executor = crate::Execution::new(
current_dir.clone(),
execution_mode,
skip_ref_packages,
);
let mut version_idx = TxnIndex {
version,
txn: txn.clone(),
Expand All @@ -188,6 +200,17 @@ impl OnlineExecutor {

// handle source code
if let Some((address, package_name, map)) = source_code_data {
if executor.check_package_skip(&package_name) {
env::set_var(
"MOVE_COMPILER_EXP",
format!("{},{}", DISABLE_SPEC_CHECK, DISABLE_REF_CHECK),
);
} else {
env::set_var(
"MOVE_COMPILER_EXP",
format!("{},{}", DISABLE_SPEC_CHECK, ENABLE_REF_CHECK),
);
}
let execution_mode_opt = Some(execution_mode);
let package_info_opt = Self::dump_and_check_src(
version,
Expand Down
Loading

0 comments on commit 2f9f5c2

Please sign in to comment.