Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Add value<->native_pointer intrinsics #855

Merged
merged 15 commits into from
Oct 10, 2022
Merged

Add value<->native_pointer intrinsics #855

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4f28e19
add value<->native_pointer builtins
TheNumbat Sep 29, 2022
c079237
didn't autoformat
TheNumbat Sep 29, 2022
27cd077
didn't need passthrough op
TheNumbat Sep 30, 2022
2b1960f
Update backend/cmm_helpers.ml
TheNumbat Sep 30, 2022
2278607
merge
TheNumbat Sep 30, 2022
5f1818a
fix reg alloc
TheNumbat Sep 30, 2022
743cee7
fix for arm64
TheNumbat Sep 30, 2022
ccb99fb
reverts
TheNumbat Oct 4, 2022
b15f4e8
add intofvalue/valueofint to cmm test parser
TheNumbat Oct 4, 2022
09dca6b
allow allocating two registers
TheNumbat Oct 4, 2022
b6cef97
make ops impure
TheNumbat Oct 4, 2022
7edc05b
emit mov instead of assert
TheNumbat Oct 4, 2022
9765504
adjust emit; reload intofvalue/valueofint
TheNumbat Oct 4, 2022
80f367c
format
TheNumbat Oct 4, 2022
77f0159
adjust arm emit
TheNumbat Oct 7, 2022
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
2 changes: 1 addition & 1 deletion backend/CSEgen.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ method class_of_operation op =
| Iintop_imm(_, _) -> Op_pure
| Icompf _
| Inegf | Iabsf | Iaddf | Isubf | Imulf | Idivf
| Ifloatofint | Iintoffloat -> Op_pure
| Ifloatofint | Iintoffloat | Ivalueofint | Iintofvalue -> Op_pure
| Ispecific _ -> Op_other
| Iname_for_debugger _ -> Op_pure
| Iprobe_is_enabled _ -> Op_other
Expand Down
5 changes: 3 additions & 2 deletions backend/amd64/CSE.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ method! class_of_operation op =
| Ioffset_loc(_, _) -> Op_store true
| Ifloatarithmem _ | Ifloatsqrtf _ -> Op_load Mutable
| Ibswap _ | Isqrtf -> super#class_of_operation op
| Irdtsc | Irdpmc
| Irdtsc | Irdpmc
| Ilfence | Isfence | Imfence -> Op_other
| Ifloat_iround | Ifloat_min | Ifloat_max | Ifloat_round _
| Icrc32q -> Op_pure
Expand All @@ -43,7 +43,8 @@ method! class_of_operation op =
end
| Imove | Ispill | Ireload | Inegf | Iabsf | Iaddf | Isubf | Imulf | Idivf
| Icompf _
| Ifloatofint | Iintoffloat | Iconst_int _ | Iconst_float _ | Iconst_symbol _
| Ifloatofint | Iintoffloat | Ivalueofint | Iintofvalue
| Iconst_int _ | Iconst_float _ | Iconst_symbol _
| Icall_ind | Icall_imm _ | Itailcall_ind | Itailcall_imm _ | Iextcall _
| Istackoffset _ | Iload _ | Istore _ | Ialloc _
| Iintop _ | Iintop_imm _
Expand Down
2 changes: 1 addition & 1 deletion backend/amd64/cfg_stack_operands.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ let basic (map : spilled_map) (instr : Cfg.basic Cfg.instruction) =
| Op (Intop (Ipopcnt | Iclz _| Ictz _))
| Op (Move | Spill | Reload | Negf | Absf | Const_float _ | Compf _ | Stackoffset _
| Load _ | Store _ | Name_for_debugger _ | Probe_is_enabled _
| Opaque | Begin_region | End_region )
| Valueofint | Intofvalue | Opaque | Begin_region | End_region )
gretay-js marked this conversation as resolved.
Show resolved Hide resolved
| Op (Specific (Isqrtf | Isextend32 | Izextend32 | Ilea _
| Istore_int (_, _, _)
| Ioffset_loc (_, _) | Ifloatarithmem (_, _)
Expand Down
2 changes: 2 additions & 0 deletions backend/amd64/emit.mlp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,6 +908,8 @@ let emit_instr fallthrough i =
I.cvtsi2sd (arg i 0) (res i 0)
| Lop(Iintoffloat) ->
I.cvttsd2si (arg i 0) (res i 0)
| Lop(Iintofvalue | Ivalueofint) ->
move i.arg.(0) i.res.(0)
| Lop(Iopaque) ->
assert (i.arg.(0).loc = i.res.(0).loc)
| Lop(Ispecific(Ilea addr)) ->
Expand Down
12 changes: 9 additions & 3 deletions backend/amd64/proc.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ let destroyed_at_oper = function
| Iop(Imove | Ispill | Ireload | Inegf | Iabsf | Iaddf | Isubf | Imulf | Idivf
| Icompf _
| Ifloatofint | Iintoffloat
| Ivalueofint | Iintofvalue
| Iconst_int _ | Iconst_float _ | Iconst_symbol _
| Itailcall_ind | Itailcall_imm _ | Istackoffset _ | Iload (_, _, _)
| Iname_for_debugger _ | Iprobe _| Iprobe_is_enabled _ | Iopaque)
Expand Down Expand Up @@ -411,6 +412,7 @@ let destroyed_at_basic (basic : Cfg_intf.S.basic) =
| Negf | Absf | Addf | Subf | Mulf | Divf
| Compf _
| Floatofint | Intoffloat
| Valueofint | Intofvalue
| Probe _
| Probe_is_enabled _
| Opaque
Expand Down Expand Up @@ -449,7 +451,8 @@ let destroyed_at_terminator (terminator : Cfg_intf.S.terminator) =
let safe_register_pressure = function
Iextcall _ -> if win64 then if fp then 7 else 8 else 0
| Ialloc _ | Imove | Ispill | Ireload
| Inegf | Iabsf | Iaddf | Isubf | Imulf | Idivf | Ifloatofint | Iintoffloat
| Inegf | Iabsf | Iaddf | Isubf | Imulf | Idivf
| Ifloatofint | Iintoffloat | Ivalueofint | Iintofvalue
| Icompf _
| Iconst_int _ | Iconst_float _ | Iconst_symbol _
| Icall_ind | Icall_imm _ | Itailcall_ind | Itailcall_imm _
Expand Down Expand Up @@ -486,7 +489,8 @@ let max_register_pressure =
| Double ),
_, _)
| Imove | Ispill | Ireload | Inegf | Iabsf | Iaddf | Isubf | Imulf | Idivf
| Ifloatofint | Iintoffloat | Iconst_int _ | Iconst_float _ | Iconst_symbol _
| Ifloatofint | Iintoffloat | Ivalueofint | Iintofvalue
| Iconst_int _ | Iconst_float _ | Iconst_symbol _
| Icall_ind | Icall_imm _ | Itailcall_ind | Itailcall_imm _
| Istackoffset _ | Iload (_, _, _)
| Ispecific(Ilea _ | Isextend32 | Izextend32 | Iprefetch _ | Ipause
Expand Down Expand Up @@ -530,7 +534,9 @@ let operation_supported = function
| Cclz _ | Cctz _
| Ccmpi _ | Caddv | Cadda | Ccmpa _
| Cnegf | Cabsf | Caddf | Csubf | Cmulf | Cdivf
| Cfloatofint | Cintoffloat | Ccmpf _
| Cfloatofint | Cintoffloat
| Cvalueofint | Cintofvalue
| Ccmpf _
| Craise _
| Ccheckbound
| Cprobe _ | Cprobe_is_enabled _ | Copaque | Cbeginregion | Cendregion
Expand Down
2 changes: 1 addition & 1 deletion backend/amd64/reload.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ method! reload_operation op arg res =
| Icompf _
| Itailcall_ind|Itailcall_imm _|Iextcall _|Istackoffset _|Iload (_, _, _)
| Istore (_, _, _)|Ialloc _|Iname_for_debugger _|Iprobe _|Iprobe_is_enabled _
| Iopaque
| Ivalueofint | Iintofvalue | Iopaque
| Ibeginregion | Iendregion
-> (* Other operations: all args and results in registers,
except moves and probes. *)
Expand Down
9 changes: 5 additions & 4 deletions backend/amd64/selection.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@ let pseudoregs_for_operation op arg res =
|Ifloat_iround|Ifloat_round _
|Ipause|Ilfence|Isfence|Imfence
|Ioffset_loc (_, _)|Ifloatsqrtf _|Irdtsc|Iprefetch _)
| Imove|Ispill|Ireload|Ifloatofint|Iintoffloat|Iconst_int _|Iconst_float _
| Imove|Ispill|Ireload|Ifloatofint|Iintoffloat|Ivalueofint|Iintofvalue
| Iconst_int _|Iconst_float _
| Iconst_symbol _|Icall_ind|Icall_imm _|Itailcall_ind|Itailcall_imm _
| Iextcall _|Istackoffset _|Iload (_, _, _) | Istore (_, _, _)|Ialloc _
| Iname_for_debugger _|Iprobe _|Iprobe_is_enabled _ | Iopaque
Expand Down Expand Up @@ -324,11 +325,11 @@ method! select_operation op args dbg =
Ispecific Ifloat_max, args
| "caml_pause_hint", ([|Val|] | [| |]) ->
Ispecific Ipause, args
| "caml_load_fence", ([|Val|] | [| |]) ->
| "caml_load_fence", ([|Val|] | [| |]) ->
Ispecific Ilfence, args
| "caml_store_fence", ([|Val|] | [| |]) ->
| "caml_store_fence", ([|Val|] | [| |]) ->
Ispecific Isfence, args
| "caml_memory_fence", ([|Val|] | [| |]) ->
| "caml_memory_fence", ([|Val|] | [| |]) ->
Ispecific Imfence, args
| _ ->
super#select_operation op args dbg
Expand Down
5 changes: 5 additions & 0 deletions backend/arm64/emit.mlp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,7 @@ module BR = Branch_relaxation.Make (struct
| Lop (Iintop _) -> 1
| Lop (Iintop_imm _) -> 1
| Lop (Ifloatofint | Iintoffloat | Iabsf | Inegf | Ispecific Isqrtf) -> 1
| Lop (Ivalueofint | Iintofvalue) -> 1
| Lop (Iaddf | Isubf | Imulf | Idivf | Ispecific Inegmulf) -> 1
| Lop (Iopaque) -> 0
| Lop (Ispecific (Imuladdf | Inegmuladdf | Imulsubf | Inegmulsubf)) -> 1
Expand Down Expand Up @@ -863,6 +864,10 @@ let emit_instr i =
| Ispecific Isqrtf -> "fsqrt"
| _ -> assert false) in
` {emit_string instr} {emit_reg i.res.(0)}, {emit_reg i.arg.(0)}\n`
| Lop(Ivalueofint | Iintofvalue) ->
let src = i.arg.(0) and dst = i.res.(0) in
TheNumbat marked this conversation as resolved.
Show resolved Hide resolved
if src.loc <> dst.loc then
` mov {emit_reg dst}, {emit_reg src}\n`
gretay-js marked this conversation as resolved.
Show resolved Hide resolved
| Lop(Iaddf | Isubf | Imulf | Idivf | Ispecific Inegmulf as op) ->
let instr = (match op with
| Iaddf -> "fadd"
Expand Down
3 changes: 2 additions & 1 deletion backend/arm64/proc.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,8 @@ let operation_supported = function
| Cand | Cor | Cxor | Clsl | Clsr | Casr
| Ccmpi _ | Caddv | Cadda | Ccmpa _
| Cnegf | Cabsf | Caddf | Csubf | Cmulf | Cdivf
| Cfloatofint | Cintoffloat | Ccmpf _
| Cfloatofint | Cintoffloat | Cintofvalue | Cvalueofint
| Ccmpf _
| Craise _
| Ccheckbound
| Cprobe _ | Cprobe_is_enabled _ | Copaque
Expand Down
14 changes: 11 additions & 3 deletions backend/cfg/cfg.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ let dump_op ?(specific = fun ppf _ -> Format.fprintf ppf "specific") ppf =
| Compf _ -> Format.fprintf ppf "compf"
| Floatofint -> Format.fprintf ppf "floattoint"
| Intoffloat -> Format.fprintf ppf "intoffloat"
| Valueofint -> Format.fprintf ppf "valueofint"
| Intofvalue -> Format.fprintf ppf "intofvalue"
| Specific op -> specific ppf op
| Probe { name; handler_code_sym } ->
Format.fprintf ppf "probe %s %s" name handler_code_sym
Expand Down Expand Up @@ -376,6 +378,8 @@ let can_raise_operation : operation -> bool = function
| Compf _ -> false
| Floatofint -> false
| Intoffloat -> false
| Valueofint -> false
| Intofvalue -> false
| Probe _ -> true
| Probe_is_enabled _ -> false
| Specific op -> Arch.operation_can_raise op
Expand Down Expand Up @@ -424,6 +428,10 @@ let is_pure_operation : operation -> bool = function
| Compf _ -> true
| Floatofint -> true
| Intoffloat -> true
(* Conservative to ensure valueofint/intofvalue are not eliminated before
emit. *)
| Valueofint -> false
| Intofvalue -> false
| Probe _ -> false
| Probe_is_enabled _ -> true
| Opaque -> false
Expand Down Expand Up @@ -460,9 +468,9 @@ let is_noop_move instr =
| Op
( Const_int _ | Const_float _ | Const_symbol _ | Stackoffset _ | Load _
| Store _ | Intop _ | Intop_imm _ | Negf | Absf | Addf | Subf | Mulf
| Divf | Compf _ | Floatofint | Intoffloat | Probe _ | Opaque
| Probe_is_enabled _ | Specific _ | Name_for_debugger _ | Begin_region
| End_region )
| Divf | Compf _ | Floatofint | Intoffloat | Intofvalue | Valueofint
| Probe _ | Opaque | Probe_is_enabled _ | Specific _ | Name_for_debugger _
| Begin_region | End_region )
| Call _ | Reloadretaddr | Pushtrap _ | Poptrap | Prologue ->
false

