Shrink mpfr jn test count

Author: tgross35

crates/libm-test/Cargo.toml

@@ -18,6 +18,7 @@ build-musl = ["dep:musl-math-sys"]
 [dependencies]
 anyhow = "1.0.90"
 az = { version = "1.2.1", optional = true }
+either = "1.13.0"
 libm = { path = "../.." }
 libm-macros = { path = "../libm-macros" }
 musl-math-sys = { path = "../musl-math-sys", optional = true }

crates/libm-test/src/gen/random.rs

@@ -3,11 +3,12 @@
 
 use std::sync::LazyLock;
 
+use either::Either;
 use rand::{Rng, SeedableRng};
 use rand_chacha::ChaCha8Rng;
 
 use super::CachedInput;
-use crate::GenerateInput;
+use crate::{CheckBasis, CheckCtx, GenerateInput};
 
 const SEED: [u8; 32] = *b"3.141592653589793238462643383279";
 
@@ -50,9 +51,10 @@ static TEST_CASES_JN: LazyLock<CachedInput> = LazyLock::new(|| {
     let mut cases = (&*TEST_CASES).clone();
 
     // These functions are extremely slow, limit them
-    cases.inputs_i32.truncate((NTESTS / 1000).max(80));
-    cases.inputs_f32.truncate((NTESTS / 1000).max(80));
-    cases.inputs_f64.truncate((NTESTS / 1000).max(80));
+    let ntests_jn = (NTESTS / 1000).max(80);
+    cases.inputs_i32.truncate(ntests_jn);
+    cases.inputs_f32.truncate(ntests_jn);
+    cases.inputs_f64.truncate(ntests_jn);
 
     // It is easy to overflow the stack with these in debug mode
     let max_iterations = if cfg!(optimizations_enabled) && cfg!(target_pointer_width = "64") {
@@ -115,11 +117,19 @@ fn make_test_cases(ntests: usize) -> CachedInput {
 }
 
 /// Create a test case iterator.
-pub fn get_test_cases<RustArgs>(fname: &str) -> impl Iterator<Item = RustArgs>
+pub fn get_test_cases<RustArgs>(ctx: &CheckCtx) -> impl Iterator<Item = RustArgs>
 where
     CachedInput: GenerateInput<RustArgs>,
 {
-    let inputs = if fname == "jn" || fname == "jnf" { &TEST_CASES_JN } else { &TEST_CASES };
-
-    CachedInput::get_cases(inputs)
+    // jn is extremely slow on MPFR, we need to reduce it further
+    let ntests_jn_multi = (NTESTS / 5000).max(20);
+
+    match (&ctx.basis, ctx.fname) {
+        (CheckBasis::Musl, "jnf") => Either::Left(TEST_CASES_JN.get_cases()),
+        (_, "jn") => Either::Left(TEST_CASES_JN.get_cases()),
+        (CheckBasis::MultiPrecision, "jnf") => {
+            Either::Right(TEST_CASES_JN.get_cases().take(ntests_jn_multi))
+        }
+        _ => Either::Left(TEST_CASES.get_cases()),
+    }
 }

crates/libm-test/tests/compare_built_musl.rs

@@ -29,8 +29,8 @@ macro_rules! musl_rand_tests {
         fn [< musl_random_ $fn_name >]() {
             let fname = stringify!($fn_name);
             let ulp = musl_allowed_ulp(fname);
-            let cases = random::get_test_cases::<$RustArgs>(fname);
             let ctx = CheckCtx::new(ulp, fname, CheckBasis::Musl);
+            let cases = random::get_test_cases::<$RustArgs>(&ctx);
 
             for input in cases {
                 let musl_res = input.call(musl::$fn_name as $CFn);

crates/libm-test/tests/multiprecision.rs

@@ -26,9 +26,9 @@ macro_rules! multiprec_rand_tests {
 
                 let fname = stringify!($fn_name);
                 let ulp = multiprec_allowed_ulp(fname);
-                let cases = random::get_test_cases::<$RustArgs>(fname);
                 let mut mp_vals = MpOpTy::new();
                 let ctx = CheckCtx::new(ulp, fname, CheckBasis::MultiPrecision);
+                let cases = random::get_test_cases::<$RustArgs>(&ctx);
 
                 for input in cases {
                     let mp_res = mp_vals.run(input);
@@ -58,8 +58,5 @@ libm_macros::for_each_function! {
         remquof,
         scalbn,
         scalbnf,
-
-        jn,
-        jnf,
     ],
 }