Merge branch 'master' into ripgrep-remove

Author: rylev

ci/check-profiling.sh

@@ -129,7 +129,7 @@ test   -f results/eprintln-Test-helloworld-Check-Full
 test ! -s results/eprintln-Test-helloworld-Check-Full
 
 # llvm-lines. `Debug` not `Check` because it doesn't support `Check` profiles.
-# Including both `helloworld` and `regex` benchmarks, as they exercise the
+# Including both `helloworld` and `regex-1.5.5` benchmarks, as they exercise the
 # zero dependency and the greater than zero dependency cases, respectively, the
 # latter of which has broken before.
 RUST_BACKTRACE=1 RUST_LOG=raw_cargo_messages=trace,collector=debug,rust_sysroot=debug \
@@ -138,12 +138,12 @@ RUST_BACKTRACE=1 RUST_LOG=raw_cargo_messages=trace,collector=debug,rust_sysroot=
         --id Test \
         --profiles Debug \
         --cargo $bindir/cargo \
-        --include helloworld,regex \
+        --include helloworld,regex-1.5.5 \
         --scenarios Full
 test -f results/ll-Test-helloworld-Debug-Full
 grep -q "Lines.*Copies.*Function name" results/ll-Test-helloworld-Debug-Full
-test -f results/ll-Test-regex-Debug-Full
-grep -q "Lines.*Copies.*Function name" results/ll-Test-regex-Debug-Full
+test -f results/ll-Test-regex-1.5.5-Debug-Full
+grep -q "Lines.*Copies.*Function name" results/ll-Test-regex-1.5.5-Debug-Full
 
 
 #----------------------------------------------------------------------------

collector/README.md

@@ -189,14 +189,14 @@ Finally, while most of the options you can pass to the collector are supported,
 the profilers used in the `profile_local` command are not. In Windows, the only currently supported
 profiler is the `self-profiler`.
 
-As a complete example, let's run just the `regex` benchmark in the `Debug`
+As a complete example, let's run just the `regex-1.5.5` benchmark in the `Debug`
 profile with self-profiling results available:
 
 ```pwsh
 $env:XPERF="C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit\xperf.exe"
 $env:TRACELOG="C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\tracelog.exe"
-.\target\release\collector.exe bench_local $env:RUST_ORIGINAL --id Original --profiles Debug --include regex --self-profile
-.\target\release\collector.exe bench_local $env:RUST_MODIFIED --id Modified --profiles Debug --include regex --self-profile
+.\target\release\collector.exe bench_local $env:RUST_ORIGINAL --id Original --profiles Debug --include regex-1.5.5 --self-profile
+.\target\release\collector.exe bench_local $env:RUST_MODIFIED --id Modified --profiles Debug --include regex-1.5.5 --self-profile
 .\target\release\site.exe .\results.db
 ```
 

collector/benchmarks/README.md

@@ -17,6 +17,11 @@ They mostly consist of real-world crates.
 
 - **cargo-0.60.0**: The Rust package manager. A large program, and an important
   one in the Rust ecosystem.
+- **clap-3.1.6**: A command line argument parser. A crate used by many Rust
+  programs.
+- **image-0.24.1**: Basic image processing functions and methods for 
+  converting to and from various image formats. Used often in graphics 
+  programming.
 - **clap-rs**: A command line argument parser. A crate used by many Rust
   programs.
 - **cranelift-codegen**: The largest crate from a code generator. Used by
@@ -33,6 +38,7 @@ They mostly consist of real-world crates.
   many Rust programs.
 - **piston-image**: A modular game engine. An interesting Rust program.
 - **regex**: A regular expression parser. Used by many Rust programs.
+- **regex-1.5.5**: A regular expression parser. Used by many Rust programs.
 - **ripgrep-13.0.0**: A line-oriented search tool. A widely-used utility.
 - **serde**: A serialization/deserialization crate. Used by many other
   Rust programs.
@@ -134,7 +140,7 @@ Rust code being written today.
 - **inflate**: An old implementation of the DEFLATE algorithm. Contains
   a very large function containing many locals and basic blocks, similar to
   `keccak` but less extreme.
-- **regex**: See above.
+- **regex**: See above. This is an older version of the crate.
 - **piston-image**: See above.
 - **style-servo**: An old version of Servo's `style` crate. A large crate, and
   one used by old versions of Firefox.

collector/benchmarks/clap-3.1.6/.cargo_vcs_info.json

@@ -0,0 +1,6 @@
+{
+  "git": {
+    "sha1": "e702f42e5ec416b477dfc8f71d8caef3a3dff923"
+  },
+  "path_in_vcs": ""
+}

collector/benchmarks/clap-3.1.6/0-println.patch

@@ -0,0 +1,13 @@
+diff --git a/src/output/usage.rs b/src/output/usage.rs
+index 45cfa746..5e6431ce 100644
+--- a/src/output/usage.rs
++++ b/src/output/usage.rs
+@@ -15,6 +15,7 @@ pub(crate) struct Usage<'help, 'cmd> {
+ 
+ impl<'help, 'cmd> Usage<'help, 'cmd> {
+     pub(crate) fn new(cmd: &'cmd Command<'help>) -> Self {
++        println!("testing!");
+         Usage {
+             cmd,
+             required: None,
+