Skip to content

Commit 6a66ca2

Browse files
borsbors
committed
Auto merge of rust-lang#81746 - bjorn3:cg_clif_rustup_component, r=Mark-Simulacrum
Distribute cg_clif as rustup component on the nightly channel This makes it possible to use cg_clif using: ```bash $ rustup component add rustc-codegen-cranelift-preview --toolchain nightly $ RUSTFLAGS="-Zcodegen-backend=cranelift" cargo +nightly build ``` cc rust-lang/compiler-team#405. r? `@Mark-Simulacrum`
2 parents 7314873 + aaa4e54 commit 6a66ca2

File tree

13 files changed

+208
-69
lines changed

13 files changed

+208
-69
lines changed

‎.github/workflows/ci.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,9 @@ jobs:
193193
os: ubuntu-20.04-8core-32gb
194194
env: {}
195195
- name: dist-aarch64-linux
196+
env:
197+
CODEGEN_BACKENDS: "llvm,cranelift"
196198
os: ubuntu-20.04-8core-32gb
197-
env: {}
198199
- name: dist-android
199200
os: ubuntu-20.04-8core-32gb
200201
env: {}
@@ -244,15 +245,18 @@ jobs:
244245
os: ubuntu-20.04-8core-32gb
245246
env: {}
246247
- name: dist-x86_64-linux
248+
env:
249+
CODEGEN_BACKENDS: "llvm,cranelift"
247250
os: ubuntu-20.04-16core-64gb
248-
env: {}
249251
- name: dist-x86_64-linux-alt
250252
env:
251253
IMAGE: dist-x86_64-linux
254+
CODEGEN_BACKENDS: "llvm,cranelift"
252255
os: ubuntu-20.04-16core-64gb
253256
- name: dist-x86_64-musl
257+
env:
258+
CODEGEN_BACKENDS: "llvm,cranelift"
254259
os: ubuntu-20.04-8core-32gb
255-
env: {}
256260
- name: dist-x86_64-netbsd
257261
os: ubuntu-20.04-8core-32gb
258262
env: {}
@@ -316,6 +320,7 @@ jobs:
316320
NO_DEBUG_ASSERTIONS: 1
317321
NO_OVERFLOW_CHECKS: 1
318322
DIST_REQUIRE_ALL_TOOLS: 1
323+
CODEGEN_BACKENDS: "llvm,cranelift"
319324
os: macos-13
320325
- name: dist-apple-various
321326
env:
@@ -554,8 +559,9 @@ jobs:
554559
matrix:
555560
include:
556561
- name: dist-x86_64-linux
562+
env:
563+
CODEGEN_BACKENDS: "llvm,cranelift"
557564
os: ubuntu-20.04-16core-64gb
558-
env: {}
559565
timeout-minutes: 600
560566
runs-on: "${{ matrix.os }}"
561567
steps:

‎compiler/rustc_codegen_cranelift/Cargo.lock

+28-28
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
4545

4646
[[package]]
4747
name = "cranelift-bforest"
48-
version = "0.101.1"
48+
version = "0.101.2"
4949
source = "registry+https://github.com/rust-lang/crates.io-index"
50-
checksum = "c1512c3bb6b13018e7109fc3ac964bc87b329eaf3a77825d337558d0c7f6f1be"
50+
checksum = "f773437307980ac0f424bf9b9a5d0cd21a0f17248c6860c9a65bec8b5975f3fe"
5151
dependencies = [
5252
"cranelift-entity",
5353
]
5454

