Skip to content
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

[DO NOT MERGE] adapt the default data-layout for aarch64 following llvm change #124801

Closed
wants to merge 2 commits into from

Conversation

krasimirgg
Copy link
Contributor

llvm/llvm-project@ddecada updated the default aarch64 data-layout. The mismatch can be seen at the rust + llvm @ head CI:
https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/27933#018f4d59-5008-4c38-ad98-9281c8d661d4/822-823

For rust, we might need something in the spirit of #116672. This is a quick-and-incomplete fix to try and patch the CI in the meantime.

@rustbot label: +llvm-main

@rustbot
Copy link
Collaborator

rustbot commented May 6, 2024

r? @wesleywiser

rustbot has assigned @wesleywiser.
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 rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) labels May 6, 2024
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-llvm-17 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
#16 exporting to docker image format
#16 sending tarball 29.5s done
#16 DONE 32.1s
##[endgroup]
Setting extra environment values for docker:  --env ENABLE_GCC_CODEGEN=1 --env GCC_EXEC_PREFIX=/usr/lib/gcc/
[CI_JOB_NAME=x86_64-gnu-llvm-17]
---
sccache: Starting the server...
##[group]Configure the build
configure: processing command line
configure: 
configure: build.configure-args := ['--build=x86_64-unknown-linux-gnu', '--llvm-root=/usr/lib/llvm-17', '--enable-llvm-link-shared', '--set', 'rust.thin-lto-import-instr-limit=10', '--set', 'change-id=99999999', '--enable-verbose-configure', '--enable-sccache', '--disable-manage-submodules', '--enable-locked-deps', '--enable-cargo-native-static', '--set', 'rust.codegen-units-std=1', '--set', 'dist.compression-profile=balanced', '--dist-compression-formats=xz', '--disable-dist-src', '--release-channel=nightly', '--enable-debug-assertions', '--enable-overflow-checks', '--enable-llvm-assertions', '--set', 'rust.verify-llvm-ir', '--set', 'rust.codegen-backends=llvm,cranelift,gcc', '--set', 'llvm.static-libstdcpp', '--enable-new-symbol-mangling']
configure: target.x86_64-unknown-linux-gnu.llvm-config := /usr/lib/llvm-17/bin/llvm-config
configure: llvm.link-shared     := True
configure: rust.thin-lto-import-instr-limit := 10
configure: change-id            := 99999999
---
failures:

---- [ui] tests/ui/abi/arm-unadjusted-intrinsic.rs#aarch64 stdout ----

error in revision `aarch64`: test compilation failed although it shouldn't!
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/abi/arm-unadjusted-intrinsic.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--cfg" "aarch64" "--check-cfg" "cfg(FALSE,arm,aarch64)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/abi/arm-unadjusted-intrinsic.aarch64" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/abi/arm-unadjusted-intrinsic.aarch64/auxiliary" "--target" "aarch64-unknown-linux-gnu"
--- stderr -------------------------------
--- stderr -------------------------------
error: data-layout for target `aarch64-unknown-linux-gnu`, `e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32`, differs from LLVM target's `aarch64-unknown-linux-gnu` default layout, `e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128`
error: aborting due to 1 previous error
------------------------------------------



---- [ui] tests/ui/target-feature/feature-hierarchy.rs#aarch64-neon stdout ----

error in revision `aarch64-neon`: test compilation failed although it shouldn't!
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/target-feature/feature-hierarchy.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--cfg" "aarch64_neon" "--check-cfg" "cfg(FALSE,aarch64_neon,aarch64_sve2)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/target-feature/feature-hierarchy.aarch64-neon" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/target-feature/feature-hierarchy.aarch64-neon/auxiliary" "-Ctarget-feature=+neon" "--target=aarch64-unknown-linux-gnu"
--- stderr -------------------------------
--- stderr -------------------------------
error: data-layout for target `aarch64-unknown-linux-gnu`, `e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32`, differs from LLVM target's `aarch64-unknown-linux-gnu` default layout, `e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128`
error: aborting due to 1 previous error
------------------------------------------



---- [ui] tests/ui/target-feature/feature-hierarchy.rs#aarch64-sve2 stdout ----

error in revision `aarch64-sve2`: test compilation failed although it shouldn't!
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/target-feature/feature-hierarchy.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--cfg" "aarch64_sve2" "--check-cfg" "cfg(FALSE,aarch64_neon,aarch64_sve2)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/target-feature/feature-hierarchy.aarch64-sve2" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/target-feature/feature-hierarchy.aarch64-sve2/auxiliary" "-Ctarget-feature=-neon,+sve2" "--target=aarch64-unknown-linux-gnu"
--- stderr -------------------------------
--- stderr -------------------------------
error: data-layout for target `aarch64-unknown-linux-gnu`, `e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32`, differs from LLVM target's `aarch64-unknown-linux-gnu` default layout, `e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128`
error: aborting due to 1 previous error
------------------------------------------



---- [ui] tests/ui/target-feature/no-llvm-leaks.rs#aarch64 stdout ----

error in revision `aarch64`: test compilation failed although it shouldn't!
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/target-feature/no-llvm-leaks.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--cfg" "aarch64" "--check-cfg" "cfg(FALSE,aarch64,x86_64)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/target-feature/no-llvm-leaks.aarch64" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/target-feature/no-llvm-leaks.aarch64/auxiliary" "-Ctarget-feature=+neon,+fp16,+fhm" "--target=aarch64-unknown-linux-gnu"
--- stderr -------------------------------
--- stderr -------------------------------
error: data-layout for target `aarch64-unknown-linux-gnu`, `e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32`, differs from LLVM target's `aarch64-unknown-linux-gnu` default layout, `e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128`
error: aborting due to 1 previous error
------------------------------------------



---- [ui] tests/ui/target-feature/tied-features.rs stdout ----
diff of stderr:

+ error: data-layout for target `aarch64-unknown-linux-gnu`, `e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32`, differs from LLVM target's `aarch64-unknown-linux-gnu` default layout, `e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128`
+ 
1 error: the target features paca, pacg must all be either enabled or disabled together
2   --> $DIR/tied-features.rs:12:5

14    |
15    = help: add the missing features in a `target_feature` attribute
16 
---
To only update this specific test, also pass `--test-args target-feature/tied-features.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/target-feature/tied-features.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--check-cfg" "cfg(FALSE)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/target-feature/tied-features" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/target-feature/tied-features/auxiliary" "--crate-type=rlib" "--target=aarch64-unknown-linux-gnu"
--- stderr -------------------------------
--- stderr -------------------------------
error: data-layout for target `aarch64-unknown-linux-gnu`, `e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32`, differs from LLVM target's `aarch64-unknown-linux-gnu` default layout, `e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128`

error: the target features paca, pacg must all be either enabled or disabled together
   |
   |
LL |     #[target_feature(enable = "pacg")]
   |
   = help: add the missing features in a `target_feature` attribute


error: the target features paca, pacg must all be either enabled or disabled together
   |
   |
LL | #[target_feature(enable = "paca")]
   |
   = help: add the missing features in a `target_feature` attribute

error: aborting due to 3 previous errors

@krasimirgg
Copy link
Contributor Author

@rustbot label: -llvm-main

@rustbot rustbot removed the llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) label May 6, 2024
@krasimirgg krasimirgg closed this May 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants