address review feedbacks

Author: xonx4l

src/bootstrap/src/core/build_steps/test.rs

@@ -904,6 +904,12 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
     }
 }
 
+/// 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,
@@ -917,12 +923,12 @@ impl Step for IntrinsicTest {
         run.path("library/stdarch/crates/intrinsic-test").path("library/stdarch/crates/core_arch")
     }
 
-    fn is_default_step(_builder: &Builder<'_>) -> bool {
-        true
-    }
-
     fn make_run(run: RunConfig<'_>) {
-        run.builder.ensure(IntrinsicTest { host: run.target });
+        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<'_>) {
@@ -949,16 +955,22 @@ impl Step for IntrinsicTest {
                 None,
             )
         } else {
-            return;
+            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() {
-            std::os::unix::fs::symlink(builder.src.join("library/stdarch/crates"), &crates_link)
-                .unwrap();
+            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);
@@ -967,7 +979,7 @@ impl Step for IntrinsicTest {
         cmd.arg("--target").arg(&*host.triple);
         cmd.arg("--skip").arg(&skip_file);
         cmd.arg("--sample-percentage").arg("10");
-        cmd.env("CC", "clang");
+        cmd.env("CC", builder.cc(host));
         cmd.env("CFLAGS", cflags);
         cmd.run(builder);
 
@@ -978,7 +990,7 @@ impl Step for IntrinsicTest {
         cargo.arg("--manifest-path").arg(&manifest);
         cargo.arg("--target").arg(&*host.triple);
         cargo.arg("--profile").arg("release");
-        cargo.env("CC", "clang");
+        cargo.env("CC", builder.cc(host));
         cargo.env("CFLAGS", cflags);
         cargo.env("RUSTC", &builder.initial_rustc);
         cargo.env("RUSTC_BOOTSTRAP", "1");

src/bootstrap/src/core/build_steps/tool.rs

@@ -502,7 +502,7 @@ bootstrap_tool!(
     FeaturesStatusDump, "src/tools/features-status-dump", "features-status-dump";
     OptimizedDist, "src/tools/opt-dist", "opt-dist", submodules = &["src/tools/rustc-perf"];
     RunMakeSupport, "src/tools/run-make-support", "run_make_support", artifact_kind = ToolArtifactKind::Library;
-    IntrinsicTest, "library/stdarch/crates/intrinsic-test", "intrinsic-test", is_external_tool = true;
+    IntrinsicTest, "library/stdarch/crates/intrinsic-test", "intrinsic-test";
 );
 
 /// These are the submodules that are required for rustbook to work due to

src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap

@@ -181,10 +181,6 @@ expression: test
 [Test] test::RustcBook
     targets: [x86_64-unknown-linux-gnu]
     - Set({test::src/doc/rustc})
-[Test] test::IntrinsicTest
-    targets: [x86_64-unknown-linux-gnu]
-    - Set({test::library/stdarch/crates/core_arch})
-    - Set({test::library/stdarch/crates/intrinsic-test})
 [Test] test::RustdocJSStd
     targets: [x86_64-unknown-linux-gnu]
     - Suite(test::tests/rustdoc-js-std)

src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage.snap

@@ -180,10 +180,6 @@ expression: test --skip=coverage
 [Test] test::RustcBook
     targets: [x86_64-unknown-linux-gnu]
     - Set({test::src/doc/rustc})
-[Test] test::IntrinsicTest
-    targets: [x86_64-unknown-linux-gnu]
-    - Set({test::library/stdarch/crates/core_arch})
-    - Set({test::library/stdarch/crates/intrinsic-test})
 [Test] test::RustdocJSStd
     targets: [x86_64-unknown-linux-gnu]
     - Suite(test::tests/rustdoc-js-std)

src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests.snap

@@ -144,10 +144,6 @@ expression: test --skip=tests
 [Test] test::RustcBook
     targets: [x86_64-unknown-linux-gnu]
     - Set({test::src/doc/rustc})
-[Test] test::IntrinsicTest
-    targets: [x86_64-unknown-linux-gnu]
-    - Set({test::library/stdarch/crates/core_arch})
-    - Set({test::library/stdarch/crates/intrinsic-test})
 [Test] test::RustdocTheme
     targets: [x86_64-unknown-linux-gnu]
     - Set({test::src/tools/rustdoc-themes})

src/bootstrap/src/core/builder/tests.rs

@@ -2138,7 +2138,6 @@ mod snapshot {
         [test] link-check <host>
         [test] tier-check <host>
         [test] rustc 0 <host> -> rust-analyzer 1 <host>
-        [build] rustc 0 <host> -> IntrinsicTest 1 <host>
         [build] rustc 0 <host> -> RustdocTheme 1 <host>
         [test] rustdoc-theme 1 <host>
         [test] compiletest-rustdoc-ui 1 <host>
@@ -2322,7 +2321,6 @@ mod snapshot {
         [test] rustc 1 <host> -> rust-analyzer 2 <host>
         [doc] rustc (book) <host>
         [test] rustc 1 <host> -> lint-docs 2 <host>
-        [build] rustc 0 <host> -> IntrinsicTest 1 <host>
         [build] rustc 0 <host> -> RustdocTheme 1 <host>
         [test] rustdoc-theme 2 <host>
         [test] compiletest-rustdoc-ui 2 <host>