sort blocks

ocsigen · Jul 27, 2023 · 57f8755 · 57f8755
1 parent beeb986
commit 57f8755
Show file tree

Hide file tree

Showing 4 changed files with 666 additions and 658 deletions.
diff --git a/compiler/lib/generate.ml b/compiler/lib/generate.ml
@@ -1461,6 +1461,8 @@ and compile_block_no_loop st queue (pc : Addr.t) ~fall_through scope_stack =
     Structure.get_edges st.dom pc
     |> Addr.Set.elements
     |> List.filter ~f:(fun pc' -> is_switch pc' || Structure.is_merge_node st.graph pc')
+    |> List.sort ~cmp:(fun a b ->
+           compare (Structure.block_order st.graph a) (Structure.block_order st.graph b))
   in
   if debug () && not (List.is_empty new_scopes)
   then

diff --git a/compiler/lib/structure.ml b/compiler/lib/structure.ml
@@ -30,6 +30,8 @@ type control_flow_graph =
   ; block_order : (Addr.t, int) Hashtbl.t
   }
 
+let block_order g pc = Hashtbl.find g.block_order pc
+
 let is_backward g pc pc' = Hashtbl.find g.block_order pc >= Hashtbl.find g.block_order pc'
 
 let is_forward g pc pc' = Hashtbl.find g.block_order pc < Hashtbl.find g.block_order pc'

diff --git a/compiler/lib/structure.mli b/compiler/lib/structure.mli
@@ -12,6 +12,8 @@ type control_flow_graph =
   ; block_order : (int, int) Hashtbl.t
   }
 
+val block_order : control_flow_graph -> int -> int
+
 val is_backward : control_flow_graph -> int -> int -> bool
 
 val is_forward : control_flow_graph -> int -> int -> bool