Updating fp partial eval binoq cmps

microsoft · Jan 3, 2025 · cccd88e · cccd88e
1 parent d687b03
commit cccd88e
Showing 1 changed file with 25 additions and 4 deletions.
diff --git a/compiler/qsc_partial_eval/src/lib.rs b/compiler/qsc_partial_eval/src/lib.rs
@@ -3218,12 +3218,12 @@ fn eval_bin_op_with_double_literals(
     };
 
     match bin_op {
-        BinOp::Eq => Ok(Value::Bool((lhs - rhs).abs() < f64::EPSILON)),
-        BinOp::Neq => Ok(Value::Bool((lhs - rhs).abs() > f64::EPSILON)),
+        BinOp::Eq => Ok(Value::Bool(f64_approx_eq(lhs, rhs))),
+        BinOp::Neq => Ok(Value::Bool(f64_approx_neq(lhs, rhs))),
         BinOp::Gt => Ok(Value::Bool(lhs > rhs)),
-        BinOp::Gte => Ok(Value::Bool(lhs >= rhs)),
+        BinOp::Gte => Ok(Value::Bool(f64_approx_gte(lhs, rhs))),
         BinOp::Lt => Ok(Value::Bool(lhs < rhs)),
-        BinOp::Lte => Ok(Value::Bool(lhs <= rhs)),
+        BinOp::Lte => Ok(Value::Bool(f64_approx_lte(lhs, rhs))),
         BinOp::Add => Ok(Value::Double(lhs + rhs)),
         BinOp::Sub => Ok(Value::Double(lhs - rhs)),
         BinOp::Mul => Ok(Value::Double(lhs * rhs)),
@@ -3378,3 +3378,24 @@ fn try_get_eval_var_type(value: &Value) -> Option<VarTy> {
         _ => None,
     }
 }
+
+fn f64_approx_lte(lhs: f64, rhs: f64) -> bool {
+    lhs < rhs || f64_approx_eq(lhs, rhs)
+}
+
+fn f64_approx_gte(lhs: f64, rhs: f64) -> bool {
+    lhs > rhs || f64_approx_eq(lhs, rhs)
+}
+
+fn f64_approx_neq(lhs: f64, rhs: f64) -> bool {
+    !f64_approx_eq(lhs, rhs)
+}
+
+fn f64_approx_eq(lhs: f64, rhs: f64) -> bool {
+    // check equality, this is fastest and handles +0.0 == -0.0
+    // also lets us avoid constly math operations in the true case
+    lhs == rhs || {
+        // not equal, check if they are close enough
+        (lhs - rhs).abs() <= f64::EPSILON
+    }
+}