Skip to content

Commit c5baeb1

Browse files
committed
testsuite: update tests to not use math intrinsics directly
1 parent d9c54f8 commit c5baeb1

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

Diff for: src/test/bench/shootout-nbody.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use core::from_str::FromStr;
22
use core::uint::range;
3-
use core::unstable::intrinsics::sqrtf64;
43

54
static PI: f64 = 3.141592653589793;
65
static SOLAR_MASS: f64 = 4.0 * PI * PI;
@@ -88,7 +87,7 @@ fn advance(bodies: &mut [Planet, ..N_BODIES], dt: f64, steps: i32) {
8887
d[2] = bodies[i].x[2] - bodies[j].x[2];
8988

9089
let d2 = d[0]*d[0] + d[1]*d[1] + d[2]*d[2];
91-
let mag = dt / (d2 * sqrtf64(d2));
90+
let mag = dt / (d2 * f64::sqrt(d2));
9291

9392
let a_mass = bodies[i].mass, b_mass = bodies[j].mass;
9493
bodies[i].v[0] -= d[0] * b_mass * mag;
@@ -121,7 +120,7 @@ fn energy(bodies: &[Planet, ..N_BODIES]) -> f64 {
121120
for range(0, 3) |k| {
122121
d[k] = bodies[i].x[k] - bodies[j].x[k];
123122
}
124-
let dist = sqrtf64(d[0]*d[0] + d[1]*d[1] + d[2]*d[2]);
123+
let dist = f64::sqrt(d[0]*d[0] + d[1]*d[1] + d[2]*d[2]);
125124
e -= bodies[i].mass * bodies[j].mass / dist;
126125
}
127126
}
@@ -147,4 +146,3 @@ fn main() {
147146

148147
println(fmt!("%.9f", energy(&bodies) as float));
149148
}
150-

Diff for: src/test/bench/shootout-spectralnorm.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use core::from_str::FromStr;
22
use core::iter::ExtendedMutableIter;
3-
use core::unstable::intrinsics::sqrtf64;
43

54
#[inline]
65
fn A(i: i32, j: i32) -> i32 {
@@ -49,6 +48,5 @@ fn main() {
4948
mult_AtAv(v, u, tmp);
5049
}
5150

52-
println(fmt!("%.9f", sqrtf64(dot(u,v) / dot(v,v)) as float));
51+
println(fmt!("%.9f", f64::sqrt(dot(u,v) / dot(v,v)) as float));
5352
}
54-

0 commit comments

Comments
 (0)