Change --skip-self-profile to --self-profile.

It makes more sense that way, especially in the docs.

Author: nnethercote

ci/check-benchmarks.sh

@@ -9,7 +9,6 @@ git clone https://github.com/rust-lang-nursery/rustc-timing.git;
 cargo build -p collector;
 RUST_BACKTRACE=1 RUST_LOG=collector=trace,rust_sysroot=debug \
     cargo run -p collector --bin collector -- \
-    --skip-self-profile \
     --output-repo rustc-timing \
     --exclude servo,cargo,crates.io,packed-simd,sentry-cli,tuple-stress test_benchmarks;
 code=$?

collector/README.md

@@ -94,6 +94,8 @@ depending on the speed of your machine.
 
 The following options, if present, must appear before `bench_local` in the
 command.
+- `--self-profile` can be used to do self-profiling, which requires the
+  `measureme` tool.
 - `--filter $STR` can be used to run a subset of the benchmarks. `$STR` is a
   substring of the name of the benchmark(s) you wish to run.
 - `--exclude $STR` is the inverse of `--filter`. `$STR` is a substring of the
@@ -196,7 +198,15 @@ might be optimized.
 
 ### Profiling local builds
 
-To profile local builds:
+To self-profile a local build:
+```
+RUST_LOG=info ./target/release/collector --output-repo $OUTPUT_DIR --self-profile \
+    bench_local $PROFILER --rustc $RUSTC --cargo $CARGO $ID
+```
+
+Then view the results the same way as for the `bench_local` subcommand.
+
+To profile a local build with a different profiler:
 ```
 RUST_LOG=info ./target/release/collector --output-repo $OUTPUT_DIR \
     profile $PROFILER --rustc $RUSTC --cargo $CARGO $ID

collector/src/bin/rustc-perf-collector/main.rs

@@ -289,7 +289,7 @@ fn bench_commit(
         assert!(
             has_measureme,
             "needs `summarize` in PATH for self profile.\n\
-             Pass --skip-self-profile` to opt out"
+             Omit --self-profile` to opt out"
         );
     }
 
@@ -298,7 +298,6 @@ fn bench_commit(
             continue;
         }
 
-        // Only collect self-profile if we have summarize in the path
         let mut processor = execute::MeasureProcessor::new(collect_self_profile);
         let result =
             benchmark.measure(&mut processor, build_kinds, run_kinds, compiler, iterations);
@@ -398,7 +397,7 @@ fn main_result() -> anyhow::Result<i32> {
        (@arg exclude: --exclude +takes_value "Ignore all benchmarks that contain this")
        (@arg sync_git: --("sync-git") "Synchronize repository with remote")
        (@arg output_repo: --("output-repo") +required +takes_value "Output repository/directory")
-       (@arg skip_self_profile: --("skip-self-profile") "Skip self-profile")
+       (@arg self_profile: --("self-profile") "Collect self-profile")
 
        (@subcommand bench_commit =>
            (about: "benchmark a bors merge from AWS")
@@ -456,7 +455,7 @@ fn main_result() -> anyhow::Result<i32> {
     let exclude = matches.value_of("exclude");
     let benchmarks = get_benchmarks(&benchmark_dir, filter, exclude)?;
     let use_remote = matches.is_present("sync_git");
-    let collect_self_profile = !matches.is_present("skip_self_profile");
+    let collect_self_profile = matches.is_present("self_profile");
 
     let get_out_dir = || {
         let path = PathBuf::from(matches.value_of_os("output_repo").unwrap());