Skip to content

Commit de0296d

Browse files
gretay-jsgretay-js
authored
Format tests (ocaml-flambda#3957)
1 parent e415e96 commit de0296d

File tree

165 files changed

+6912
-5430
lines changed

Some content is hidden

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

165 files changed

+6912
-5430
lines changed

‎flambda-backend/tests/backend/vectorizer/.ocamlformat renamed to ‎flambda-backend/tests/.ocamlformat

File renamed without changes.

‎flambda-backend/tests/.ocamlformat-ignore

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
; the following files use unboxed or local syntax that is not supported on opam
2+
backend/vectorizer/test_int64_unboxed.ml
3+
backend/vectorizer/test_float_unboxed.ml
4+
backend/vectorizer/test_int32_unboxed.ml
5+
backend/vectorizer/test_float32_unboxed.ml
6+
simd/*_u.ml
7+
simd/unbox_types.ml
8+
simd/arrays.ml
9+
small_numbers/float32_u_lib.ml
10+
backend/zero_alloc_checker/fail27.ml
11+
intrinsics/select_float.ml
12+
backend/zero_alloc_checker/test_remove_inferred_assume.ml
13+
backend/zero_alloc_checker/test_remove_inferred_assume_workaround.ml
14+
backend/zero_alloc_checker/test_flambda2_invalid.ml
15+
backend/address_sanitizer/address_sanitizer.ml
16+
backend/caml_apply_split_max_arity/stack.ml

‎flambda-backend/tests/backend/caml_apply_split_max_arity/t.ml

+122-11
Large diffs are not rendered by default.

‎flambda-backend/tests/backend/frame-too-long/t.expected

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
i=10000 name=Raised at T.break in file "flambda-backend/tests/backend/frame-too-long/t.ml", line 5, characters 2-15
1+
i=10000 name=Raised at T.break in file "flambda-backend/tests/backend/frame-too-long/t.ml", line 5, characters 29-42

‎flambda-backend/tests/backend/frame-too-long/t.ml

+58-62
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
let[@inline never] make n = List.init n Fun.id
22

33
exception Exn of int
4-
let[@inline never] break n =
5-
raise (Exn n)
4+
5+
let[@inline never] break n = raise (Exn n)
66

77
let[@inline never] check_backtrace n =
8-
try
9-
break n
10-
with
11-
| Exn i ->
8+
try break n
9+
with Exn i ->
1210
let raw_backtrace = Printexc.get_raw_backtrace () in
1311
let len = Printexc.raw_backtrace_length raw_backtrace in
1412
assert (len > 0);
15-
let slot = Printexc.get_raw_backtrace_slot raw_backtrace 0
16-
|> Printexc.convert_raw_backtrace_slot in
13+
let slot =
14+
Printexc.get_raw_backtrace_slot raw_backtrace 0
15+
|> Printexc.convert_raw_backtrace_slot
16+
in
1717
let name = Printexc.Slot.format 0 slot |> Option.get in
1818
Printf.printf "i=%d name=%s\n" i name;
1919
()
@@ -23,64 +23,60 @@ let test n =
2323
(*$
2424
for i = 1 to Sys.opaque_identity 20 do
2525
Printf.printf "let a%d = Sys.opaque_identity 1 in\n" i
26-
done;
27-
*)let a1 = Sys.opaque_identity 1 in
28-
let a2 = Sys.opaque_identity 1 in
29-
let a3 = Sys.opaque_identity 1 in
30-
let a4 = Sys.opaque_identity 1 in
31-
let a5 = Sys.opaque_identity 1 in
32-
let a6 = Sys.opaque_identity 1 in
33-
let a7 = Sys.opaque_identity 1 in
34-
let a8 = Sys.opaque_identity 1 in
35-
let a9 = Sys.opaque_identity 1 in
36-
let a10 = Sys.opaque_identity 1 in
37-
let a11 = Sys.opaque_identity 1 in
38-
let a12 = Sys.opaque_identity 1 in
39-
let a13 = Sys.opaque_identity 1 in
40-
let a14 = Sys.opaque_identity 1 in
41-
let a15 = Sys.opaque_identity 1 in
42-
let a16 = Sys.opaque_identity 1 in
43-
let a17 = Sys.opaque_identity 1 in
44-
let a18 = Sys.opaque_identity 1 in
45-
let a19 = Sys.opaque_identity 1 in
46-
let a20 = Sys.opaque_identity 1 in
47-
(*$*)
26+
done
27+
*)
28+
let a1 = Sys.opaque_identity 1 in
29+
let a2 = Sys.opaque_identity 1 in
30+
let a3 = Sys.opaque_identity 1 in
31+
let a4 = Sys.opaque_identity 1 in
32+
let a5 = Sys.opaque_identity 1 in
33+
let a6 = Sys.opaque_identity 1 in
34+
let a7 = Sys.opaque_identity 1 in
35+
let a8 = Sys.opaque_identity 1 in
36+
let a9 = Sys.opaque_identity 1 in
37+
let a10 = Sys.opaque_identity 1 in
38+
let a11 = Sys.opaque_identity 1 in
39+
let a12 = Sys.opaque_identity 1 in
40+
let a13 = Sys.opaque_identity 1 in
41+
let a14 = Sys.opaque_identity 1 in
42+
let a15 = Sys.opaque_identity 1 in
43+
let a16 = Sys.opaque_identity 1 in
44+
let a17 = Sys.opaque_identity 1 in
45+
let a18 = Sys.opaque_identity 1 in
46+
let a19 = Sys.opaque_identity 1 in
47+
let a20 = Sys.opaque_identity 1 in
48+
(*$*)
4849
check_backtrace n;
4950
let l = make (List.length l) in
5051
Gc.compact ();
51-
[
52-
(*$
53-
for i = 1 to Sys.opaque_identity 20 do
54-
Printf.printf "a%d;\n" i
55-
done;
56-
*)a1;
57-
a2;
58-
a3;
59-
a4;
60-
a5;
61-
a6;
62-
a7;
63-
a8;
64-
a9;
65-
a10;
66-
a11;
67-
a12;
68-
a13;
69-
a14;
70-
a15;
71-
a16;
72-
a17;
73-
a18;
74-
a19;
75-
a20;
76-
(*$*)
77-
]@l
52+
[ (*$
53+
for i = 1 to Sys.opaque_identity 20 do
54+
Printf.printf "a%d;\n" i
55+
done
56+
*)
57+
a1;
58+
a2;
59+
a3;
60+
a4;
61+
a5;
62+
a6;
63+
a7;
64+
a8;
65+
a9;
66+
a10;
67+
a11;
68+
a12;
69+
a13;
70+
a14;
71+
a15;
72+
a16;
73+
a17;
74+
a18;
75+
a19;
76+
a20 (*$*) ]
77+
@ l
7878
|> Sys.opaque_identity
7979

80-
8180
let () =
8281
Printexc.record_backtrace true;
83-
10_000
84-
|> Sys.opaque_identity
85-
|> test
86-
|> ignore
82+
10_000 |> Sys.opaque_identity |> test |> ignore

‎flambda-backend/tests/backend/greedy/pqueue.ml

+64-52
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,79 @@
11
module Int_min = struct
2-
include Int
2+
include Int
33

4-
let compare l r = Int.compare r l
4+
let compare l r = Int.compare r l
55
end
66

77
module Test (I : Priority_queue.Order with type t = int) = struct
8+
module Q = Priority_queue.Make (I)
9+
module M = Map.Make (I)
810

9-
module Q = Priority_queue.Make (I)
10-
module M = Map.Make (I)
11+
let equal l r = I.compare l r = 0
1112

12-
let equal l r = I.compare l r = 0
13+
let enq map i d =
14+
M.update i
15+
(function
16+
| None -> Some (M.singleton d 1)
17+
| Some ds ->
18+
Some
19+
(M.update d (function None -> Some 1 | Some j -> Some (j + 1)) ds))
20+
map
1321

14-
let enq map i d =
15-
M.update i (function
16-
| None -> Some (M.singleton d 1)
17-
| Some ds -> Some (M.update d (function
18-
| None -> Some 1
19-
| Some j -> Some (j + 1)) ds)) map
22+
let deq map i d =
23+
M.update i
24+
(function
25+
| None -> assert false
26+
| Some ds when M.equal equal ds (M.singleton d 1) -> None
27+
| Some ds ->
28+
Some
29+
(M.update d
30+
(function
31+
| None | Some 0 -> assert false
32+
| Some 1 -> None
33+
| Some j -> Some (j - 1))
34+
ds))
35+
map
2036

21-
let deq map i d =
22-
M.update i (function
23-
| None -> assert false
24-
| Some ds when M.equal equal ds (M.singleton d 1) -> None
25-
| Some ds -> Some (M.update d (function
26-
| None | Some 0 -> assert false
27-
| Some 1 -> None
28-
| Some j -> Some (j - 1)) ds)) map
37+
let check_top q m =
38+
if Q.is_empty q
39+
then assert (M.is_empty !m)
40+
else
41+
let Q.{ priority = qi; data = qd } = Q.get q in
42+
let mi, mds = M.max_binding !m in
43+
assert (qi = mi);
44+
assert (M.mem qd mds)
2945

30-
let check_top q m =
31-
if Q.is_empty q then assert (M.is_empty !m)
32-
else (let Q.{ priority = qi; data = qd } = Q.get q in
33-
let mi, mds = M.max_binding !m in
34-
assert (qi = mi);
35-
assert (M.mem qd mds))
46+
let enq q m =
47+
let i = Random.int 100 in
48+
let d = Random.int 1_000 in
49+
Q.add q ~priority:i ~data:d;
50+
m := enq !m i d;
51+
check_top q m
3652

37-
let enq q m =
38-
let i = Random.int 100 in
39-
let d = Random.int 1_000 in
40-
Q.add q ~priority:i ~data:d;
41-
m := enq !m i d;
42-
check_top q m
53+
let deq q m =
54+
let Q.{ priority = qi; data = qd } = Q.get q in
55+
let Q.{ priority = qi'; data = qd' } = Q.get_and_remove q in
56+
assert (qi = qi');
57+
assert (qd = qd');
58+
m := deq !m qi qd;
59+
check_top q m
4360

44-
let deq q m =
45-
let Q.{ priority = qi; data = qd } = Q.get q in
46-
let Q.{ priority = qi'; data = qd' } = Q.get_and_remove q in
47-
assert (qi = qi');
48-
assert (qd = qd');
49-
m := deq !m qi qd;
50-
check_top q m
51-
52-
let () =
53-
Random.init 42;
54-
let q = Q.make ~initial_capacity:10 in
55-
let m = ref M.empty in
56-
for _ = 0 to 1_000_000 do
57-
(* Bias towards adding elements. *)
58-
if Random.int 100 < 55 then enq q m
59-
else if Q.is_empty q then assert (M.is_empty !m)
60-
else deq q m
61-
done;
62-
while not (Q.is_empty q) do deq q m done;
63-
assert (M.is_empty !m)
64-
;;
61+
let () =
62+
Random.init 42;
63+
let q = Q.make ~initial_capacity:10 in
64+
let m = ref M.empty in
65+
for _ = 0 to 1_000_000 do
66+
(* Bias towards adding elements. *)
67+
if Random.int 100 < 55
68+
then enq q m
69+
else if Q.is_empty q
70+
then assert (M.is_empty !m)
71+
else deq q m
72+
done;
73+
while not (Q.is_empty q) do
74+
deq q m
75+
done;
76+
assert (M.is_empty !m)
6577
end
6678

6779
module Int_max_test = Test (Int)

‎flambda-backend/tests/backend/polls/t.ml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
let[@poll error] test n =
22
let res = ref 0 in
33
for i = 0 to n do
4-
res := Sys.opaque_identity (i) + !res
4+
res := Sys.opaque_identity i + !res
55
done;
66
!res
7-

‎flambda-backend/tests/backend/probes/region.ml

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
(* minimal BUG example from alanechang *)
22
let _ =
3-
(fun f -> [%probe "" (
4-
let local_ a = "abc" in
5-
f a; ()
6-
)]) (fun x -> ())
3+
(fun f ->
4+
[%probe
5+
""
6+
(let local_ a = "abc" in
7+
f a;
8+
())]) (fun x -> ())

‎flambda-backend/tests/backend/probes/test_ocamldep.ml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
(* Regression test for a bug where ocamldep wouldn't register a dependency on
2-
the payload of a probe expression.
3-
*)
2+
the payload of a probe expression. *)
43

54
let () =
65
[%probe "probe1" For_test_ocamldep1.x];

0 commit comments

Comments
 (0)