Merge pull request #7 from herbie-fp/missing-ops

Add missing complex and posit operations

Author: pavpanchekha

src/lib.rs

@@ -1,3 +1,4 @@
+#![recursion_limit = "500"]
 pub mod math;
 pub mod rules;
 

src/math.rs

@@ -73,17 +73,6 @@ define_language! {
         "<=" = LessEq([Id; 2]),
         ">=" = GreaterEq([Id; 2]),
 
-        // complex operators not from FPCore
-        "re" = Re(Id),
-        "im" = Im(Id),
-        "complex" = Complex([Id; 2]),
-        "conj" = Conj(Id),
-        "+.c" = Addc([Id; 2]),
-        "-.c" = Subc([Id; 2]),
-        "neg.c" = Negc(Id),
-        "/.c" = Divc([Id; 2]),
-        "*.c" = Mulc([Id; 2]),
-
         // FPCore operations
         "erf" = Erf(Id),
         "erfc" = Erfc(Id),
@@ -134,11 +123,84 @@ define_language! {
         "expm1" = Expm1(Id),
         "hypot" = Hypot([Id; 2]),
 
-        "+.p16" = PositAdd([Id; 2]),
-        "-.p16" = PositSub([Id; 2]),
-        "*.p16" = PositMul([Id; 2]),
-        "/.p16" = PositDiv([Id; 2]),
-        "real->posit" = RealToPosit(Id),
+        // Complex numbers
+
+        "+.c" = Addc([Id; 2]),
+        "neg.c" = Negc(Id),
+        "-.c" = Subc([Id; 2]),
+        "*.c" = Mulc([Id; 2]),
+        "/.c" = Divc([Id; 2]),
+        "exp.c" = Expc(Id),
+        "log.c" = Logc(Id),
+        "pow.c" = Powc([Id; 2]),
+        "sqrt.c" = Sqrtc(Id),
+        "complex" = Complex([Id; 2]),
+        "re" = Re(Id),
+        "im" = Im(Id),
+        "conj" = Conj(Id),
+
+        // 8-bit posit numbers
+
+        "+.p8" = Posit8Add([Id; 2]),
+        "neg.p8" = Posit8Neg(Id),
+        "-.p8" = Posit8Sub([Id; 2]),
+        "*.p8" = Posit8Mul([Id; 2]),
+        "/.p8" = Posit8Div([Id; 2]),
+        "sqrt.p8" = Posit8Sqrt(Id),
+        "<.p8" = Posit8Lt([Id; 2]),
+        ">.p8" = Posit8Gt([Id; 2]),
+        "<=.p8" = Posit8Lte([Id; 2]),
+        ">=.p8" = Posit8Gte([Id; 2]),
+        "real->posit8" = RealToPosit8(Id),
+        "posit8->real" = Posit8ToReal(Id),
+        "real->quire8" = RealToQuire8(Id),
+        "quire8->real" = Quire8ToReal(Id),
+        "quire8-mul-add" = Quire8MulAdd([Id; 3]),
+        "quire8-mul-sub" = Quire8MulSub([Id; 3]),
+        "posit8->quire8" = Posit8ToQuire8(Id),
+        "quire8->posit8" = Quire8ToPosit8(Id),
+
+        // 16-bit posit numbers
+
+        "+.p16" = Posit16Add([Id; 2]),
+        "neg.p16" = Posit16Neg(Id),
+        "-.p16" = Posit16Sub([Id; 2]),
+        "*.p16" = Posit16Mul([Id; 2]),
+        "/.p16" = Posit16Div([Id; 2]),
+        "sqrt.p16" = Posit16Sqrt(Id),
+        "<.p16" = Posit16Lt([Id; 2]),
+        ">.p16" = Posit16Gt([Id; 2]),
+        "<=.p16" = Posit16Lte([Id; 2]),
+        ">=.p16" = Posit16Gte([Id; 2]),
+        "real->posit16" = RealToPosit16(Id),
+        "posit16->real" = Posit16ToReal(Id),
+        "real->quire16" = RealToQuire16(Id),
+        "quire16->real" = Quire16ToReal(Id),
+        "quire16-mul-add" = Quire16MulAdd([Id; 3]),
+        "quire16-mul-sub" = Quire16MulSub([Id; 3]),
+        "posit16->quire16" = Posit16ToQuire16(Id),
+        "quire16->posit16" = Quire16ToPosit16(Id),
+
+        // 32-bit posit numbers
+
+        "+.p32" = Posit32Add([Id; 2]),
+        "neg.p32" = Posit32Neg(Id),
+        "-.p32" = Posit32Sub([Id; 2]),
+        "*.p32" = Posit32Mul([Id; 2]),
+        "/.p32" = Posit32Div([Id; 2]),
+        "sqrt.p32" = Posit32Sqrt(Id),
+        "<.p32" = Posit32Lt([Id; 2]),
+        ">.p32" = Posit32Gt([Id; 2]),
+        "<=.p32" = Posit32Lte([Id; 2]),
+        ">=.p32" = Posit32Gte([Id; 2]),
+        "real->posit32" = RealToPosit32(Id),
+        "posit32->real" = Posit32ToReal(Id),
+        "real->quire32" = RealToQuire32(Id),
+        "quire32->real" = Quire32ToReal(Id),
+        "quire32-mul-add" = Quire32MulAdd([Id; 3]),
+        "quire32-mul-sub" = Quire32MulSub([Id; 3]),
+        "posit32->quire32" = Posit32ToQuire32(Id),
+        "quire32->posit32" = Quire32ToPosit32(Id),
 
         Constant(Constant),
         Variable(egg::Symbol),