From 1fd5f9da25d9ce7be5206e5b1eabc0364064cdfb Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Thu, 29 Apr 2021 14:29:59 +0200
Subject: [PATCH] factor::table::factor_chunk: Turn loop inside-out

This keeps the traversal of `P_INVS_U64` (a large table) to a single pass
in-order, rather than `CHUNK_SIZE` passes.
---
 src/uu/factor/src/table.rs | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/uu/factor/src/table.rs b/src/uu/factor/src/table.rs
index 72628054c..45464ac27 100644
--- a/src/uu/factor/src/table.rs
+++ b/src/uu/factor/src/table.rs
@@ -45,7 +45,30 @@ pub fn factor(num: &mut u64, factors: &mut Factors) {
 
 pub const CHUNK_SIZE: usize = 4;
 pub fn factor_chunk(n_s: &mut [u64; CHUNK_SIZE], f_s: &mut [Factors; CHUNK_SIZE]) {
-    for (n, s) in n_s.iter_mut().zip(f_s.iter_mut()) {
-        factor(n, s);
+    for &(prime, inv, ceil) in P_INVS_U64 {
+        if n_s[0] == 1 && n_s[1] == 1 && n_s[2] == 1 && n_s[3] == 1 {
+            break;
+        }
+
+        for (num, factors) in n_s.iter_mut().zip(f_s.iter_mut()) {
+            if *num == 1 {
+                continue;
+            }
+            let mut k = 0;
+            loop {
+                let x = num.wrapping_mul(inv);
+
+                // While prime divides num
+                if x <= ceil {
+                    *num = x;
+                    k += 1;
+                } else {
+                    if k > 0 {
+                        factors.add(prime, k);
+                    }
+                    break;
+                }
+            }
+        }
     }
 }