Use more PGO counters

Author: Kobzol

src/bootstrap/llvm.rs

@@ -344,6 +344,7 @@ impl Step for Llvm {
                     cfg.define("LLVM_PROFILE_DATA_DIR", llvm_profile_dir);
                 }
             }
+            cfg.define("LLVM_VP_COUNTERS_PER_SITE", "10");
             cfg.define("LLVM_BUILD_RUNTIME", "No");
         }
         if let Some(path) = builder.config.llvm_profile_use.as_ref() {

src/ci/stage-build.py

@@ -822,7 +822,7 @@ def execute_build_pipeline(timer: Timer, pipeline: Pipeline, runner: BenchmarkRu
 
     # Stage 1b: Build rustc + CS PGO instrumented LLVM
     with timer.section("Stage 1b (LLVM CS PGO)") as stage1b:
-        with stage1.section("Build rustc and LLVM") as rustc_build:
+        with stage1b.section("Build rustc and LLVM") as rustc_build:
             build_rustc(pipeline, args=[
                 "--llvm-profile-generate",
                 "--llvm-profile-use",