Skip to content

Commit ce88833

Browse files
lpw25lpw25
committed
Merge flambda-backend changes
2 parents b7506bb + fe8a98b commit ce88833

65 files changed

Lines changed: 579 additions & 330 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.depend‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2093,15 +2093,18 @@ asmcomp/CSEgen.cmo : \
20932093
asmcomp/proc.cmi \
20942094
asmcomp/mach.cmi \
20952095
asmcomp/cmm.cmi \
2096+
parsing/asttypes.cmi \
20962097
asmcomp/CSEgen.cmi
20972098
asmcomp/CSEgen.cmx : \
20982099
asmcomp/reg.cmx \
20992100
asmcomp/proc.cmx \
21002101
asmcomp/mach.cmx \
21012102
asmcomp/cmm.cmx \
2103+
parsing/asttypes.cmi \
21022104
asmcomp/CSEgen.cmi
21032105
asmcomp/CSEgen.cmi : \
2104-
asmcomp/mach.cmi
2106+
asmcomp/mach.cmi \
2107+
parsing/asttypes.cmi
21052108
asmcomp/afl_instrument.cmo : \
21062109
lambda/lambda.cmi \
21072110
asmcomp/cmm.cmi \
@@ -2146,6 +2149,7 @@ asmcomp/asmgen.cmo : \
21462149
asmcomp/linscan.cmi \
21472150
asmcomp/linearize.cmi \
21482151
file_formats/linear_format.cmi \
2152+
asmcomp/linear.cmi \
21492153
lambda/lambda.cmi \
21502154
asmcomp/interval.cmi \
21512155
asmcomp/interf.cmi \
@@ -2188,6 +2192,7 @@ asmcomp/asmgen.cmx : \
21882192
asmcomp/linscan.cmx \
21892193
asmcomp/linearize.cmx \
21902194
file_formats/linear_format.cmx \
2195+
asmcomp/linear.cmx \
21912196
lambda/lambda.cmx \
21922197
asmcomp/interval.cmx \
21932198
asmcomp/interf.cmx \
@@ -2211,6 +2216,7 @@ asmcomp/asmgen.cmx : \
22112216
asmcomp/asmgen.cmi
22122217
asmcomp/asmgen.cmi : \
22132218
lambda/lambda.cmi \
2219+
asmcomp/emitaux.cmi \
22142220
asmcomp/cmm.cmi \
22152221
middle_end/clambda.cmi \
22162222
middle_end/backend_intf.cmi
@@ -2719,6 +2725,7 @@ asmcomp/mach.cmo : \
27192725
lambda/debuginfo.cmi \
27202726
asmcomp/cmm.cmi \
27212727
middle_end/backend_var.cmi \
2728+
parsing/asttypes.cmi \
27222729
asmcomp/arch.cmo \
27232730
asmcomp/mach.cmi
27242731
asmcomp/mach.cmx : \
@@ -2729,6 +2736,7 @@ asmcomp/mach.cmx : \
27292736
lambda/debuginfo.cmx \
27302737
asmcomp/cmm.cmx \
27312738
middle_end/backend_var.cmx \
2739+
parsing/asttypes.cmi \
27322740
asmcomp/arch.cmx \
27332741
asmcomp/mach.cmi
27342742
asmcomp/mach.cmi : \
@@ -2738,6 +2746,7 @@ asmcomp/mach.cmi : \
27382746
lambda/debuginfo.cmi \
27392747
asmcomp/cmm.cmi \
27402748
middle_end/backend_var.cmi \
2749+
parsing/asttypes.cmi \
27412750
asmcomp/arch.cmo
27422751
asmcomp/printcmm.cmo : \
27432752
utils/targetint.cmi \

‎Makefile.config.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ WITH_OCAMLDOC=@ocamldoc@
225225
WITH_OCAMLTEST=@ocamltest@
226226
ASM_CFI_SUPPORTED=@asm_cfi_supported@
227227
WITH_FRAME_POINTERS=@frame_pointers@
228+
WITH_CPP_MANGLING=@cpp_mangling@
228229
WITH_PROFINFO=@profinfo@
229230
PROFINFO_WIDTH=@profinfo_width@
230231
WITH_FPIC=@fpic@

‎asmcomp/CSEgen.ml‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type valnum = int
2525
type op_class =
2626
| Op_pure (* pure arithmetic, produce one or several result *)
2727
| Op_checkbound (* checkbound-style: no result, can raise an exn *)
28-
| Op_load (* memory load *)
28+
| Op_load of Asttypes.mutable_flag (* memory load *)
2929
| Op_store of bool (* memory store, false = init, true = assign *)
3030
| Op_other (* anything else that does not allocate nor store in memory *)
3131

@@ -40,29 +40,30 @@ module Equations = struct
4040
Map.Make(struct type t = rhs let compare = Stdlib.compare end)
4141

