Initial iteration of the MSVC MPIR support.

Author: AmineKhaldi

.github/workflows/benchmark.yml

@@ -54,6 +54,7 @@ jobs:
         git clone https://github.com/Chia-Network/clvm_tools.git --branch=main --single-branch
         python -m pip install ./clvm_tools
         python -m pip install colorama
+        git clone https://github.com/Chia-Network/mpir_gc_x64.git --depth 1
         maturin develop --release
 
     - name: Run benchmarks (Windows)

Cargo.toml

@@ -26,10 +26,9 @@ lazy_static = "=1.4.0"
 bls12_381 = "=0.5.0"
 sha2 = "=0.9.5"
 
+[target.'cfg(unix)'.dependencies]
 # we just want the GMP bindings, so we disable default features
 gmp-mpfr-sys = { version = "=1.4", default-features = false }
-
-[target.'cfg(unix)'.dependencies]
 openssl = { version = "0.10.35", features = ["vendored"] }
 
 [target.'cfg(target_family="wasm")'.dependencies]

README.md

@@ -9,6 +9,12 @@ Use `maturin` to build the python interface. First, install into current virtual
 $ pip install maturin
 ```
 
+As we need `MPIR` for MSVC builds, prepare this dependency with
+
+```
+$ git clone https://github.com/Chia-Network/mpir_gc_x64.git --depth 1
+```
+
 Build `clvm_rs` directly into the current virtualenv with
 
 ```

build.rs

@@ -0,0 +1,7 @@
+fn main() {
+    #[cfg(windows)]
+    {
+        println!("cargo:rustc-link-lib=mpir");
+        println!("cargo:rustc-link-search=mpir_gc_x64");
+    }
+}

src/lib.rs

@@ -8,6 +8,8 @@ pub mod f_table;
 mod gen;
 mod int_to_bytes;
 pub mod more_ops;
+#[cfg(windows)]
+mod mpir_msvc;
 pub mod node;
 mod number;
 mod op_utils;

src/mpir_msvc.rs

