-
-
Notifications
You must be signed in to change notification settings - Fork 15.1k
bootstrap: add bootstrap step to run intrinsic-test in CI #156356
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
0df5250
51f2651
29612d0
8c34814
7cab70e
d9f84a8
d8c5095
a558195
957a4f7
34e12dd
4c6143c
561e9f0
152db4e
beaa342
e0ae211
5c82915
7d15b28
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -957,6 +957,103 @@ impl Step for StdarchVerify { | |
| } | ||
| } | ||
|
|
||
| /// Runs stdarch's intrinsic-test binary crate to verify that Rust's `core::arch` | ||
| /// SIMD intrinsics produce the same results as their C counterparts. | ||
| /// | ||
| /// First runs the `intrinsic-test` binary, which generates C wrapper programs | ||
| /// and a Rust Cargo workspace. Then runs `cargo test` on that workspace | ||
| /// which compiles both versions and compares their outputs on random inputs. | ||
| #[derive(Debug, Clone, PartialEq, Eq, Hash)] | ||
| pub struct IntrinsicTest { | ||
| host: TargetSelection, | ||
| } | ||
|
|
||
| impl Step for IntrinsicTest { | ||
| type Output = (); | ||
| const IS_HOST: bool = true; | ||
|
|
||
| fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { | ||
| run.path("library/stdarch/crates/intrinsic-test") | ||
| } | ||
|
Comment on lines
+975
to
+977
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the intrinsic tests should also run when any of the source in
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No you are not misinterpreting :) . You're so right I have added the |
||
|
|
||
| fn make_run(run: RunConfig<'_>) { | ||
| let target = run.target; | ||
| if !target.contains("aarch64-unknown-linux") && !target.contains("x86_64-unknown-linux") { | ||
| return; | ||
| } | ||
| run.builder.ensure(IntrinsicTest { host: target }); | ||
| } | ||
|
|
||
| fn run(self, builder: &Builder<'_>) { | ||
| let host = self.host; | ||
|
|
||
| let (input_file, skip_file, cflags, sde_runner) = if host.contains("x86_64-unknown-linux") { | ||
| let cpuid_def = | ||
| builder.src.join("library/stdarch/ci/docker/x86_64-unknown-linux-gnu/cpuid.def"); | ||
| let sde_runner = format!( | ||
| "/intel-sde/sde64 -cpuid-in {} -rtm-mode full -tsx --", | ||
| cpuid_def.display() | ||
| ); | ||
| ( | ||
| builder.src.join("library/stdarch/intrinsics_data/x86-intel.xml"), | ||
| builder.src.join("library/stdarch/crates/intrinsic-test/missing_x86.txt"), | ||
| "-I/usr/include/x86_64-linux-gnu/", | ||
| Some(sde_runner), | ||
| ) | ||
| } else if host.contains("aarch64-unknown-linux") { | ||
| ( | ||
| builder.src.join("library/stdarch/intrinsics_data/arm_intrinsics.json"), | ||
| builder.src.join("library/stdarch/crates/intrinsic-test/missing_aarch64.txt"), | ||
| "-I/usr/aarch64-linux-gnu/include/", | ||
| None, | ||
| ) | ||
| } else { | ||
| panic!("intrinsic-test only supports aarch64/x86_64 Linux, got {host}"); | ||
| }; | ||
|
|
||
| let out_dir = builder.out.join(host).join("intrinsic-test"); | ||
| t!(fs::create_dir_all(&out_dir)); | ||
|
|
||
| let crates_link = out_dir.join("crates"); | ||
| if !crates_link.exists() { | ||
| t!( | ||
| helpers::symlink_dir( | ||
| &builder.config, | ||
| &builder.src.join("library/stdarch/crates"), | ||
| &crates_link | ||
| ), | ||
| format!("failed to symlink stdarch crates into {}", crates_link.display()) | ||
| ); | ||
| } | ||
|
|
||
| let mut cmd = builder.tool_cmd(Tool::IntrinsicTest); | ||
| cmd.current_dir(&out_dir); | ||
| cmd.arg(&input_file); | ||
| cmd.arg("--target").arg(&*host.triple); | ||
| cmd.arg("--skip").arg(&skip_file); | ||
| cmd.arg("--sample-percentage").arg("10"); | ||
| cmd.env("CC", builder.cc(host)); | ||
| cmd.env("CFLAGS", cflags); | ||
| cmd.run(builder); | ||
|
|
||
| let manifest = out_dir.join("rust_programs/Cargo.toml"); | ||
| let mut cargo = command(&builder.initial_cargo); | ||
| cargo.arg("test"); | ||
| cargo.arg("--tests"); | ||
| cargo.arg("--manifest-path").arg(&manifest); | ||
| cargo.arg("--target").arg(&*host.triple); | ||
| cargo.arg("--profile").arg("release"); | ||
| cargo.env("CC", builder.cc(host)); | ||
| cargo.env("CFLAGS", cflags); | ||
| cargo.env("RUSTC", &builder.initial_rustc); | ||
| cargo.env("RUSTC_BOOTSTRAP", "1"); | ||
| if let Some(runner) = sde_runner { | ||
| cargo.env("CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER", runner); | ||
| } | ||
| cargo.run(builder); | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Clone, PartialEq, Eq, Hash)] | ||
| pub struct Clippy { | ||
| compilers: RustcPrivateCompilers, | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,8 +19,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ | |
| mingw-w64 \ | ||
| zlib1g-dev \ | ||
| libzstd-dev \ | ||
| clang \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| # Install Intel SDE for AVX-512 emulation | ||
| RUN curl -L http://ci-mirrors.rust-lang.org/sde-external-10.8.0-2026-03-15-lin.tar.xz -o /tmp/sde.tar.xz \ | ||
| && mkdir -p /intel-sde \ | ||
| && tar -xJf /tmp/sde.tar.xz --strip-components=1 -C /intel-sde \ | ||
| && rm /tmp/sde.tar.xz | ||
|
Comment on lines
+26
to
+29
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this doesn't need an instant fix, but we bump the version of this tool occasionally, so ideally we'd sync that version between the repositories.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok, noted. |
||
|
|
||
| COPY scripts/sccache.sh /scripts/ | ||
| RUN sh /scripts/sccache.sh | ||
|
|
||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.