some tidy fixes

Author: nagisa

compiler/rustc_target/src/spec/mod.rs

@@ -1764,7 +1764,6 @@ supported_targets! {
 
     ("bpfeb-unknown-none", bpfeb_unknown_none),
     ("bpfel-unknown-none", bpfel_unknown_none),
-    ("bpfel-unknown-unknown", bpfel_unknown_unknown),
     ("sbf-solana-solana", sbf_solana_solana),
     ("sbpf-solana-solana", sbpf_solana_solana),
     ("sbpfv0-solana-solana", sbpfv0_solana_solana),

library/compiler-builtins/ci/ci-util.py

@@ -40,14 +40,10 @@
 
             Note that `--extract` will overwrite files in `gungraun-home`.
 
-        check-regressions [--home iai-home] [--allow-pr-override pr_number]
-            Check `iai-home` (or `iai-home` if unspecified) for `summary.json`
-            files and see if there are any regressions. This is used as a workaround
-            for `iai-callgrind` not exiting with error status; see
-            <https://github.com/iai-callgrind/iai-callgrind/issues/337>.
-
-            If `--allow-pr-override` is specified, the regression check will not exit
-            with failure if any line in the PR starts with `allow-regressions`.
+        handle-bench-regressions PR_NUMBER
+            Exit with success if the pull request contains a line starting with
+            `ci: allow-regressions`, indicating that regressions in benchmarks should
+            be accepted. Otherwise, exit 1.
     """
 )
 
@@ -428,27 +424,22 @@ def locate_baseline(flags: list[str]) -> None:
     eprint("baseline extracted successfully")
 
 
-def check_iai_regressions(args: list[str]):
-    """Find regressions in iai summary.json files, exit with failure if any are
-    found.
-    """
+def handle_bench_regressions(args: list[str]):
+    """Exit with error unless the PR message contains an ignore directive."""
 
-    iai_home_str = "iai-home"
-    pr_number = None
+    match args:
+        case [pr_number]:
+            pr_number = pr_number
+        case _:
+            eprint(USAGE)
+            exit(1)
 
     pr = PrInfo.from_pr(pr_number)
     if pr.cfg.allow_regressions:
         eprint("PR allows regressions")
         return
 
-    eprint("Found regressions:", json.dumps(regressions, indent=4))
-
-    if pr_number is not None:
-        pr = PrInfo.load(pr_number)
-        if pr.contains_directive(REGRESSION_DIRECTIVE):
-            eprint("PR allows regressions, returning")
-            return
-
+    eprint("Regressions were found; benchmark failed")
     exit(1)
 
 
@@ -459,8 +450,8 @@ def main():
             ctx.emit_workflow_output()
         case ["locate-baseline", *flags]:
             locate_baseline(flags)
-        case ["check-regressions", *args]:
-            check_iai_regressions(args)
+        case ["handle-bench-regressions", *args]:
+            handle_bench_regressions(args)
         case ["--help" | "-h"]:
             print(USAGE)
             exit()

library/std/src/sys/pal/sbf/path.rs

@@ -611,8 +611,8 @@ impl Config {
             offload_clang_dir: llvm_clang_dir,
             polly: llvm_polly,
             clang: llvm_clang,
-            enable_warnings: llvm_enable_warnings,
             enable_projects: llvm_enable_projects,
+            enable_warnings: llvm_enable_warnings,
             download_ci_llvm: llvm_download_ci_llvm,
             build_config: llvm_build_config,
         } = toml.llvm.unwrap_or_default();
@@ -1377,8 +1377,8 @@ impl Config {
             llvm_clang_cl,
             llvm_clang_dir: llvm_clang_dir.map(PathBuf::from),
             llvm_cxxflags,
-            llvm_enable_warnings: llvm_enable_warnings.unwrap_or(false),
             llvm_enable_projects: llvm_enable_projects,
+            llvm_enable_warnings: llvm_enable_warnings.unwrap_or(false),
             llvm_enzyme: llvm_enzyme.unwrap_or(false),
             llvm_experimental_targets,
             llvm_from_ci,

library/std/src/sys/pal/sbf/thread.rs

@@ -1314,13 +1314,6 @@ impl Build {
             base.push("-fno-omit-frame-pointer".into());
         }
 
-        if &*target.triple == "bpfel-unknown-unknown" {
-            base.push("-Xclang".into());
-            base.push("-target-feature".into());
-            base.push("-Xclang".into());
-            base.push("+solana".into());
-        }
-
         if let Some(map_to) = self.debuginfo_map_to(which, RemapScheme::NonCompiler) {
             let map = format!("{}={}", self.src.display(), map_to);
             let cc = self.cc(target);

src/bootstrap/src/core/config/config.rs

@@ -119,7 +119,6 @@ ENV TARGETS=$TARGETS,armv8r-none-eabihf
 ENV TARGETS=$TARGETS,thumbv7neon-unknown-linux-gnueabihf
 ENV TARGETS=$TARGETS,armv7a-none-eabi
 ENV TARGETS=$TARGETS,armv7a-none-eabihf
-ENV TARGETS=$TARGETS,bpfel-unknown-unknown
 
 ENV CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft" \
     CFLAGS_arm_unknown_linux_musleabi="-march=armv6 -marm" \

src/bootstrap/src/lib.rs

@@ -115,6 +115,7 @@ fn arch_to_llvm_component(arch: &str) -> String {
         _ if arch.starts_with("mips") => "mips".into(),
         _ if arch.starts_with("powerpc") => "powerpc".into(),
         _ if arch.starts_with("riscv") => "riscv".into(),
+        _ if arch.starts_with("sbpf") => "sbf".into(),
         _ => arch.to_ascii_lowercase(),
     }
 }