Skip to content

run powerpc64le assert_instr on CI #1784

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Apr 23, 2025
Merged

run powerpc64le assert_instr on CI #1784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f736d2
run `powerpc64le` `assert_instr` on CI
folkertdev Apr 20, 2025
9616a73
run `cargo generate-lockfile` before running docker
folkertdev Apr 21, 2025
f7c228c
reset the host linker
folkertdev Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ jobs:
- target:
tuple: powerpc64le-unknown-linux-gnu
os: ubuntu-latest
disable_assert_instr: true
test_everything: true
- target:
tuple: riscv64gc-unknown-linux-gnu
Expand Down
9 changes: 9 additions & 0 deletions ci/run-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ if [ $# -lt 1 ]; then
fi

run() {
# Set the linker that is used for the host (e.g. when compiling a build.rs)
# This overrides any configuration in e.g. `.cargo/config.toml`, which will
# probably not work within the docker container.
HOST_LINKER="CARGO_TARGET_$(rustc --print host-tuple | tr '[:lower:]-' '[:upper:]_')_LINKER"

# Prevent `Read-only file system (os error 30)`.
cargo generate-lockfile

echo "Building docker container for TARGET=${1}"
docker build -t stdarch -f "ci/docker/${1}/Dockerfile" ci/
mkdir -p target c_programs rust_programs
Expand All @@ -22,6 +30,7 @@ run() {
--env CARGO_HOME=/cargo \
--env CARGO_TARGET_DIR=/checkout/target \
--env TARGET="${1}" \
--env "${HOST_LINKER}"="cc" \
--env STDARCH_TEST_EVERYTHING \
--env STDARCH_DISABLE_ASSERT_INSTR \
--env NOSTD \
Expand Down
4 changes: 2 additions & 2 deletions crates/core_arch/src/powerpc/altivec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1878,7 +1878,7 @@ mod sealed {

#[inline]
#[target_feature(enable = "altivec")]
#[cfg_attr(test, assert_instr(vmaddfp))]
#[cfg_attr(test, assert_instr(xvmaddasp))]
pub unsafe fn vec_vmaddfp(a: vector_float, b: vector_float, c: vector_float) -> vector_float {
simd_fma(a, b, c)
}
Expand Down Expand Up @@ -3239,7 +3239,7 @@ mod sealed {
unsafe fn vec_round(self) -> Self;
}

test_impl! { vec_vrfin(a: vector_float) -> vector_float [vrfin, vrfin] }
test_impl! { vec_vrfin(a: vector_float) -> vector_float [vrfin, xvrspic] }

#[unstable(feature = "stdarch_powerpc", issue = "111145")]
impl VectorRound for vector_float {
Expand Down