Auto merge of #112049 - Kobzol:pgo-omit-benchmarks, r=<try>

[do not merge] CI experiments

Various CI experiments for try/dist builds.

r? `@ghost`

Author: rust-bors[bot]

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -2954,53 +2954,49 @@ fn add_static_crate(
     let name = &name[3..name.len() - 5]; // chop off lib/.rlib
     let bundled_lib_file_names = bundled_lib_file_names.clone();
 
-    sess.prof.generic_activity_with_arg("link_altering_rlib", name).run(|| {
-        let canonical_name = name.replace('-', "_");
-        let upstream_rust_objects_already_included =
-            are_upstream_rust_objects_already_included(sess);
-        let is_builtins =
-            sess.target.no_builtins || !codegen_results.crate_info.is_no_builtins.contains(&cnum);
-
-        let mut archive = archive_builder_builder.new_archive_builder(sess);
-        if let Err(error) = archive.add_archive(
-            cratepath,
-            Box::new(move |f| {
-                if f == METADATA_FILENAME {
-                    return true;
-                }
+    let canonical_name = name.replace('-', "_");
+    let upstream_rust_objects_already_included = are_upstream_rust_objects_already_included(sess);
+    let is_builtins =
+        sess.target.no_builtins || !codegen_results.crate_info.is_no_builtins.contains(&cnum);
+
+    let mut archive = archive_builder_builder.new_archive_builder(sess);
+    if let Err(error) = archive.add_archive(
+        cratepath,
+        Box::new(move |f| {
+            if f == METADATA_FILENAME {
+                return true;
+            }
 
-                let canonical = f.replace('-', "_");
+            let canonical = f.replace('-', "_");
 
-                let is_rust_object =
-                    canonical.starts_with(&canonical_name) && looks_like_rust_object_file(f);
+            let is_rust_object =
+                canonical.starts_with(&canonical_name) && looks_like_rust_object_file(f);
 
-                // If we're performing LTO and this is a rust-generated object
-                // file, then we don't need the object file as it's part of the
-                // LTO module. Note that `#![no_builtins]` is excluded from LTO,
-                // though, so we let that object file slide.
-                if upstream_rust_objects_already_included && is_rust_object && is_builtins {
-                    return true;
-                }
+            // If we're performing LTO and this is a rust-generated object
+            // file, then we don't need the object file as it's part of the
+            // LTO module. Note that `#![no_builtins]` is excluded from LTO,
+            // though, so we let that object file slide.
+            if upstream_rust_objects_already_included && is_rust_object && is_builtins {
+                return true;
+            }
 
-                // We skip native libraries because:
-                // 1. This native libraries won't be used from the generated rlib,
-                //    so we can throw them away to avoid the copying work.
-                // 2. We can't allow it to be a single remaining entry in archive
-                //    as some linkers may complain on that.
-                if bundled_lib_file_names.contains(&Symbol::intern(f)) {
-                    return true;
-                }
+            // We skip native libraries because:
+            // 1. This native libraries won't be used from the generated rlib,
+            //    so we can throw them away to avoid the copying work.
+            // 2. We can't allow it to be a single remaining entry in archive
+            //    as some linkers may complain on that.
+            if bundled_lib_file_names.contains(&Symbol::intern(f)) {
+                return true;
+            }
 
-                false
-            }),
-        ) {
-            sess.dcx()
-                .emit_fatal(errors::RlibArchiveBuildFailure { path: cratepath.clone(), error });
-        }
-        if archive.build(&dst) {
-            link_upstream(&dst);
-        }
-    });
+            false
+        }),
+    ) {
+        sess.dcx().emit_fatal(errors::RlibArchiveBuildFailure { path: cratepath.clone(), error });
+    }
+    if archive.build(&dst) {
+        link_upstream(&dst);
+    }
 }
 
 // Same thing as above, but for dynamic crates instead of static crates.

compiler/rustc_codegen_ssa/src/back/write.rs

@@ -1789,7 +1789,7 @@ fn spawn_work<'a, B: ExtraBackendMethods>(
     work: WorkItem<B>,
 ) {
     if cgcx.config(work.module_kind()).time_module && llvm_start_time.is_none() {
-        *llvm_start_time = Some(cgcx.prof.verbose_generic_activity("LLVM_passes"));
+        *llvm_start_time = None;
     }
 
     let cgcx = cgcx.clone();