perf(napi): optimize primitive functions

denoland · littledivy · Oct 7, 2022 · Oct 5, 2022 · Oct 7, 2022 · Oct 7, 2022
commit 3b612963942d77b8ba67f89aa243319fa894c8b0
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -159,6 +159,8 @@ opt-level = 3
 opt-level = 3
 [profile.release.package.deno_napi]
 opt-level = 3
+[profile.release.package.test_napi]
+opt-level = 3
 [profile.release.package.num-bigint-dig]
 opt-level = 3
 [profile.release.package.v8]

diff --git a/cli/bench/napi/bench.js b/cli/bench/napi/bench.js
@@ -0,0 +1,6 @@
+import { loadTestLibrary } from "../../../test_napi/common.js";
+
+const lib = loadTestLibrary();
+
+Deno.bench("warmup", () => {});
+Deno.bench("napi_get_undefined", () => lib.test_get_undefined(0));
diff --git a/cli/bench/napi/bench_node.mjs b/cli/bench/napi/bench_node.mjs
@@ -0,0 +1,10 @@
+import { run, bench } from "mitata";
+import { createRequire } from "module";
+
+const require = createRequire(import.meta.url);
+const lib = require("../../../test_napi.node");
+
+bench("warmup", () => {});
+bench("napi_get_undefined", () => lib.test_get_undefined(0));
+
+run();
diff --git a/cli/napi/js_native_api.rs b/cli/napi/js_native_api.rs
@@ -1324,9 +1324,9 @@ fn napi_get_boolean(
   result: *mut napi_value,
 ) -> Result {
   let env: &mut Env = env.as_mut().ok_or(Error::InvalidArg)?;
-  let value: v8::Local<v8::Value> =
-    v8::Boolean::new(&mut env.scope(), value).into();
-  *result = transmute::<v8::Local<v8::Value>, napi_value>(value);
+  *result = transmute::<v8::Local<v8::Value>, napi_value>(
+    v8::Boolean::new(env.isolate(), value).into(),
+  );
   Ok(())
 }
 
@@ -1511,9 +1511,9 @@ fn napi_get_new_target(
 #[napi_sym::napi_sym]
 fn napi_get_null(env: *mut Env, result: *mut napi_value) -> Result {
   let env: &mut Env = env.as_mut().ok_or(Error::InvalidArg)?;
-
-  let value: v8::Local<v8::Value> = v8::null(&mut env.scope()).into();
-  *result = transmute::<v8::Local<v8::Value>, napi_value>(value);
+  *result = transmute::<v8::Local<v8::Value>, napi_value>(
+    v8::null(env.isolate()).into(),
+  );
   Ok(())
 }
 
@@ -1603,8 +1603,9 @@ fn napi_get_typedarray_info(
 #[napi_sym::napi_sym]
 fn napi_get_undefined(env: *mut Env, result: *mut napi_value) -> Result {
   let env: &mut Env = env.as_mut().ok_or(Error::InvalidArg)?;
-  let value: v8::Local<v8::Value> = v8::undefined(&mut env.scope()).into();
-  *result = transmute::<v8::Local<v8::Value>, napi_value>(value);
+  *result = transmute::<v8::Local<v8::Value>, napi_value>(
+    v8::undefined(env.isolate()).into(),
+  );
   Ok(())
 }
 

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -33,7 +33,7 @@ serde_json = { version = "1.0.79", features = ["preserve_order"] }
 serde_v8 = { version = "0.64.0", path = "../serde_v8" }
 sourcemap = "6.1"
 url = { version = "2.3.1", features = ["serde", "expose_internals"] }
-v8 = { version = "0.51.0", default-features = false }
+v8 = { path = "../../rusty_v8", version = "0.51.0", default-features = false }
 
 [[example]]
 name = "http_bench_json_ops"

diff --git a/serde_v8/Cargo.toml b/serde_v8/Cargo.toml
@@ -18,7 +18,7 @@ derive_more = "0.99.17"
 serde = { version = "1.0.136", features = ["derive"] }
 serde_bytes = "0.11"
 smallvec = { version = "1.8", features = ["union"] }
-v8 = { version = "0.51.0", default-features = false }
+v8 = { path = "../../rusty_v8", version = "0.51.0", default-features = false }
 
 [dev-dependencies]
 bencher = "0.1"

diff --git a/serde_v8/ser.rs b/serde_v8/ser.rs
@@ -3,6 +3,7 @@ use serde::ser;
 use serde::ser::Serialize;
 
 use std::cell::RefCell;
+use std::ops::DerefMut;
 
 use crate::error::{Error, Result};
 use crate::keys::v8_struct_key;
@@ -435,11 +436,13 @@ impl<'a, 'b, 'c> ser::Serializer for Serializer<'a, 'b, 'c> {
   }
 
   fn serialize_f64(self, v: f64) -> JsResult<'a> {
-    Ok(v8::Number::new(&mut self.scope.borrow_mut(), v).into())
+    let scope = &mut self.scope.borrow_mut();
+    Ok(v8::Number::new(scope.deref_mut(), v).into())
   }
 
   fn serialize_bool(self, v: bool) -> JsResult<'a> {
-    Ok(v8::Boolean::new(&mut self.scope.borrow_mut(), v).into())
+    let scope = &mut self.scope.borrow_mut();
+    Ok(v8::Boolean::new(scope.deref_mut(), v).into())
   }
 
   fn serialize_char(self, v: char) -> JsResult<'a> {