@@ -0,0 +1,126 @@
+#![allow(non_camel_case_types, non_snake_case)]
+
+use core::ptr::NonNull;
+use std::cmp::Ordering;
+use std::ffi::c_void;
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug)]
+pub struct mpz_t {
+    pub alloc: c_int,
+    pub size: c_int,
+    pub d: NonNull<c_ulonglong>,
+}
+
+// FIXME: Inspect c_* for type mismatches
+#[cfg(test)]
+type c_char = i8;
+type c_int = i32;
+type c_long = i64;
+type c_ulong = u64;
+type c_ulonglong = u64;
+type mpz_srcptr = *const mpz_t;
+type mpz_ptr = *mut mpz_t;
+type bitcnt_t = c_ulong;
+
+extern "C" {
+    #[link_name = "__gmpz_init"]
+    pub fn mpz_init(x: mpz_ptr);
+    #[cfg(test)]
+    #[link_name = "__gmpz_init_set_str"]
+    pub fn mpz_init_set_str(rop: mpz_ptr, str: *const c_char, base: c_int) -> c_int;
+    #[cfg(test)]
+    #[link_name = "__gmpz_get_str"]
+    pub fn mpz_get_str(str: *mut c_char, base: c_int, op: mpz_srcptr) -> *mut c_char;
+    #[link_name = "__gmpz_import"]
+    pub fn mpz_import(
+        rop: mpz_ptr,
+        count: usize,
+        order: c_int,
+        size: usize,
+        endian: c_int,
+        nails: usize,
+        op: *const c_void,
+    );
+    #[link_name = "__gmpz_add_ui"]
+    pub fn mpz_add_ui(rop: mpz_ptr, op1: mpz_srcptr, op2: c_ulong);
+    #[link_name = "__gmpz_set"]
+    pub fn mpz_set(rop: mpz_ptr, op: mpz_srcptr);
+    #[link_name = "__gmpz_export"]
+    pub fn mpz_export(
+        rop: *mut c_void,
+        countp: *mut usize,
+        order: c_int,
+        size: usize,
+        endian: c_int,
+        nails: usize,
+        op: mpz_srcptr,
+    ) -> *mut c_void;
+    #[link_name = "__gmpz_sizeinbase"]
+    pub fn mpz_sizeinbase(arg1: mpz_srcptr, arg2: c_int) -> usize;
+    #[link_name = "__gmpz_fdiv_qr"]
+    pub fn mpz_fdiv_qr(q: mpz_ptr, r: mpz_ptr, n: mpz_srcptr, d: mpz_srcptr);
+    #[link_name = "__gmpz_fdiv_q"]
+    pub fn mpz_fdiv_q(q: mpz_ptr, n: mpz_srcptr, d: mpz_srcptr);
+    #[link_name = "__gmpz_fdiv_r"]
+    pub fn mpz_fdiv_r(r: mpz_ptr, n: mpz_srcptr, d: mpz_srcptr);
+    #[link_name = "__gmpz_fdiv_q_2exp"]
+    pub fn mpz_fdiv_q_2exp(q: mpz_ptr, n: mpz_srcptr, b: bitcnt_t);
+    #[link_name = "__gmpz_init_set_ui"]
+    pub fn mpz_init_set_ui(rop: mpz_ptr, op: c_ulong);
+    #[link_name = "__gmpz_init_set_si"]
+    pub fn mpz_init_set_si(rop: mpz_ptr, op: c_long);
+    #[link_name = "__gmpz_clear"]
+    pub fn mpz_clear(x: mpz_ptr);
+    #[link_name = "__gmpz_add"]
+    pub fn mpz_add(rop: mpz_ptr, op1: mpz_srcptr, op2: mpz_srcptr);
+    #[link_name = "__gmpz_sub"]
+    pub fn mpz_sub(rop: mpz_ptr, op1: mpz_srcptr, op2: mpz_srcptr);
+    #[link_name = "__gmpz_mul"]
+    pub fn mpz_mul(rop: mpz_ptr, op1: mpz_srcptr, op2: mpz_srcptr);
+    #[link_name = "__gmpz_mul_2exp"]
+    pub fn mpz_mul_2exp(rop: mpz_ptr, op1: mpz_srcptr, op2: bitcnt_t);
+    #[link_name = "__gmpz_get_si"]
+    pub fn mpz_get_si(op: mpz_srcptr) -> c_long;
+    #[link_name = "__gmpz_and"]
+    pub fn mpz_and(rop: mpz_ptr, op1: mpz_srcptr, op2: mpz_srcptr);
+    #[link_name = "__gmpz_ior"]
+    pub fn mpz_ior(rop: mpz_ptr, op1: mpz_srcptr, op2: mpz_srcptr);
+    #[link_name = "__gmpz_xor"]
+    pub fn mpz_xor(rop: mpz_ptr, op1: mpz_srcptr, op2: mpz_srcptr);
+    #[link_name = "__gmpz_com"]
+    pub fn mpz_com(rop: mpz_ptr, op: mpz_srcptr);
+    #[link_name = "__gmpz_cmp"]
+    pub fn mpz_cmp(op1: mpz_srcptr, op2: mpz_srcptr) -> c_int;
+    #[link_name = "__gmpz_cmp_si"]
+    pub fn mpz_cmp_si(op1: mpz_srcptr, op2: c_long) -> c_int;
+    #[link_name = "__gmpz_cmp_ui"]
+    pub fn mpz_cmp_ui(op1: mpz_srcptr, op2: c_ulong) -> c_int;
+}
+
+#[inline]
+pub unsafe extern "C" fn mpz_neg(rop: mpz_ptr, op: mpz_srcptr) {
+    if rop as mpz_srcptr != op {
+        mpz_set(rop, op);
+    }
+    (*rop).size = -(*rop).size;
+}
+
+#[inline]
+pub unsafe extern "C" fn mpz_sgn(op: mpz_srcptr) -> c_int {
+    match { (*op).size }.cmp(&0) {
+        Ordering::Less => -1,
+        Ordering::Equal => 0,
+        Ordering::Greater => 1,
+    }
+}
+
+#[inline]
+pub unsafe extern "C" fn mpz_get_ui(op: mpz_srcptr) -> c_ulong {
+    if { (*op).size } != 0 {
+        let p = (*op).d.as_ptr();
+        (*p) as c_ulong
+    } else {
+        0
+    }
+}

src/number.rs

@@ -1,17 +1,19 @@
 use crate::allocator::{Allocator, NodePtr};
+#[cfg(windows)]
+use crate::mpir_msvc as gmp;
 use crate::node::Node;
 use crate::reduction::EvalErr;
 use core::mem::MaybeUninit;
+#[cfg(not(windows))]
 use gmp_mpfr_sys::gmp;
+use std::cmp::Ordering;
 use std::cmp::PartialOrd;
 use std::ffi::c_void;
 use std::ops::Drop;
 use std::ops::{
     AddAssign, BitAndAssign, BitOrAssign, BitXorAssign, MulAssign, Not, Shl, Shr, SubAssign,
 };
 
-use std::cmp::Ordering;
-
 #[allow(clippy::enum_variant_names)]
 #[derive(PartialEq)]
 pub enum Sign {