[sledge] Improve: Include order info in equal_or_separate

Summary:
When equal_or_separate returns Unknown, it is common to sort the args,
which is wasteful since computing equal_or_separate already had to
test if the args are equal, which is most if not all of the work of
comparing them.

Reviewed By: jvillard

Differential Revision: D23636205

fbshipit-source-id: 5b2bcdd8f

sledge/src/fol.ml

@@ -95,7 +95,6 @@ let equal_trm x y =
       Int.equal i j
   | _ -> equal_trm x y
 
-let sort_trm x y = if compare_trm x y <= 0 then (x, y) else (y, x)
 let zero = Z Z.zero
 let one = Z Z.one
 let _Neg x = Neg x
@@ -211,53 +210,55 @@ end = struct
   let _Tt = Tt
   let _Ff = Ff
 
-  type equal_or_separate = Equal | Separate | Unknown
+  (** classification of terms as either semantically equal or disequal, or
+      if semantic relationship is unknown, as either syntactically less than
+      or greater than *)
+  type compare_semantic_syntactic = SemEq | SemDq | SynLt | SynGt
 
-  let equal_or_separate d e : equal_or_separate =
+  let compare_semantic_syntactic d e =
     match (d, e) with
-    | Z y, Z z -> if Z.equal y z then Equal else Separate
+    | Z y, Z z -> if Z.equal y z then SemEq else SemDq
-    | Q q, Q r -> if Q.equal q r then Equal else Separate
+    | Q q, Q r -> if Q.equal q r then SemEq else SemDq
-    | Z z, Q q | Q q, Z z ->
+    | Z z, Q q | Q q, Z z -> if Q.equal (Q.of_z z) q then SemEq else SemDq
-        if Q.equal (Q.of_z z) q then Equal else Separate
+    | _ ->
-    | _ -> if equal_trm d e then Equal else Unknown
+        let ord = compare_trm d e in
+        if ord < 0 then SynLt else if ord = 0 then SemEq else SynGt
 
   let _Eq0 x =
-    match equal_or_separate zero x with
+    match compare_semantic_syntactic zero x with
     (* 0 = 0 ==> tt *)
-    | Equal -> Tt
+    | SemEq -> Tt
     (* 0 = N ==> ff for N ≢ 0 *)
-    | Separate -> Ff
+    | SemDq -> Ff
-    | Unknown -> Eq0 x
+    | SynLt | SynGt -> Eq0 x
 
   let _Dq0 x =
-    match equal_or_separate zero x with
+    match compare_semantic_syntactic zero x with
     (* 0 ≠ 0 ==> ff *)
-    | Equal -> Ff
+    | SemEq -> Ff
     (* 0 ≠ N ==> tt for N ≢ 0 *)
-    | Separate -> Tt
+    | SemDq -> Tt
-    | Unknown -> Dq0 x
+    | SynLt | SynGt -> Dq0 x
 
   let _Eq x y =
     if x == zero then _Eq0 y
     else if y == zero then _Eq0 x
     else
-      match equal_or_separate x y with
+      match compare_semantic_syntactic x y with
-      | Equal -> Tt
+      | SemEq -> Tt
-      | Separate -> Ff
+      | SemDq -> Ff
-      | Unknown ->
+      | SynLt -> Eq (x, y)
-          let x, y = sort_trm x y in
+      | SynGt -> Eq (y, x)
-          Eq (x, y)
 
   let _Dq x y =
     if x == zero then _Dq0 y
     else if y == zero then _Dq0 x
     else
-      match equal_or_separate x y with
+      match compare_semantic_syntactic x y with
-      | Equal -> Ff
+      | SemEq -> Ff
-      | Separate -> Tt
+      | SemDq -> Tt
-      | Unknown ->
+      | SynLt -> Dq (x, y)
-          let x, y = sort_trm x y in
+      | SynGt -> Dq (y, x)
-          Dq (x, y)
 
   let _Gt0 = function
     | Z z -> if Z.gt z Z.zero then Tt else Ff