flambda-backend: Only speculate during inlining if argument types have useful information (oxcaml#343)

mshinwell · web-flow · commit dc9b7fdc98f5 · 2021-10-26T12:20:06.000+01:00
diff --git a/driver/compenv.ml b/driver/compenv.ml
@@ -439,6 +439,9 @@ let read_one_param ppf position name v =
     Float_arg_helper.parse v
       "Bad syntax in OCAMLPARAM for 'flambda2-inline-threshold'"
       Flambda2.Inlining.threshold
+  | "flambda2-speculative-inlining-only-if-arguments-useful" ->
+    set "flambda2-speculative-inlining-only-if-arguments-useful"
+      [Flambda2.Inlining.speculative_inlining_only_if_arguments_useful] v
   | "flambda2-treat-invalid-code-as-unreachable" ->
     set "flambda2-treat-invalid-code-as-unreachable"
       [Flambda2.treat_invalid_code_as_unreachable] v
diff --git a/driver/main_args.ml b/driver/main_args.ml
@@ -1160,6 +1160,24 @@ let mk_flambda2_inline_threshold f =
         \     more aggressive) (Flambda 2 only)"
       Clflags.Flambda2.Inlining.Default.threshold
 
+let mk_flambda2_speculative_inlining_only_if_arguments_useful f =
+  "-flambda2-speculative-inlining-only-if-arguments-useful", Arg.Unit f,
+    Printf.sprintf " Only\n\
+        \    perform speculative inlining if the Flambda type system has\n\
+        \    useful information about the argument(s) at the call site%s\n\
+        \    (Flambda 2 only)"
+      (format_default
+        Flambda2.Inlining.Default.speculative_inlining_only_if_arguments_useful)
+
+let mk_no_flambda2_speculative_inlining_only_if_arguments_useful f =
+  "-no-flambda2-speculative-inlining-only-if-arguments-useful", Arg.Unit f,
+    Printf.sprintf " Ignore\n\
+        \     whether the Flambda type system has useful information\n\
+        \     about the argument(s) at the call site when performing\n\
+        \     speculative inlining%s (Flambda 2 only)"
+      (format_not_default
+        Flambda2.Inlining.Default.speculative_inlining_only_if_arguments_useful)
+
 let mk_flambda2_treat_invalid_code_as_unreachable f =
   "-flambda2-treat-invalid-code-as-unreachable", Arg.Unit f,
   Printf.sprintf " Treat code deemed as\n\
@@ -1452,6 +1470,8 @@ module type Optcommon_options = sig
   val _flambda2_inline_small_function_size : string -> unit
   val _flambda2_inline_large_function_size : string -> unit
   val _flambda2_inline_threshold : string -> unit
+  val _flambda2_speculative_inlining_only_if_arguments_useful : unit -> unit
+  val _no_flambda2_speculative_inlining_only_if_arguments_useful : unit -> unit
 
   val _flambda2_inlining_report_bin : unit -> unit
 
@@ -1850,6 +1870,10 @@ struct
     mk_flambda2_inline_large_function_size
       F._flambda2_inline_large_function_size;
     mk_flambda2_inline_threshold F._flambda2_inline_threshold;
+    mk_flambda2_speculative_inlining_only_if_arguments_useful
+      F._flambda2_speculative_inlining_only_if_arguments_useful;
+    mk_no_flambda2_speculative_inlining_only_if_arguments_useful
+      F._no_flambda2_speculative_inlining_only_if_arguments_useful;
 
     mk_flambda2_inlining_report_bin F._flambda2_inlining_report_bin;
 
@@ -2035,6 +2059,10 @@ module Make_opttop_options (F : Opttop_options) = struct
     mk_flambda2_inline_large_function_size
       F._flambda2_inline_large_function_size;
     mk_flambda2_inline_threshold F._flambda2_inline_threshold;
+    mk_flambda2_speculative_inlining_only_if_arguments_useful
+      F._flambda2_speculative_inlining_only_if_arguments_useful;
+    mk_no_flambda2_speculative_inlining_only_if_arguments_useful
+      F._no_flambda2_speculative_inlining_only_if_arguments_useful;
 
     mk_flambda2_inlining_report_bin F._flambda2_inlining_report_bin;
 
@@ -2425,6 +2453,12 @@ module Default = struct
         "Syntax: -flambda2-inline-threshold <float> | <round>=<float>[,...]"
         Flambda2.Inlining.threshold
 
+    let _flambda2_speculative_inlining_only_if_arguments_useful =
+      set Flambda2.Inlining.speculative_inlining_only_if_arguments_useful
+
+    let _no_flambda2_speculative_inlining_only_if_arguments_useful =
+      clear Flambda2.Inlining.speculative_inlining_only_if_arguments_useful
+
     let _flambda2_inlining_report_bin = set Flambda2.Inlining.report_bin
 
     let _flambda2_unicode = set Flambda2.unicode
diff --git a/driver/main_args.mli b/driver/main_args.mli
@@ -257,6 +257,9 @@ module type Optcommon_options = sig
   val _flambda2_inline_large_function_size : string -> unit
   val _flambda2_inline_threshold : string -> unit
 
+  val _flambda2_speculative_inlining_only_if_arguments_useful : unit -> unit
+  val _no_flambda2_speculative_inlining_only_if_arguments_useful : unit -> unit
+
   val _flambda2_inlining_report_bin : unit -> unit
 
   val _flambda2_unicode : unit -> unit
diff --git a/utils/clflags.ml b/utils/clflags.ml
@@ -536,6 +536,8 @@ module Flambda2 = struct
       let large_function_size = 10
 
       let threshold = 10.
+
+      let speculative_inlining_only_if_arguments_useful = true
     end
 
     module F = Float_arg_helper
@@ -555,6 +557,9 @@ module Flambda2 = struct
 
     let threshold = ref (F.default Default.threshold)
 
+    let speculative_inlining_only_if_arguments_useful =
+      ref Default.speculative_inlining_only_if_arguments_useful
+
     let report_bin = ref false
 
     type inlining_arguments = {
diff --git a/utils/clflags.mli b/utils/clflags.mli
@@ -288,6 +288,8 @@ module Flambda2 : sig
       val large_function_size : int
 
       val threshold : float
+
+      val speculative_inlining_only_if_arguments_useful : bool
     end
 
     val max_depth : Int_arg_helper.parsed ref
@@ -304,6 +306,8 @@ module Flambda2 : sig
 
     val threshold : Float_arg_helper.parsed ref
 
+    val speculative_inlining_only_if_arguments_useful : bool ref
+
     val report_bin : bool ref
   end
 end
