Try different profile format name

Author: Kobzol

src/bootstrap/llvm.rs

@@ -342,10 +342,10 @@ impl Step for Llvm {
                 cfg.define("LLVM_BUILD_INSTRUMENTED", "IR");
                 if let Ok(llvm_profile_dir) = std::env::var("LLVM_PROFILE_DIR") {
                     cfg.define("LLVM_PROFILE_DATA_DIR", llvm_profile_dir);
-                    cxxflags.push("-mllvm");
-                    cxxflags.push("-vp-counters-per-site=10");
                 }
             }
+            cxxflags.push("-mllvm");
+            cxxflags.push("-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

@@ -829,8 +829,8 @@ def execute_build_pipeline(timer: Timer, pipeline: Pipeline, runner: BenchmarkRu
                 pipeline.llvm_profile_merged_file_intermediate()
             ], env=dict(
                 LLVM_USE_CS_PGO="1",
-                LLVM_PROFILE_DIR=str(pipeline.llvm_profile_dir_root() / "prof-%p"),
-
+                LLVM_PROFILE_DIR=str(pipeline.llvm_profile_dir_root() / "%4m.profraw"),
+                # LLVM_PROFILE_DIR=str(pipeline.llvm_profile_dir_root() / "prof-%p"),
             ))
             record_metrics(pipeline, rustc_build)