Expand Down
2 changes: 2 additions & 0 deletions backend/cfg/cfg_equivalence.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,8 @@ let check_operation : location -> Cfg.operation -> Cfg.operation -> unit =
()
| Floatofint, Floatofint -> ()
| Intoffloat, Intoffloat -> ()
| Valueofint, Valueofint -> ()
| Intofvalue, Intofvalue -> ()
| ( Probe
{ name = expected_name; handler_code_sym = expected_handler_code_sym },
Probe { name = result_name; handler_code_sym = result_handler_code_sym } )
Expand Down
2 changes: 2 additions & 0 deletions backend/cfg/cfg_intf.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ module S = struct
| Compf of Mach.float_comparison (* CR gyorsh: can merge with float_test? *)
| Floatofint
| Intoffloat
| Valueofint
| Intofvalue
| Probe of
{ name : string;
handler_code_sym : string
Expand Down
2 changes: 2 additions & 0 deletions backend/cfg/cfg_irc_utils.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ let is_move_basic : Cfg.basic -> bool =
| Compf _ -> false
| Floatofint -> false
| Intoffloat -> false
| Valueofint -> false
| Intofvalue -> false
| Probe _ -> false
| Probe_is_enabled _ -> false
| Opaque -> false
Expand Down
2 changes: 2 additions & 0 deletions backend/cfg/cfg_regalloc_utils.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@ let precondition : Cfg_with_layout.t -> unit =
| Compf _ -> ()
| Floatofint -> ()
| Intoffloat -> ()
| Valueofint -> ()
| Intofvalue -> ()
| Probe _ -> ()
| Probe_is_enabled _ -> ()
| Opaque -> ()
Expand Down
2 changes: 2 additions & 0 deletions backend/cfg/cfg_to_linear_desc.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ let from_basic (basic : basic) : Linear.instruction_desc =
| Compf c -> Icompf c
| Floatofint -> Ifloatofint
| Intoffloat -> Iintoffloat
| Valueofint -> Ivalueofint
| Intofvalue -> Iintofvalue
| Probe { name; handler_code_sym } -> Iprobe { name; handler_code_sym }
| Probe_is_enabled { name } -> Iprobe_is_enabled { name }
| Opaque -> Iopaque
Expand Down
8 changes: 5 additions & 3 deletions backend/cfg/cfgize.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ let basic_or_terminator_of_operation :
| Idivf -> Basic (Op Divf)
| Ifloatofint -> Basic (Op Floatofint)
| Iintoffloat -> Basic (Op Intoffloat)
| Ivalueofint -> Basic (Op Valueofint)
| Iintofvalue -> Basic (Op Intofvalue)
| Ispecific op -> Basic (Op (Specific op))
| Iopaque -> Basic (Op Opaque)
| Iname_for_debugger _ ->
Expand Down Expand Up @@ -653,9 +655,9 @@ module Stack_offset_and_exn = struct
| Op
( Move | Spill | Reload | Const_int _ | Const_float _ | Const_symbol _
| Load _ | Store _ | Intop _ | Intop_imm _ | Negf | Absf | Addf | Subf
| Mulf | Divf | Compf _ | Floatofint | Intoffloat | Probe _
| Probe_is_enabled _ | Opaque | Begin_region | End_region | Specific _
| Name_for_debugger _ )
| Mulf | Divf | Compf _ | Floatofint | Intoffloat | Valueofint
| Intofvalue | Probe _ | Probe_is_enabled _ | Opaque | Begin_region
| End_region | Specific _ | Name_for_debugger _ )
| Call _ | Reloadretaddr | Prologue ->
stack_offset, traps, instr

