Skip to content

Commit b222ef8

Browse files
onur-ozkanonur-ozkan
committed
improve staging api
Signed-off-by: onur-ozkan <[email protected]>
1 parent 79b6c4b commit b222ef8

File tree

14 files changed

+328
-221
lines changed

14 files changed

+328
-221
lines changed

‎src/bootstrap/src/core/build_steps/check.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ impl Step for Std {
5757
builder.require_submodule("library/stdarch", None);
5858

5959
let target = self.target;
60-
let compiler = builder.compiler(builder.top_stage, builder.config.build);
60+
let compiler = builder.compiler(builder.top_stage, builder.config.build, false);
6161

6262
let mut cargo = builder::Cargo::new(
6363
builder,
@@ -192,7 +192,7 @@ impl Step for Rustc {
192192
/// the `compiler` targeting the `target` architecture. The artifacts
193193
/// created will also be linked into the sysroot directory.
194194
fn run(self, builder: &Builder<'_>) {
195-
let compiler = builder.compiler(builder.top_stage, builder.config.build);
195+
let compiler = builder.compiler(builder.top_stage, builder.config.build, false);
196196
let target = self.target;
197197

198198
if compiler.stage != 0 {
@@ -274,7 +274,7 @@ impl Step for CodegenBackend {
274274
return;
275275
}
276276

277-
let compiler = builder.compiler(builder.top_stage, builder.config.build);
277+
let compiler = builder.compiler(builder.top_stage, builder.config.build, false);
278278
let target = self.target;
279279
let backend = self.backend;
280280

@@ -329,7 +329,7 @@ impl Step for RustAnalyzer {
329329
}
330330

331331
fn run(self, builder: &Builder<'_>) {
332-
let compiler = builder.compiler(builder.top_stage, builder.config.build);
332+
let compiler = builder.compiler(builder.top_stage, builder.config.build, true);
333333
let target = self.target;
334334

335335
builder.ensure(Rustc::new(target, builder));
@@ -411,7 +411,7 @@ fn run_tool_check_step(
411411
path: &str,
412412
) {
413413
let display_name = path.rsplit('/').next().unwrap();
414-
let compiler = builder.compiler(builder.top_stage, builder.config.build);
414+
let compiler = builder.compiler(builder.top_stage, builder.config.build, true);
415415

416416
builder.ensure(Rustc::new(target, builder));
417417

‎src/bootstrap/src/core/build_steps/clean.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ macro_rules! clean_crate_tree {
6060

6161
fn make_run(run: RunConfig<'_>) {
6262
let builder = run.builder;
63-
let compiler = builder.compiler(builder.top_stage, run.target);
63+
let compiler = builder.compiler(builder.top_stage, run.target, false);
6464
builder.ensure(Self { crates: run.cargo_crates_in_set(), compiler });
6565
}
6666

‎src/bootstrap/src/core/build_steps/clippy.rs‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ impl Step for Std {
144144
builder.require_submodule("library/stdarch", None);
145145

146146
let target = self.target;
147-
let compiler = builder.compiler(builder.top_stage, builder.config.build);
147+
let compiler = builder.compiler(builder.top_stage, builder.config.build, false);
148148

149149
let mut cargo = builder::Cargo::new(
150150
builder,
@@ -204,7 +204,7 @@ impl Step for Rustc {
204204
/// This will lint the compiler for a particular stage of the build using
205205
/// the `compiler` targeting the `target` architecture.
206206
fn run(self, builder: &Builder<'_>) {
207-
let compiler = builder.compiler(builder.top_stage, builder.config.build);
207+
let compiler = builder.compiler(builder.top_stage, builder.config.build, false);
208208
let target = self.target;
209209

210210
if compiler.stage != 0 {
@@ -254,7 +254,7 @@ impl Step for Rustc {
254254

255255
macro_rules! lint_any {
256256
($(
257-
$name:ident, $path:expr, $readable_name:expr
257+
$name:ident, $path:expr, $readable_name:expr, $mode:expr
258258
$(,lint_by_default = $lint_by_default:expr)*
259259
;
260260
)+) => {
@@ -283,15 +283,15 @@ macro_rules! lint_any {
283283
}
284284

285285
fn run(self, builder: &Builder<'_>) -> Self::Output {
286-
let compiler = builder.compiler(builder.top_stage, builder.config.build);
286+
let compiler = builder.compiler(builder.top_stage, builder.config.build, $mode == Mode::ToolRustc);
287287
let target = self.target;
288288

289289
builder.ensure(check::Rustc::new(target, builder).build_kind(Some(Kind::Check)));
290290

291291
let cargo = prepare_tool_cargo(
292292
builder,
293293
compiler,
294-
Mode::ToolRustc,
294+
$mode,
295295
target,
296296
Kind::Clippy,
297297
$path,
@@ -301,15 +301,15 @@ macro_rules! lint_any {
301301

302302
let _guard = builder.msg_tool(
303303
Kind::Clippy,
304-
Mode::ToolRustc,
304+
$mode,
305305
$readable_name,
306306
compiler.stage,
307307
&compiler.host,
308308
&target,
309309
);
310310

311311
let stringified_name = stringify!($name).to_lowercase();
312-
let stamp = BuildStamp::new(&builder.cargo_out(compiler, Mode::ToolRustc, target))
312+
let stamp = BuildStamp::new(&builder.cargo_out(compiler, $mode, target))
313313
.with_prefix(&format!("{}-check", stringified_name));
314314

315315
run_cargo(
@@ -328,31 +328,31 @@ macro_rules! lint_any {
328328
}
329329

330330
lint_any!(
331-
Bootstrap, "src/bootstrap", "bootstrap";
332-
BuildHelper, "src/build_helper", "build_helper";
333-
BuildManifest, "src/tools/build-manifest", "build-manifest";
334-
CargoMiri, "src/tools/miri/cargo-miri", "cargo-miri";
335-
Clippy, "src/tools/clippy", "clippy";
336-
CollectLicenseMetadata, "src/tools/collect-license-metadata", "collect-license-metadata";
337-
CodegenGcc, "compiler/rustc_codegen_gcc", "rustc-codegen-gcc";
338-
Compiletest, "src/tools/compiletest", "compiletest";
339-
CoverageDump, "src/tools/coverage-dump", "coverage-dump";
340-
Jsondocck, "src/tools/jsondocck", "jsondocck";
341-
Jsondoclint, "src/tools/jsondoclint", "jsondoclint";
342-
LintDocs, "src/tools/lint-docs", "lint-docs";
343-
LlvmBitcodeLinker, "src/tools/llvm-bitcode-linker", "llvm-bitcode-linker";
344-
Miri, "src/tools/miri", "miri";
345-
MiroptTestTools, "src/tools/miropt-test-tools", "miropt-test-tools";
346-
OptDist, "src/tools/opt-dist", "opt-dist";
347-
RemoteTestClient, "src/tools/remote-test-client", "remote-test-client";
348-
RemoteTestServer, "src/tools/remote-test-server", "remote-test-server";
349-
Rls, "src/tools/rls", "rls";
350-
RustAnalyzer, "src/tools/rust-analyzer", "rust-analyzer";
351-
Rustdoc, "src/librustdoc", "clippy";
352-
Rustfmt, "src/tools/rustfmt", "rustfmt";
353-
RustInstaller, "src/tools/rust-installer", "rust-installer";
354-
Tidy, "src/tools/tidy", "tidy";
355-
TestFloatParse, "src/etc/test-float-parse", "test-float-parse";
331+
Bootstrap, "src/bootstrap", "bootstrap", Mode::ToolBootstrap;
332+
BuildHelper, "src/build_helper", "build_helper", Mode::ToolBootstrap;
333+
BuildManifest, "src/tools/build-manifest", "build-manifest", Mode::ToolBootstrap;
334+
CargoMiri, "src/tools/miri/cargo-miri", "cargo-miri", Mode::ToolRustc;
335+
Clippy, "src/tools/clippy", "clippy", Mode::ToolRustc;
336+
CollectLicenseMetadata, "src/tools/collect-license-metadata", "collect-license-metadata", Mode::ToolBootstrap;
337+
CodegenGcc, "compiler/rustc_codegen_gcc", "rustc-codegen-gcc", Mode::ToolRustc;
338+
Compiletest, "src/tools/compiletest", "compiletest", Mode::ToolBootstrap;
339+
CoverageDump, "src/tools/coverage-dump", "coverage-dump", Mode::ToolBootstrap;
340+
Jsondocck, "src/tools/jsondocck", "jsondocck", Mode::ToolBootstrap;
341+
Jsondoclint, "src/tools/jsondoclint", "jsondoclint", Mode::ToolBootstrap;
342+
LintDocs, "src/tools/lint-docs", "lint-docs", Mode::ToolBootstrap;
343+
LlvmBitcodeLinker, "src/tools/llvm-bitcode-linker", "llvm-bitcode-linker", Mode::ToolRustc;
344+
Miri, "src/tools/miri", "miri", Mode::ToolRustc;
345+
MiroptTestTools, "src/tools/miropt-test-tools", "miropt-test-tools", Mode::ToolRustc;
346+
OptDist, "src/tools/opt-dist", "opt-dist", Mode::ToolBootstrap;
347+
RemoteTestClient, "src/tools/remote-test-client", "remote-test-client", Mode::ToolBootstrap;
348+
RemoteTestServer, "src/tools/remote-test-server", "remote-test-server", Mode::ToolBootstrap;
349+
Rls, "src/tools/rls", "rls", Mode::ToolBootstrap;
350+
RustAnalyzer, "src/tools/rust-analyzer", "rust-analyzer", Mode::ToolRustc;
351+
Rustdoc, "src/librustdoc", "clippy", Mode::ToolRustc;
352+
Rustfmt, "src/tools/rustfmt", "rustfmt", Mode::ToolRustc;
353+
RustInstaller, "src/tools/rust-installer", "rust-installer", Mode::ToolBootstrap;
354+
Tidy, "src/tools/tidy", "tidy", Mode::ToolBootstrap;
355+
TestFloatParse, "src/etc/test-float-parse", "test-float-parse", Mode::ToolStd;
356356
);
357357

358358
#[derive(Debug, Clone, PartialEq, Eq, Hash)]

‎src/bootstrap/src/core/build_steps/compile.rs‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ impl Step for Std {
110110
&& builder.config.last_modified_commit(&["library"], "download-rustc", true).is_none();
111111

112112
run.builder.ensure(Std {
113-
compiler: run.builder.compiler(run.builder.top_stage, run.build_triple()),
113+
compiler: run.builder.compiler(run.builder.top_stage, run.build_triple(), false),
114114
target: run.target,
115115
crates,
116116
force_recompile,
@@ -162,7 +162,7 @@ impl Step for Std {
162162

163163
let mut target_deps = builder.ensure(StartupObjects { compiler, target });
164164

165-
let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target);
165+
let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target, false);
166166
if compiler_to_use != compiler {
167167
builder.ensure(Std::new(compiler_to_use, target));
168168
let msg = if compiler_to_use.host == target {
@@ -264,7 +264,7 @@ impl Step for Std {
264264

265265
builder.ensure(StdLink::from_std(
266266
self,
267-
builder.compiler(compiler.stage, builder.config.build),
267+
builder.compiler(compiler.stage, builder.config.build, false),
268268
));
269269
}
270270
}
@@ -770,7 +770,7 @@ impl Step for StartupObjects {
770770

771771
fn make_run(run: RunConfig<'_>) {
772772
run.builder.ensure(StartupObjects {
773-
compiler: run.builder.compiler(run.builder.top_stage, run.build_triple()),
773+
compiler: run.builder.compiler(run.builder.top_stage, run.build_triple(), false),
774774
target: run.target,
775775
});
776776
}
@@ -894,7 +894,7 @@ impl Step for Rustc {
894894
fn make_run(run: RunConfig<'_>) {
895895
let crates = run.cargo_crates_in_set();
896896
run.builder.ensure(Rustc {
897-
compiler: run.builder.compiler(run.builder.top_stage, run.build_triple()),
897+
compiler: run.builder.compiler(run.builder.top_stage, run.build_triple(), false),
898898
target: run.target,
899899
crates,
900900
});
@@ -931,9 +931,9 @@ impl Step for Rustc {
931931
return compiler.stage;
932932
}
933933

934-
let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target);
934+
let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target, false);
935935
if compiler_to_use != compiler {
936-
let _ = builder.compiler(compiler_to_use.stage, target);
936+
let _ = builder.compiler(compiler_to_use.stage, target, false);
937937

938938
let msg = if compiler_to_use.host == target {
939939
format!(
@@ -957,7 +957,7 @@ impl Step for Rustc {
957957

958958
// Ensure that build scripts and proc macros have a std / libproc_macro to link against.
959959
builder.ensure(Std::new(
960-
builder.compiler(self.compiler.stage, builder.config.build),
960+
builder.compiler(self.compiler.stage, builder.config.build, false),
961961
builder.config.build,
962962
));
963963

@@ -1023,7 +1023,7 @@ impl Step for Rustc {
10231023

10241024
builder.ensure(RustcLink::from_rustc(
10251025
self,
1026-
builder.compiler(compiler.stage, builder.config.build),
1026+
builder.compiler(compiler.stage, builder.config.build, false),
10271027
));
10281028

10291029
compiler.stage
@@ -1424,7 +1424,7 @@ impl Step for CodegenBackend {
14241424

14251425
run.builder.ensure(CodegenBackend {
14261426
target: run.target,
1427-
compiler: run.builder.compiler(run.builder.top_stage, run.build_triple()),
1427+
compiler: run.builder.compiler(run.builder.top_stage, run.build_triple(), false),
14281428
backend: backend.clone(),
14291429
});
14301430
}
@@ -1435,7 +1435,7 @@ impl Step for CodegenBackend {
14351435
let target = self.target;
14361436
let backend = self.backend;
14371437

1438-
let _ = builder.compiler(compiler.stage, target);
1438+
let _ = builder.compiler(compiler.stage, target, false);
14391439

14401440
if builder.config.keep_stage.contains(&compiler.stage) {
14411441
builder.info(
@@ -1447,7 +1447,7 @@ impl Step for CodegenBackend {
14471447
return;
14481448
}
14491449

1450-
let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target);
1450+
let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target, false);
14511451
if compiler_to_use != compiler {
14521452
builder.ensure(CodegenBackend { compiler: compiler_to_use, target, backend });
14531453
return;
@@ -1745,7 +1745,7 @@ impl Step for Assemble {
17451745

17461746
fn make_run(run: RunConfig<'_>) {
17471747
run.builder.ensure(Assemble {
1748-
target_compiler: run.builder.compiler(run.builder.top_stage + 1, run.target),
1748+
target_compiler: run.builder.compiler(run.builder.top_stage + 1, run.target, false),
17491749
});
17501750
}
17511751

@@ -1846,7 +1846,8 @@ impl Step for Assemble {
18461846
//
18471847
// FIXME: It may be faster if we build just a stage 1 compiler and then
18481848
// use that to bootstrap this compiler forward.
1849-
let mut build_compiler = builder.compiler(target_compiler.stage - 1, builder.config.build);
1849+
let mut build_compiler =
1850+
builder.compiler(target_compiler.stage - 1, builder.config.build, false);
18501851

18511852
// Build enzyme
18521853
let enzyme_install = if builder.config.llvm_enzyme {
@@ -1989,7 +1990,11 @@ impl Step for Assemble {
19891990
);
19901991
}
19911992

1992-
maybe_install_llvm_bitcode_linker(target_compiler);
1993+
{
1994+
let mut compiler_for_rustc_tool = build_compiler;
1995+
compiler_for_rustc_tool.downgraded_from = Some(target_compiler.stage);
1996+
maybe_install_llvm_bitcode_linker(compiler_for_rustc_tool);
1997+
}
19931998

19941999
// Ensure that `libLLVM.so` ends up in the newly build compiler directory,
19952000
// so that it can be found when the newly built `rustc` is run.

0 commit comments

Comments
 (0)