5555
[[package]]
5656
name = "cranelift-codegen"
57-
version = "0.101.1"
57+
version = "0.101.2"
5858
source = "registry+https://github.com/rust-lang/crates.io-index"
59-
checksum = "16cb8fb9220a6ea7a226705a273ab905309ee546267bdf34948d57932d7f0396"
59+
checksum = "443c2ac50e97fb7de1a0f862753fce3f27215558811a6fcee508eb0c3747fa79"
6060
dependencies = [
6161
"bumpalo",
6262
"cranelift-bforest",
@@ -75,39 +75,39 @@ dependencies = [
7575

7676
[[package]]
7777
name = "cranelift-codegen-meta"
78-
version = "0.101.1"
78+
version = "0.101.2"
7979
source = "registry+https://github.com/rust-lang/crates.io-index"
80-
checksum = "ab3a8d3b0d4745b183da5ea0792b13d79f5c23d6e69ac04761728e2532b56649"
80+
checksum = "c5b174c411480c79ce0793c55042fa51bec27e486381d103a53cab3b480cb2db"
8181
dependencies = [
8282
"cranelift-codegen-shared",
8383
]
8484

8585
[[package]]
8686
name = "cranelift-codegen-shared"
87-
version = "0.101.1"
87+
version = "0.101.2"
8888
source = "registry+https://github.com/rust-lang/crates.io-index"
89-
checksum = "524141c8e68f2abc2043de4c2b31f6d9dd42432738c246431d0572a1422a4a84"
89+
checksum = "73fa0151a528066a369de6debeea4d4b23a32aba68b5add8c46d3dc8091ff434"
9090

9191
[[package]]
9292
name = "cranelift-control"
93-
version = "0.101.1"
93+
version = "0.101.2"
9494
source = "registry+https://github.com/rust-lang/crates.io-index"
95-
checksum = "97513b57c961c713789a03886a57b43e14ebcd204cbaa8ae50ca6c70a8e716b3"
95+
checksum = "b8adf1e6398493c9bea1190e37d28a0eb0eca5fddbc80e01e506cda34db92b1f"
9696
dependencies = [
9797
"arbitrary",
9898
]
9999

100100
[[package]]
101101
name = "cranelift-entity"
102-
version = "0.101.1"
102+
version = "0.101.2"
103103
source = "registry+https://github.com/rust-lang/crates.io-index"
104-
checksum = "e3f23d3cf3afa7e45f239702612c76d87964f652a55e28d13ed6d7e20f3479dd"
104+
checksum = "4917e2ed3bb5fe87d0ed88395ca6d644018d119a034faedd1f3e1f2c33cd52b2"
105105

106106
[[package]]
107107
name = "cranelift-frontend"
108-
version = "0.101.1"
108+
version = "0.101.2"
109109
source = "registry+https://github.com/rust-lang/crates.io-index"
110-
checksum = "554cd4947ec9209b58bf9ae5bf83581b5ddf9128bd967208e334b504a57db54e"
110+
checksum = "9aaadf1e7cf28886bbf046eaf7ef538997bc8a7e020e578ea4957b39da87d5a1"
111111
dependencies = [
112112
"cranelift-codegen",
113113
"log",
@@ -117,15 +117,15 @@ dependencies = [
117117

118118
[[package]]
119119
name = "cranelift-isle"
120-
version = "0.101.1"
120+
version = "0.101.2"
121121
source = "registry+https://github.com/rust-lang/crates.io-index"
122-
checksum = "6c1892a439696b6413cb54083806f5fd9fc431768b8de74864b3d9e8b93b124f"
122+
checksum = "a67fda31b9d69eaa1c49a2081939454c45857596a9d45af6744680541c628b4c"
123123

124124
[[package]]
125125
name = "cranelift-jit"
126-
version = "0.101.1"
126+
version = "0.101.2"
127127
source = "registry+https://github.com/rust-lang/crates.io-index"
128-
checksum = "32209252fb38acaf1662ccd0397907bbe0e92bdb13b6ddbfd2f74e437f83e685"
128+
checksum = "d6bf32710628e7ff298739f1ed80a0bfdafc0c6a3e284c4540b23f18e8889d4b"
129129
dependencies = [
130130
"anyhow",
131131
"cranelift-codegen",
@@ -143,9 +143,9 @@ dependencies = [
143143

144144
[[package]]
145145
name = "cranelift-module"
146-
version = "0.101.1"
146+
version = "0.101.2"
147147
source = "registry+https://github.com/rust-lang/crates.io-index"
148-
checksum = "bf42656f5f6df7bfafc4dd7b63a1888b0627c07b43b2cb9aa54e13843fed39eb"
148+
checksum = "4d693e93a0fbf56b4bc93cffe6b107c2e52f070e1111950505fc8c83ac440b9d"
149149
dependencies = [
150150
"anyhow",
151151
"cranelift-codegen",
@@ -154,9 +154,9 @@ dependencies = [
154154

155155
[[package]]
156156
name = "cranelift-native"
157-
version = "0.101.1"
157+
version = "0.101.2"
158158
source = "registry+https://github.com/rust-lang/crates.io-index"
159-
checksum = "e0c2d3badd4b9690865f5bb68a71fa94de592fa2df3f3d11a5a062c60c0a107a"
159+
checksum = "76fb52ba71be98312f35e798d9e98e45ab2586f27584231bf7c644fa9501e8af"
160160
dependencies = [
161161
"cranelift-codegen",
162162
"libc",
@@ -165,9 +165,9 @@ dependencies = [
165165

166166
[[package]]
167167
name = "cranelift-object"
168-
version = "0.101.1"
168+
version = "0.101.2"
169169
source = "registry+https://github.com/rust-lang/crates.io-index"
170-
checksum = "88eca54bbecea3170035168357306e9c779d4a63d8bf036c9e16bd21fdaa69b5"
170+
checksum = "2551b2e185022b89e9efa5e04c0f17f679b86ef73d9f7feabc48b608ff23120d"
171171
dependencies = [
172172
"anyhow",
173173
"cranelift-codegen",
@@ -362,9 +362,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
362362

363363
[[package]]
364364
name = "target-lexicon"
365-
version = "0.12.5"
365+
version = "0.12.12"
366366
source = "registry+https://github.com/rust-lang/crates.io-index"
367-
checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d"
367+
checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
368368

369369
[[package]]
370370
name = "version_check"
@@ -374,9 +374,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
374374

375375
[[package]]
376376
name = "wasmtime-jit-icache-coherence"
377-
version = "14.0.1"
377+
version = "14.0.2"
378378
source = "registry+https://github.com/rust-lang/crates.io-index"
379-
checksum = "9aaf2fa8fd2d6b65abae9b92edfe69254cc5d6b166e342364036c3e347de8da9"
379+
checksum = "0980a96b16abbdaf829858d2389697b1d6cfc6a903873fd74b7e47a6b1045584"
380380
dependencies = [
381381
"cfg-if",
382382
"libc",

‎compiler/rustc_codegen_cranelift/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ crate-type = ["dylib"]
88

99
[dependencies]
1010
# These have to be in sync with each other
11-
cranelift-codegen = { version = "0.101.1", features = ["unwind", "all-arch"] }
12-
cranelift-frontend = { version = "0.101.1" }
13-
cranelift-module = { version = "0.101.1" }
14-
cranelift-native = { version = "0.101.1" }
15-
cranelift-jit = { version = "0.101.1", optional = true }
16-
cranelift-object = { version = "0.101.1" }
11+
cranelift-codegen = { version = "0.101.2", default-features = false, features = ["std", "unwind", "all-arch"] }
12+
cranelift-frontend = { version = "0.101.2" }
13+
cranelift-module = { version = "0.101.2" }
14+
cranelift-native = { version = "0.101.2" }
15+
cranelift-jit = { version = "0.101.2", optional = true }
16+
cranelift-object = { version = "0.101.2" }
1717
target-lexicon = "0.12.0"
1818
gimli = { version = "0.28", default-features = false, features = ["write"]}
1919
object = { version = "0.32", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }

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

+97-14
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use crate::core::builder::{Builder, Kind, RunConfig, ShouldRun, Step};
2727
use crate::core::config::TargetSelection;
2828
use crate::utils::cache::{Interned, INTERNER};
2929
use crate::utils::channel;
30-
use crate::utils::helpers::{exe, is_dylib, output, t, timeit};
30+
use crate::utils::helpers::{exe, is_dylib, output, t, target_supports_cranelift_backend, timeit};
3131
use crate::utils::tarball::{GeneratedTarball, OverlayKind, Tarball};
3232
use crate::{Compiler, DependencyType, Mode, LLVM_TOOLS};
3333

@@ -443,19 +443,6 @@ impl Step for Rustc {
443443
}
444444
}
445445

446-
// Copy over the codegen backends
447-
let backends_src = builder.sysroot_codegen_backends(compiler);
448-
let backends_rel = backends_src
449-
.strip_prefix(&src)
450-
.unwrap()
451-
.strip_prefix(builder.sysroot_libdir_relative(compiler))
452-
.unwrap();
453-
// Don't use custom libdir here because ^lib/ will be resolved again with installer
454-
let backends_dst = image.join("lib").join(&backends_rel);
455-
456-
t!(fs::create_dir_all(&backends_dst));
457-
builder.cp_r(&backends_src, &backends_dst);
458-
459446
// Copy libLLVM.so to the lib dir as well, if needed. While not
460447
// technically needed by rustc itself it's needed by lots of other
461448
// components like the llvm tools and LLD. LLD is included below and
@@ -1282,6 +1269,91 @@ impl Step for Miri {
12821269
}
12831270
}
12841271

1272+
#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
1273+
pub struct CodegenBackend {
1274+
pub compiler: Compiler,
1275+
pub backend: Interned<String>,
1276+
}
1277+
1278+
impl Step for CodegenBackend {
1279+
type Output = Option<GeneratedTarball>;
1280+
const DEFAULT: bool = true;
1281+
const ONLY_HOSTS: bool = true;
1282+
1283+
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
1284+
run.path("compiler/rustc_codegen_cranelift")
1285+
}
1286+
1287+
fn make_run(run: RunConfig<'_>) {
1288+
for &backend in &run.builder.config.rust_codegen_backends {
1289+
if backend == "llvm" {
1290+
continue; // Already built as part of rustc
1291+
}
1292+
1293+
run.builder.ensure(CodegenBackend {
1294+
compiler: run.builder.compiler(run.builder.top_stage, run.target),
1295+
backend,
1296+
});
1297+
}
1298+
}
1299+
1300+
fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
1301+
// This prevents rustc_codegen_cranelift from being built for "dist"
1302+
// or "install" on the stable/beta channels. It is not yet stable and
1303+
// should not be included.
1304+
if !builder.build.unstable_features() {
1305+
return None;
1306+
}
1307+
1308+
if self.backend == "cranelift" {
1309+
if !target_supports_cranelift_backend(self.compiler.host) {
1310+
builder.info("target not supported by rustc_codegen_cranelift. skipping");
1311+
return None;
1312+
}
1313+
1314+
if self.compiler.host.contains("windows") {
1315+
builder.info(
1316+
"dist currently disabled for windows by rustc_codegen_cranelift. skipping",
1317+
);
1318+
return None;
1319+
}
1320+
}
1321+
1322+
let compiler = self.compiler;
1323+
let backend = self.backend;
1324+
1325+
let mut tarball =
1326+
Tarball::new(builder, &format!("rustc-codegen-{}", backend), &compiler.host.triple);
1327+
if backend == "cranelift" {
1328+
tarball.set_overlay(OverlayKind::RustcCodegenCranelift);
1329+
} else {
1330+
panic!("Unknown backend rustc_codegen_{}", backend);
1331+
}
1332+
tarball.is_preview(true);
1333+
tarball.add_legal_and_readme_to(format!("share/doc/rustc_codegen_{}", backend));
1334+
1335+
let src = builder.sysroot(compiler);
1336+
let backends_src = builder.sysroot_codegen_backends(compiler);
1337+
let backends_rel = backends_src
1338+
.strip_prefix(&src)
1339+
.unwrap()
1340+
.strip_prefix(builder.sysroot_libdir_relative(compiler))
1341+
.unwrap();
1342+
// Don't use custom libdir here because ^lib/ will be resolved again with installer
1343+
let backends_dst = PathBuf::from("lib").join(&backends_rel);
1344+
1345+
let backend_name = format!("rustc_codegen_{}", backend);
1346+
for backend in fs::read_dir(&backends_src).unwrap() {
1347+
let file_name = backend.unwrap().file_name();
1348+
if file_name.to_str().unwrap().contains(&backend_name) {
1349+
tarball.add_file(backends_src.join(file_name), &backends_dst, 0o644);
1350+
}
1351+
}
1352+
1353+
Some(tarball.generate())
1354+
}
1355+
}
1356+
12851357
#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
12861358
pub struct Rustfmt {
12871359
pub compiler: Compiler,
@@ -1452,6 +1524,10 @@ impl Step for Extended {
14521524
add_component!("clippy" => Clippy { compiler, target });
14531525
add_component!("miri" => Miri { compiler, target });
14541526
add_component!("analysis" => Analysis { compiler, target });
1527+
add_component!("rustc-codegen-cranelift" => CodegenBackend {
1528+
compiler: builder.compiler(stage, target),
1529+
backend: INTERNER.intern_str("cranelift"),
1530+
});
14551531

14561532
let etc = builder.src.join("src/etc/installer");
14571533

@@ -1548,6 +1624,9 @@ impl Step for Extended {
15481624
prepare(tool);
15491625
}
15501626
}
1627+
if builder.config.rust_codegen_backends.contains(&INTERNER.intern_str("cranelift")) {
1628+
prepare("rustc-codegen-cranelift");
1629+
}
15511630
// create an 'uninstall' package
15521631
builder.install(&etc.join("pkg/postinstall"), &pkg.join("uninstall"), 0o755);
15531632
pkgbuild("uninstall");
@@ -1587,6 +1666,10 @@ impl Step for Extended {
15871666
"rust-demangler-preview".to_string()
15881667
} else if name == "miri" {
15891668
"miri-preview".to_string()
1669+
} else if name == "rustc-codegen-cranelift" {
1670+
// FIXME add installer support for cg_clif once it is ready to be distributed on
1671+
// windows.
1672+
unreachable!("cg_clif shouldn't be built for windows");
15901673
} else {
15911674
name.to_string()
15921675
};

0 commit comments

Comments
 (0)