Skip to content

Refactor max_register_pressure amd64/proc.ml #144

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Aug 10, 2021
Merged

Refactor max_register_pressure amd64/proc.ml #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5da668c
Refactor max_register_pressure (from upstream PR 9945)
gretay-js Aug 5, 2021
61e372e
Fix i386 build
gretay-js Aug 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions backend/amd64/proc.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,23 +360,24 @@ let safe_register_pressure = function
| Iprobe _ | Iprobe_is_enabled _
-> if fp then 10 else 11

let max_register_pressure = function
let max_register_pressure =
let consumes ~int ~float =
if fp
then [| 12 - int; 16 - float |]
else [| 13 - int; 16 - float |]
in function
Iextcall _ ->
if win64 then
if fp then [| 7; 10 |] else [| 8; 10 |]
else
if fp then [| 3; 0 |] else [| 4; 0 |]
if win64
then consumes ~int:5 ~float:6
else consumes ~int:9 ~float:16
| Iintop(Idiv | Imod) | Iintop_imm((Idiv | Imod), _) ->
if fp then [| 10; 16 |] else [| 11; 16 |]
consumes ~int:2 ~float:0
| Ialloc _ ->
if fp then [| 11 - num_destroyed_by_plt_stub; 16 |]
else [| 12 - num_destroyed_by_plt_stub; 16 |]
consumes ~int:(1 + num_destroyed_by_plt_stub) ~float:0
| Iintop(Icomp _) | Iintop_imm((Icomp _), _) ->
if fp then [| 11; 16 |] else [| 12; 16 |]
| Istore(Single, _, _) ->
if fp then [| 12; 15 |] else [| 13; 15 |]
| Icompf _ ->
if fp then [| 12; 15 |] else [| 13; 15 |]
consumes ~int:1 ~float:0
| Istore(Single, _, _) | Icompf _ ->
consumes ~int:0 ~float:1
| Iintop(Iadd | Isub | Imul | Imulh | Iand | Ior | Ixor | Ilsl | Ilsr | Iasr
| Ipopcnt|Iclz _| Ictz _|Icheckbound)
| Iintop_imm((Iadd | Isub | Imul | Imulh | Iand | Ior | Ixor | Ilsl | Ilsr
Expand All @@ -394,7 +395,7 @@ let max_register_pressure = function
| Ioffset_loc (_, _) | Ifloatarithmem (_, _)
| Ibswap _ | Ifloatsqrtf _ | Isqrtf)
| Iname_for_debugger _ | Iprobe _ | Iprobe_is_enabled _
-> if fp then [| 12; 16 |] else [| 13; 16 |]
-> consumes ~int:0 ~float:0

(* Pure operations (without any side effect besides updating their result
registers). *)
Expand Down
8 changes: 4 additions & 4 deletions backend/i386/emit.mlp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ let is_tos = function { loc = Reg _; typ = Float } -> true | _ -> false

(* Emit the code for a floating-point comparison *)

let emit_float_test_and_return_condition cmp arg lbl =
let emit_float_test_and_return_condition cmp arg =
let actual_cmp =
match (is_tos arg.(0), is_tos arg.(1)) with
| (true, true) ->
Expand Down Expand Up @@ -423,8 +423,8 @@ let emit_float_test_and_return_condition cmp arg lbl =
I.and_ (int 69) ah;
NE

let emit_float_test env cmp arg lbl =
let condition = emit_float_test_and_return_condition env cmp arg in
let emit_float_test cmp arg lbl =
let condition = emit_float_test_and_return_condition cmp arg in
I.j condition lbl

(* Emit a Ifloatspecial instruction *)
Expand Down Expand Up @@ -654,7 +654,7 @@ let emit_instr fallthrough i =
I.set (cond cmp) al;
I.movzx al (reg i.res.(0));
| Lop(Icompf cmp) ->
let cond = emit_float_test_and_return_condition env cmp i.arg in
let cond = emit_float_test_and_return_condition cmp i.arg in
I.set cond al;
I.movzx al (reg i.res.(0))
| Lop(Iintop_imm(Icomp cmp, n)) ->
Expand Down