PERF

Author: vouillon

compiler/lib-wasm/generate.ml

@@ -880,39 +880,67 @@ module Generate (Target : Target_sig.S) = struct
           Value.unit
     | Prim (Not, [ x ]) ->
         Value.not (transl_prim_arg ctx ~typ:(Number (Int Unnormalized)) x)
-    | Prim (Lt, [ x; y ]) ->
-        Value.lt
-          (transl_prim_arg ctx ~typ:(Number (Int Normalized)) x)
-          (transl_prim_arg ctx ~typ:(Number (Int Normalized)) y)
-    | Prim (Le, [ x; y ]) ->
-        Value.le
-          (transl_prim_arg ctx ~typ:(Number (Int Normalized)) x)
-          (transl_prim_arg ctx ~typ:(Number (Int Normalized)) y)
+    | Prim (Lt, [ x; y ]) -> (
+        match get_type ctx x, get_type ctx y with
+        | (Number (Int Normalized) as typ), Number (Int Normalized) ->
+            Arith.(transl_prim_arg ctx ~typ x < transl_prim_arg ctx ~typ y)
+        | ( Number (Int (Normalized | Unnormalized))
+          , Number (Int (Normalized | Unnormalized)) ) ->
+            Arith.(
+              transl_prim_arg ctx ~typ:(Number (Int Unnormalized)) x lsl const 1l
+              < transl_prim_arg ctx ~typ:(Number (Int Unnormalized)) y lsl const 1l)
+        | _ ->
+            Value.lt
+              (transl_prim_arg ctx ~typ:(Number (Int Normalized)) x)
+              (transl_prim_arg ctx ~typ:(Number (Int Normalized)) y))
+    | Prim (Le, [ x; y ]) -> (
+        match get_type ctx x, get_type ctx y with
+        | (Number (Int Normalized) as typ), Number (Int Normalized) ->
+            Arith.(transl_prim_arg ctx ~typ x <= transl_prim_arg ctx ~typ y)
+        | ( Number (Int (Normalized | Unnormalized))
+          , Number (Int (Normalized | Unnormalized)) ) ->
+            Arith.(
+              transl_prim_arg ctx ~typ:(Number (Int Unnormalized)) x lsl const 1l
+              <= transl_prim_arg ctx ~typ:(Number (Int Unnormalized)) y lsl const 1l)
+        | _ ->
+            Value.le
+              (transl_prim_arg ctx ~typ:(Number (Int Normalized)) x)
+              (transl_prim_arg ctx ~typ:(Number (Int Normalized)) y))
     | Prim (Eq, [ x; y ]) -> (
         match get_type ctx x, get_type ctx y with
         | (Number (Int Normalized) as typ), Number (Int Normalized) ->
             Arith.(transl_prim_arg ctx ~typ x = transl_prim_arg ctx ~typ y)
-        | ( (Number (Int (Normalized | Unnormalized)) as typ)
+        | ( Number (Int (Normalized | Unnormalized))
           , Number (Int (Normalized | Unnormalized)) ) ->
             Arith.(
-              transl_prim_arg ctx ~typ x lsl const 1l
-              = transl_prim_arg ctx ~typ y lsl const 1l)
+              transl_prim_arg ctx ~typ:(Number (Int Unnormalized)) x lsl const 1l
+              = transl_prim_arg ctx ~typ:(Number (Int Unnormalized)) y lsl const 1l)
         | _ -> Value.eq (transl_prim_arg ctx ~typ:Top x) (transl_prim_arg ctx ~typ:Top y))
     | Prim (Neq, [ x; y ]) -> (
         match get_type ctx x, get_type ctx y with
         | (Number (Int Normalized) as typ), Number (Int Normalized) ->
             Arith.(transl_prim_arg ctx ~typ x <> transl_prim_arg ctx ~typ y)
-        | ( (Number (Int (Normalized | Unnormalized)) as typ)
+        | ( Number (Int (Normalized | Unnormalized))
           , Number (Int (Normalized | Unnormalized)) ) ->
             Arith.(
-              transl_prim_arg ctx ~typ x lsl const 1l
-              <> transl_prim_arg ctx ~typ y lsl const 1l)
+              transl_prim_arg ctx ~typ:(Number (Int Unnormalized)) x lsl const 1l
+              <> transl_prim_arg ctx ~typ:(Number (Int Unnormalized)) y lsl const 1l)
         | _ -> Value.neq (transl_prim_arg ctx ~typ:Top x) (transl_prim_arg ctx ~typ:Top y)
         )
-    | Prim (Ult, [ x; y ]) ->
-        Value.ult
-          (transl_prim_arg ctx ~typ:(Number (Int Normalized)) x)
-          (transl_prim_arg ctx ~typ:(Number (Int Normalized)) y)
+    | Prim (Ult, [ x; y ]) -> (
+        match get_type ctx x, get_type ctx y with
+        | (Number (Int Normalized) as typ), Number (Int Normalized) ->
+            Arith.ult (transl_prim_arg ctx ~typ x) (transl_prim_arg ctx ~typ y)
+        | ( Number (Int (Normalized | Unnormalized))
+          , Number (Int (Normalized | Unnormalized)) ) ->
+            Arith.(
+              ult
+                (transl_prim_arg ctx ~typ:(Number (Int Unnormalized)) x lsl const 1l)
+                (transl_prim_arg ctx ~typ:(Number (Int Unnormalized)) y lsl const 1l))
+        | _ ->
+            Value.ult
+              (transl_prim_arg ctx ~typ:(Number (Int Normalized)) x)
+              (transl_prim_arg ctx ~typ:(Number (Int Normalized)) y))
     | Prim (Array_get, [ x; y ]) ->
         Memory.array_get
           (transl_prim_arg ctx x)