4242
type 'a t =
43-
{ load_equations : 'a Rhs_map.t;
43+
{ mutable_load_equations : 'a Rhs_map.t;
4444
other_equations : 'a Rhs_map.t }
4545

4646
let empty =
47-
{ load_equations = Rhs_map.empty;
47+
{ mutable_load_equations = Rhs_map.empty;
4848
other_equations = Rhs_map.empty }
4949

5050
let add op_class op v m =
5151
match op_class with
52-
| Op_load ->
53-
{ m with load_equations = Rhs_map.add op v m.load_equations }
52+
| Op_load Mutable ->
53+
{ m with mutable_load_equations =
54+
Rhs_map.add op v m.mutable_load_equations }
5455
| _ ->
5556
{ m with other_equations = Rhs_map.add op v m.other_equations }
5657

5758
let find op_class op m =
5859
match op_class with
59-
| Op_load ->
60-
Rhs_map.find op m.load_equations
60+
| Op_load Mutable ->
61+
Rhs_map.find op m.mutable_load_equations
6162
| _ ->
6263
Rhs_map.find op m.other_equations
6364

64-
let remove_loads m =
65-
{ load_equations = Rhs_map.empty;
65+
let remove_mutable_loads m =
66+
{ mutable_load_equations = Rhs_map.empty;
6667
other_equations = m.other_equations }
6768
end
6869

@@ -190,8 +191,8 @@ let set_unknown_regs n rs =
190191

191192
(* Keep only the equations satisfying the given predicate. *)
192193

193-
let remove_load_numbering n =
194-
{ n with num_eqs = Equations.remove_loads n.num_eqs }
194+
let remove_mutable_load_numbering n =
195+
{ n with num_eqs = Equations.remove_mutable_loads n.num_eqs }
195196

196197
(* Forget everything we know about registers of type [Addr]. *)
197198

@@ -225,7 +226,7 @@ method class_of_operation op =
225226
| Icall_ind | Icall_imm _ | Itailcall_ind | Itailcall_imm _
226227
| Iextcall _ | Iprobe _ | Iopaque -> assert false (* treated specially *)
227228
| Istackoffset _ -> Op_other
228-
| Iload(_,_) -> Op_load
229+
| Iload(_,_,mut) -> Op_load mut
229230
| Istore(_,_,asg) -> Op_store asg
230231
| Ialloc _ -> assert false (* treated specially *)
231232
| Iintop(Icheckbound) -> Op_checkbound
@@ -246,11 +247,11 @@ method is_cheap_operation op =
246247
| Iconst_int _ -> true
247248
| _ -> false
248249

249-
(* Forget all equations involving memory loads. Performed after a
250-
non-initializing store *)
250+
(* Forget all equations involving mutable memory loads.
251+
Performed after a non-initializing store *)
251252

252253
method private kill_loads n =
253-
remove_load_numbering n
254+
remove_mutable_load_numbering n
254255

255256
(* Perform CSE on the given instruction [i] and its successors.
256257
[n] is the value numbering current at the beginning of [i]. *)
@@ -292,13 +293,13 @@ method private cse n i =
292293
Moreover, allocation can trigger the asynchronous execution
293294
of arbitrary Caml code (finalizer, signal handler, context
294295
switch), which can contain non-initializing stores.
295-
Hence, all equations over loads must be removed. *)
296+
Hence, all equations over mutable loads must be removed. *)
296297
let n1 = kill_addr_regs (self#kill_loads n) in
297298
let n2 = set_unknown_regs n1 i.res in
298299
{i with next = self#cse n2 i.next}
299300
| Iop op ->
300301
begin match self#class_of_operation op with
301-
| (Op_pure | Op_checkbound | Op_load) as op_class ->
302+
| (Op_pure | Op_checkbound | Op_load _) as op_class ->
302303
let (n1, varg) = valnum_regs n i.arg in
303304
let n2 = set_unknown_regs n1 (Proc.destroyed_at_oper i.desc) in
304305
begin match find_equation op_class n1 (op, varg) with
@@ -336,7 +337,7 @@ method private cse n i =
336337
{i with next = self#cse n2 i.next}
337338
| Op_store true ->
338339
(* A non-initializing store can invalidate
339-
anything we know about prior loads. *)
340+
anything we know about prior mutable loads. *)
340341
let n1 = set_unknown_regs n (Proc.destroyed_at_oper i.desc) in
341342
let n2 = set_unknown_regs n1 i.res in
342343
let n3 = self#kill_loads n2 in

‎asmcomp/CSEgen.mli‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
type op_class =
2020
| Op_pure (* pure, produce one result *)
2121
| Op_checkbound (* checkbound-style: no result, can raise an exn *)
22-
| Op_load (* memory load *)
22+
| Op_load of Asttypes.mutable_flag (* memory load *)
2323
| Op_store of bool (* memory store, false = init, true = assign *)
2424
| Op_other (* anything else that does not allocate nor store in memory *)
2525

‎asmcomp/amd64/CSE.ml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ method! class_of_operation op =
3030
| Ilea _ | Isextend32 | Izextend32 -> Op_pure
3131
| Istore_int(_, _, is_asg) -> Op_store is_asg
3232
| Ioffset_loc(_, _) -> Op_store true
33-
| Ifloatarithmem _ | Ifloatsqrtf _ -> Op_load
33+
| Ifloatarithmem _ | Ifloatsqrtf _ -> Op_load Mutable
3434
| Ibswap _ | Isqrtf -> super#class_of_operation op
3535
end
3636
| _ -> super#class_of_operation op

‎asmcomp/amd64/arch.ml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,20 @@ let print_specific_operation printreg op ppf arg =
134134
| Izextend32 ->
135135
fprintf ppf "zextend32 %a" printreg arg.(0)
136136

137+
(* Are we using the Windows 64-bit ABI? *)
138+
137139
let win64 =
138140
match Config.system with
139141
| "win64" | "mingw64" | "cygwin" -> true
140142
| _ -> false
143+
144+
(* Specific operations that are pure *)
145+
146+
let operation_is_pure = function
147+
| Ilea _ | Ibswap _ | Isqrtf | Isextend32 | Izextend32 -> true
148+
| Ifloatarithmem _ | Ifloatsqrtf _ -> true
149+
| _ -> false
150+
151+
(* Specific operations that can raise *)
152+
153+
let operation_can_raise _ = false

‎asmcomp/amd64/emit.mlp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ let emit_instr fallthrough i =
717717
end
718718
| Lop(Istackoffset n) ->
719719
emit_stack_offset n
720-
| Lop(Iload(chunk, addr)) ->
720+
| Lop(Iload(chunk, addr, _mut)) ->
721721
let dest = res i 0 in
722722
begin match chunk with
723723
| Word_int | Word_val ->

‎asmcomp/amd64/proc.ml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -360,19 +360,6 @@ let max_register_pressure = function
360360
if fp then [| 12; 15 |] else [| 13; 15 |]
361361
| _ -> if fp then [| 12; 16 |] else [| 13; 16 |]
362362

363-
(* Pure operations (without any side effect besides updating their result
364-
registers). *)
365-
366-
let op_is_pure = function
367-
| Icall_ind | Icall_imm _ | Itailcall_ind | Itailcall_imm _
368-
| Iextcall _ | Istackoffset _ | Istore _ | Ialloc _
369-
| Iintop(Icheckbound) | Iintop_imm(Icheckbound, _) | Iopaque -> false
370-
| Ispecific(Ilea _|Isextend32|Izextend32) -> true
371-
| Ispecific _ -> false
372-
| Iprobe _ | Iprobe_is_enabled _-> false
373-
| Ibeginregion | Iendregion -> false
374-
| _ -> true
375-
376363
(* Layout of the stack frame *)
377364

378365
let frame_required fd =

‎asmcomp/arm/arch.ml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,3 +262,15 @@ let is_immediate n =
262262
s := !s + 2
263263
done;
264264
!s <= m
265+
266+
(* Specific operations that are pure *)
267+
268+
let operation_is_pure = function
269+
| Ishiftcheckbound _ -> false
270+
| _ -> true
271+
272+
(* Specific operations that can raise *)
273+
274+
let operation_can_raise = function
275+
| Ishiftcheckbound _ -> true
276+
| _ -> false

‎asmcomp/arm/emit.mlp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -580,10 +580,10 @@ let emit_instr i =
580580
let ninstr = emit_stack_adjustment (-n) in
581581
stack_offset := !stack_offset + n;
582582
ninstr
583-
| Lop(Iload(Single, addr)) when !fpu >= VFPv2 ->
583+
| Lop(Iload(Single, addr, _mut)) when !fpu >= VFPv2 ->
584584
` flds s14, {emit_addressing addr i.arg 0}\n`;
585585
` fcvtds {emit_reg i.res.(0)}, s14\n`; 2
586-
| Lop(Iload(Double, addr)) when !fpu = Soft ->
586+
| Lop(Iload(Double, addr, _mut)) when !fpu = Soft ->
587587
(* Use LDM or LDRD if possible *)
588588
begin match i.res.(0), i.res.(1), addr with
589589
{loc = Reg rt}, {loc = Reg rt2}, Iindexed 0
@@ -602,7 +602,7 @@ let emit_instr i =
602602
` ldr {emit_reg i.res.(0)}, {emit_addressing addr i.arg 0}\n`
603603
end; 2
604604
end
605-
| Lop(Iload(size, addr)) ->
605+
| Lop(Iload(size, addr, _mut)) ->
606606
let r = i.res.(0) in
607607
let instr =
608608
match size with

0 commit comments

Comments
 (0)