@@ -464,19 +467,22 @@ impl<'a, 'b, 'c> ser::Serializer for Serializer<'a, 'b, 'c> {
   }
 
   fn serialize_none(self) -> JsResult<'a> {
-    Ok(v8::null(&mut self.scope.borrow_mut()).into())
+    let scope = &mut self.scope.borrow_mut();
+    Ok(v8::null(scope.deref_mut()).into())
   }
 
   fn serialize_some<T: ?Sized + Serialize>(self, value: &T) -> JsResult<'a> {
     value.serialize(self)
   }
 
   fn serialize_unit(self) -> JsResult<'a> {
-    Ok(v8::null(&mut self.scope.borrow_mut()).into())
+    let scope = &mut self.scope.borrow_mut();
+    Ok(v8::null(scope.deref_mut()).into())
   }
 
   fn serialize_unit_struct(self, _name: &'static str) -> JsResult<'a> {
-    Ok(v8::null(&mut self.scope.borrow_mut()).into())
+    let scope = &mut self.scope.borrow_mut();
+    Ok(v8::null(scope.deref_mut()).into())
   }
 
   /// For compatibility with serde-json, serialises unit variants as "Variant" strings.

diff --git a/test_napi/src/lib.rs b/test_napi/src/lib.rs
@@ -10,6 +10,7 @@ pub mod callback;
 pub mod coerce;
 pub mod numbers;
 pub mod object_wrap;
+pub mod primitives;
 pub mod promise;
 pub mod properties;
 pub mod strings;
@@ -67,6 +68,7 @@ unsafe extern "C" fn napi_register_module_v1(
   numbers::init(env, exports);
   typedarray::init(env, exports);
   array::init(env, exports);
+  primitives::init(env, exports);
   properties::init(env, exports);
   promise::init(env, exports);
   coerce::init(env, exports);

diff --git a/test_napi/src/primitives.rs b/test_napi/src/primitives.rs
@@ -0,0 +1,23 @@
+use napi_sys::*;
+use std::ptr;
+
+extern "C" fn test_get_undefined(
+  env: napi_env,
+  _: napi_callback_info,
+) -> napi_value {
+  let mut result = ptr::null_mut();
+  unsafe { napi_get_undefined(env, &mut result) };
+  result
+}
+
+pub fn init(env: napi_env, exports: napi_value) {
+  let properties = &[crate::new_property!(
+    env,
+    "test_get_undefined\0",
+    test_get_undefined
+  )];
+
+  unsafe {
+    napi_define_properties(env, exports, properties.len(), properties.as_ptr())
+  };
+}