Skip to content

Commit

Permalink
perf(ext/ffi): support Uint8Array in fast calls (denoland#15319)
Browse files Browse the repository at this point in the history
  • Loading branch information
littledivy committed Jul 27, 2022
1 parent 3d40eee commit fad8d7d
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 7 deletions.
26 changes: 22 additions & 4 deletions ext/ffi/jit_trampoline.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ fn native_arg_to_c(ty: &NativeType) -> &'static str {
NativeType::I64 => "int64_t",
NativeType::ISize => "intptr_t",
NativeType::USize => "uintptr_t",
NativeType::Pointer | NativeType::Function => "void*",
NativeType::Pointer => "struct FastApiTypedArray*",
NativeType::Function => "void*",
}
}

Expand Down Expand Up @@ -85,11 +86,15 @@ pub(crate) fn codegen(sym: &crate::Symbol) -> String {
c += ") {\n";
// return func(p0, p1, ...);
c += " return func(";
for (i, _) in sym.parameter_types.iter().enumerate() {
for (i, ty) in sym.parameter_types.iter().enumerate() {
if i > 0 {
c += ", ";
}
let _ = write!(c, "p{i}");
if matches!(ty, NativeType::Pointer) {
let _ = write!(c, "p{i}->data");
} else {
let _ = write!(c, "p{i}");
}
}
c += ");\n}\n\n";
c
Expand All @@ -103,7 +108,6 @@ pub(crate) fn gen_trampoline(
// SAFETY: symbol satisfies ABI requirement.
unsafe { ctx.add_symbol(cstr!("func"), sym.ptr.0 as *const c_void) };
let c = codegen(&sym);

ctx.compile_string(cstr!(c))?;
let alloc = Allocation {
addr: ctx.relocate_and_get_symbol(cstr!("func_trampoline"))?,
Expand Down Expand Up @@ -172,6 +176,20 @@ mod tests {
\n return func(p0, p1);\n\
}\n\n",
);
assert_codegen(
codegen(vec![NativeType::Pointer, NativeType::U32], NativeType::U32),
"extern uint32_t func(void* p0, uint32_t p1);\n\n\
uint32_t func_trampoline(void* recv, struct FastApiTypedArray* p0, uint32_t p1) {\
\n return func(p0->data, p1);\n\
}\n\n",
);
assert_codegen(
codegen(vec![NativeType::Pointer, NativeType::Pointer], NativeType::U32),
"extern uint32_t func(void* p0, void* p1);\n\n\
uint32_t func_trampoline(void* recv, struct FastApiTypedArray* p0, struct FastApiTypedArray* p1) {\
\n return func(p0->data, p1->data);\n\
}\n\n",
);
}

#[test]
Expand Down
5 changes: 2 additions & 3 deletions ext/ffi/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -746,9 +746,8 @@ impl From<&NativeType> for fast_api::Type {
NativeType::I64 => fast_api::Type::Int64,
NativeType::U64 => fast_api::Type::Uint64,
NativeType::ISize => fast_api::Type::Int64,
NativeType::USize | NativeType::Function | NativeType::Pointer => {
fast_api::Type::Uint64
}
NativeType::USize | NativeType::Function => fast_api::Type::Uint64,
NativeType::Pointer => fast_api::Type::TypedArray(fast_api::CType::Uint8),
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions ext/ffi/prelude.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,9 @@ typedef unsigned long int uint64_t;
/* Types for `void *' pointers. */
typedef long int intptr_t;
typedef unsigned long int uintptr_t;

// https://source.chromium.org/chromium/chromium/src/+/main:v8/include/v8-fast-api-calls.h;l=336
struct FastApiTypedArray {
uintptr_t length_;
void* data;
};
10 changes: 10 additions & 0 deletions test_ffi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,16 @@ pub extern "C" fn add_f64(a: f64, b: f64) -> f64 {
a + b
}

#[no_mangle]
unsafe extern "C" fn hash(ptr: *const u8, length: u32) -> u32 {
let buf = std::slice::from_raw_parts(ptr, length as usize);
let mut hash: u32 = 0;
for byte in buf {
hash = hash.wrapping_mul(0x10001000).wrapping_add(*byte as u32);
}
hash
}

#[no_mangle]
pub extern "C" fn sleep_blocking(ms: u64) {
let duration = Duration::from_millis(ms);
Expand Down
8 changes: 8 additions & 0 deletions test_ffi/tests/bench.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const libPath = `${targetDir}/${libPrefix}test_ffi.${libSuffix}`;
const dylib = Deno.dlopen(libPath, {
"nop": { parameters: [], result: "void" },
"add_u32": { parameters: ["u32", "u32"], result: "u32" },
"hash": { parameters: ["pointer", "u32"], result: "u32" },
"nop_u8": { parameters: ["u8"], result: "void" },
"nop_i8": { parameters: ["i8"], result: "void" },
"nop_u16": { parameters: ["u16"], result: "void" },
Expand Down Expand Up @@ -231,6 +232,13 @@ Deno.bench("add_u32()", () => {
add_u32(1, 2);
});

const bytes = new Uint8Array(64);

const { hash } = dylib.symbols;
Deno.bench("hash()", () => {
hash(bytes, bytes.byteLength);
});

const { nop_u8 } = dylib.symbols;
Deno.bench("nop_u8()", () => {
nop_u8(100);
Expand Down

0 comments on commit fad8d7d

Please sign in to comment.