Skip to content

Commit a4f24dc

Browse files
authored
Implement floor and ceil in assembly on i586
Fixes: #837 The assembly is based on - https://github.com/NetBSD/src/blob/20433927938987dd64c8f6aa46904b7aca3fa39e/lib/libm/arch/i387/s_floor.S - https://github.com/NetBSD/src/blob/20433927938987dd64c8f6aa46904b7aca3fa39e/lib/libm/arch/i387/s_ceil.S Which both state /* * Written by J.T. Conklin <[email protected]>. * Public domain. */ Which I believe means we're good in terms of licensing.
1 parent c4966f9 commit a4f24dc

File tree

2 files changed

+55
-52
lines changed

2 files changed

+55
-52
lines changed

libm-test/src/precision.rs

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -271,18 +271,6 @@ impl MaybeOverride<(f32,)> for SpecialCase {
271271

272272
impl MaybeOverride<(f64,)> for SpecialCase {
273273
fn check_float<F: Float>(input: (f64,), actual: F, expected: F, ctx: &CheckCtx) -> CheckAction {
274-
if cfg!(x86_no_sse)
275-
&& ctx.base_name == BaseName::Ceil
276-
&& ctx.basis == CheckBasis::Musl
277-
&& input.0 < 0.0
278-
&& input.0 > -1.0
279-
&& expected == F::ZERO
280-
&& actual == F::ZERO
281-
{
282-
// musl returns -0.0, we return +0.0
283-
return XFAIL("i586 ceil signed zero");
284-
}
285-
286274
if cfg!(x86_no_sse)
287275
&& (ctx.base_name == BaseName::Rint || ctx.base_name == BaseName::Roundeven)
288276
&& (expected - actual).abs() <= F::ONE
@@ -292,16 +280,6 @@ impl MaybeOverride<(f64,)> for SpecialCase {
292280
return XFAIL("i586 rint rounding mode");
293281
}
294282

295-
if cfg!(x86_no_sse)
296-
&& (ctx.fn_ident == Identifier::Ceil || ctx.fn_ident == Identifier::Floor)
297-
&& expected.eq_repr(F::NEG_ZERO)
298-
&& actual.eq_repr(F::ZERO)
299-
{
300-
// FIXME: the x87 implementations do not keep the distinction between -0.0 and 0.0.
301-
// See https://github.com/rust-lang/libm/pull/404#issuecomment-2572399955
302-
return XFAIL("i586 ceil/floor signed zero");
303-
}
304-
305283
if cfg!(x86_no_sse)
306284
&& (ctx.fn_ident == Identifier::Exp10 || ctx.fn_ident == Identifier::Exp2)
307285
{

libm/src/math/arch/i586.rs

Lines changed: 55 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,62 @@
11
//! Architecture-specific support for x86-32 without SSE2
2+
//!
3+
//! We use an alternative implementation on x86, because the
4+
//! main implementation fails with the x87 FPU used by
5+
//! debian i386, probably due to excess precision issues.
6+
//!
7+
//! See https://github.com/rust-lang/compiler-builtins/pull/976 for discussion on why these
8+
//! functions are implemented in this way.
29
3-
use super::super::fabs;
4-
5-
/// Use an alternative implementation on x86, because the
6-
/// main implementation fails with the x87 FPU used by
7-
/// debian i386, probably due to excess precision issues.
8-
/// Basic implementation taken from https://github.com/rust-lang/libm/issues/219.
9-
pub fn ceil(x: f64) -> f64 {
10-
if fabs(x).to_bits() < 4503599627370496.0_f64.to_bits() {
11-
let truncated = x as i64 as f64;
12-
if truncated < x {
13-
return truncated + 1.0;
14-
} else {
15-
return truncated;
16-
}
17-
} else {
18-
return x;
10+
pub fn ceil(mut x: f64) -> f64 {
11+
unsafe {
12+
core::arch::asm!(
13+
"fld qword ptr [{x}]",
14+
// Save the FPU control word, using `x` as scratch space.
15+
"fstcw [{x}]",
16+
// Set rounding control to 0b10 (+∞).
17+
"mov word ptr [{x} + 2], 0x0b7f",
18+
"fldcw [{x} + 2]",
19+
// Round.
20+
"frndint",
21+
// Restore FPU control word.
22+
"fldcw [{x}]",
23+
// Save rounded value to memory.
24+
"fstp qword ptr [{x}]",
25+
x = in(reg) &mut x,
26+
// All the x87 FPU stack is used, all registers must be clobbered
27+
out("st(0)") _, out("st(1)") _,
28+
out("st(2)") _, out("st(3)") _,
29+
out("st(4)") _, out("st(5)") _,
30+
out("st(6)") _, out("st(7)") _,
31+
options(nostack),
32+
);
1933
}
34+
x
2035
}
2136

22-
/// Use an alternative implementation on x86, because the
23-
/// main implementation fails with the x87 FPU used by
24-
/// debian i386, probably due to excess precision issues.
25-
/// Basic implementation taken from https://github.com/rust-lang/libm/issues/219.
26-
pub fn floor(x: f64) -> f64 {
27-
if fabs(x).to_bits() < 4503599627370496.0_f64.to_bits() {
28-
let truncated = x as i64 as f64;
29-
if truncated > x {
30-
return truncated - 1.0;
31-
} else {
32-
return truncated;
33-
}
34-
} else {
35-
return x;
37+
pub fn floor(mut x: f64) -> f64 {
38+
unsafe {
39+
core::arch::asm!(
40+
"fld qword ptr [{x}]",
41+
// Save the FPU control word, using `x` as scratch space.
42+
"fstcw [{x}]",
43+
// Set rounding control to 0b01 (-∞).
44+
"mov word ptr [{x} + 2], 0x077f",
45+
"fldcw [{x} + 2]",
46+
// Round.
47+
"frndint",
48+
// Restore FPU control word.
49+
"fldcw [{x}]",
50+
// Save rounded value to memory.
51+
"fstp qword ptr [{x}]",
52+
x = in(reg) &mut x,
53+
// All the x87 FPU stack is used, all registers must be clobbered
54+
out("st(0)") _, out("st(1)") _,
55+
out("st(2)") _, out("st(3)") _,
56+
out("st(4)") _, out("st(5)") _,
57+
out("st(6)") _, out("st(7)") _,
58+
options(nostack),
59+
);
3660
}
61+
x
3762
}

0 commit comments

Comments
 (0)