language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-02 16:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Wasm: load platform object file in tests and pass the bytes to the backend

Browse source
This commit is contained in:
Brian Carroll 2022-01-09 07:48:48 +00:00
parent 5d5e0eca96
commit fd79613f0d
2 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/gen_wasm/src/lib.rs
View file

@ -38,9 +38,10 @@ pub struct Env<'a> {
pub fn build_module<'a>(
env: &'a Env<'a>,
interns: &'a mut Interns,
platform_bytes: &[u8],
procedures: MutMap<(Symbol, ProcLayout<'a>), Proc<'a>>,
) -> Result<std::vec::Vec<u8>, String> {
let (wasm_module, _) = build_module_help(env, interns, procedures)?;
let (wasm_module, _) = build_module_help(env, interns, platform_bytes, procedures)?;
let mut buffer = std::vec::Vec::with_capacity(4096);
wasm_module.serialize(&mut buffer);
Ok(buffer)
@ -49,6 +50,7 @@ pub fn build_module<'a>(
pub fn build_module_help<'a>(
env: &'a Env<'a>,
interns: &'a mut Interns,
platform_bytes: &[u8],
procedures: MutMap<(Symbol, ProcLayout<'a>), Proc<'a>>,
) -> Result<(WasmModule<'a>, u32), String> {
let mut layout_ids = LayoutIds::default();

21
compiler/test_gen/src/helpers/wasm.rs
View file

@ -48,7 +48,10 @@ pub fn compile_and_load<'a, T: Wasm32TestResult>(
_test_wrapper_type_info: PhantomData<T>,
_test_type: TestType,
) -> wasmer::Instance {
let compiled_bytes = compile_roc_to_wasm_bytes(arena, src, stdlib, _test_wrapper_type_info);
let platform_bytes = load_platform_and_builtins();
let compiled_bytes =
compile_roc_to_wasm_bytes(arena, stdlib, &platform_bytes, src, _test_wrapper_type_info);
if DEBUG_LOG_SETTINGS.keep_test_binary {
let build_dir_hash = src_hash(src);
@ -58,6 +61,12 @@ pub fn compile_and_load<'a, T: Wasm32TestResult>(
load_bytes_into_runtime(compiled_bytes)
}
fn load_platform_and_builtins() -> std::vec::Vec<u8> {
let out_dir = std::env::var(OUT_DIR_VAR).unwrap();
let platform_path = Path::new(&out_dir).join([PLATFORM_FILENAME, "o"].join("."));
std::fs::read(&platform_path).unwrap()
}
fn src_hash(src: &str) -> u64 {
let mut hash_state = DefaultHasher::new();
src.hash(&mut hash_state);
@ -66,8 +75,9 @@ fn src_hash(src: &str) -> u64 {
fn compile_roc_to_wasm_bytes<'a, T: Wasm32TestResult>(
arena: &'a bumpalo::Bump,
src: &str,
stdlib: &'a roc_builtins::std::StdLib,
preload_bytes: &[u8],
src: &str,
_test_wrapper_type_info: PhantomData<T>,
) -> Vec<u8> {
let filename = PathBuf::from("Test.roc");
@ -119,7 +129,7 @@ fn compile_roc_to_wasm_bytes<'a, T: Wasm32TestResult>(
};
let (mut wasm_module, main_fn_index) =
roc_gen_wasm::build_module_help(&env, &mut interns, procedures).unwrap();
roc_gen_wasm::build_module_help(&env, &mut interns, platform_bytes, procedures).unwrap();
T::insert_test_wrapper(arena, &mut wasm_module, TEST_WRAPPER_NAME, main_fn_index);
@ -137,7 +147,10 @@ fn save_wasm_file(app_module_bytes: &[u8], build_dir_hash: u64) {
std::fs::create_dir_all(debug_dir_path).unwrap();
std::fs::write(&final_wasm_file, app_module_bytes).unwrap();
println!("Debug command:\n\twasm-objdump -dx {}", final_wasm_file.to_str().unwrap());
println!(
"Debug command:\n\twasm-objdump -dx {}",
final_wasm_file.to_str().unwrap()
);
}
fn load_bytes_into_runtime(bytes: Vec<u8>) -> wasmer::Instance {