Run part of cg_clif's tests in CI #112701

bjorn3 · 2023-06-16T08:52:27Z

While currently cg_clif is already built in CI ensuring that it always compiles, sometimes there is a bug in the changes that were made causing tests to fail. This PR is one step towards preventing this.

Part of the test suite is still skipped until vendoring for the projects that are being tested is implemented. I will implement that in a future PR.

Fixes part of https://github.com/bjorn3/rustc_codegen_cranelift/issues/1290
Fixes part of #95518
Required for #81746

rustbot · 2023-06-16T08:52:33Z

r? @albertlarsan68

(rustbot has picked a reviewer for you, use r? to override)

bjorn3 · 2023-06-16T08:54:21Z

src/bootstrap/dist.rs

-            let backends_dst = image.join("lib").join(&backends_rel);
-
-            t!(fs::create_dir_all(&backends_dst));
-            builder.cp_r(&backends_src, &backends_dst);


I had to make this change immediately to prevent shipping cg_clif in the rustc component. #81746 will create a separate component for cg_clif.

Doesn't this break users who do want this? If we avoid modifying defaults or change CI to not have cranelift enabled in dist builders, then this is probably not needed, right?

albertlarsan68 · 2023-06-18T08:06:13Z

r? @Mark-Simulacrum
Sorry for the delay

Mark-Simulacrum · 2023-06-24T15:44:24Z

config.example.toml

@@ -608,7 +608,7 @@ changelog-seen = 2
 # and currently the only standard options supported are `"llvm"`, `"cranelift"`
 # and `"gcc"`. The first backend in this list will be used as default by rustc
 # when no explicit backend is specified.
-#codegen-backends = ["llvm"]
+#codegen-backends = ["llvm", "cranelift"]


The list here tends to be the default built list - are we starting to build cranelift in this PR by default?

Yes. We already compile it by default in ./x.py check. If this was enabled in the CI config instead it would be easy to forget to test it locally.

#112701 (comment)

Mark-Simulacrum · 2023-06-24T15:47:06Z

src/bootstrap/defaults/config.user.toml

@@ -13,6 +13,8 @@ extended = true
 download-ci-llvm = false
 [rust]
 download-rustc = false
+# Skip building the cranelift backend. It isn't ready to be shipped yet.
+codegen-backends = ["llvm"]


I don't think we can rely on profiles as the way to modify the defaults - is there a reason we're modifying those in this PR? We can enable building/testing cranelift in CI without changing defaults.

لا أعتقد أنه يمكننا الاعتماد على الملفات الشخصية كطريقة لتعديل الإعدادات الافتراضية - هل هناك سبب لتعديل تلك الموجودة في هذه العلاقات العامة؟ يمكننا تمكين بناء / اختبار رافعة الرافعة في CI دون تغيير الإعدادات الافتراضية.

Mark-Simulacrum · 2023-06-24T15:51:11Z

src/bootstrap/dist.rs

-            let backends_dst = image.join("lib").join(&backends_rel);
-
-            t!(fs::create_dir_all(&backends_dst));
-            builder.cp_r(&backends_src, &backends_dst);


Doesn't this break users who do want this? If we avoid modifying defaults or change CI to not have cranelift enabled in dist builders, then this is probably not needed, right?

src/bootstrap/test.rs

Mark-Simulacrum · 2023-06-24T15:57:00Z

src/bootstrap/test.rs

