forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#115795 - Kobzol:opt-dist-custom, r=Mark-Simul…
…acrum Refactor `opt-dist` to simplify local building This PR refactors the `opt-dist` tool to make it easier to invoke it locally, outside of CI, and thus simplify building PGO/BOLT optimized `rustc` builds e.g. for distro maintainers. It should also make it easier to run the PGO/BOLT workflow locally e.g. to profile performance or debug issues (looking at you, rust-lang#115554).
- Loading branch information
Showing
15 changed files
with
423 additions
and
277 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| use camino::Utf8PathBuf; | ||
| use derive_builder::Builder; | ||
|
|
||
| #[derive(Builder)] | ||
| pub struct Environment { | ||
| host_triple: String, | ||
| python_binary: String, | ||
| /// The rustc checkout, where the compiler source is located. | ||
| checkout_dir: Utf8PathBuf, | ||
| /// The main directory where the build occurs. Stage0 rustc and cargo have to be available in | ||
| /// this directory before `opt-dist` is started. | ||
| build_dir: Utf8PathBuf, | ||
| /// Directory where the optimization artifacts (PGO/BOLT profiles, etc.) | ||
| /// will be stored. | ||
| artifact_dir: Utf8PathBuf, | ||
| /// Path to the host LLVM used to compile LLVM in `src/llvm-project`. | ||
| host_llvm_dir: Utf8PathBuf, | ||
| /// List of test paths that should be skipped when testing the optimized artifacts. | ||
| skipped_tests: Vec<String>, | ||
| /// Directory containing a pre-built rustc-perf checkout. | ||
| #[builder(default)] | ||
| prebuilt_rustc_perf: Option<Utf8PathBuf>, | ||
| use_bolt: bool, | ||
| shared_llvm: bool, | ||
| } | ||
|
|
||
| impl Environment { | ||
| pub fn host_triple(&self) -> &str { | ||
| &self.host_triple | ||
| } | ||
|
|
||
| pub fn python_binary(&self) -> &str { | ||
| &self.python_binary | ||
| } | ||
|
|
||
| pub fn checkout_path(&self) -> Utf8PathBuf { | ||
| self.checkout_dir.clone() | ||
| } | ||
|
|
||
| pub fn build_root(&self) -> Utf8PathBuf { | ||
| self.build_dir.clone() | ||
| } | ||
|
|
||
| pub fn build_artifacts(&self) -> Utf8PathBuf { | ||
| self.build_root().join("build").join(&self.host_triple) | ||
| } | ||
|
|
||
| pub fn artifact_dir(&self) -> Utf8PathBuf { | ||
| self.artifact_dir.clone() | ||
| } | ||
|
|
||
| pub fn cargo_stage_0(&self) -> Utf8PathBuf { | ||
| self.build_artifacts() | ||
| .join("stage0") | ||
| .join("bin") | ||
| .join(format!("cargo{}", executable_extension())) | ||
| } | ||
|
|
||
| pub fn rustc_stage_0(&self) -> Utf8PathBuf { | ||
| self.build_artifacts() | ||
| .join("stage0") | ||
| .join("bin") | ||
| .join(format!("rustc{}", executable_extension())) | ||
| } | ||
|
|
||
| pub fn rustc_stage_2(&self) -> Utf8PathBuf { | ||
| self.build_artifacts() | ||
| .join("stage2") | ||
| .join("bin") | ||
| .join(format!("rustc{}", executable_extension())) | ||
| } | ||
|
|
||
| pub fn prebuilt_rustc_perf(&self) -> Option<Utf8PathBuf> { | ||
| self.prebuilt_rustc_perf.clone() | ||
| } | ||
|
|
||
| /// Path to the built rustc-perf benchmark suite. | ||
| pub fn rustc_perf_dir(&self) -> Utf8PathBuf { | ||
| self.artifact_dir.join("rustc-perf") | ||
| } | ||
|
|
||
| pub fn host_llvm_dir(&self) -> Utf8PathBuf { | ||
| self.host_llvm_dir.clone() | ||
| } | ||
|
|
||
| pub fn use_bolt(&self) -> bool { | ||
| self.use_bolt | ||
| } | ||
|
|
||
| pub fn supports_shared_llvm(&self) -> bool { | ||
| self.shared_llvm | ||
| } | ||
|
|
||
| pub fn skipped_tests(&self) -> &[String] { | ||
| &self.skipped_tests | ||
| } | ||
| } | ||
|
|
||
| /// What is the extension of binary executables on this platform? | ||
| #[cfg(target_family = "unix")] | ||
| pub fn executable_extension() -> &'static str { | ||
| "" | ||
| } | ||
|
|
||
| #[cfg(target_family = "windows")] | ||
| pub fn executable_extension() -> &'static str { | ||
| ".exe" | ||
| } |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.