Expand Down
7 changes: 5 additions & 2 deletions backend/cfg/linear_to_cfg.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,8 @@ let to_basic (mop : Mach.operation) : C.basic =
| Icompf c -> Op (Compf c)
| Ifloatofint -> Op Floatofint
| Iintoffloat -> Op Intoffloat
| Ivalueofint -> Op Valueofint
| Iintofvalue -> Op Intofvalue
| Iopaque -> Op Opaque
| Ibeginregion -> Op Begin_region
| Iendregion -> Op End_region
Expand Down Expand Up @@ -592,8 +594,9 @@ let rec create_blocks (t : t) (i : L.instruction) (block : C.basic_block)
let stack_offset = stack_offset + bytes in
create_blocks t i.next block ~stack_offset ~traps
| Imove | Ispill | Ireload | Inegf | Iabsf | Iaddf | Isubf | Imulf | Idivf
| Ifloatofint | Iintoffloat | Iconst_int _ | Iconst_float _ | Icompf _
| Iconst_symbol _ | Icall_ind | Icall_imm _ | Iextcall _
| Ifloatofint | Iintoffloat | Ivalueofint | Iintofvalue | Iconst_int _
| Iconst_float _ | Icompf _ | Iconst_symbol _ | Icall_ind | Icall_imm _
| Iextcall _
| Iload (_, _, _)
| Istore (_, _, _)
| Ialloc _ | Iintop _
Expand Down
2 changes: 1 addition & 1 deletion backend/checkmach.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ end = struct
match op with
| Imove | Ispill | Ireload | Iconst_int _ | Iconst_float _ | Iconst_symbol _
| Iload _ | Icompf _ | Inegf | Iabsf | Iaddf | Isubf | Imulf | Idivf
| Ifloatofint | Iintoffloat
| Ifloatofint | Iintoffloat | Ivalueofint | Iintofvalue
| Iintop_imm
( ( Iadd | Isub | Imul | Imulh _ | Idiv | Imod | Iand | Ior | Ixor
| Ilsl | Ilsr | Iasr | Ipopcnt | Iclz _ | Ictz _ | Icomp _ ),
Expand Down
1 change: 1 addition & 0 deletions backend/cmm.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ and operation =
| Cnegf | Cabsf
| Caddf | Csubf | Cmulf | Cdivf
| Cfloatofint | Cintoffloat
| Cvalueofint | Cintofvalue
| Ccmpf of float_comparison
| Craise of Lambda.raise_kind
| Ccheckbound
Expand Down
1 change: 1 addition & 0 deletions backend/cmm.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ and operation =
| Cnegf | Cabsf
| Caddf | Csubf | Cmulf | Cdivf
| Cfloatofint | Cintoffloat
| Cvalueofint | Cintofvalue
| Ccmpf of float_comparison
| Craise of Lambda.raise_kind
| Ccheckbound (* Takes two arguments : first the bound to check against,
Expand Down
9 changes: 9 additions & 0 deletions backend/cmm_helpers.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2676,6 +2676,11 @@ let floatfield n ptr dbg =
dbg )

let int_as_pointer arg dbg = Cop (Caddi, [arg; Cconst_int (-1, dbg)], dbg)

TheNumbat marked this conversation as resolved.
Show resolved Hide resolved
let int_of_value arg dbg = Cop (Cintofvalue, [arg], dbg)

let value_of_int arg dbg = Cop (Cvalueofint, [arg], dbg)

(* always a pointer outside the heap *)

let raise_prim raise_kind arg dbg =
Expand Down Expand Up @@ -3357,6 +3362,10 @@ let transl_builtin name args dbg =
(* Native_pointer: handled as unboxed nativeint *)
| "caml_ext_pointer_as_native_pointer" ->
Some (int_as_pointer (one_arg name args) dbg)
| "caml_native_pointer_of_value" ->
Some (int_of_value (one_arg name args) dbg)
| "caml_native_pointer_to_value" ->
Some (value_of_int (one_arg name args) dbg)
| "caml_native_pointer_load_immediate"
| "caml_native_pointer_load_unboxed_nativeint" ->
Some (Cop (Cload (Word_int, Mutable), args, dbg))
Expand Down
2 changes: 1 addition & 1 deletion backend/comballoc.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ let rec combine i allocstate =
(instr_cons_debug i.desc i.arg i.res i.dbg newnext, s')
end
| Iop((Imove|Ispill|Ireload|Inegf|Iabsf|Iaddf|Isubf|Imulf|Idivf|Ifloatofint|
Iintoffloat|Iopaque|Iconst_int _|Iconst_float _|
Iintoffloat|Ivalueofint|Iintofvalue|Iopaque|Iconst_int _|Iconst_float _|
Iconst_symbol _|Istackoffset _|Iload (_, _, _)|Istore (_, _, _)|Icompf _|
Ispecific _|Iname_for_debugger _|Iprobe_is_enabled _))
| Iop(Iintop(Iadd | Isub | Imul | Idiv | Imod | Iand | Ior | Ixor
Expand Down
13 changes: 9 additions & 4 deletions backend/mach.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ type operation =
| Icompf of float_comparison
| Inegf | Iabsf | Iaddf | Isubf | Imulf | Idivf
| Ifloatofint | Iintoffloat
| Ivalueofint | Iintofvalue
| Iopaque
| Ispecific of Arch.specific_operation
| Iname_for_debugger of { ident : Backend_var.t; which_parameter : int option;
Expand Down Expand Up @@ -175,7 +176,7 @@ let rec instr_iter f i =
| Iintop _ | Iintop_imm _
| Inegf | Iabsf | Iaddf | Isubf | Imulf | Idivf
| Icompf _
| Ifloatofint | Iintoffloat
| Ifloatofint | Iintoffloat | Ivalueofint | Iintofvalue
| Ispecific _ | Iname_for_debugger _ | Iprobe _ | Iprobe_is_enabled _
| Iopaque
| Ibeginregion | Iendregion) ->
Expand All @@ -184,7 +185,9 @@ let rec instr_iter f i =
let operation_is_pure = function
| Icall_ind | Icall_imm _ | Itailcall_ind | Itailcall_imm _
| Iextcall _ | Istackoffset _ | Istore _ | Ialloc _
| Iintop(Icheckbound) | Iintop_imm(Icheckbound, _) | Iopaque -> false
| Iintop(Icheckbound) | Iintop_imm(Icheckbound, _) | Iopaque
(* Conservative to ensure valueofint/intofvalue are not eliminated before emit. *)
| Ivalueofint | Iintofvalue -> false
| Ibeginregion | Iendregion -> false
| Iprobe _ -> false
| Iprobe_is_enabled _-> true
Expand All @@ -195,7 +198,8 @@ let operation_is_pure = function
| Ilsl | Ilsr | Iasr | Ipopcnt | Iclz _|Ictz _|Icomp _)
| Imove | Ispill | Ireload | Inegf | Iabsf | Iaddf | Isubf | Imulf | Idivf
| Icompf _
| Ifloatofint | Iintoffloat | Iconst_int _ | Iconst_float _ | Iconst_symbol _
| Ifloatofint | Iintoffloat
| Iconst_int _ | Iconst_float _ | Iconst_symbol _
| Iload (_, _, _) | Iname_for_debugger _
-> true

Expand All @@ -213,7 +217,8 @@ let operation_can_raise op =
| Ilsl | Ilsr | Iasr | Ipopcnt | Iclz _|Ictz _|Icomp _)
| Imove | Ispill | Ireload | Inegf | Iabsf | Iaddf | Isubf | Imulf | Idivf
| Icompf _
| Ifloatofint | Iintoffloat | Iconst_int _ | Iconst_float _ | Iconst_symbol _
| Ifloatofint | Iintoffloat | Ivalueofint | Iintofvalue
| Iconst_int _ | Iconst_float _ | Iconst_symbol _
| Istackoffset _ | Istore _ | Iload (_, _, _) | Iname_for_debugger _
| Itailcall_imm _ | Itailcall_ind
| Iopaque | Ibeginregion | Iendregion
Expand Down
1 change: 1 addition & 0 deletions backend/mach.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ type operation =
| Icompf of float_comparison
| Inegf | Iabsf | Iaddf | Isubf | Imulf | Idivf
| Ifloatofint | Iintoffloat
| Ivalueofint | Iintofvalue
| Iopaque
| Ispecific of Arch.specific_operation
| Iname_for_debugger of { ident : Backend_var.t; which_parameter : int option;
Expand Down
Loading