forked from M-Labs/nac3
[artiq] codegen: Reimplement polymorphic_print for strided ndarray
Based on 2a6ee503
: artiq: reimplement polymorphic_print for ndarray
This commit is contained in:
parent
ddd16738a6
commit
f4c5038b95
@ -16,7 +16,6 @@ use super::{symbol_resolver::InnerResolver, timeline::TimeFns};
|
|||||||
use nac3core::{
|
use nac3core::{
|
||||||
codegen::{
|
codegen::{
|
||||||
expr::{destructure_range, gen_call},
|
expr::{destructure_range, gen_call},
|
||||||
irrt::ndarray::call_ndarray_calc_size,
|
|
||||||
llvm_intrinsics::{call_int_smax, call_memcpy, call_stackrestore, call_stacksave},
|
llvm_intrinsics::{call_int_smax, call_memcpy, call_stackrestore, call_stacksave},
|
||||||
stmt::{gen_block, gen_for_callback_incrementing, gen_if_callback, gen_with},
|
stmt::{gen_block, gen_for_callback_incrementing, gen_if_callback, gen_with},
|
||||||
type_aligned_alloca,
|
type_aligned_alloca,
|
||||||
@ -1339,57 +1338,50 @@ fn polymorphic_print<'ctx>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
TypeEnum::TObj { obj_id, .. } if *obj_id == PrimDef::NDArray.id() => {
|
TypeEnum::TObj { obj_id, .. } if *obj_id == PrimDef::NDArray.id() => {
|
||||||
let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, ty);
|
|
||||||
|
|
||||||
fmt.push_str("array([");
|
fmt.push_str("array([");
|
||||||
flush(ctx, generator, &mut fmt, &mut args);
|
flush(ctx, generator, &mut fmt, &mut args);
|
||||||
|
|
||||||
let val = NDArrayType::from_unifier_type(generator, ctx, ty)
|
let (dtype, _) = unpack_ndarray_var_tys(&mut ctx.unifier, ty);
|
||||||
|
let ndarray = NDArrayType::from_unifier_type(generator, ctx, ty)
|
||||||
.map_value(value.into_pointer_value(), None);
|
.map_value(value.into_pointer_value(), None);
|
||||||
let len = call_ndarray_calc_size(generator, ctx, &val.shape(), (None, None));
|
|
||||||
let last =
|
|
||||||
ctx.builder.build_int_sub(len, llvm_usize.const_int(1, false), "").unwrap();
|
|
||||||
|
|
||||||
gen_for_callback_incrementing(
|
let num_0 = llvm_usize.const_zero();
|
||||||
generator,
|
|
||||||
ctx,
|
|
||||||
None,
|
|
||||||
llvm_usize.const_zero(),
|
|
||||||
(len, false),
|
|
||||||
|generator, ctx, _, i| {
|
|
||||||
let elem = unsafe { val.data().get_unchecked(ctx, generator, &i, None) };
|
|
||||||
|
|
||||||
polymorphic_print(
|
// Print `ndarray` as a flat list delimited by interspersed with ", \0"
|
||||||
ctx,
|
ndarray.foreach(generator, ctx, |generator, ctx, _, hdl| {
|
||||||
generator,
|
let i = hdl.get_index(ctx);
|
||||||
&[(elem_ty, elem.into())],
|
let scalar = hdl.get_scalar(ctx);
|
||||||
"",
|
|
||||||
None,
|
|
||||||
true,
|
|
||||||
as_rtio,
|
|
||||||
)?;
|
|
||||||
|
|
||||||
|
// if (i != 0) puts(", ");
|
||||||
gen_if_callback(
|
gen_if_callback(
|
||||||
generator,
|
generator,
|
||||||
ctx,
|
ctx,
|
||||||
|_, ctx| {
|
|_, ctx| {
|
||||||
Ok(ctx
|
let not_first = ctx
|
||||||
.builder
|
.builder
|
||||||
.build_int_compare(IntPredicate::ULT, i, last, "")
|
.build_int_compare(IntPredicate::NE, i, num_0, "")
|
||||||
.unwrap())
|
.unwrap();
|
||||||
|
Ok(not_first)
|
||||||
},
|
},
|
||||||
|generator, ctx| {
|
|generator, ctx| {
|
||||||
printf(ctx, generator, ", \0".into(), Vec::default());
|
printf(ctx, generator, ", \0".into(), Vec::default());
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
},
|
},
|
||||||
|_, _| Ok(()),
|
|_, _| Ok(()),
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
Ok(())
|
// Print element
|
||||||
},
|
polymorphic_print(
|
||||||
llvm_usize.const_int(1, false),
|
ctx,
|
||||||
|
generator,
|
||||||
|
&[(dtype, scalar.into())],
|
||||||
|
"",
|
||||||
|
None,
|
||||||
|
true,
|
||||||
|
as_rtio,
|
||||||
)?;
|
)?;
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
|
||||||
fmt.push_str(")]");
|
fmt.push_str(")]");
|
||||||
flush(ctx, generator, &mut fmt, &mut args);
|
flush(ctx, generator, &mut fmt, &mut args);
|
||||||
|
Loading…
Reference in New Issue
Block a user