switch to num-bigint over ibig

calyxir · Sep 9, 2024 · cd452cc · cd452cc
1 parent 1b3d20b
commit cd452cc
Show file tree

Hide file tree

Showing 6 changed files with 147 additions and 192 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/interp/Cargo.toml b/interp/Cargo.toml
@@ -24,16 +24,16 @@ pest_consume.workspace = true
 argh.workspace = true
 owo-colors = "^3.5"
 bitvec = "1.0"
-base64 = "0.13.0"
 serde_json = "1.0"
 rustyline = "=10.0.0"
 fraction = { version = "0.11.0", features = ["with-serde-support"] }
 thiserror = "1.0.26"
-ibig = { version = "0.3.4", features = ["serde"] }
 slog = "2.7.0"
 slog-term = "2.8.0"
 slog-async = "2.7.0"
 ahash = "0.8.3"
+num-bigint = "0.4.6"
+num-traits = "0.2.19"
 
 once_cell = "1.9.0"
 petgraph = "0.6.3"

diff --git a/interp/src/flatten/primitives/stateful/math.rs b/interp/src/flatten/primitives/stateful/math.rs
@@ -1,22 +1,16 @@
-use ibig::ops::RemEuclid;
-
 use crate::{
     flatten::{
         flat_ir::prelude::*,
         primitives::{
-            declare_ports,
+            declare_ports, ports,
+            prim_trait::*,
             utils::{floored_division, int_sqrt, ShiftBuffer},
         },
-    },
-    values::InputNumber,
-};
-use crate::{
-    flatten::{
-        primitives::{ports, prim_trait::*},
         structures::environment::PortMap,
     },
-    values::Value,
+    values::{InputNumber, Value},
 };
+use num_traits::Euclid;
 
 pub struct StdMultPipe<const DEPTH: usize> {
     base_port: GlobalPortIdx,
@@ -199,7 +193,7 @@ impl<const DEPTH: usize, const SIGNED: bool> Primitive
                                     (left
                                         .val()
                                         .as_unsigned()
-                                        .rem_euclid(right.val().as_unsigned()))
+                                        .rem_euclid(&right.val().as_unsigned()))
                                     .into()
                                 } else {
                                     (left.val().as_signed()
@@ -530,7 +524,7 @@ impl<const DEPTH: usize, const SIGNED: bool> Primitive
                                     (left
                                         .val()
                                         .as_unsigned()
-                                        .rem_euclid(right.val().as_unsigned()))
+                                        .rem_euclid(&right.val().as_unsigned()))
                                     .into()
                                 } else {
                                     (left.val().as_signed()

diff --git a/interp/src/flatten/primitives/utils.rs b/interp/src/flatten/primitives/utils.rs
@@ -1,14 +1,13 @@
+use num_bigint::{BigInt, BigUint, Sign};
 use std::collections::VecDeque;
 
-use ibig::{ibig, UBig};
-use ibig::{ubig, IBig};
-
-pub(crate) fn floored_division(left: &IBig, right: &IBig) -> IBig {
+/// There's probably a better way to do this but I'm not fixing it right now
+pub(crate) fn floored_division(left: &BigInt, right: &BigInt) -> BigInt {
     let div = left / right;
 
-    if left.signum() != ibig!(-1) && right.signum() != ibig!(-1) {
+    if left.sign() != Sign::Minus && right.sign() != Sign::Minus {
         div
-    } else if (div.signum() == (-1).into() || div.signum() == 0.into())
+    } else if (div.sign() == Sign::Minus || div.sign() == Sign::NoSign)
         && (left != &(&div * right))
     {
         div - 1_i32
@@ -18,14 +17,17 @@ pub(crate) fn floored_division(left: &IBig, right: &IBig) -> IBig {
 }
 
 /// Implementation of integer square root via a basic binary search algorithm
-/// based on wikipedia psuedocode
-pub(crate) fn int_sqrt(i: &UBig) -> UBig {
-    let mut lower: UBig = ubig!(0);
-    let mut upper: UBig = i + ubig!(1);
-    let mut temp: UBig;
+/// based on wikipedia pseudocode.
+///
+/// TODO griffin: See if this can be replaced with a `sqrt` function in the
+/// `num-bigint` crate
+pub(crate) fn int_sqrt(i: &BigUint) -> BigUint {
+    let mut lower: BigUint = BigUint::from(0_u32);
+    let mut upper: BigUint = i + BigUint::from(1_u32);
+    let mut temp: BigUint;
 
-    while lower != (&upper - ubig!(1)) {
-        temp = (&lower + &upper) / ubig!(2);
+    while lower != (&upper - BigUint::from(1_u32)) {
+        temp = (&lower + &upper) / BigUint::from(2_u32);
         if &(&temp * &temp) <= i {
             lower = temp
         } else {