ci: Add support for dist-loongarch64-linux #110519

heiher · 2023-04-19T03:15:32Z

We are preparing to promote loongarch64-unknown-linux-gnu to Tier 2, and one of the tasks is to add CI support. We are currently in the process of upgrading the dependencies for the build tools, and before this is completed, we would like to request comments. Thanks

Progress

Update linux-raw-sys to 0.3.2 (Update linux-raw-sys to 0.3.2 cargo#11998)
Update openssl-src to 111.25.3+1.1.1t (Update openssl-src to 111.25.3+1.1.1t cargo#12005)
bootstrap: Update linux-raw-sys to 0.3.2 (bootstrap: Update linux-raw-sys to 0.3.2 #110516)
Update linux-raw-sys to 0.3.4 (Update linux-raw-sys to 0.3.4 #110518)
Update cargo (Update cargo #110834)
linux_like: Add missing constants for loongarch64 (linux_like: Add missing constants for loongarch64 libc#3237)
Release 0.2.143 (Release 0.2.143 libc#3236)
Update libc to 0.2.144 (Update libc to 0.2.144 cargo#12098)
Update cargo (Update cargo #111456)

Tier 2 with host tools MCP: rust-lang/compiler-team#518

rustbot · 2023-04-19T03:15:41Z

r? @Mark-Simulacrum

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

heiher · 2023-04-26T05:19:53Z

@bors try

bors · 2023-04-26T05:19:55Z

@heiher: 🔑 Insufficient privileges: not in try users

heiher · 2023-04-29T00:46:46Z

@Mark-Simulacrum Ready for review, ci test result: https://github.com/loongarch-rs/rust/actions/runs/4804319116

cuviper · 2023-05-02T21:55:45Z

Note that try only runs dist-x86_64-linux unless you (temporarily) edit the CI config for that job.

My crosstool refactoring in #110865 was just approved, so it would be great if you followed suit here. I see that you're using a git snapshot for loongarch support, but apart from that you should be able to work like the others.

heiher · 2023-05-03T00:28:54Z

Hello @cuviper, Thanks for your comments.

Note that try only runs dist-x86_64-linux unless you (temporarily) edit the CI config for that job.

You're right, I did make a temporary change to the CI configuration for that job.

Commits: https://github.com/loongarch-rs/rust/commits/auto
Action results: https://github.com/loongarch-rs/rust/actions

My crosstool refactoring in #110865 was just approved, so it would be great if you followed suit here. I see that you're using a git snapshot for loongarch support, but apart from that you should be able to work like the others.

Great job! Thank you for pushing the update for crosstool-ng. However, support for LoongArch is expected to be available only in the next release version (1.26). Therefore, it may be a good idea for us to use the git snapshot version for now and make the change once version 1.26 is released. This way, we shouldn't miss out on Rust 1.71.

I am grateful for your insightful comments and suggestions. ❤️

cuviper · 2023-05-03T17:19:15Z

@heiher Yes, it's fine that you need to use a pre-release version of crosstool-ng. I meant that you should try to follow the rest of the refactoring that I implemented: committing a defconfig rather than a full config, and using the new common scripts/crosstool-ng-build.sh instead of individual scripts like your build-toolchains.sh.

bors · 2023-05-03T18:26:26Z

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

heiher · 2023-05-04T00:01:31Z

@cuviper It has been rebased to the mainline and passed the tests. Does it look good to you please?

xen0n

This is much easier to review now, thanks for the rebasing! Only one question from me below.

xen0n · 2023-05-04T06:59:03Z

src/ci/docker/README.md

+- Operating System > Linux kernel version = 5.19.16
+- Binary utilities > Version of binutils = 2.40
+- C-library > glibc version = 2.36
+- C compiler > gcc version = 12.2.0


Are we able to raise this to GCC 13.1.0 now that it's released?

Certainly, although GCC 13 has been released, the upgrade for crosstool-ng is still in progress. We would like to catch up with the Rust 1.71 release, and since LoongArch CI is not dependent on GCC 13, I propose that we upgrade after crosstool-ng is ready, possibly through a new PR.

If crosstool-ng is ready earlier than expected, I would be happy to include it in this PR.

Ah yes. I forgot we privately talked about this a while ago.

cuviper

I'm going to leave the formal review to Mark. I'm not sure if the target should be built in CI at all until it has approval per the target tier policy.

cuviper · 2023-05-04T17:38:02Z

src/ci/docker/host-x86_64/dist-loongarch64-linux/loongarch64-unknown-linux-gnu.defconfig

+CT_DEBUG_GDB=y
+CT_GDB_V_12=y
+# CT_GDB_CROSS_PYTHON is not set
+# CT_GDB_GDBSERVER is not set


We don't need GDB, so all 4 of these can be removed.

cuviper · 2023-05-04T17:39:22Z

src/ci/docker/host-x86_64/dist-loongarch64-linux/loongarch64-unknown-linux-gnu.defconfig

+# CT_GDB_CROSS_PYTHON is not set
+# CT_GDB_GDBSERVER is not set
+CT_ISL_V_0_24=y
+CT_ZSTD_V_1_5_2=y


On all other targets, I left out versions for things like ISL and ZSTD so they could just use their defaults. Are there particular needs here?

cuviper · 2023-05-04T17:44:04Z

src/ci/docker/host-x86_64/dist-loongarch64-linux/loongarch64-unknown-linux-gnu.defconfig

+CT_CONFIG_VERSION="4"
+CT_EXPERIMENTAL=y
+CT_PREFIX_DIR="/x-tools/${CT_TARGET}"
+CT_LOG_ALL=y


We don't really need logging, but I guess it doesn't hurt either way.

Please do add the mirror config like the other targets though:

CT_USE_MIRROR=y CT_MIRROR_BASE_URL="https://ci-mirrors.rust-lang.org/rustc"

(We don't have everything mirrored, but AIUI this will let our mirror take precedence when we do add things.)

heiher · 2023-05-05T02:16:53Z

I'm going to leave the formal review to Mark. I'm not sure if the target should be built in CI at all until it has approval per the target tier policy.

Thanks for your feedback. We are moving forward, and there is a resolved MCP that for LoongArch to Tier2: rust-lang/compiler-team#518

heiher · 2023-05-06T02:30:25Z

@rustbot author

cargo build breaks by libc constants are missing.

Mark-Simulacrum · 2023-05-06T17:09:36Z

Can you temporarily enable the builder here for try builds or in PR CI? That will let us test how long this takes (after Docker is cached) and make a decision in T-infra on whether we currently have capacity to add the builder.

nikic · 2023-05-06T19:56:56Z

src/ci/docker/scripts/crosstool-ng-git.sh

+#!/bin/sh
+set -ex
+
+git clone --depth=1 https://github.com/crosstool-ng/crosstool-ng


This should be pinned to a fixed commit, to make sure we don't pick up a broken commit.

heiher · 2023-05-07T02:09:31Z

@Mark-Simulacrum Certainly, Thank you.

Mark-Simulacrum · 2023-05-22T14:43:21Z

Infra discussed and agreed to move forward with adding the builder.

@bors r+

bors · 2023-05-22T14:43:24Z

📌 Commit 5f173e9 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

bors · 2023-05-22T23:48:47Z

⌛ Testing commit 5f173e9 with merge 4f80088941583158b9f62e8d6a60b94a087329d9...

bors · 2023-05-23T04:03:47Z

💥 Test timed out

xen0n · 2023-05-23T04:33:34Z

The dist-x86_64-apple build seems to be flaking out.

rust-log-analyzer · 2023-05-23T04:52:02Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

heiher · 2023-05-23T05:58:29Z

@bors retry

This PR doesn't seem bad, retry again.

bors · 2023-05-23T05:58:31Z

@heiher: 🔑 Insufficient privileges: not in try users

workingjubilee · 2023-05-23T06:43:51Z

@bors retry

bors · 2023-05-23T07:27:54Z

⌛ Testing commit 5f173e9 with merge cda5bec...

klensy · 2023-05-23T07:53:18Z

src/ci/docker/scripts/cross-apt-packages.sh

@@ -22,6 +22,7 @@ apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install
  patch \
  pkg-config \
  python3 \
+  rsync \


rsync used somewhere? Can't see any matches here.

It is used by crosstool-ng git version.

bors · 2023-05-23T10:12:38Z

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

rust-timer · 2023-05-23T11:29:29Z

Finished benchmarking commit (cda5bec): 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)	2.9%	[2.8%, 3.0%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.6%	[-1.6%, -1.6%]	1
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: 644.363s -> 644.28s (-0.01%)

ci: Upgrade loongarch64-linux-gnu GCC to 13.1.0 This PR upgrades GCC to 13.1.0 for the `loongarch64-unknown-linux-gnu` target. This upgrade was suggested in a previous review discussion: rust-lang#110519 (comment)

rustbot assigned Mark-Simulacrum Apr 19, 2023

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Apr 19, 2023

This comment has been minimized.

Sign in to view

heiher mentioned this pull request Apr 19, 2023

Update linux-raw-sys to 0.3.2 rust-lang/cargo#11998

Merged

heiher marked this pull request as ready for review April 26, 2023 03:36

heiher mentioned this pull request Apr 28, 2023

Promote loongarch64-unknown-linux-gnu to Tier 2 with host tools #110936

Merged

heiher marked this pull request as draft May 3, 2023 01:19

heiher marked this pull request as ready for review May 4, 2023 00:02

xen0n reviewed May 4, 2023

View reviewed changes

cuviper reviewed May 4, 2023

View reviewed changes

rustbot 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 May 6, 2023

nikic reviewed May 6, 2023

View reviewed changes

This comment has been minimized.

Sign in to view

Mark-Simulacrum removed the S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). label May 22, 2023

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 May 22, 2023

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

Dylan-DPC 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 May 23, 2023

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 23, 2023

klensy reviewed May 23, 2023

View reviewed changes

bors added the merged-by-bors This PR was explicitly merged by bors. label May 23, 2023

bors merged commit cda5bec into rust-lang:master May 23, 2023

rustbot added this to the 1.71.0 milestone May 23, 2023

heiher deleted the ci branch May 23, 2023 10:33

heiher mentioned this pull request Jun 6, 2023

ci: Upgrade loongarch64-linux-gnu GCC to 13.1.0 #112335

Merged

Skepfyr mentioned this pull request Jan 6, 2024

regression: overflow evaluating requirement #113239

Open

ci: Add support for dist-loongarch64-linux #110519

ci: Add support for dist-loongarch64-linux #110519

Conversation

heiher commented Apr 19, 2023 • edited Loading

Progress

rustbot commented Apr 19, 2023

This comment has been minimized.

heiher commented Apr 26, 2023

bors commented Apr 26, 2023

heiher commented Apr 29, 2023

cuviper commented May 2, 2023

heiher commented May 3, 2023

cuviper commented May 3, 2023

bors commented May 3, 2023

heiher commented May 4, 2023

xen0n left a comment

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

Choose a reason for hiding this comment

cuviper left a comment

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

heiher commented May 5, 2023

heiher commented May 6, 2023

Mark-Simulacrum commented May 6, 2023

Choose a reason for hiding this comment

heiher commented May 7, 2023

This comment has been minimized.

This comment has been minimized.

Mark-Simulacrum commented May 22, 2023

bors commented May 22, 2023

bors commented May 22, 2023

bors commented May 23, 2023

xen0n commented May 23, 2023

rust-log-analyzer commented May 23, 2023

heiher commented May 23, 2023

bors commented May 23, 2023

workingjubilee commented May 23, 2023

bors commented May 23, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bors commented May 23, 2023

rust-timer commented May 23, 2023

Overall result: no relevant changes - no action needed

heiher commented Apr 19, 2023 •

edited

Loading