Merge pull request #694 from Mark-Simulacrum/reduce-further

Reduce runtime further

Author: Mark-Simulacrum

collector/benchmarks/ripgrep/build.rs

@@ -18,6 +18,7 @@ use app::{RGArg, RGArgKind};
 mod app;
 
 fn main() {
+    println!("cargo:rerun-if-changed=build.rs");
     // OUT_DIR is set by Cargo and it's where any additional build artifacts
     // are written.
     let outdir = match env::var_os("OUT_DIR") {
@@ -26,7 +27,8 @@ fn main() {
             eprintln!(
                 "OUT_DIR environment variable not defined. \
                  Please file a bug: \
-                 https://github.com/BurntSushi/ripgrep/issues/new");
+                 https://github.com/BurntSushi/ripgrep/issues/new"
+            );
             process::exit(1);
         }
     };
@@ -95,8 +97,10 @@ fn generate_man_page<P: AsRef<Path>>(outdir: P) -> io::Result<()> {
     File::create(&txt_path)?.write_all(tpl.as_bytes())?;
     let result = process::Command::new("a2x")
         .arg("--no-xmllint")
-        .arg("--doctype").arg("manpage")
-        .arg("--format").arg("manpage")
+        .arg("--doctype")
+        .arg("manpage")
+        .arg("--format")
+        .arg("manpage")
         .arg(&txt_path)
         .spawn()?
         .wait()?;
@@ -119,7 +123,7 @@ fn formatted_options() -> io::Result<String> {
         // ripgrep only has two positional arguments, and probably will only
         // ever have two positional arguments, so we just hardcode them into
         // the template.
-        if let app::RGArgKind::Positional{..} = arg.kind {
+        if let app::RGArgKind::Positional { .. } = arg.kind {
             continue;
         }
         formatted.push(formatted_arg(&arg)?);
@@ -129,8 +133,12 @@ fn formatted_options() -> io::Result<String> {
 
 fn formatted_arg(arg: &RGArg) -> io::Result<String> {
     match arg.kind {
-        RGArgKind::Positional{..} => panic!("unexpected positional argument"),
-        RGArgKind::Switch { long, short, multiple } => {
+        RGArgKind::Positional { .. } => panic!("unexpected positional argument"),
+        RGArgKind::Switch {
+            long,
+            short,
+            multiple,
+        } => {
             let mut out = vec![];
 
             let mut header = format!("--{}", long);
@@ -147,7 +155,13 @@ fn formatted_arg(arg: &RGArg) -> io::Result<String> {
 
             Ok(String::from_utf8(out).unwrap())
         }
-        RGArgKind::Flag { long, short, value_name, multiple, .. } => {
+        RGArgKind::Flag {
+            long,
+            short,
+            value_name,
+            multiple,
+            ..
+        } => {
             let mut out = vec![];
 
             let mut header = format!("--{}", long);

collector/benchmarks/script-servo-2/Cargo.lock

@@ -31,3 +31,6 @@ surfman = { git = "https://github.com/servo/surfman" }
 surfman-chains = { git = "https://github.com/asajeffrey/surfman-chains" }
 # https://github.com/retep998/winapi-rs/pull/816
 winapi = { git = "https://github.com/servo/winapi-rs", branch = "patch-1" }
+
+[patch."https://github.com/servo/rust-mozjs"]
+mozjs = { path = "./rust-mozjs" }

collector/benchmarks/script-servo-2/Cargo.toml

@@ -28,4 +28,5 @@ fn main() {
         .atoms(static_atoms.lines().map(Result::unwrap))
         .write_to_file(&Path::new(&env::var_os("OUT_DIR").unwrap()).join("atom.rs"))
         .unwrap();
+    println!("cargo:rerun-if-changed=build.rs");
 }

collector/benchmarks/script-servo-2/components/atoms/build.rs

@@ -8,6 +8,7 @@ use std::io::{Read, Write};
 use std::path::Path;
 
 fn main() {
+    println!("cargo:rerun-if-changed=build.rs");
     let lockfile_path = Path::new(&env::var("CARGO_MANIFEST_DIR").unwrap())
         .join("..")
         .join("..")

collector/benchmarks/script-servo-2/components/compositing/build.rs

@@ -3,6 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 fn main() {
+    println!("cargo:rerun-if-changed=build.rs");
     let version =
         std::env::var("DEP_OPENSSL_VERSION_NUMBER").expect("missing DEP_OPENSSL_VERSION_NUMBER");
     let actual = u64::from_str_radix(&version, 16).unwrap();

collector/benchmarks/script-servo-2/components/net/build.rs

@@ -44,6 +44,7 @@ fn main() {
         map.build(),
     )
     .unwrap();
+    println!("cargo:rerun-if-changed=build.rs");
 }
 
 #[derive(Eq, Hash, PartialEq)]

collector/benchmarks/script-servo-2/components/script/build.rs

@@ -0,0 +1,11 @@
+/doc
+/target
+/Cargo.lock
+
+# Keep this in sync with ignore() in build.rs
+
+*.pyc
+*.o
+*.so
+*.dll
+*.dylib

collector/benchmarks/script-servo-2/mozjs/.gitignore

@@ -0,0 +1,32 @@
+[package]
+name = "mozjs_sys"
+description = "System crate for the Mozilla SpiderMonkey JavaScript engine."
+repository = "https://github.com/servo/mozjs/"
+version = "0.68.1"
+authors = ["Mozilla"]
+license = "MPL-2.0"
+exclude = [
+  "mozjs/js/src/tests/**",
+  "mozjs/js/src/octane/**",
+  "mozjs/js/src/jit-test/**",
+  "mozjs/js/src/jsapi-tests/**",
+  "mozjs/js/src/doc/**",
+]
+
+[features]
+debugmozjs = []
+profilemozjs = []
+uwp = []
+jitspew = []
+
+[lib]
+name = "mozjs_sys"
+# The generated jsapi.rs contains #[doc] strings which look like
+# doctests but are definitely not.
+doctest = false
+
+[dependencies]
+encoding_c = "0.9.6"
+encoding_c_mem = "0.2.5"
+libc = "0.2"
+libz-sys = "1.0"

collector/benchmarks/script-servo-2/mozjs/Cargo.toml

@@ -0,0 +1,89 @@
+This repository contains Rust bindings for [SpiderMonkey][sm] for use with
+[Servo][s].
+
+[sm]: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
+[s]: https://servo.org/
+
+The bindings are to the raw SpiderMonkey API, higher-level bindings
+are in the [rust-mozjs repository][r-m].
+
+[r-m]: https://github.com/servo/rust-mozjs/
+
+Building
+========
+
+Under Linux:
+
+Install Clang (at least version 3.9) and autoconf v 2.13, for example in a Debian-based Linux:
+```
+sudo apt-get install clang-6.0 autoconf2.13
+
+```
+
+If you have more than one version of Clang installed, you can set the `LIBCLANG_PATH`
+environment variable, for example:
+```
+export LIBCLANG_PATH=/usr/lib/clang/4.0/lib
+```
+
+Under Windows:
+
+1. Follow the directions at
+   https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Build_Instructions/Windows_Prerequisites
+
+2. Open up a shell configured to use Visual Studio. This could be the
+   one included with Visual Studio (e.g. Visual Studio 2017 / X64 Native
+   Tools Command Prompt for VS 2017) or a shell in which you have run
+```
+"c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
+```
+
+3. Set the `MOZTOOLS_PATH` environment variable to point to the tools from the Mozilla Build Package:
+```
+set MOZTOOLS_PATH=C:\mozilla-build\msys\bin;C:\mozilla-build\bin
+```
+
+4. Download and install Clang for Windows (64 bit) from https://releases.llvm.org/download.html
+   and set the `LIBCLANG_PATH` environment variable to its `lib` directory:
+```
+set LIBCLANG_PATH=C:\Program Files\LLVM\lib
+```
+
+5. Set environment variables so the build script can find Python 2.7 and Autoconf 2.13:
+```
+set AUTOCONF=C:\mozilla-build\msys\local\bin\autoconf-2.13
+set NATIVE_WIN32_PYTHON=C:\mozilla-build\python\python2.7.exe
+```
+
+You can now build and test the crate using cargo:
+```
+cargo build
+cargo test
+cargo build --features debugmozjs
+cargo test --features debugmozjs
+```
+
+Upgrading
+=========
+
+In order to upgrade to a new version of SpiderMonkey:
+
+1. Find the mozilla-release commit for the desired version of SpiderMonkey, at
+   https://treeherder.mozilla.org/#/jobs?repo=mozilla-release&filter-searchStr=spidermonkey%20pkg.
+   You are looking for an SM(pkg) tagged with FIREFOX_RELEASE.
+   Take a note of the commit number to the left (a hex number such as ac4fbb7aaca0).
+
+2. Click on the SM(pkg) link, which will open a panel with details of the
+   commit, including an artefact uploaded link, with a name of the form
+   mozjs-*version*.tar.bz2. Download it and save it locally.
+
+3. Look at the patches in `etc/patches/*.patch`, and remove any that no longer apply
+   (with a bit of luck this will be all of them).
+
+4. Run `python3 ./etc/update.py path/to/tarball`.
+
+5. Update `etc/COMMIT` with the commit number.
+
+6. Build and test the bindings as above, then submit a PR!
+
+[bindgen]: https://github.com/servo/rust-bindgen