abdul124
/
nac3
forked from M-Labs/nac3
1
0
Fork 0
Code Pull Requests Activity

core: fix new irrt ndarray issues

This commit is contained in:
lyken 2024-07-14 23:40:19 +08:00
parent d92cccb85e
commit 0cc7e41c6f
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nac3core/src/codegen/irrt/numpy/ndarray.rs
View File

@ -204,7 +204,7 @@ fn call_nac3_ndarray_set_strides_by_shape<'ctx, G: CodeGenerator + ?Sized>(
FunctionBuilder::begin( FunctionBuilder::begin(
ctx, ctx,
&get_sized_dependent_function_name(sizet, "__nac3_ndarray_util_assert_shape_no_negative"), &get_sized_dependent_function_name(sizet, "__nac3_ndarray_set_strides_by_shape"),
) )
.arg("ndarray", &PointerModel(StructModel(NpArray { sizet })), ndarray_ptr) .arg("ndarray", &PointerModel(StructModel(NpArray { sizet })), ndarray_ptr)
.returning_void(); .returning_void();
@ -217,12 +217,9 @@ fn call_nac3_ndarray_nbytes<'ctx, G: CodeGenerator + ?Sized>(
) -> Int<'ctx> { ) -> Int<'ctx> {
let sizet = IntModel(generator.get_size_type(ctx.ctx)); let sizet = IntModel(generator.get_size_type(ctx.ctx));
FunctionBuilder::begin( FunctionBuilder::begin(ctx, &get_sized_dependent_function_name(sizet, "__nac3_ndarray_nbytes"))
ctx, .arg("ndarray", &PointerModel(StructModel(NpArray { sizet })), ndarray_ptr)
&get_sized_dependent_function_name(sizet, "__nac3_ndarray_util_assert_shape_no_negative"), .returning("nbytes", &sizet)
)
.arg("ndarray", &PointerModel(StructModel(NpArray { sizet })), ndarray_ptr)
.returning("nbytes", &sizet)
} }
pub fn call_nac3_ndarray_fill_generic<'ctx, G: CodeGenerator + ?Sized>( pub fn call_nac3_ndarray_fill_generic<'ctx, G: CodeGenerator + ?Sized>(

12
nac3core/src/codegen/model/pointer.rs
View File

@ -77,4 +77,16 @@ impl<'ctx> OpaquePointer<'ctx> {
pub fn store(&self, ctx: &CodeGenContext<'ctx, '_>, value: BasicValueEnum<'ctx>) { pub fn store(&self, ctx: &CodeGenContext<'ctx, '_>, value: BasicValueEnum<'ctx>) {
ctx.builder.build_store(self.0, value).unwrap(); ctx.builder.build_store(self.0, value).unwrap();
} }
pub fn from_ptr(ctx: &CodeGenContext<'ctx, '_>, ptr: PointerValue<'ctx>) -> Self {
let ptr = ctx
.builder
.build_pointer_cast(
ptr,
ctx.ctx.i8_type().ptr_type(AddressSpace::default()),
"opaque.from_ptr",
)
.unwrap();
OpaquePointer(ptr)
}
} }

13
nac3core/src/codegen/numpy_new.rs
View File

@ -55,9 +55,16 @@ where
let ndarray_ptr = call_ndarray_empty_impl(generator, ctx, elem_ty, shape, shape_ty, name)?; let ndarray_ptr = call_ndarray_empty_impl(generator, ctx, elem_ty, shape, shape_ty, name)?;
// NOTE: fill_value's type is not checked!! so be careful with logics // NOTE: fill_value's type is not checked!! so be careful with logics
let fill_value_ptr =
OpaquePointer(ctx.builder.build_alloca(fill_value.get_type(), "fill_value_ptr").unwrap()); // Allocate fill_value on the stack and give the corresponding stack pointer
fill_value_ptr.store(ctx, fill_value); // to call_nac3_ndarray_fill_generic
let fill_value_ptr = ctx.builder.build_alloca(fill_value.get_type(), "fill_value_ptr").unwrap();
ctx.builder.build_store(fill_value_ptr, fill_value).unwrap();
// Opaque-ize fill_value_ptr (turning it into `i8*`) before passing
// to call_nac3_ndarray_fill_generic
let fill_value_ptr = OpaquePointer::from_ptr(ctx, fill_value_ptr);
call_nac3_ndarray_fill_generic(generator, ctx, &ndarray_ptr, &fill_value_ptr); call_nac3_ndarray_fill_generic(generator, ctx, &ndarray_ptr, &fill_value_ptr);
Ok(ndarray_ptr) Ok(ndarray_ptr)