Compare commits

...

6 Commits

Author SHA1 Message Date
David Mak 1bffdc739e WIP - More constants 2024-08-13 18:01:13 +08:00
David Mak 31d9324ff6 WIP - Constants 2024-08-13 17:58:21 +08:00
David Mak 75ac769df4 WIP - Constants 2024-08-13 17:58:21 +08:00
David Mak 07faed6779 WIP 2024-08-13 17:58:21 +08:00
David Mak 3e666af206 WIP 2024-08-13 17:58:19 +08:00
David Mak 9f0df625da WIP 2024-08-13 17:58:10 +08:00
1 changed files with 78 additions and 16 deletions

View File

@ -29,7 +29,10 @@ use pyo3::{
use crate::{symbol_resolver::InnerResolver, timeline::TimeFns};
use inkwell::types::BasicType;
use itertools::Itertools;
use nac3core::codegen::classes::{ArrayLikeIndexer, ArrayLikeValue, ArraySliceValue, NDArrayType};
use nac3core::codegen::llvm_intrinsics;
use std::{
collections::{hash_map::DefaultHasher, HashMap},
hash::{Hash, Hasher},
@ -428,7 +431,8 @@ fn gen_rpc_tag(
);
buffer.push(b'a');
buffer.push((ndarray_ndims & 0xFF) as u8);
buffer.push(1u8);
// buffer.push((ndarray_ndims & 0xFF) as u8);
gen_rpc_tag(ctx, ndarray_dtype, buffer)?;
}
_ => return Err(format!("Unsupported type: {:?}", ctx.unifier.stringify(ty))),
@ -444,10 +448,11 @@ fn rpc_codegen_callback_fn<'ctx>(
args: Vec<(Option<StrRef>, ValueEnum<'ctx>)>,
generator: &mut dyn CodeGenerator,
) -> Result<Option<BasicValueEnum<'ctx>>, String> {
let ptr_type = ctx.ctx.i8_type().ptr_type(AddressSpace::default());
let size_type = generator.get_size_type(ctx.ctx);
let int1 = ctx.ctx.bool_type();
let int8 = ctx.ctx.i8_type();
let int32 = ctx.ctx.i32_type();
let size_type = generator.get_size_type(ctx.ctx);
let ptr_type = int8.ptr_type(AddressSpace::default());
let tag_ptr_type = ctx.ctx.struct_type(&[ptr_type.into(), size_type.into()], false);
let service_id = int32.const_int(fun.1 .0 as u64, false);
@ -541,24 +546,81 @@ fn rpc_codegen_callback_fn<'ctx>(
let arg_slot =
generator.gen_var_alloc(ctx, arg.get_type(), Some(&format!("rpc.arg{i}"))).unwrap();
ctx.builder.build_store(arg_slot, *arg).unwrap();
let arg_slot = ctx
.builder
.build_bitcast(arg_slot, ptr_type, "rpc.arg")
.map(BasicValueEnum::into_pointer_value)
.unwrap();
let arg_slot = if matches!(&*ctx.unifier.get_ty_immutable(*arg_ty), TypeEnum::TObj { obj_id, .. } if *obj_id == PrimDef::NDArray.id())
{
unsafe {
ctx.builder
.build_in_bounds_gep(
arg_slot,
&[size_type.const_int(u64::from(size_type.get_bit_width() / 8), false)], // should be 4
"",
let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, *arg_ty);
let llvm_arg_ty =
NDArrayType::new(generator, ctx.ctx, ctx.get_llvm_type(generator, elem_ty));
let llvm_arg = NDArrayValue::from_ptr_val(arg.into_pointer_value(), size_type, None);
let llvm_usize_sizeof = ctx
.builder
.build_int_truncate_or_bit_cast(llvm_arg_ty.size_type().size_of(), int32, "")
.unwrap();
let llvm_elem_sizeof = ctx
.builder
.build_int_truncate_or_bit_cast(
llvm_arg_ty.element_type().size_of().unwrap(),
int32,
"",
)
.unwrap();
let dims_buf_sz =
ctx.builder.build_int_mul(llvm_arg.load_ndims(ctx), llvm_usize_sizeof, "").unwrap();
let data_buf_sz = ctx
.builder
.build_int_mul(
call_ndarray_calc_size(generator, ctx, &llvm_arg.dim_sizes(), (None, None)),
llvm_elem_sizeof,
"",
)
.unwrap();
let buffer_size = ctx.builder.build_int_add(dims_buf_sz, data_buf_sz, "").unwrap();
let buffer = ctx.builder.build_array_alloca(int8, buffer_size, "").unwrap();
let buffer = ArraySliceValue::from_ptr_val(buffer, buffer_size, None);
for (offset, byte) in
[1u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8].into_iter().enumerate()
{
let pbuffer = unsafe {
buffer.ptr_offset_unchecked(
ctx,
generator,
&size_type.const_int(offset as u64, false),
None,
)
.unwrap()
};
ctx.builder.build_store(pbuffer, int8.const_int(byte as u64, false)).unwrap();
}
// llvm_intrinsics::call_memcpy_generic(
// ctx,
// buffer.base_ptr(ctx, generator),
// llvm_arg.dim_sizes().base_ptr(ctx, generator),
// dims_buf_sz,
// int1.const_zero(),
// );
//
// let pbuffer_data_begin =
// unsafe { buffer.ptr_offset_unchecked(ctx, generator, &dims_buf_sz, None) };
// llvm_intrinsics::call_memcpy_generic(
// ctx,
// pbuffer_data_begin,
// llvm_arg.data().base_ptr(ctx, generator),
// data_buf_sz,
// int1.const_zero(),
// );
buffer.base_ptr(ctx, generator)
} else {
arg_slot
ctx.builder
.build_bitcast(arg_slot, ptr_type, "rpc.arg")
.map(BasicValueEnum::into_pointer_value)
.unwrap()
};
let arg_ptr = unsafe {
ctx.builder.build_gep(