Promote ohos targets to tier2 with host tools. #137011

LuuuXXX · 2025-02-14T07:09:38Z

What does this PR try to resolve?

Try to promote the following [Tier 2 without Host Tools](https://doc.rust-lang.org/rustc/platform-support.html#tier-2-without-host-tools) targets to [Tier 2 with Host Tools](https://doc.rust-lang.org/rustc/platform-support.html#tier-2-with-host-tools):

aarch64-unknown-linux-ohos
armv7-unknown-linux-ohos
x86_64-unknown-linux-ohos

More Information?

see MCP: rust-lang/compiler-team#811

Blockage to be solved?

Submit an MCP
Submit code of promote ohos targets
Resolve related dependencies （measureme）

The modified code of the measureme has been merged （see https://github.com/rust-lang/measureme/pull/238）. [done]
The new version will was released (rust-lang/measureme#240). [done]

rustbot · 2025-02-14T07:09:47Z

r? @Kobzol

rustbot has assigned @Kobzol.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2025-02-14T07:09:50Z

This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp.

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

LuuuXXX · 2025-02-14T08:04:57Z

The measureme-mirror used to replace the measureme cannot pass the tidy check. It seems that a new measureme version is required.

Kobzol · 2025-02-14T12:11:49Z

This job runs on the free GitHub runners, so in terms of infra cost, the build time increase should be fine.

LuuuXXX · 2025-02-15T01:19:58Z

Very appreciate it.

LuuuXXX · 2025-02-15T18:37:24Z

It seems guard is ok

LuuuXXX · 2025-02-18T06:42:38Z

r? @Amanieu

Amanieu · 2025-02-18T08:58:29Z

Cargo.lock

@@ -2353,7 +2367,7 @@ dependencies = [
 "libc",
 "libffi",
 "libloading",
- "measureme",
+ "measureme 11.0.1",


It seems miri is still using measureme 11, could this cause problems?

I missed this tool in my local test.

Amanieu · 2025-02-18T09:09:21Z

src/ci/docker/host-x86_64/dist-ohos/Dockerfile

@@ -51,7 +62,7 @@ ENV RUST_CONFIGURE_ARGS \
    --enable-profiler \
    --disable-docs


You want to add: --full-tools --extended --sanitizers here as well.

Sorry that should be --enable-extended --enable-full-tools --enable-sanitizers.

that should be --enable-extended --enable-full-tools --enable-sanitizers.

After --enable-sanitizers, the unwinder library is missing during sanitizers compilation.

Building sanitizers for aarch64-unknown-linux-ohos CMAKE_TOOLCHAIN_FILE_aarch64-unknown-linux-ohos = None CMAKE_TOOLCHAIN_FILE_aarch64_unknown_linux_ohos = None TARGET_CMAKE_TOOLCHAIN_FILE = None CMAKE_TOOLCHAIN_FILE = None CMAKE_PREFIX_PATH_aarch64-unknown-linux-ohos = None CMAKE_PREFIX_PATH_aarch64_unknown_linux_ohos = None TARGET_CMAKE_PREFIX_PATH = None CMAKE_PREFIX_PATH = None CMAKE_aarch64-unknown-linux-ohos = None CMAKE_aarch64_unknown_linux_ohos = None TARGET_CMAKE = None CMAKE = None running: cd "/root/rust/build/aarch64-unknown-linux-ohos/native/sanitizers/build" && CMAKE_PREFIX_PATH="" DESTDIR="" "cmake" "/root/rust/src/llvm-project/compiler-rt" "-G" "Ninja" "-DCMAKE_C_COMPILER_TARGET=aarch64-unknown-linux-ohos" "-DCOMPILER_RT_BUILD_BUILTINS=OFF" "-DCOMPILER_RT_BUILD_CRT=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" "-DCOMPILER_RT_BUILD_SANITIZERS=ON" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCOMPILER_RT_USE_LIBCXX=OFF" "-DLLVM_CONFIG_PATH=/root/rust/build/x86_64-unknown-linux-gnu/llvm/bin/llvm-config" "-DCMAKE_INSTALL_MESSAGE=LAZY" "-DCMAKE_CROSSCOMPILING=True" "-DCMAKE_SYSTEM_NAME=Linux" "-DCMAKE_C_COMPILER=/usr/local/bin/aarch64-unknown-linux-ohos-clang.sh" "-DCMAKE_CXX_COMPILER=/usr/local/bin/aarch64-unknown-linux-ohos-clang++.sh" "-DCMAKE_ASM_COMPILER=/usr/local/bin/aarch64-unknown-linux-ohos-clang.sh" "-DCMAKE_C_FLAGS=-ffunction-sections -fdata-sections -fPIC --target=aarch64-unknown-linux-ohos" "-DCMAKE_CXX_FLAGS=-ffunction-sections -fdata-sections -fPIC --target=aarch64-unknown-linux-ohos" "-DCMAKE_AR=/opt/ohos-sdk/native/llvm/bin/llvm-ar" "-DCMAKE_SHARED_LINKER_FLAGS=" "-DCMAKE_MODULE_LINKER_FLAGS=" "-DCMAKE_EXE_LINKER_FLAGS=" "-DCMAKE_INSTALL_PREFIX=/root/rust/build/aarch64-unknown-linux-ohos/native/sanitizers" "-DCMAKE_ASM_FLAGS= -ffunction-sections -fdata-sections -fPIC --target=aarch64-unknown-linux-ohos" "-DCMAKE_BUILD_TYPE=Release" CMake Deprecation Warning at /root/rust/src/llvm-project/cmake/Modules/CMakePolicy.cmake:6 (cmake_policy): The OLD behavior for policy CMP0114 will be removed from a future version of CMake. The cmake-policies(7) manual explains that the OLD behaviors of all policies are deprecated and that a policy should be set to OLD only under specific short-term circumstances. Projects should be ported to the NEW behavior and not rely on setting a policy to OLD. Call Stack (most recent call first): CMakeLists.txt:12 (include) CMake Deprecation Warning at /root/rust/src/llvm-project/cmake/Modules/CMakePolicy.cmake:11 (cmake_policy): The OLD behavior for policy CMP0116 will be removed from a future version of CMake. The cmake-policies(7) manual explains that the OLD behaviors of all policies are deprecated and that a policy should be set to OLD only under specific short-term circumstances. Projects should be ported to the NEW behavior and not rely on setting a policy to OLD. Call Stack (most recent call first): CMakeLists.txt:12 (include) CMake Warning at cmake/Modules/CompilerRTUtils.cmake:290 (message): LLVM_CONFIG_PATH is deprecated, please use LLVM_CMAKE_DIR instead Call Stack (most recent call first): CMakeLists.txt:105 (load_llvm_config) CMake Warning at cmake/Modules/CompilerRTUtils.cmake:335 (message): LLVMTestingSupport not found in LLVM_AVAILABLE_LIBS Call Stack (most recent call first): CMakeLists.txt:105 (load_llvm_config) -- LLVM_MAIN_SRC_DIR: "/root/rust/src/llvm-project/llvm" -- cmake c compiler target: aarch64-unknown-linux-ohos -- Compiler-RT supported architectures: aarch64 CMake Error at lib/scudo/standalone/CMakeLists.txt:167 (message): No suitable unwinder library -- Configuring incomplete, errors occurred!

I'm not particularly sure, but It should be automatically getting it from native/llvm/lib/aarch64-linux-ohos/libunwind.a ?

Looking through the LLVM config, I think you need to pass COMPILER_RT_USE_BUILTINS_LIBRARY=ON to LLVM's cmake.

Looking through the LLVM config, I think you need to pass COMPILER_RT_USE_BUILTINS_LIBRARY=ON to LLVM's cmake.

yes, very appreciae, it does works.

rustbot · 2025-02-24T03:42:32Z

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

The Miri subtree was changed

cc @rust-lang/miri

bors · 2025-02-25T03:16:35Z

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

bors · 2025-03-05T17:03:26Z

⌛ Trying commit 23adb46 with merge 77ad712...

…, r=<try> Promote ohos targets to tier2 with host tools. ### What does this PR try to resolve? Try to promote the following [[Tier 2 without Host Tools](https://doc.rust-lang.org/rustc/platform-support.html#tier-2-without-host-tools)](https://doc.rust-lang.org/rustc/platform-support.html#tier-2-without-host-tools) targets to [[Tier 2 with Host Tools](https://doc.rust-lang.org/rustc/platform-support.html#tier-2-with-host-tools)](https://doc.rust-lang.org/rustc/platform-support.html#tier-2-with-host-tools): - `aarch64-unknown-linux-ohos` - `armv7-unknown-linux-ohos` - `x86_64-unknown-linux-ohos` ### More Information? see MCP: rust-lang/compiler-team#811 ### Blockage to be solved? - [x] Submit an MCP - [x] Submit code of promote ohos targets - [x] Resolve related dependencies （`measureme`） The modified code of the measureme has been merged （see rust-lang/measureme#238）. [done] The new version will was released (rust-lang/measureme#240). [done] try-job: dist-ohos

jieyouxu · 2025-03-05T18:34:03Z

@bors r- (in case try job somehow gets promoted to full merge)

bors · 2025-03-05T19:35:50Z

💔 Test failed - checks-actions

jieyouxu · 2025-03-05T19:51:53Z

No space left on device. You may wish to talk to infra over at https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra about a larger runner for this?

Amanieu · 2025-03-06T23:03:10Z

@bors try

…, r=<try> Promote ohos targets to tier2 with host tools. ### What does this PR try to resolve? Try to promote the following [[Tier 2 without Host Tools](https://doc.rust-lang.org/rustc/platform-support.html#tier-2-without-host-tools)](https://doc.rust-lang.org/rustc/platform-support.html#tier-2-without-host-tools) targets to [[Tier 2 with Host Tools](https://doc.rust-lang.org/rustc/platform-support.html#tier-2-with-host-tools)](https://doc.rust-lang.org/rustc/platform-support.html#tier-2-with-host-tools): - `aarch64-unknown-linux-ohos` - `armv7-unknown-linux-ohos` - `x86_64-unknown-linux-ohos` ### More Information? see MCP: rust-lang/compiler-team#811 ### Blockage to be solved? - [x] Submit an MCP - [x] Submit code of promote ohos targets - [x] Resolve related dependencies （`measureme`） The modified code of the measureme has been merged （see rust-lang/measureme#238）. [done] The new version will was released (rust-lang/measureme#240). [done] try-job: dist-ohos

bors · 2025-03-06T23:04:22Z

⌛ Trying commit 4cd350f with merge 4f4ed10...

bors · 2025-03-07T02:42:20Z

☀️ Try build successful - checks-actions
Build commit: 4f4ed10 (4f4ed103bd2aef1c38c7b609f2aab272123a8b2a)

LuuuXXX · 2025-03-13T07:57:03Z

The check should have passed. Maybe we can merge it?

Amanieu · 2025-03-16T12:44:49Z

@bors r+

bors · 2025-03-16T12:44:52Z

📌 Commit 4cd350f has been approved by Amanieu

It is now in the queue for this repository.

bors · 2025-03-16T18:42:22Z

⌛ Testing commit 4cd350f with merge 227690a...

bors · 2025-03-16T21:54:36Z

☀️ Test successful - checks-actions
Approved by: Amanieu
Pushing 227690a to master...

github-actions · 2025-03-16T21:56:14Z

This is an experimental post-merge analysis report. You can ignore it.

Post-merge report

Comparing 8b87fef (base) -> 227690a (this PR)

Test differences

No test diffs found

rust-timer · 2025-03-16T23:11:57Z

Finished benchmarking commit (227690a): 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 (secondary -1.8%)

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)	-1.8%	[-1.8%, -1.8%]	1
All ❌✅ (primary)	-	-	0

Cycles

Results (secondary -0.8%)

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.6%	[2.6%, 2.6%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.6%	[-3.0%, -2.2%]	2
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 775.103s -> 775.741s (0.08%)
Artifact size: 365.12 MiB -> 365.10 MiB (-0.00%)

rustbot assigned Kobzol Feb 14, 2025

rustbot added A-query-system A-testsuite S-waiting-on-review T-bootstrap T-compiler T-infra labels Feb 14, 2025

LuuuXXX changed the title ~~【WIP】Promote ohos targets to tier2 with host tools.~~ [WIP] Promote ohos targets to tier2 with host tools. Feb 14, 2025

This comment has been minimized.

Sign in to view

LuuuXXX changed the title ~~[WIP] Promote ohos targets to tier2 with host tools.~~ Promote ohos targets to tier2 with host tools. Feb 15, 2025

rustbot assigned Amanieu and unassigned Kobzol Feb 18, 2025

Amanieu reviewed Feb 18, 2025

View reviewed changes

LuuuXXX force-pushed the promote-ohos-with-host-tools branch from 42df98f to 494f28d Compare February 24, 2025 03:44

This comment has been minimized.

Sign in to view

LuuuXXX force-pushed the promote-ohos-with-host-tools branch 2 times, most recently from d9f8e75 to 088ed36 Compare February 24, 2025 05:26

This comment has been minimized.

Sign in to view

LuuuXXX changed the title ~~Promote ohos targets to tier2 with host tools.~~ [WIP] Promote ohos targets to tier2 with host tools. Feb 25, 2025

LuuuXXX force-pushed the promote-ohos-with-host-tools branch 2 times, most recently from 6e2d47f to 75bdb2f Compare February 25, 2025 06:27

This comment has been minimized.

Sign in to view

LuuuXXX force-pushed the promote-ohos-with-host-tools branch 2 times, most recently from 6082516 to 1b31525 Compare March 6, 2025 12:30

remove zip file in /tmp to save some space and use large runner

4cd350f

LuuuXXX force-pushed the promote-ohos-with-host-tools branch from 1b31525 to 4cd350f Compare March 6, 2025 12:35

LuuuXXX requested a review from Amanieu March 11, 2025 01:06

rustbot added S-waiting-on-review and removed S-waiting-on-author labels Mar 11, 2025

bors added S-waiting-on-bors and removed S-waiting-on-review labels Mar 16, 2025

bors added the merged-by-bors label Mar 16, 2025

bors merged commit 227690a into rust-lang:master Mar 16, 2025
7 checks passed

rustbot added this to the 1.87.0 milestone Mar 16, 2025

bors mentioned this pull request Mar 16, 2025

Use Wunused-crate-dependencies for the compiler #137930

Merged

		@@ -51,7 +62,7 @@ ENV RUST_CONFIGURE_ARGS \
		--enable-profiler \
		--disable-docs

Promote ohos targets to tier2 with host tools. #137011

Promote ohos targets to tier2 with host tools. #137011

Conversation

LuuuXXX commented Feb 14, 2025 • edited by Amanieu Loading

What does this PR try to resolve?

More Information?

Blockage to be solved?

rustbot commented Feb 14, 2025

rustbot commented Feb 14, 2025

This comment has been minimized.

LuuuXXX commented Feb 14, 2025

Kobzol commented Feb 14, 2025

LuuuXXX commented Feb 15, 2025

LuuuXXX commented Feb 15, 2025 • edited Loading

LuuuXXX commented Feb 18, 2025

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

LuuuXXX Feb 20, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rustbot commented Feb 24, 2025

This comment has been minimized.

This comment has been minimized.

bors commented Feb 25, 2025

bors commented Mar 5, 2025

jieyouxu commented Mar 5, 2025

This comment has been minimized.

bors commented Mar 5, 2025

jieyouxu commented Mar 5, 2025

Amanieu commented Mar 6, 2025

bors commented Mar 6, 2025

bors commented Mar 7, 2025

LuuuXXX commented Mar 13, 2025

Amanieu commented Mar 16, 2025

bors commented Mar 16, 2025

bors commented Mar 16, 2025

bors commented Mar 16, 2025

github-actions bot commented Mar 16, 2025

Test differences

rust-timer commented Mar 16, 2025

Overall result: no relevant changes - no action needed

LuuuXXX commented Feb 14, 2025 •

edited by Amanieu

Loading

LuuuXXX commented Feb 15, 2025 •

edited

Loading

LuuuXXX Feb 20, 2025 •

edited

Loading