Merge ab08c75 into bb2b6f6

.gitignore

@@ -17,3 +17,9 @@ yarn-error.log
 
 # tests/js/test.js is used for testing changes locally
 tests/js/test.js
+
+# Profiling
+*.string_data
+*.string_index
+*.events
+chrome_profiler.json 

.vscode/tasks.json

@@ -20,6 +20,24 @@
         "clear": true
       }
     },
+    {
+      "type": "process",
+      "label": "Cargo Run (Profiler)",
+      "command": "cargo",
+      "args": ["run", "--features", "Boa/profiler", "../tests/js/test.js"],
+      "problemMatcher": ["$rustc"],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "options": {
+        "env": { "RUST_BACKTRACE": "full" },
+        "cwd": "${workspaceFolder}/boa_cli"
+      },
+      "presentation": {
+        "clear": true
+      }
+    },
     {
       "type": "process",
       "label": "Get Tokens",

README.md

@@ -71,6 +71,10 @@ See [CHANGELOG.md](./CHANGELOG.md).
 - Run with `cargo run -- test.js` where `test.js` is an existing JS file.
 - If any JS doesn't work then it's a bug. Please raise an issue!
 
+## Profiling
+
+See [Profiling](./docs/profiling.md)
+
 ## Command-line Options
 
 ```

boa/Cargo.toml

@@ -10,6 +10,9 @@ license = "Unlicense/MIT"
 exclude = ["../.vscode/*", "../Dockerfile", "../Makefile", "../.editorConfig"]
 edition = "2018"
 
+[features]
+profiler = ["measureme", "once_cell"]
+
 [dependencies]
 gc = { version = "0.3.5", features = ["derive"] }
 serde_json = "1.0.53"
@@ -18,10 +21,12 @@ num-traits = "0.2.11"
 regex = "1.3.7"
 rustc-hash = "1.1.0"
 num-bigint = { version = "0.2.6", features = ["serde"] }
+bitflags = "1.2.1"
 
 # Optional Dependencies
 serde = { version = "1.0.110", features = ["derive"], optional = true }
-bitflags = "1.2.1"
+measureme = { version = "0.7.1", optional = true }
+once_cell = { version = "1.4.0", optional = true }
 
 [dev-dependencies]
 criterion = "0.3.2"

boa/src/builtins/array/mod.rs

@@ -20,6 +20,7 @@ use crate::{
         value::{same_value_zero, ResultValue, Value, ValueData},
     },
     exec::Interpreter,
+    BoaProfiler,
 };
 use std::{
     borrow::Borrow,
@@ -1041,6 +1042,7 @@ impl Array {
     /// Initialise the `Array` object on the global object.
     #[inline]
     pub(crate) fn init(global: &Value) {
+        let _timer = BoaProfiler::global().start_event("array", "init");
         global.set_field("Array", Self::create(global));
     }
 }

boa/src/builtins/bigint/mod.rs

@@ -19,6 +19,7 @@ use crate::{
     },
     exec::Interpreter,
     syntax::ast::bigint::BigInt as AstBigInt,
+    BoaProfiler,
 };
 
 #[cfg(test)]
@@ -138,6 +139,7 @@ impl BigInt {
     /// Initialise the `BigInt` object on the global object.
     #[inline]
     pub(crate) fn init(global: &Value) {
+        let _timer = BoaProfiler::global().start_event("bigint", "init");
         global.set_field("BigInt", Self::create(global));
     }
 }

boa/src/builtins/boolean/mod.rs

@@ -19,6 +19,7 @@ use crate::{
         value::{ResultValue, Value, ValueData},
     },
     exec::Interpreter,
+    BoaProfiler,
 };
 use std::{borrow::Borrow, ops::Deref};
 
@@ -128,6 +129,7 @@ impl Boolean {
     /// Initialise the `Boolean` object on the global object.
     #[inline]
     pub(crate) fn init(global: &Value) {
+        let _timer = BoaProfiler::global().start_event("boolean", "init");
         global.set_field("Boolean", Self::create(global));
     }
 }

boa/src/builtins/console/mod.rs

@@ -23,6 +23,7 @@ use crate::{
         value::{display_obj, ResultValue, Value},
     },
     exec::Interpreter,
+    BoaProfiler,
 };
 use rustc_hash::FxHashMap;
 use std::time::SystemTime;
@@ -554,5 +555,6 @@ pub fn create(global: &Value) -> Value {
 /// Initialise the `console` object on the global object.
 #[inline]
 pub fn init(global: &Value) {
+    let _timer = BoaProfiler::global().start_event("console", "init");
     global.set_field("console", create(global));
 }

boa/src/builtins/error/mod.rs

@@ -17,6 +17,7 @@ use crate::{
         value::{ResultValue, Value},
     },
     exec::Interpreter,
+    profiler::BoaProfiler,
 };
 
 // mod eval;
@@ -81,6 +82,7 @@ impl Error {
 
     /// Initialise the global object with the `Error` object.
     pub(crate) fn init(global: &Value) {
+        let _timer = BoaProfiler::global().start_event("error", "init");
         global.set_field("Error", Self::create(global));
     }
 }

boa/src/builtins/error/range.rs

@@ -17,6 +17,7 @@ use crate::{
         value::{ResultValue, Value},
     },
     exec::Interpreter,
+    profiler::BoaProfiler,
 };
 
 /// JavaScript `RangeError` impleentation.
@@ -71,6 +72,7 @@ impl RangeError {
 
     /// Initialise the global object with the `RangeError` object.
     pub(crate) fn init(global: &Value) {
+        let _timer = BoaProfiler::global().start_event("rangeerror", "init");
         global.set_field("RangeError", Self::create(global));
     }
 }

boa/src/builtins/function/mod.rs

@@ -22,6 +22,7 @@ use crate::{
     environment::lexical_environment::{new_function_environment, Environment},
     exec::{Executable, Interpreter},
     syntax::ast::node::{FormalParameter, StatementList},
+    BoaProfiler,
 };
 use gc::{unsafe_empty_trace, Finalize, Trace};
 use std::fmt::{self, Debug};
@@ -142,6 +143,7 @@ impl Function {
     where
         P: Into<Box<[FormalParameter]>>,
     {
+        let _timer = BoaProfiler::global().start_event("function::builtin", "function");
         Self::new(
             parameter_list.into(),
             None,
@@ -163,6 +165,7 @@ impl Function {
         interpreter: &mut Interpreter,
         this_obj: &mut Value,
     ) -> ResultValue {
+        let _timer = BoaProfiler::global().start_event("function::call", "function");
         if self.callable {
             match self.body {
                 FunctionBody::BuiltIn(func) => func(this_obj, args_list, interpreter),
@@ -433,6 +436,9 @@ pub fn make_builtin_fn<N>(function: NativeFunctionData, name: N, parent: &Value,
 where
     N: Into<String>,
 {
+    let name_copy: String = name.into();
+    let label = format!("{}{}", String::from("make_builtin_fn: "), &name_copy);
+    let _timer = BoaProfiler::global().start_event(&label, "init");
     let func = Function::builtin(Vec::new(), function);
 
     let mut new_func = Object::function();
@@ -441,11 +447,12 @@ where
     let new_func_obj = Value::from(new_func);
     new_func_obj.set_field("length", length);
 
-    parent.set_field(name.into(), new_func_obj);
+    parent.set_field(Value::from(name_copy), new_func_obj);
 }
 
 /// Initialise the `Function` object on the global object.
 #[inline]
 pub fn init(global: &Value) {
+    let _timer = BoaProfiler::global().start_event("function", "init");
     global.set_field("Function", create(global));
 }

boa/src/builtins/json/mod.rs

@@ -19,7 +19,7 @@ use crate::builtins::{
     property::Property,
     value::{ResultValue, Value},
 };
-use crate::exec::Interpreter;
+use crate::{exec::Interpreter, BoaProfiler};
 use serde_json::{self, Value as JSONValue};
 
 #[cfg(test)]
@@ -174,5 +174,6 @@ pub fn create(global: &Value) -> Value {
 /// Initialise the `JSON` object on the global object.
 #[inline]
 pub fn init(global: &Value) {
+    let _timer = BoaProfiler::global().start_event("json", "init");
     global.set_field("JSON", create(global));
 }