user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request rust-lang/libm#404 from tgross35/i586-mpfr

Browse source 
Enable MPFR tests on i586
This commit is contained in:
Trevor Gross 2025-01-06 15:55:57 -05:00 • committed by GitHub
commit deb87d0a70
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
library/compiler-builtins/libm/ci/docker/i586-unknown-linux-gnu/Dockerfile
View file

@ -2,4 +2,4 @@ FROM ubuntu:24.04
RUN apt-get update && \
apt-get install -y --no-install-recommends \
gcc-multilib libc6-dev ca-certificates
gcc-multilib m4 make libc6-dev ca-certificates

2
library/compiler-builtins/libm/ci/run.sh
View file

@ -45,8 +45,8 @@ case "$target" in
# FIXME(ci): we should be able to enable aarch64 Linux here once GHA
# support rolls out.
x86_64*) extra_flags="$extra_flags --features libm-test/test-multiprecision" ;;
# i686 works fine, i586 does not
i686*) extra_flags="$extra_flags --features libm-test/test-multiprecision" ;;
i586*) extra_flags="$extra_flags --features libm-test/test-multiprecision --features gmp-mpfr-sys/force-cross" ;;
# Apple aarch64 is native
aarch64*apple*) extra_flags="$extra_flags --features libm-test/test-multiprecision" ;;
esac

3
library/compiler-builtins/libm/crates/libm-test/Cargo.toml
View file

@ -12,7 +12,7 @@ unstable-float = ["libm/unstable-float", "rug?/nightly-float"]
# Generate tests which are random inputs and the outputs are calculated with
# musl libc.
test-multiprecision = ["dep:az", "dep:rug"]
test-multiprecision = ["dep:az", "dep:rug", "dep:gmp-mpfr-sys"]
# Build our own musl for testing and benchmarks
build-musl = ["dep:musl-math-sys"]
@ -26,6 +26,7 @@ short-benchmarks = []
[dependencies]
anyhow = "1.0.90"
az = { version = "1.2.1", optional = true }
gmp-mpfr-sys = { version = "1.6.4", optional = true, default-features = false, features = ["mpfr"] }
indicatif = { version = "0.17.9", default-features = false }
libm = { path = "../..", features = ["unstable-public-internals"] }
libm-macros = { path = "../libm-macros" }

5
library/compiler-builtins/libm/crates/libm-test/src/precision.rs
View file

@ -104,11 +104,14 @@ pub fn default_ulp(ctx: &CheckCtx) -> u32 {
// In some cases, our implementation is less accurate than musl on i586.
if cfg!(x86_no_sse) {
match ctx.fn_ident {
// FIXME(#401): these need to be correctly rounded but are not.
Id::Fmaf => ulp = 1,
Id::Fdim => ulp = 1,
Id::Asinh => ulp = 3,
Id::Asinhf => ulp = 3,
Id::Exp10 | Id::Exp10f => ulp = 1_000_000,
Id::Exp2 | Id::Exp2f => ulp = 10_000_000,
Id::Fmaf => ulp = 1,
Id::Log1p | Id::Log1pf => ulp = 2,
Id::Rint => ulp = 100_000,
Id::Round => ulp = 1,