Skip to content

Commit acd6e4c

Browse files
committed
tests(coverage): Add mcdc_non_control_flow tests
1 parent 865eaf9 commit acd6e4c

File tree

3 files changed

+369
-0
lines changed

3 files changed

+369
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,199 @@
1+
Function name: mcdc_non_control_flow::assign_3
2+
Raw bytes (73): 0x[01, 01, 09, 05, 07, 0b, 11, 09, 0d, 01, 05, 01, 05, 22, 11, 01, 05, 22, 11, 01, 05, 09, 01, 16, 01, 00, 28, 03, 01, 09, 00, 0a, 01, 00, 0d, 00, 0e, 20, 05, 22, 00, 0d, 00, 0e, 22, 00, 12, 00, 13, 20, 1e, 11, 00, 12, 00, 13, 1e, 00, 17, 00, 18, 20, 09, 0d, 00, 17, 00, 18, 03, 01, 05, 01, 02]
3+
Number of files: 1
4+
- file 0 => global file 1
5+
Number of expressions: 9
6+
- expression 0 operands: lhs = Counter(1), rhs = Expression(1, Add)
7+
- expression 1 operands: lhs = Expression(2, Add), rhs = Counter(4)
8+
- expression 2 operands: lhs = Counter(2), rhs = Counter(3)
9+
- expression 3 operands: lhs = Counter(0), rhs = Counter(1)
10+
- expression 4 operands: lhs = Counter(0), rhs = Counter(1)
11+
- expression 5 operands: lhs = Expression(8, Sub), rhs = Counter(4)
12+
- expression 6 operands: lhs = Counter(0), rhs = Counter(1)
13+
- expression 7 operands: lhs = Expression(8, Sub), rhs = Counter(4)
14+
- expression 8 operands: lhs = Counter(0), rhs = Counter(1)
15+
Number of file 0 mappings: 9
16+
- Code(Counter(0)) at (prev + 22, 1) to (start + 0, 40)
17+
- Code(Expression(0, Add)) at (prev + 1, 9) to (start + 0, 10)
18+
= (c1 + ((c2 + c3) + c4))
19+
- Code(Counter(0)) at (prev + 0, 13) to (start + 0, 14)
20+
- Branch { true: Counter(1), false: Expression(8, Sub) } at (prev + 0, 13) to (start + 0, 14)
21+
true = c1
22+
false = (c0 - c1)
23+
- Code(Expression(8, Sub)) at (prev + 0, 18) to (start + 0, 19)
24+
= (c0 - c1)
25+
- Branch { true: Expression(7, Sub), false: Counter(4) } at (prev + 0, 18) to (start + 0, 19)
26+
true = ((c0 - c1) - c4)
27+
false = c4
28+
- Code(Expression(7, Sub)) at (prev + 0, 23) to (start + 0, 24)
29+
= ((c0 - c1) - c4)
30+
- Branch { true: Counter(2), false: Counter(3) } at (prev + 0, 23) to (start + 0, 24)
31+
true = c2
32+
false = c3
33+
- Code(Expression(0, Add)) at (prev + 1, 5) to (start + 1, 2)
34+
= (c1 + ((c2 + c3) + c4))
35+
36+
Function name: mcdc_non_control_flow::assign_3_bis
37+
Raw bytes (82): 0x[01, 01, 07, 07, 11, 09, 0d, 01, 05, 05, 09, 16, 1a, 05, 09, 01, 05, 0a, 01, 1b, 01, 00, 2c, 03, 01, 09, 00, 0a, 01, 00, 0d, 00, 0e, 28, 00, 02, 00, 0d, 00, 13, 30, 05, 1a, 01, 02, 00, 00, 0d, 00, 0e, 05, 00, 12, 00, 13, 30, 09, 16, 02, 00, 00, 00, 12, 00, 13, 13, 00, 17, 00, 18, 20, 0d, 11, 00, 17, 00, 18, 03, 01, 05, 01, 02]
38+
Number of files: 1
39+
- file 0 => global file 1
40+
Number of expressions: 7
41+
- expression 0 operands: lhs = Expression(1, Add), rhs = Counter(4)
42+
- expression 1 operands: lhs = Counter(2), rhs = Counter(3)
43+
- expression 2 operands: lhs = Counter(0), rhs = Counter(1)
44+
- expression 3 operands: lhs = Counter(1), rhs = Counter(2)
45+
- expression 4 operands: lhs = Expression(5, Sub), rhs = Expression(6, Sub)
46+
- expression 5 operands: lhs = Counter(1), rhs = Counter(2)
47+
- expression 6 operands: lhs = Counter(0), rhs = Counter(1)
48+
Number of file 0 mappings: 10
49+
- Code(Counter(0)) at (prev + 27, 1) to (start + 0, 44)
50+
- Code(Expression(0, Add)) at (prev + 1, 9) to (start + 0, 10)
51+
= ((c2 + c3) + c4)
52+
- Code(Counter(0)) at (prev + 0, 13) to (start + 0, 14)
53+
- MCDCDecision { bitmap_idx: 0, conditions_num: 2 } at (prev + 0, 13) to (start + 0, 19)
54+
- MCDCBranch { true: Counter(1), false: Expression(6, Sub), condition_id: 1, true_next_id: 2, false_next_id: 0 } at (prev + 0, 13) to (start + 0, 14)
55+
true = c1
56+
false = (c0 - c1)
57+
- Code(Counter(1)) at (prev + 0, 18) to (start + 0, 19)
58+
- MCDCBranch { true: Counter(2), false: Expression(5, Sub), condition_id: 2, true_next_id: 0, false_next_id: 0 } at (prev + 0, 18) to (start + 0, 19)
59+
true = c2
60+
false = (c1 - c2)
61+
- Code(Expression(4, Add)) at (prev + 0, 23) to (start + 0, 24)
62+
= ((c1 - c2) + (c0 - c1))
63+
- Branch { true: Counter(3), false: Counter(4) } at (prev + 0, 23) to (start + 0, 24)
64+
true = c3
65+
false = c4
66+
- Code(Expression(0, Add)) at (prev + 1, 5) to (start + 1, 2)
67+
= ((c2 + c3) + c4)
68+
69+
Function name: mcdc_non_control_flow::assign_and
70+
Raw bytes (51): 0x[01, 01, 04, 07, 0e, 09, 0d, 01, 05, 01, 05, 07, 01, 0c, 01, 00, 21, 03, 01, 09, 00, 0a, 01, 00, 0d, 00, 0e, 20, 05, 0e, 00, 0d, 00, 0e, 05, 00, 12, 00, 13, 20, 09, 0d, 00, 12, 00, 13, 03, 01, 05, 01, 02]
71+
Number of files: 1
72+
- file 0 => global file 1
73+
Number of expressions: 4
74+
- expression 0 operands: lhs = Expression(1, Add), rhs = Expression(3, Sub)
75+
- expression 1 operands: lhs = Counter(2), rhs = Counter(3)
76+
- expression 2 operands: lhs = Counter(0), rhs = Counter(1)
77+
- expression 3 operands: lhs = Counter(0), rhs = Counter(1)
78+
Number of file 0 mappings: 7
79+
- Code(Counter(0)) at (prev + 12, 1) to (start + 0, 33)
80+
- Code(Expression(0, Add)) at (prev + 1, 9) to (start + 0, 10)
81+
= ((c2 + c3) + (c0 - c1))
82+
- Code(Counter(0)) at (prev + 0, 13) to (start + 0, 14)
83+
- Branch { true: Counter(1), false: Expression(3, Sub) } at (prev + 0, 13) to (start + 0, 14)
84+
true = c1
85+
false = (c0 - c1)
86+
- Code(Counter(1)) at (prev + 0, 18) to (start + 0, 19)
87+
- Branch { true: Counter(2), false: Counter(3) } at (prev + 0, 18) to (start + 0, 19)
88+
true = c2
89+
false = c3
90+
- Code(Expression(0, Add)) at (prev + 1, 5) to (start + 1, 2)
91+
= ((c2 + c3) + (c0 - c1))
92+
93+
Function name: mcdc_non_control_flow::assign_or
94+
Raw bytes (51): 0x[01, 01, 04, 07, 0d, 05, 09, 01, 05, 01, 05, 07, 01, 11, 01, 00, 20, 03, 01, 09, 00, 0a, 01, 00, 0d, 00, 0e, 20, 05, 0e, 00, 0d, 00, 0e, 0e, 00, 12, 00, 13, 20, 09, 0d, 00, 12, 00, 13, 03, 01, 05, 01, 02]
95+
Number of files: 1
96+
- file 0 => global file 1
97+
Number of expressions: 4
98+
- expression 0 operands: lhs = Expression(1, Add), rhs = Counter(3)
99+
- expression 1 operands: lhs = Counter(1), rhs = Counter(2)
100+
- expression 2 operands: lhs = Counter(0), rhs = Counter(1)
101+
- expression 3 operands: lhs = Counter(0), rhs = Counter(1)
102+
Number of file 0 mappings: 7
103+
- Code(Counter(0)) at (prev + 17, 1) to (start + 0, 32)
104+
- Code(Expression(0, Add)) at (prev + 1, 9) to (start + 0, 10)
105+
= ((c1 + c2) + c3)
106+
- Code(Counter(0)) at (prev + 0, 13) to (start + 0, 14)
107+
- Branch { true: Counter(1), false: Expression(3, Sub) } at (prev + 0, 13) to (start + 0, 14)
108+
true = c1
109+
false = (c0 - c1)
110+
- Code(Expression(3, Sub)) at (prev + 0, 18) to (start + 0, 19)
111+
= (c0 - c1)
112+
- Branch { true: Counter(2), false: Counter(3) } at (prev + 0, 18) to (start + 0, 19)
113+
true = c2
114+
false = c3
115+
- Code(Expression(0, Add)) at (prev + 1, 5) to (start + 1, 2)
116+
= ((c1 + c2) + c3)
117+
118+
Function name: mcdc_non_control_flow::foo
119+
Raw bytes (9): 0x[01, 01, 00, 01, 01, 25, 01, 02, 02]
120+
Number of files: 1
121+
- file 0 => global file 1
122+
Number of expressions: 0
123+
Number of file 0 mappings: 1
124+
- Code(Counter(0)) at (prev + 37, 1) to (start + 2, 2)
125+
126+
Function name: mcdc_non_control_flow::func_call
127+
Raw bytes (39): 0x[01, 01, 03, 01, 05, 0b, 02, 09, 0d, 05, 01, 29, 01, 01, 0a, 20, 05, 02, 01, 09, 00, 0a, 05, 00, 0e, 00, 0f, 20, 09, 0d, 00, 0e, 00, 0f, 07, 01, 01, 00, 02]
128+
Number of files: 1
129+
- file 0 => global file 1
130+
Number of expressions: 3
131+
- expression 0 operands: lhs = Counter(0), rhs = Counter(1)
132+
- expression 1 operands: lhs = Expression(2, Add), rhs = Expression(0, Sub)
133+
- expression 2 operands: lhs = Counter(2), rhs = Counter(3)
134+
Number of file 0 mappings: 5
135+
- Code(Counter(0)) at (prev + 41, 1) to (start + 1, 10)
136+
- Branch { true: Counter(1), false: Expression(0, Sub) } at (prev + 1, 9) to (start + 0, 10)
137+
true = c1
138+
false = (c0 - c1)
139+
- Code(Counter(1)) at (prev + 0, 14) to (start + 0, 15)
140+
- Branch { true: Counter(2), false: Counter(3) } at (prev + 0, 14) to (start + 0, 15)
141+
true = c2
142+
false = c3
143+
- Code(Expression(1, Add)) at (prev + 1, 1) to (start + 0, 2)
144+
= ((c2 + c3) + (c0 - c1))
145+
146+
Function name: mcdc_non_control_flow::right_comb_tree
147+
Raw bytes (117): 0x[01, 01, 13, 07, 1a, 0b, 19, 0f, 15, 13, 11, 09, 0d, 01, 05, 01, 05, 05, 19, 05, 19, 4a, 15, 05, 19, 4a, 15, 05, 19, 46, 11, 4a, 15, 05, 19, 46, 11, 4a, 15, 05, 19, 0d, 01, 20, 01, 00, 41, 03, 01, 09, 00, 0a, 01, 00, 0d, 00, 0e, 20, 05, 1a, 00, 0d, 00, 0e, 05, 00, 13, 00, 14, 20, 4a, 19, 00, 13, 00, 14, 4a, 00, 19, 00, 1a, 20, 46, 15, 00, 19, 00, 1a, 46, 00, 1f, 00, 20, 20, 42, 11, 00, 1f, 00, 20, 42, 00, 24, 00, 27, 20, 09, 0d, 00, 24, 00, 27, 03, 01, 05, 01, 02]
148+
Number of files: 1
149+
- file 0 => global file 1
150+
Number of expressions: 19
151+
- expression 0 operands: lhs = Expression(1, Add), rhs = Expression(6, Sub)
152+
- expression 1 operands: lhs = Expression(2, Add), rhs = Counter(6)
153+
- expression 2 operands: lhs = Expression(3, Add), rhs = Counter(5)
154+
- expression 3 operands: lhs = Expression(4, Add), rhs = Counter(4)
155+
- expression 4 operands: lhs = Counter(2), rhs = Counter(3)
156+
- expression 5 operands: lhs = Counter(0), rhs = Counter(1)
157+
- expression 6 operands: lhs = Counter(0), rhs = Counter(1)
158+
- expression 7 operands: lhs = Counter(1), rhs = Counter(6)
159+
- expression 8 operands: lhs = Counter(1), rhs = Counter(6)
160+
- expression 9 operands: lhs = Expression(18, Sub), rhs = Counter(5)
161+
- expression 10 operands: lhs = Counter(1), rhs = Counter(6)
162+
- expression 11 operands: lhs = Expression(18, Sub), rhs = Counter(5)
163+
- expression 12 operands: lhs = Counter(1), rhs = Counter(6)
164+
- expression 13 operands: lhs = Expression(17, Sub), rhs = Counter(4)
165+
- expression 14 operands: lhs = Expression(18, Sub), rhs = Counter(5)
166+
- expression 15 operands: lhs = Counter(1), rhs = Counter(6)
167+
- expression 16 operands: lhs = Expression(17, Sub), rhs = Counter(4)
168+
- expression 17 operands: lhs = Expression(18, Sub), rhs = Counter(5)
169+
- expression 18 operands: lhs = Counter(1), rhs = Counter(6)
170+
Number of file 0 mappings: 13
171+
- Code(Counter(0)) at (prev + 32, 1) to (start + 0, 65)
172+
- Code(Expression(0, Add)) at (prev + 1, 9) to (start + 0, 10)
173+
= (((((c2 + c3) + c4) + c5) + c6) + (c0 - c1))
174+
- Code(Counter(0)) at (prev + 0, 13) to (start + 0, 14)
175+
- Branch { true: Counter(1), false: Expression(6, Sub) } at (prev + 0, 13) to (start + 0, 14)
176+
true = c1
177+
false = (c0 - c1)
178+
- Code(Counter(1)) at (prev + 0, 19) to (start + 0, 20)
179+
- Branch { true: Expression(18, Sub), false: Counter(6) } at (prev + 0, 19) to (start + 0, 20)
180+
true = (c1 - c6)
181+
false = c6
182+
- Code(Expression(18, Sub)) at (prev + 0, 25) to (start + 0, 26)
183+
= (c1 - c6)
184+
- Branch { true: Expression(17, Sub), false: Counter(5) } at (prev + 0, 25) to (start + 0, 26)
185+
true = ((c1 - c6) - c5)
186+
false = c5
187+
- Code(Expression(17, Sub)) at (prev + 0, 31) to (start + 0, 32)
188+
= ((c1 - c6) - c5)
189+
- Branch { true: Expression(16, Sub), false: Counter(4) } at (prev + 0, 31) to (start + 0, 32)
190+
true = (((c1 - c6) - c5) - c4)
191+
false = c4
192+
- Code(Expression(16, Sub)) at (prev + 0, 36) to (start + 0, 39)
193+
= (((c1 - c6) - c5) - c4)
194+
- Branch { true: Counter(2), false: Counter(3) } at (prev + 0, 36) to (start + 0, 39)
195+
true = c2
196+
false = c3
197+
- Code(Expression(0, Add)) at (prev + 1, 5) to (start + 1, 2)
198+
= (((((c2 + c3) + c4) + c5) + c6) + (c0 - c1))
199+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
LL| |#![feature(coverage_attribute)]
2+
LL| |//@ edition: 2021
3+
LL| |//@ min-llvm-version: 18
4+
LL| |//@ compile-flags: -Zcoverage-options=mcdc
5+
LL| |//@ llvm-cov-flags: --show-mcdc
6+
LL| |
7+
LL| |// This test ensures that boolean expressions that are not inside control flow
8+
LL| |// decisions are correctly instrumented.
9+
LL| |
10+
LL| |use core::hint::black_box;
11+
LL| |
12+
LL| 3|fn assign_and(a: bool, b: bool) {
13+
LL| 3| let x = a && b;
14+
^2
15+
LL| 3| black_box(x);
16+
LL| 3|}
17+
LL| |
18+
LL| 3|fn assign_or(a: bool, b: bool) {
19+
LL| 3| let x = a || b;
20+
^1
21+
LL| 3| black_box(x);
22+
LL| 3|}
23+
LL| |
24+
LL| 4|fn assign_3(a: bool, b: bool, c: bool) {
25+
LL| 4| let x = a || b && c;
26+
^2 ^1
27+
LL| 4| black_box(x);
28+
LL| 4|}
29+
LL| |
30+
LL| 4|fn assign_3_bis(a: bool, b: bool, c: bool) {
31+
LL| 4| let x = a && b || c;
32+
^2 ^3
33+
------------------
34+
|---> MC/DC Decision Region (LL:13) to (LL:19)
35+
|
36+
| Number of Conditions: 2
37+
| Condition C1 --> (LL:13)
38+
| Condition C2 --> (LL:18)
39+
|
40+
| Executed MC/DC Test Vectors:
41+
|
42+
| C1, C2 Result
43+
| 1 { F, - = F }
44+
| 2 { T, F = F }
45+
| 3 { T, T = T }
46+
|
47+
| C1-Pair: covered: (1,3)
48+
| C2-Pair: covered: (2,3)
49+
| MC/DC Coverage for Decision: 100.00%
50+
|
51+
------------------
52+
LL| 4| black_box(x);
53+
LL| 4|}
54+
LL| |
55+
LL| 3|fn right_comb_tree(a: bool, b: bool, c: bool, d: bool, e: bool) {
56+
LL| 3| let x = a && (b && (c && (d && (e))));
57+
^2 ^1 ^1 ^1
58+
LL| 3| black_box(x);
59+
LL| 3|}
60+
LL| |
61+
LL| 3|fn foo(a: bool) -> bool {
62+
LL| 3| black_box(a)
63+
LL| 3|}
64+
LL| |
65+
LL| 3|fn func_call(a: bool, b: bool) {
66+
LL| 3| foo(a && b);
67+
^2
68+
LL| 3|}
69+
LL| |
70+
LL| |#[coverage(off)]
71+
LL| |fn main() {
72+
LL| | assign_and(true, false);
73+
LL| | assign_and(true, true);
74+
LL| | assign_and(false, false);
75+
LL| |
76+
LL| | assign_or(true, false);
77+
LL| | assign_or(true, true);
78+
LL| | assign_or(false, false);
79+
LL| |
80+
LL| | assign_3(true, false, false);
81+
LL| | assign_3(true, true, false);
82+
LL| | assign_3(false, false, true);
83+
LL| | assign_3(false, true, true);
84+
LL| |
85+
LL| | assign_3_bis(true, false, false);
86+
LL| | assign_3_bis(true, true, false);
87+
LL| | assign_3_bis(false, false, true);
88+
LL| | assign_3_bis(false, true, true);
89+
LL| |
90+
LL| | right_comb_tree(false, false, false, true, true);
91+
LL| | right_comb_tree(true, false, false, true, true);
92+
LL| | right_comb_tree(true, true, true, true, true);
93+
LL| |
94+
LL| | func_call(true, false);
95+
LL| | func_call(true, true);
96+
LL| | func_call(false, false);
97+
LL| |}
98+
+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
#![feature(coverage_attribute)]
2+
//@ edition: 2021
3+
//@ min-llvm-version: 18
4+
//@ compile-flags: -Zcoverage-options=mcdc
5+
//@ llvm-cov-flags: --show-mcdc
6+
7+
// This test ensures that boolean expressions that are not inside control flow
8+
// decisions are correctly instrumented.
9+
10+
use core::hint::black_box;
11+
12+
fn assign_and(a: bool, b: bool) {
13+
let x = a && b;
14+
black_box(x);
15+
}
16+
17+
fn assign_or(a: bool, b: bool) {
18+
let x = a || b;
19+
black_box(x);
20+
}
21+
22+
fn assign_3(a: bool, b: bool, c: bool) {
23+
let x = a || b && c;
24+
black_box(x);
25+
}
26+
27+
fn assign_3_bis(a: bool, b: bool, c: bool) {
28+
let x = a && b || c;
29+
black_box(x);
30+
}
31+
32+
fn right_comb_tree(a: bool, b: bool, c: bool, d: bool, e: bool) {
33+
let x = a && (b && (c && (d && (e))));
34+
black_box(x);
35+
}
36+
37+
fn foo(a: bool) -> bool {
38+
black_box(a)
39+
}
40+
41+
fn func_call(a: bool, b: bool) {
42+
foo(a && b);
43+
}
44+
45+
#[coverage(off)]
46+
fn main() {
47+
assign_and(true, false);
48+
assign_and(true, true);
49+
assign_and(false, false);
50+
51+
assign_or(true, false);
52+
assign_or(true, true);
53+
assign_or(false, false);
54+
55+
assign_3(true, false, false);
56+
assign_3(true, true, false);
57+
assign_3(false, false, true);
58+
assign_3(false, true, true);
59+
60+
assign_3_bis(true, false, false);
61+
assign_3_bis(true, true, false);
62+
assign_3_bis(false, false, true);
63+
assign_3_bis(false, true, true);
64+
65+
right_comb_tree(false, false, false, true, true);
66+
right_comb_tree(true, false, false, true, true);
67+
right_comb_tree(true, true, true, true, true);
68+
69+
func_call(true, false);
70+
func_call(true, true);
71+
func_call(false, false);
72+
}

0 commit comments

Comments
 (0)