flambda-backend: Save Mach as Cfg after Selection (#624)

gretay-js · web-flow · commit fe8a98b0cd38 · 2022-05-03T16:44:42.000+01:00
diff --git a/driver/maindriver.ml b/driver/maindriver.ml
@@ -63,7 +63,8 @@ let main argv ppf =
            are  incompatible with -pack, -a, -output-obj"
           (String.concat "|"
              (P.available_pass_names ~filter:(fun _ -> true) ~native:false))
-      | Some (P.Scheduling | P.Simplify_cfg | P.Emit) -> assert false (* native only *)
+      | Some (P.Scheduling | P.Simplify_cfg | P.Emit | P.Selection) ->
+        assert false (* native only *)
     end;
     if !make_archive then begin
       Compmisc.init_path ();
diff --git a/driver/optmaindriver.ml b/driver/optmaindriver.ml
@@ -76,7 +76,7 @@ let main argv ppf =
           Compenv.fatal "Please specify at most one of -pack, -a, -shared, -c, \
                          -output-obj";
       | Some ((P.Parsing | P.Typing | P.Scheduling
-              | P.Simplify_cfg | P.Emit) as p) ->
+              | P.Simplify_cfg | P.Emit | P.Selection) as p) ->
         assert (P.is_compilation_pass p);
         Printf.ksprintf Compenv.fatal
           "Options -i and -stop-after (%s) \
diff --git a/testsuite/tests/tool-ocamlopt-save-ir/save_ir_after_typing.compilers.reference b/testsuite/tests/tool-ocamlopt-save-ir/save_ir_after_typing.compilers.reference
@@ -1 +1 @@
-wrong argument 'typing'; option '-save-ir-after' expects one of: scheduling simplify_cfg.
+wrong argument 'typing'; option '-save-ir-after' expects one of: scheduling simplify_cfg selection.
diff --git a/utils/clflags.ml b/utils/clflags.ml
@@ -546,26 +546,29 @@ module Compiler_pass = struct
      - the manpages in man/ocaml{c,opt}.m
      - the manual manual/manual/cmds/unified-options.etex
   *)
-  type t = Parsing | Typing | Scheduling | Emit | Simplify_cfg
+  type t = Parsing | Typing | Scheduling | Emit | Simplify_cfg | Selection
 
   let to_string = function
     | Parsing -> "parsing"
     | Typing -> "typing"
     | Scheduling -> "scheduling"
     | Emit -> "emit"
     | Simplify_cfg -> "simplify_cfg"
+    | Selection -> "selection"
 
   let of_string = function
     | "parsing" -> Some Parsing
     | "typing" -> Some Typing
     | "scheduling" -> Some Scheduling
     | "emit" -> Some Emit
     | "simplify_cfg" -> Some Simplify_cfg
+    | "selection" -> Some Selection
     | _ -> None
 
   let rank = function
     | Parsing -> 0
     | Typing -> 1
+    | Selection -> 20
     | Simplify_cfg -> 49
     | Scheduling -> 50
     | Emit -> 60
@@ -576,19 +579,22 @@ module Compiler_pass = struct
     Scheduling;
     Emit;
     Simplify_cfg;
+    Selection;
   ]
   let is_compilation_pass _ = true
   let is_native_only = function
     | Scheduling -> true
     | Emit -> true
     | Simplify_cfg -> true
+    | Selection -> true
     | Parsing | Typing -> false
 
   let enabled is_native t = not (is_native_only t) || is_native
   let can_save_ir_after = function
     | Scheduling -> true
     | Simplify_cfg -> true
-    | _ -> false
+    | Selection -> true
+    | Parsing | Typing | Emit -> false
 
   let available_pass_names ~filter ~native =
     passes
@@ -603,6 +609,7 @@ module Compiler_pass = struct
     match t with
     | Scheduling -> prefix ^ Compiler_ir.(extension Linear)
     | Simplify_cfg -> prefix ^ Compiler_ir.(extension Cfg)
+    | Selection -> prefix ^ Compiler_ir.(extension Cfg) ^ "-sel"
     | Emit | Parsing | Typing -> Misc.fatal_error "Not supported"
 
   let of_input_filename name =
diff --git a/utils/clflags.mli b/utils/clflags.mli
@@ -254,7 +254,7 @@ module Compiler_ir : sig
 end
 
 module Compiler_pass : sig
-  type t = Parsing | Typing | Scheduling | Emit | Simplify_cfg
+  type t = Parsing | Typing | Scheduling | Emit | Simplify_cfg | Selection
   val of_string : string -> t option
   val to_string : t -> string
   val is_compilation_pass : t -> bool

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-wrong argument 'typing'; option '-save-ir-after' expects one of: scheduling simplify_cfg.`
	`1`	`+wrong argument 'typing'; option '-save-ir-after' expects one of: scheduling simplify_cfg selection.`