about summary refs log tree commit diff
path: root/src/bootstrap
AgeCommit message (Collapse)AuthorLines
2024-06-20Auto merge of #124032 - Voultapher:a-new-sort, r=thomccbors-1/+1
Replace sort implementations This PR replaces the sort implementations with tailor-made ones that strike a balance of run-time, compile-time and binary-size, yielding run-time and compile-time improvements. Regressing binary-size for `slice::sort` while improving it for `slice::sort_unstable`. All while upholding the existing soft and hard safety guarantees, and even extending the soft guarantees, detecting strict weak ordering violations with a high chance and reporting it to users via a panic. * `slice::sort` -> driftsort [design document](https://github.com/Voultapher/sort-research-rs/blob/main/writeup/driftsort_introduction/text.md), includes detailed benchmarks and analysis. * `slice::sort_unstable` -> ipnsort [design document](https://github.com/Voultapher/sort-research-rs/blob/main/writeup/ipnsort_introduction/text.md), includes detailed benchmarks and analysis. #### Why should we change the sort implementations? In the [2023 Rust survey](https://blog.rust-lang.org/2024/02/19/2023-Rust-Annual-Survey-2023-results.html#challenges), one of the questions was: "In your opinion, how should work on the following aspects of Rust be prioritized?". The second place was "Runtime performance" and the third one "Compile Times". This PR aims to improve both. #### Why is this one big PR and not multiple? * The current documentation gives performance recommendations for `slice::sort` and `slice::sort_unstable`. If for example only one of them were to be changed, this advice would be misleading for some Rust versions. By replacing them atomically, the advice remains largely unchanged, and users don't have to change their code. * driftsort and ipnsort share a substantial part of their implementations. * The implementation of `select_nth_unstable` uses internals of `slice::sort_unstable`, which makes it impractical to split changes. --- This PR is a collaboration with `@orlp.`
2024-06-20Improve html-checker error messageLukas Bergdoll-1/+1
The previous message omits which of the dozens of tools called tidy is meant. And it's written in a way that one can easily miss the *not*, thinking it reads "Note that `tidy` is the in-tree `src/tools/tidy` but needs to be installed". The error message should hopefully help future contributors.
2024-06-20Appease `clippy`Jakub Beránek-14/+14
2024-06-20Remove unused importJakub Beránek-1/+1
2024-06-20Implement `run_cmd` in terms of `run_tracked`Jakub Beránek-72/+1
2024-06-20Remove `run_delaying_failure`Jakub Beránek-30/+32
2024-06-20Remove `run_quiet_delaying_failure`Jakub Beránek-13/+10
2024-06-20Remove `run_quiet`Jakub Beránek-14/+8
2024-06-20Implement new command execution logicJakub Beránek-2/+104
This function both handles error printing and early/late failures, but it also always returns the actual output of the command
2024-06-20bootstrap-rustdoc: use current stage if download-rustc enabledonur-ozkan-12/+11
When using download-rustc, using stage 1 rustdoc results in the wrong librustc_driver being used. ```sh $ ./build/host/stage1/bin/rustdoc --version ./build/host/stage1/bin/rustdoc: error while loading shared libraries: librustc_driver-7ff02ed05016d515.so: cannot open shared object file: No such file or directory ``` This change fixes that by not cutting the stage if download-rustc is enabled. Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-06-19ignore `llvm::Lld` step if `lld` is not enabledonur-ozkan-7/+9
People are having trouble when they don't want to build `lld` for their custom distribution tarballs even with `lld = false` in their config.toml. This is because it is not controlled by `lld_enabled` flag. This change ensures that `llvm:Lld` is controlled by lld configuration. Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-06-19patch an ELF file using `--add-rpath`DianQK-9/+4
2024-06-19patch `rust-lld` and `ld.lld` on NixOSDianQK-4/+4
2024-06-19Rollup merge of #126572 - onur-ozkan:channel-problem, r=clubby789León Orell Valerian Liehr-18/+23
override user defined channel when using precompiled rustc We need to override `rust.channel` if it's manually specified when using the CI rustc. This is because if the compiler uses a different channel than the one specified in config.toml, tests may fail due to using a different channel than the one used by the compiler during tests. For more context, see https://github.com/rust-lang/rust/pull/122709#issuecomment-2165246281.
2024-06-19Remove `src/tools/rust-demangler`Zalathar-177/+3
2024-06-18make codegen-backend config warning less noisyonur-ozkan-4/+10
If `codegen-backends` is missing "cranelift" and "gcc" (which is common), bootstrap will now only show this warning during `dist` and `install` steps, or if codegen-backends was explicitly called for build. Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-06-18replace `remove_dir` with `remove_dir_all` in `helpers::symlink_dir`onur-ozkan-1/+1
When using `symlink_dir`, it first removes the existing link with `remove_dir`. However, if the path isn't a link and contains files, `remove_dir` fails with "DirectoryNotEmpty", which causes the symbolic linking to fail as well. We have this problem on linking 'rustlib/rust' because it contains files as an actual directory. Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-06-17fix checking git submodules during a commit hookRalf Jung-20/+27
2024-06-17simplify `Builder::doc_rust_lang_org_channel`onur-ozkan-17/+6
This is already handled at the config parsing level, so we can simplify it. Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-06-17override user defined channel when using precompiled rustconur-ozkan-1/+17
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-06-17tidy: skip submodules if not present for non-CI environmentsonur-ozkan-27/+3
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-06-16Rollup merge of #126524 - klensy:bump-15-06-24, r=onur-ozkan许杰友 Jieyou Xu (Joe)-21/+9
bump few deps This bump deps to cut dupes: Updating html5ever 0.27 Updating derive_more 0.99.18 Updating crossbeam-deque v0.8.5 Updating crossbeam-epoch v0.9.18 Updating crossbeam-utils v0.8.20 Updating junction v1.1.0 No interesting changes in changelogs.
2024-06-16Rollup merge of #126309 - onur-ozkan:unify-git-utilization, r=KobzolJacob Pratt-95/+84
unify git command preperation Due to https://github.com/rust-lang/rust/issues/125954, we had to modify git invocations with certain flags in https://github.com/rust-lang/rust/pull/126255. However, because there are so many instances of `Command::new("git")` in bootstrap, it is difficult to apply these solutions to all of them. This PR creates a helper function that unifies the git usage in bootstrap. Meaning, whenever special flags or hacks are needed, we can apply them to this single function which makes things much simpler for the bootstrap team.
2024-06-16Auto merge of #126479 - Kobzol:disable-llvm-linker-by-default, r=onur-ozkanbors-7/+1
Disable `llvm-bitcode-linker` in the default bootstrap profiles I don't think that we really need to enable `llvm-bitcode-linker` in the default bootstrap profiles, since it seems that it is only useful for running `nvptx` tests. It should be enabled on CI, which it is, and that should be enough. People can enable it easily locally, if they want. The linker causes occasionally some rebuild issues (https://github.com/rust-lang/rust/issues/122491, https://github.com/rust-lang/rust/issues/126464), but more importantly it is just needless work to build it locally. I kept it enabled for `dist`, because it is distributed as a `rustup` component (for some reason it's not included in `extended`? not sure). Fixes: https://github.com/rust-lang/rust/issues/126464
2024-06-15bump few depsklensy-21/+9
2024-06-15Auto merge of #126518 - matthiaskrgr:rollup-wb70rzq, r=matthiaskrgrbors-132/+2
Rollup of 9 pull requests Successful merges: - #125829 (rustc_span: Add conveniences for working with span formats) - #126361 (Unify intrinsics body handling in StableMIR) - #126417 (Add `f16` and `f128` inline ASM support for `x86` and `x86-64`) - #126424 ( Also sort `crt-static` in `--print target-features` output) - #126428 (Polish `std::path::absolute` documentation.) - #126429 (Add `f16` and `f128` const eval for binary and unary operationations) - #126448 (End support for Python 3.8 in tidy) - #126488 (Use `std::path::absolute` in bootstrap) - #126511 (.mailmap: Associate both my work and my private email with me) r? `@ghost` `@rustbot` modify labels: rollup
2024-06-15Rollup merge of #126472 - onur-ozkan:improve-libcxx-build, r=KobzolMatthias Krüger-9/+22
build `libcxx-version` only when it doesn't exist In https://github.com/rust-lang/rust/issues/126423, it seems like c++ parsing takes quite amount of time on bootstrap startups. This PR makes libcxx-version to be compiled only when it doesn't exist. A simple demonstration on the overhead of buiding `libcxx-version`: ```sh $ rm -rf build/host/libcxx-version $ x build Building bootstrap Finished `dev` profile [unoptimized] target(s) in 0.07s ----- LIBCXX VERSION CHECK TOOK: 509ms Building tool rustdoc (stage1 -> stage2, x86_64-unknown-linux-gnu) Finished `release` profile [optimized] target(s) in 0.25s Build completed successfully in 0:00:02 $ x build Building bootstrap Finished `dev` profile [unoptimized] target(s) in 0.07s ----- LIBCXX VERSION CHECK TOOK: 2ms Creating a sysroot for stage2 compiler (use `rustup toolchain link 'name' build/host/stage2`) Building tool rustdoc (stage1 -> stage2, x86_64-unknown-linux-gnu) Finished `release` profile [optimized] target(s) in 0.14s Build completed successfully in 0:00:01 ```
2024-06-14Use `std::path::absolute` in bootstrapChris Denton-132/+2
2024-06-14Do not enable `llvm-bitcode-linker` in most default bootstrap profilesJakub Beránek-7/+1
2024-06-14fix rust bootstrap tests requiring a downloaded stage0Pietro Albini-1/+13
2024-06-14fix python bootstrap tests requiring a downloaded stage0Pietro Albini-0/+21
2024-06-14update libstdc++ compatibility error logonur-ozkan-0/+3
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-06-14build `libcxx-version` only when it doesn't existonur-ozkan-9/+19
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-06-14Rollup merge of #126399 - onur-ozkan:126156, r=albertlarsan68Matthias Krüger-13/+14
extend the check for LLVM build We don't build LLVM when using the precompiled version from the CI builder. Closes #126156
2024-06-13Rollup merge of #126238 - Nilstrieb:run,miri,run, r=RalfJungMatthias Krüger-3/+5
Fix Miri sysroot for `x run` Miri no longer (after https://github.com/rust-lang/miri/pull/3411) respects `MIRI_SYSROOT` and wants to be treated like a REAL rustc, with `--sysroot`. \*pats Miri\* sure Miri, just for you :3. fixes #126233 r? RalfJung (or whoever else feels like it)
2024-06-13Fix Miri sysroot for `x run`Nilstrieb-3/+5
Miri no longer respects `MIRI_SYSROOT` and wants to be treated like a REAL rustc, with `--sysroot`. *pats Miri* sure Miri, just for you :3.
2024-06-13fix bootstrap CI failureonur-ozkan-1/+1
Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-06-13extend the check for LLVM buildonur-ozkan-13/+14
We don't build LLVM when using the precompiled version from the CI builder. Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-06-12Auto merge of #126345 - compiler-errors:rollup-lue8u92, r=compiler-errorsbors-1/+3
Rollup of 8 pull requests Successful merges: - #125869 (Add `target_env = "p1"` to the `wasm32-wasip1` target) - #126019 (Add TODO comment to unsafe env modification) - #126036 (Migrate `run-make/short-ice` to `rmake`) - #126276 (Detect pub structs never constructed even though they impl pub trait with assoc constants) - #126282 (Ensure self-contained linker is only enabled on dev/nightly ) - #126317 (Avoid a bunch of booleans in favor of Result<(), ErrorGuaranteed> as that more robustly proves that an error has been emitted) - #126324 (Adjust LoongArch64 data layouts for LLVM update) - #126340 (Fix outdated predacates_of.rs comments) r? `@ghost` `@rustbot` modify labels: rollup
2024-06-12Add `x perf` command for profiling the compiler using `rustc-perf`Jakub Beránek-2/+61
2024-06-12Rollup merge of #126282 - lqd:contain-the-self-contained-linker, ↵Michael Goulet-1/+3
r=Mark-Simulacrum Ensure self-contained linker is only enabled on dev/nightly This is a version of #126278 for the master branch. It should be no-op _here_, compared to beta. I'll r? `@Mark-Simulacrum` like the other one.
2024-06-12Copy `rustc-fake` binary when building the `rustc-perf` toolJakub Beránek-7/+24
2024-06-12Add `RustcPerf` bootstrap toolJakub Beránek-1/+46
So that it is easier to use `rustc-perf` with `rustc` directly.
2024-06-12Add `cargo_args` to `ToolBuild`Jakub Beránek-0/+12
2024-06-12Auto merge of #126273 - pietroalbini:pa-bootstrap-update, r=Mark-Simulacrumbors-20/+13
Bump stage0 to 1.80.0 r? `@Mark-Simulacrum`
2024-06-12Auto merge of #125141 - SergioGasquez:feat/no_std-xtensa, r=davidtwcobors-2/+2
Add no_std Xtensa targets support Adds no_std Xtensa targets. This enables using Rust on ESP32, ESP32-S2 and ESP32-S3 chips. Tier 3 policy: > A tier 3 target must have a designated developer or developers (the "target maintainers") on record to be CCed when issues arise regarding the target. (The mechanism to track and CC such developers may evolve over time.) `@MabezDev` and I (`@SergioGasquez)` will maintain the targets. > Targets must use naming consistent with any existing targets; for instance, a target for the same CPU or OS as an existing Rust target should use the same name for that CPU or OS. Targets should normally use the same names and naming conventions as used elsewhere in the broader ecosystem beyond Rust (such as in other toolchains), unless they have a very good reason to diverge. Changing the name of a target can be highly disruptive, especially once the target reaches a higher tier, so getting the name right is important even for a tier 3 target. The target triple is consistent with other targets. > Target names should not introduce undue confusion or ambiguity unless absolutely necessary to maintain ecosystem compatibility. For example, if the name of the target makes people extremely likely to form incorrect beliefs about what it targets, the name should be changed or augmented to disambiguate it. > If possible, use only letters, numbers, dashes and underscores for the name. Periods (.) are known to cause issues in Cargo. We follow the same naming convention as other targets. > Tier 3 targets may have unusual requirements to build or use, but must not create legal issues or impose onerous legal terms for the Rust project or for Rust developers or users. The target does not introduce any legal issues. > The target must not introduce license incompatibilities. There are no license incompatibilities > Anything added to the Rust repository must be under the standard Rust license (MIT OR Apache-2.0). Everything added is under that licenses > The target must not cause the Rust tools or libraries built for any other host (even when supporting cross-compilation to the target) to depend on any new dependency less permissive than the Rust licensing policy. This applies whether the dependency is a Rust crate that would require adding new license exceptions (as specified by the tidy tool in the rust-lang/rust repository), or whether the dependency is a native library or binary. In other words, the introduction of the target must not cause a user installing or running a version of Rust or the Rust tools to be subject to any new license requirements. Requirements are not changed for any other target. > Compiling, linking, and emitting functional binaries, libraries, or other code for the target (whether hosted on the target itself or cross-compiling from another target) must not depend on proprietary (non-FOSS) libraries. Host tools built for the target itself may depend on the ordinary runtime libraries supplied by the platform and commonly used by other applications built for the target, but those libraries must not be required for code generation for the target; cross-compilation to the target must not require such libraries at all. For instance, rustc built for the target may depend on a common proprietary C runtime library or console output library, but must not depend on a proprietary code generation library or code optimization library. Rust's license permits such combinations, but the Rust project has no interest in maintaining such combinations within the scope of Rust itself, even at tier 3. The linker used by the targets is the GCC linker from the GCC toolchain cross-compiled for Xtensa. GNU GPL. > "onerous" here is an intentionally subjective term. At a minimum, "onerous" legal/licensing terms include but are not limited to: non-disclosure requirements, non-compete requirements, contributor license agreements (CLAs) or equivalent, "non-commercial"/"research-only"/etc terms, requirements conditional on the employer or employment of any particular Rust developers, revocable terms, any requirements that create liability for the Rust project or its developers or users, or any requirements that adversely affect the livelihood or prospects of the Rust project or its developers or users. No such terms exist for this target > Neither this policy nor any decisions made regarding targets shall create any binding agreement or estoppel by any party. If any member of an approving Rust team serves as one of the maintainers of a target, or has any legal or employment requirement (explicit or implicit) that might affect their decisions regarding a target, they must recuse themselves from any approval decisions regarding the target's tier status, though they may otherwise participate in discussions. > This requirement does not prevent part or all of this policy from being cited in an explicit contract or work agreement (e.g. to implement or maintain support for a target). This requirement exists to ensure that a developer or team responsible for reviewing and approving a target does not face any legal threats or obligations that would prevent them from freely exercising their judgment in such approval, even if such judgment involves subjective matters or goes beyond the letter of these requirements. Understood > Tier 3 targets should attempt to implement as much of the standard libraries as possible and appropriate (core for most targets, alloc for targets that can support dynamic memory allocation, std for targets with an operating system or equivalent layer of system-provided functionality), but may leave some code unimplemented (either unavailable or stubbed out as appropriate), whether because the target makes it impossible to implement or challenging to implement. The authors of pull requests are not obligated to avoid calling any portions of the standard library on the basis of a tier 3 target not implementing those portions. The target already implements core. > The target must provide documentation for the Rust community explaining how to build for the target, using cross-compilation if possible. If the target supports running binaries, or running tests (even if they do not pass), the documentation must explain how to run such binaries or tests for the target, using emulation if possible or dedicated hardware if necessary. Here is how to build for the target https://docs.esp-rs.org/book/installation/riscv-and-xtensa.html and it also covers how to run binaries on the target. > Tier 3 targets must not impose burden on the authors of pull requests, or other developers in the community, to maintain the target. In particular, do not post comments (automated or manual) on a PR that derail or suggest a block on the PR based on a tier 3 target. Do not send automated messages or notifications (via any medium, including via `@)` to a PR author or others involved with a PR regarding a tier 3 target, unless they have opted into such messages. > Backlinks such as those generated by the issue/PR tracker when linking to an issue or PR are not considered a violation of this policy, within reason. However, such messages (even on a separate repository) must not generate notifications to anyone involved with a PR who has not requested such notifications. Understood > Patches adding or updating tier 3 targets must not break any existing tier 2 or tier 1 target, and must not knowingly break another tier 3 target without approval of either the compiler team or the maintainers of the other tier 3 target. > In particular, this may come up when working on closely related targets, such as variations of the same architecture with different features. Avoid introducing unconditional uses of features that another variation of the target may not have; use conditional compilation or runtime detection, as appropriate, to let each target run code supported by that target. No other targets should be affected > Tier 3 targets must be able to produce assembly using at least one of rustc's supported backends from any host target. It can produce assembly, but it requires a custom LLVM with Xtensa support (https://github.com/espressif/llvm-project/). The patches are trying to be upstreamed (https://github.com/espressif/llvm-project/issues/4)
2024-06-12applease clippyPietro Albini-11/+11
2024-06-12Update download-ci-llvm-stampScott Mabin-1/+1
2024-06-12unify git command preperationonur-ozkan-95/+84
Due to https://github.com/rust-lang/rust/issues/125954, we had to modify git invocations with certain flags in https://github.com/rust-lang/rust/pull/126255. However, because there are so many instances of `Command::new("git")` in bootstrap, it is difficult to apply these solutions to all of them. This PR creates a helper function that unifies the git usage in bootstrap. Meaning, whenever special flags or hacks are needed, we can apply them to this single function which makes things much simpler for the bootstrap team. Signed-off-by: onur-ozkan <work@onurozkan.dev>
2024-06-11ensure the self-contained linker is only enabled on nightly/devRémy Rakic-1/+3