+
+        if !builder.config.rust_codegen_backends.contains(&INTERNER.intern_str("cranelift")) {
+            builder.info("cranelift not in rust.codegen-backends. skipping");
+            return;


I suspect these might want to be default_condition/lazy_default_condition rather than gated here...

That would still attempt to run it on ./x.py test compiler/rustc_codegen_cranelift, right?

Yes, and allow running it that way even if rust_codegen_backends doesn't contain cranelift.

librustc_codegen_cranelift-*.so needs to end up in the sysroot for cg_clif testing to work. This doesn't happen if rust_codegen_backends doesn't contain cranelift. And overwriting rust_codegen_backends if ./x.py test compiler/rustc_codegen_cranelift is done would lead to surprising results I think.

bors · 2023-06-27T21:48:47Z

☔ The latest upstream changes (presumably #113102) made this pull request unmergeable. Please resolve the merge conflicts.

bjorn3 · 2023-07-26T19:14:07Z

I switched everything to enable cg_clif testing in ci/run.sh rather than by enabling cg_clif by default for all ./x.py.

src/bootstrap/test.rs

Kobzol · 2023-09-08T09:17:29Z

@rustbot ready

I think that this is ready for another round of review.

Mark-Simulacrum · 2023-09-10T15:42:58Z

r=me with commits squashed

bjorn3 · 2023-09-10T15:57:18Z

Rebased and squashed.

@bors r=Mark-Simulacrum

bors · 2023-09-10T15:57:20Z

📌 Commit 238d8e3 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

bors · 2023-09-10T20:18:04Z

⌛ Testing commit 238d8e3 with merge c0583a0...

bors · 2023-09-10T22:07:03Z

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing c0583a0 to master...

rust-timer · 2023-09-10T23:48:46Z

Finished benchmarking commit (c0583a0): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.8%	[-3.5%, -2.2%]	2
All ❌✅ (primary)	-	-	0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 629.704s -> 630.509s (0.13%)
Artifact size: 317.61 MiB -> 317.56 MiB (-0.02%)

Run part of `rustc_codegen_gcc`'s tests in CI Thanks to rust-lang#112701 and `@bjorn3,` it made this much easier. Also cc `@antoyo.` r? `@bjorn3`

…ozkan Run part of `rustc_codegen_gcc`'s tests in CI Thanks to rust-lang#112701 and `@bjorn3,` it made this much easier. Also cc `@antoyo.` r? `@bjorn3`

bjorn3 added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-cranelift Things relevant to the [future] cranelift backend labels Jun 16, 2023

rustbot assigned albertlarsan68 Jun 16, 2023

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 16, 2023

bjorn3 commented Jun 16, 2023

View reviewed changes

bjorn3 mentioned this pull request Jun 16, 2023

Wire up testing to ./x.py test in rust-lang/rust rust-lang/rustc_codegen_cranelift#1290

Open

13 tasks

rustbot assigned Mark-Simulacrum and unassigned albertlarsan68 Jun 18, 2023

Mark-Simulacrum reviewed Jun 24, 2023

View reviewed changes

Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 24, 2023

bjorn3 force-pushed the test_cg_clif_in_ci2 branch from c384140 to fcd0a0c Compare June 28, 2023 16:25

bjorn3 force-pushed the test_cg_clif_in_ci2 branch from fcd0a0c to e1eebff Compare July 26, 2023 15:33

This comment has been minimized.

Sign in to view

bjorn3 force-pushed the test_cg_clif_in_ci2 branch from e1eebff to b9dd977 Compare July 26, 2023 17:03

rustbot added the T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. label Jul 26, 2023

This comment has been minimized.

Sign in to view

bjorn3 force-pushed the test_cg_clif_in_ci2 branch from aa5c1fb to 3c2fc10 Compare July 26, 2023 18:07

bjorn3 mentioned this pull request Aug 8, 2023

Add f16 and f128 #114607

Closed

bjorn3 commented Aug 8, 2023

View reviewed changes

src/bootstrap/test.rs Show resolved Hide resolved

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 8, 2023

Allow testing cg_clif using ./x.py test

238d8e3

bjorn3 force-pushed the test_cg_clif_in_ci2 branch from 6c8c5cb to 238d8e3 Compare September 10, 2023 15:57

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 10, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 10, 2023

bors merged commit c0583a0 into rust-lang:master Sep 10, 2023
12 checks passed

rustbot added this to the 1.74.0 milestone Sep 10, 2023

bors mentioned this pull request Sep 10, 2023

Dummy PR to test coverage test changes in CI #114917

Draft

bjorn3 deleted the test_cg_clif_in_ci2 branch September 10, 2023 22:16

GuillaumeGomez mentioned this pull request Oct 28, 2023

Run part of rustc_codegen_gcc's tests in CI #117313

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Run part of cg_clif's tests in CI #112701

Run part of cg_clif's tests in CI #112701

bjorn3 commented Jun 16, 2023 •

edited

Loading

rustbot commented Jun 16, 2023

bjorn3 Jun 16, 2023

Mark-Simulacrum Jun 24, 2023

albertlarsan68 commented Jun 18, 2023

Mark-Simulacrum Jun 24, 2023

bjorn3 Jun 24, 2023

Ohoodalzoubi Aug 21, 2023

Mark-Simulacrum Jun 24, 2023

Ohoodalzoubi Aug 21, 2023 •

edited

Loading

Mark-Simulacrum Jun 24, 2023

Mark-Simulacrum Jun 24, 2023

bjorn3 Jun 24, 2023 •

edited

Loading

Mark-Simulacrum Sep 10, 2023

bjorn3 Sep 10, 2023

bors commented Jun 27, 2023

This comment has been minimized.

This comment has been minimized.

bjorn3 commented Jul 26, 2023

Kobzol commented Sep 8, 2023

Mark-Simulacrum commented Sep 10, 2023

bjorn3 commented Sep 10, 2023

bors commented Sep 10, 2023

bors commented Sep 10, 2023

bors commented Sep 10, 2023

rust-timer commented Sep 10, 2023

Run part of cg_clif's tests in CI #112701

Run part of cg_clif's tests in CI #112701

Conversation

bjorn3 commented Jun 16, 2023 • edited Loading

rustbot commented Jun 16, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

albertlarsan68 commented Jun 18, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ohoodalzoubi Aug 21, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bjorn3 Jun 24, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bors commented Jun 27, 2023

This comment has been minimized.

This comment has been minimized.

bjorn3 commented Jul 26, 2023

Kobzol commented Sep 8, 2023

Mark-Simulacrum commented Sep 10, 2023

bjorn3 commented Sep 10, 2023

bors commented Sep 10, 2023

bors commented Sep 10, 2023

bors commented Sep 10, 2023

rust-timer commented Sep 10, 2023

Overall result: no relevant changes - no action needed

bjorn3 commented Jun 16, 2023 •

edited

Loading

Ohoodalzoubi Aug 21, 2023 •

edited

Loading

bjorn3 Jun 24, 2023 •

edited

Loading