M-Labs/nac3
M-Labs
/
nac3
8
0
Fork 10
Code Issues 98 Pull Requests 20 Releases Wiki Activity

nac3artiq: support ISA selection

This commit is contained in:
Sebastien Bourdeauducq 2021-09-29 15:33:12 +08:00
parent bfd041d361
commit dceaf42500
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nac3artiq/language.py
View File

@ -3,11 +3,13 @@ from functools import wraps
import nac3artiq import nac3artiq
import device_db
__all__ = ["extern", "kernel"] __all__ = ["extern", "kernel"]
nac3 = nac3artiq.NAC3() nac3 = nac3artiq.NAC3(device_db.device_db["core"]["arguments"]["target"])
allow_module_registration = True allow_module_registration = True

29
nac3artiq/src/lib.rs
View File

@ -24,10 +24,17 @@ use nac3core::{
mod symbol_resolver; mod symbol_resolver;
use symbol_resolver::*; use symbol_resolver::*;
#[derive(Clone, Copy)]
enum Isa {
RiscV,
CortexA9
}
// TODO: do we really want unsendable? // TODO: do we really want unsendable?
// TopLevelComposer causes a lot of problems for Send. // TopLevelComposer causes a lot of problems for Send.
#[pyclass(unsendable,name="NAC3")] #[pyclass(unsendable,name="NAC3")]
struct Nac3 { struct Nac3 {
isa: Isa,
primitive: PrimitiveStore, primitive: PrimitiveStore,
internal_resolver: Arc<ResolverInternal>, internal_resolver: Arc<ResolverInternal>,
resolver: Arc<Box<dyn SymbolResolver + Send + Sync>>, resolver: Arc<Box<dyn SymbolResolver + Send + Sync>>,
@ -39,7 +46,12 @@ struct Nac3 {
#[pymethods] #[pymethods]
impl Nac3 { impl Nac3 {
#[new] #[new]
fn new() -> Self { fn new(isa: &str) -> PyResult<Self> {
let isa = match isa {
"riscv" => Isa::RiscV,
"cortexa9" => Isa::CortexA9,
_ => return Err(exceptions::PyValueError::new_err("invalid ISA"))
};
let primitive: PrimitiveStore = TopLevelComposer::make_primitives().0; let primitive: PrimitiveStore = TopLevelComposer::make_primitives().0;
let (composer, builtins_def, builtins_ty) = TopLevelComposer::new(vec![ let (composer, builtins_def, builtins_ty) = TopLevelComposer::new(vec![
("output_int".into(), FunSignature { ("output_int".into(), FunSignature {
@ -60,14 +72,15 @@ impl Nac3 {
let resolver = Arc::new( let resolver = Arc::new(
Box::new(Resolver(internal_resolver.clone())) as Box<dyn SymbolResolver + Send + Sync> Box::new(Resolver(internal_resolver.clone())) as Box<dyn SymbolResolver + Send + Sync>
); );
Nac3 { Ok(Nac3 {
isa,
primitive, primitive,
internal_resolver, internal_resolver,
resolver, resolver,
composer, composer,
top_level: None, top_level: None,
registered_module_ids: HashSet::new() registered_module_ids: HashSet::new()
} })
} }
fn register_module(&mut self, obj: PyObject) -> PyResult<()> { fn register_module(&mut self, obj: PyObject) -> PyResult<()> {
@ -175,6 +188,7 @@ impl Nac3 {
unifier: top_level.unifiers.read()[instance.unifier_id].clone(), unifier: top_level.unifiers.read()[instance.unifier_id].clone(),
calls: instance.calls, calls: instance.calls,
}; };
let isa = self.isa;
let f = Arc::new(WithCall::new(Box::new(move |module| { let f = Arc::new(WithCall::new(Box::new(move |module| {
let builder = PassManagerBuilder::create(); let builder = PassManagerBuilder::create();
builder.set_optimization_level(OptimizationLevel::Aggressive); builder.set_optimization_level(OptimizationLevel::Aggressive);
@ -182,11 +196,10 @@ impl Nac3 {
builder.populate_module_pass_manager(&passes); builder.populate_module_pass_manager(&passes);
passes.run_on(module); passes.run_on(module);
// For RISC-V (needs https://git.m-labs.hk/M-Labs/nac3/issues/24) let (triple, features) = match isa {
//let triple = TargetTriple::create("riscv32-unknown-linux"); Isa::RiscV => (TargetTriple::create("riscv32-unknown-linux"), "+a,+m"),
//let features = "+a,+m"; Isa::CortexA9 => (TargetTriple::create("armv7-unknown-linux-gnueabihf"), "+dsp,+fp16,+neon,+vfp3"),
let triple = TargetTriple::create("armv7-unknown-linux-gnueabihf"); };
let features = "+dsp,+fp16,+neon,+vfp3";
let target = let target =
Target::from_triple(&triple).expect("couldn't create target from target triple"); Target::from_triple(&triple).expect("couldn't create target from target triple");
let target_machine = target let target_machine = target