forked from ocaml-flambda/flambda-backend
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Port
Comballoc to work on CFG values (ocaml-flambda#2163)
- Loading branch information
Showing
9 changed files
with
243 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,196 @@ | ||
| [@@@ocaml.warning "+a-30-40-41-42"] | ||
|
|
||
| module List = ListLabels | ||
| module DLL = Flambda_backend_utils.Doubly_linked_list | ||
|
|
||
| type cell = Cfg.basic Cfg.instruction DLL.cell | ||
|
|
||
| (* Description of an allocation: has the fields of a [Cfg.Alloc _] value, and a | ||
| cell so that the instruction can be modified. *) | ||
| type allocation = | ||
| { bytes : int; | ||
| dbginfo : Debuginfo.alloc_dbginfo; | ||
| mode : Lambda.locality_mode; | ||
| cell : cell | ||
| } | ||
|
|
||
| (* Description of allocations that can be folded into a previous one, and a cell | ||
| indicating where to continue the process. *) | ||
| type compatible_allocations = | ||
| { allocations : allocation list; | ||
| next_cell : cell option | ||
| } | ||
|
|
||
| (* [max_instr_id cfg] returns the maximum instruction identifier in [cfg]. *) | ||
| let max_instr_id : Cfg.t -> int = | ||
| fun cfg -> | ||
| (* CR-someday xclerc for xclerc: factor out with similar function in | ||
| regalloc/. *) | ||
| Cfg.fold_blocks cfg ~init:Int.min_int ~f:(fun _label block max_id -> | ||
| let max_id = | ||
| DLL.fold_left block.body ~init:max_id ~f:(fun max_id instr -> | ||
| Int.max max_id instr.Cfg.id) | ||
| in | ||
| Int.max max_id block.terminator.id) | ||
|
|
||
| (* [find_next_allocation cell] returns the first allocation found by iterating | ||
| from [cell]. *) | ||
| let rec find_next_allocation : cell option -> allocation option = | ||
| fun cell -> | ||
| match cell with | ||
| | None -> None | ||
| | Some cell -> ( | ||
| let instr = DLL.value cell in | ||
| match instr.desc with | ||
| | Op (Alloc { bytes; dbginfo; mode }) -> Some { bytes; dbginfo; mode; cell } | ||
| | Op | ||
| ( Move | Spill | Reload | Const_int _ | Const_float _ | Const_symbol _ | ||
| | Const_vec128 _ | Stackoffset _ | Load _ | Store _ | Intop _ | ||
| | Intop_imm _ | Intop_atomic _ | Negf | Absf | Addf | Subf | Mulf | Divf | ||
| | Compf _ | Csel _ | Floatofint | Intoffloat | Valueofint | Intofvalue | ||
| | Vectorcast _ | Scalarcast _ | Probe_is_enabled _ | Opaque | ||
| | Begin_region | End_region | Specific _ | Name_for_debugger _ | Dls_get | ||
| | Poll ) | ||
| | Reloadretaddr | Pushtrap _ | Poptrap | Prologue -> | ||
| find_next_allocation (DLL.next cell)) | ||
|
|
||
| (* [find_compatible_allocations cell ~curr_mode ~curr_size] returns the | ||
| allocations compatible with mode [curr_mode] and total size [curr_size]. *) | ||
| let find_compatible_allocations : | ||
| cell option -> | ||
| curr_mode:Lambda.locality_mode -> | ||
| curr_size:int -> | ||
| compatible_allocations = | ||
| fun cell ~curr_mode ~curr_size -> | ||
| let rec loop (allocations : allocation list) (cell : cell option) | ||
| ~(curr_mode : Lambda.alloc_mode) ~(curr_size : int) : | ||
| compatible_allocations = | ||
| match cell with | ||
| | None -> { allocations = List.rev allocations; next_cell = None } | ||
| | Some cell -> ( | ||
| let instr = DLL.value cell in | ||
| let return () = | ||
| { allocations = List.rev allocations; next_cell = Some cell } | ||
| in | ||
| match instr.desc with | ||
| | Op (Alloc { bytes; dbginfo; mode }) -> | ||
| let is_compatible = | ||
| Lambda.equal_alloc_mode mode curr_mode | ||
| && (curr_size + bytes | ||
| <= (Config.max_young_wosize + 1) * Arch.size_addr | ||
| || Lambda.is_local_mode mode) | ||
| in | ||
| if is_compatible | ||
| then | ||
| let allocation = { bytes; dbginfo; mode; cell } in | ||
| loop | ||
| (allocation :: allocations) | ||
| (DLL.next cell) ~curr_mode ~curr_size:(curr_size + bytes) | ||
| else { allocations = List.rev allocations; next_cell = Some cell } | ||
| | Op (Begin_region | End_region) -> ( | ||
| match curr_mode with | ||
| | Lambda.Alloc_local -> return () | ||
| | Lambda.Alloc_heap -> | ||
| loop allocations (DLL.next cell) ~curr_mode ~curr_size) | ||
| | Op Poll -> return () | ||
| | Reloadretaddr | Poptrap | Prologue | Pushtrap _ -> | ||
| (* CR-soon xclerc for xclerc: is it too conservative? (note: only the | ||
| `Pushtrap` case may be too conservative) *) | ||
| { allocations = List.rev allocations; next_cell = Some cell } | ||
| | Op | ||
| ( Move | Spill | Reload | Negf | Absf | Addf | Subf | Mulf | Divf | ||
| | Floatofint | Intoffloat | Valueofint | Intofvalue | Vectorcast _ | ||
| | Opaque | Const_int _ | Const_float _ | Const_vec128 _ | ||
| | Const_symbol _ | Stackoffset _ | Load _ | ||
| | Store (_, _, _) | ||
| | Compf _ | Csel _ | Specific _ | Name_for_debugger _ | ||
| | Probe_is_enabled _ | Scalarcast _ | Dls_get | ||
| | Intop | ||
| ( Iadd | Isub | Imul | Idiv | Imod | Iand | Ior | Ixor | Ilsl | ||
| | Ilsr | Iasr | Ipopcnt | Imulh _ | Iclz _ | Ictz _ | Icomp _ ) | ||
| | Intop_imm | ||
| ( ( Iadd | Isub | Imul | Idiv | Imod | Iand | Ior | Ixor | Ilsl | ||
| | Ilsr | Iasr | Ipopcnt | Imulh _ | Iclz _ | Ictz _ | Icomp _ ), | ||
| _ ) | ||
| | Intop_atomic _ ) -> | ||
| loop allocations (DLL.next cell) ~curr_mode ~curr_size) | ||
| in | ||
| loop [] cell ~curr_mode ~curr_size | ||
|
|
||
| (** [combine ~max_instr_id cell] combines allocations, starting from [cell] and | ||
| using [max_instr_id] as the counter to get new instruction identifiers. | ||
| The allocation are combined by repeatedly: | ||
| - 1. looking for a "first" allocation; | ||
| - 2. looking for all subsequent allocations compatible with the "first" one; | ||
| - 3. continuing the process at step 1. from the instruction after the last | ||
| one seen at step 2. | ||
| When steps 1 and 2 are both successful, allocations are effectively | ||
| combined. This means that: | ||
| - the "first" allocation is made bigger to account for all allocations; | ||
| - the other allocations are replaced with a reference to the result of the | ||
| previous allocation, with a different offset. *) | ||
| let rec combine : max_instr_id:int ref -> cell option -> unit = | ||
| fun ~max_instr_id cell -> | ||
| let first_allocation = find_next_allocation cell in | ||
| match first_allocation with | ||
| | None -> () | ||
| | Some { bytes; dbginfo; mode; cell } -> | ||
| assert (List.length dbginfo = 1); | ||
| let compatible_allocs = | ||
| find_compatible_allocations (DLL.next cell) ~curr_mode:mode | ||
| ~curr_size:bytes | ||
| in | ||
| (match compatible_allocs.allocations with | ||
| | [] -> () | ||
| | other_allocations -> | ||
| let first_allocation_instr = DLL.value cell in | ||
| let first_allocation_res0 = first_allocation_instr.res.(0) in | ||
| (* First, replace the "other" allocations with a reference to the result | ||
| of the previous allocation and compute the total size. *) | ||
| let total_size_of_other_allocations, dbginfo_of_other_allocations, _ = | ||
| List.fold_left other_allocations ~init:(0, [], first_allocation_res0) | ||
| ~f:(fun (size, dbginfos, prev_res0) other_allocation -> | ||
| let other_allocation_instr = DLL.value other_allocation.cell in | ||
| let res0 = other_allocation_instr.res.(0) in | ||
| DLL.set_value other_allocation.cell | ||
| { other_allocation_instr with | ||
| desc = Cfg.Op (Intop_imm (Mach.Iadd, -other_allocation.bytes)); | ||
| arg = [| prev_res0 |] | ||
| }; | ||
| ( size + other_allocation.bytes, | ||
| other_allocation.dbginfo @ dbginfos, | ||
| res0 )) | ||
| in | ||
| (* Then, change the size of the first allocation so that it is the sum of | ||
| all allocations, and update the debug info. *) | ||
| DLL.set_value cell | ||
| { first_allocation_instr with | ||
| desc = | ||
| Cfg.Op | ||
| (Alloc | ||
| { bytes = bytes + total_size_of_other_allocations; | ||
| dbginfo = dbginfo_of_other_allocations @ dbginfo; | ||
| mode | ||
| }) | ||
| }; | ||
| incr max_instr_id; | ||
| DLL.insert_after cell | ||
| { first_allocation_instr with | ||
| desc = Cfg.Op (Intop_imm (Mach.Iadd, total_size_of_other_allocations)); | ||
| arg = [| first_allocation_res0 |]; | ||
| res = [| first_allocation_res0 |]; | ||
| id = !max_instr_id | ||
| }); | ||
| combine ~max_instr_id compatible_allocs.next_cell | ||
|
|
||
| let run : Cfg_with_layout.t -> Cfg_with_layout.t = | ||
| fun cfg_with_layout -> | ||
| let cfg = Cfg_with_layout.cfg cfg_with_layout in | ||
| let max_instr_id = ref (max_instr_id cfg) in | ||
| Cfg.iter_blocks cfg ~f:(fun _label block -> | ||
| combine ~max_instr_id (DLL.hd_cell block.body)); | ||
| cfg_with_layout |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| [@@@ocaml.warning "+a-30-40-41-42"] | ||
|
|
||
| (* Combine heap allocations occurring in the same basic block. *) | ||
| val run : Cfg_with_layout.t -> Cfg_with_layout.t |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -149,6 +149,7 @@ | |
| cfg_to_linear | ||
| cfg_with_layout | ||
| cfg_with_infos | ||
| cfg_comballoc | ||
| cfg_dataflow | ||
| cfg_deadcode | ||
| cfg_liveness | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters