mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-09 14:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Store::default - create new store with BaseTunables

Browse Source
This commit is contained in:
Felix Schütt
2023-01-19 13:08:27 +01:00
parent b7c868e890
commit c61a5d7cf5
2 changed files with 6 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
lib/cli/src/commands/create_exe.rs
View File

@@ -2,7 +2,7 @@
use super::ObjectFormat;
use crate::common::normalize_path;
use crate::store::{CompilerOptions, CompilerType};
use crate::store::CompilerOptions;
use anyhow::{Context, Result};
use clap::Parser;
use serde::{Deserialize, Serialize};
@@ -224,22 +224,7 @@ impl CreateExe {
return Err(anyhow::anyhow!("input path cannot be a directory"));
}
let (_, ct) = self.compiler.get_store_for_target(target.clone())?;
let compiler_type = if self.compiler.singlepass {
CompilerType::Singlepass
} else if self.compiler.cranelift {
CompilerType::Cranelift
} else if self.compiler.llvm {
CompilerType::LLVM
} else {
ct // default compiler type
};
let engine = EngineBuilder::new(get_config(&compiler_type)?).engine();
let tunables = BaseTunables::for_target(engine.target());
let store = Store::new_with_tunables(&engine, tunables);
let (store, compiler_type) = self.compiler.get_store_for_target(target.clone())?;
println!("Compiler: {}", compiler_type.to_string());
println!("Target: {}", target.triple());
@@ -318,52 +303,6 @@ impl CreateExe {
}
}
fn get_config(
compiler: &CompilerType,
) -> Result<Box<dyn wasmer_compiler::CompilerConfig>, anyhow::Error> {
match compiler {
CompilerType::Cranelift => {
#[cfg(feature = "cranelift")]
{
Ok(Box::new(wasmer_compiler_cranelift::Cranelift::default()))
}
#[cfg(not(feature = "cranelift"))]
{
Err(anyhow::anyhow!(
"compiler \"cranelift\" not embedded in wasmer-cli"
))
}
}
CompilerType::Singlepass => {
#[cfg(feature = "singlepass")]
{
Ok(Box::new(wasmer_compiler_singlepass::Singlepass::default()))
}
#[cfg(not(feature = "singlepass"))]
{
Err(anyhow::anyhow!(
"compiler \"singlepass\" not embedded in wasmer-cli"
))
}
}
CompilerType::LLVM => {
#[cfg(feature = "llvm")]
{
Ok(Box::new(wasmer_compiler_llvm::LLVM::default()))
}
#[cfg(not(feature = "llvm"))]
{
Err(anyhow::anyhow!(
"compiler \"llvm\" not embedded in wasmer-cli"
))
}
}
CompilerType::Headless => Err(anyhow::anyhow!(
"cannot compile .wasm files to object files with compiler \"headless\""
)),
}
}
fn write_entrypoint(directory: &Path, entrypoint: &Entrypoint) -> Result<(), anyhow::Error> {
std::fs::write(
directory.join("entrypoint.json"),

6
lib/cli/src/store.rs
View File

@@ -105,7 +105,8 @@ impl CompilerOptions {
pub fn get_store_for_target(&self, target: Target) -> Result<(Store, CompilerType)> {
let (compiler_config, compiler_type) = self.get_compiler_config()?;
let engine = self.get_engine(target, compiler_config)?;
let store = Store::new(engine);
let tunables = BaseTunables::for_target(engine.target());
let store = Store::new_with_tunables(&engine, tunables);
Ok((store, compiler_type))
}
@@ -313,7 +314,8 @@ impl StoreOptions {
pub fn get_store_for_target(&self, target: Target) -> Result<(Store, CompilerType)> {
let (compiler_config, compiler_type) = self.compiler.get_compiler_config()?;
let engine = self.get_engine_with_compiler(target, compiler_config)?;
let store = Store::new(engine);
let tunables = BaseTunables::for_target(engine.target());
let store = Store::new_with_tunables(&engine, tunables);
Ok((store, compiler_type))
}