[Coverage][MCDC] Adapt mcdc to llvm 19 #126733

ZhuUx · 2024-06-20T11:28:47Z

Related issue: #126672

Also finish task 4 at #124144

llvm #82448 has introduced some break changes into mcdc, causing incompatibility between llvm 18 and 19. This draft adapts to that change and gives up supporting for llvm-18.

rustbot · 2024-06-20T11:28:55Z

r? @compiler-errors

rustbot has assigned @compiler-errors.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

ZhuUx · 2024-06-20T11:29:06Z

@rustbot label +A-code-coverage

ZhuUx · 2024-06-20T11:35:53Z

It is still unfinished. I would add some options next days and try to warn about mcdc limits with lints as this comment suggests.

@rustbot author

ZhuUx · 2024-06-21T03:32:53Z

I think we need to discuss more about mcdc options. Thus now I remove the commit and just reset max_conditions_in_decision to i16::MAX as default of clang.

Nevertheless I would wait until rustc is going to update in-tree llvm 19 and see if there are any other changes need to make.

bors · 2024-06-27T04:22:00Z

☔ The latest upstream changes (presumably #123918) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2024-07-05T14:12:52Z

☔ The latest upstream changes (presumably #127360) made this pull request unmergeable. Please resolve the merge conflicts.

rustbot · 2024-07-25T08:13:57Z

Some changes occurred in coverage tests.

cc @Zalathar

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in coverage instrumentation.

cc @Zalathar

Some changes occurred in coverage instrumentation.

cc @Zalathar

Some changes occurred in coverage instrumentation.

cc @Zalathar

Some changes occurred in coverage instrumentation.

cc @Zalathar

ZhuUx · 2024-07-25T08:19:15Z

Now this pr is independent from #126677 . We can focus on this only.
@Zalathar @compiler-errors @nikic
It's prepared for reviewing.
@rustbot review

ZhuUx · 2024-07-25T08:25:06Z

compiler/rustc_mir_build/src/build/coverageinfo/mcdc.rs

-    fn take_condition(
+    fn try_finish_decision(
        &mut self,
+        span: Span,
        true_marker: BlockMarkerId,
        false_marker: BlockMarkerId,
-    ) -> (Option<ConditionInfo>, Option<MCDCDecisionSpan>) {


This change looks a bit awkward. It's just a temporary expedient and will be removed in refactored mcdc implementation for pattern matching.

bors · 2024-08-28T20:49:17Z

☔ The latest upstream changes (presumably #129691) made this pull request unmergeable. Please resolve the merge conflicts.

Zalathar · 2024-09-07T06:26:26Z

r? Zalathar

Zalathar · 2024-09-07T07:01:38Z

@bors r+ rollup=iffy

bors · 2024-09-07T07:01:40Z

📌 Commit 3d24cf9 has been approved by Zalathar

It is now in the queue for this repository.

[Coverage][MCDC] Adapt mcdc to llvm 19 Related issue: rust-lang#126672 Also finish task 4 at rust-lang#124144 [llvm rust-lang#82448](llvm/llvm-project#82448) has introduced some break changes into mcdc, causing incompatibility between llvm 18 and 19. This draft adapts to that change and gives up supporting for llvm-18.

bors · 2024-09-07T09:10:45Z

⌛ Testing commit 3d24cf9 with merge 0909ca8...

bors · 2024-09-07T09:30:42Z

💔 Test failed - checks-actions

Lambdaris · 2024-09-07T15:37:02Z

😖 Nearly caused an accident, thankfully github is robust enough to restore. Actual diff

I have not found a method to generate i16::MAX conditions without proc macros (Manually code so many conditions looks like an attack), so just check if it allows decisions containing more than 6 conditions.

tests/coverage/mcdc/condition-limit.rs

bors · 2024-09-10T23:17:15Z

☔ The latest upstream changes (presumably #130200) made this pull request unmergeable. Please resolve the merge conflicts.

rustbot assigned compiler-errors Jun 20, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 20, 2024

rustbot added the A-code-coverage Area: Source-based code coverage (-Cinstrument-coverage) label Jun 20, 2024

ZhuUx mentioned this pull request Jun 20, 2024

MC/DC LLVM 19 intrinsics changes #126672

Open

This comment has been minimized.

Sign in to view

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 20, 2024

ZhuUx mentioned this pull request Jun 20, 2024

Track implementation for MC/DC #124144

Open

4 tasks

ZhuUx force-pushed the llvm-19-adapt branch from b268271 to 83e745f Compare June 21, 2024 03:06

ZhuUx force-pushed the llvm-19-adapt branch from 83e745f to 2a68c4d Compare July 3, 2024 08:38

ZhuUx mentioned this pull request Jul 10, 2024

[Coverage][MCDC] Prepare MCDC Builder for pattern matching and llvm 19 #126677

Closed

ZhuUx force-pushed the llvm-19-adapt branch 2 times, most recently from 1a8d158 to b09e96e Compare July 10, 2024 05:40

ZhuUx mentioned this pull request Jul 10, 2024

Support mcdc analysis for pattern matching #124278

Open

ZhuUx force-pushed the llvm-19-adapt branch from b09e96e to 20bdcb2 Compare July 15, 2024 03:51

ZhuUx force-pushed the llvm-19-adapt branch from 20bdcb2 to 664be8c Compare July 25, 2024 08:12

ZhuUx marked this pull request as ready for review July 25, 2024 08:13

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 25, 2024

ZhuUx commented Jul 25, 2024

View reviewed changes

ZhuUx force-pushed the llvm-19-adapt branch from 664be8c to c8d8958 Compare July 25, 2024 08:32

ZhuUx force-pushed the llvm-19-adapt branch from f6f6c47 to 778a5b5 Compare August 28, 2024 07:47

ZhuUx force-pushed the llvm-19-adapt branch from 778a5b5 to 3d24cf9 Compare August 29, 2024 02:27

rustbot assigned Zalathar and unassigned compiler-errors Sep 7, 2024

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 7, 2024

This comment has been minimized.

Sign in to view

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 7, 2024

Lambdaris deleted the llvm-19-adapt branch September 7, 2024 15:14

Lambdaris force-pushed the llvm-19-adapt branch 2 times, most recently from 3d24cf9 to ad5a0b3 Compare September 7, 2024 15:30

Zalathar reviewed Sep 9, 2024

View reviewed changes

tests/coverage/mcdc/condition-limit.rs Outdated Show resolved Hide resolved

ZhuUx force-pushed the llvm-19-adapt branch from ad5a0b3 to ad61314 Compare September 9, 2024 06:51

ZhuUx added 6 commits September 11, 2024 09:49

coverage. Disable supporting mcdc on llvm-18

ec987b1

coverage. MCDC ConditionId start from 0 to keep with llvm 19

eb5ad13

coverage. Group MCDC decisions and conditions until instrument mappings

fff32c4

coverage. Adapt to llvm optimization for conditions limits

125945d

coverage. Warn about too many test vectors

943710c

coverage. Fix test typo

3ae3585

ZhuUx force-pushed the llvm-19-adapt branch from ad61314 to 3ae3585 Compare September 11, 2024 02:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Coverage][MCDC] Adapt mcdc to llvm 19 #126733

[Coverage][MCDC] Adapt mcdc to llvm 19 #126733

ZhuUx commented Jun 20, 2024 •

edited

Loading

rustbot commented Jun 20, 2024

ZhuUx commented Jun 20, 2024

This comment has been minimized.

ZhuUx commented Jun 20, 2024 •

edited

Loading

ZhuUx commented Jun 21, 2024 •

edited

Loading

bors commented Jun 27, 2024

bors commented Jul 5, 2024

rustbot commented Jul 25, 2024

ZhuUx commented Jul 25, 2024 •

edited

Loading

ZhuUx Jul 25, 2024

bors commented Aug 28, 2024

Zalathar commented Sep 7, 2024

Zalathar commented Sep 7, 2024

bors commented Sep 7, 2024

bors commented Sep 7, 2024

This comment has been minimized.

bors commented Sep 7, 2024

Lambdaris commented Sep 7, 2024 •

edited

Loading

bors commented Sep 10, 2024

[Coverage][MCDC] Adapt mcdc to llvm 19 #126733

Are you sure you want to change the base?

[Coverage][MCDC] Adapt mcdc to llvm 19 #126733

Conversation

ZhuUx commented Jun 20, 2024 • edited Loading

rustbot commented Jun 20, 2024

ZhuUx commented Jun 20, 2024

This comment has been minimized.

ZhuUx commented Jun 20, 2024 • edited Loading

ZhuUx commented Jun 21, 2024 • edited Loading

bors commented Jun 27, 2024

bors commented Jul 5, 2024

rustbot commented Jul 25, 2024

ZhuUx commented Jul 25, 2024 • edited Loading

ZhuUx Jul 25, 2024

Choose a reason for hiding this comment

bors commented Aug 28, 2024

Zalathar commented Sep 7, 2024

Zalathar commented Sep 7, 2024

bors commented Sep 7, 2024

bors commented Sep 7, 2024

This comment has been minimized.

bors commented Sep 7, 2024

Lambdaris commented Sep 7, 2024 • edited Loading

bors commented Sep 10, 2024

ZhuUx commented Jun 20, 2024 •

edited

Loading

ZhuUx commented Jun 20, 2024 •

edited

Loading

ZhuUx commented Jun 21, 2024 •

edited

Loading

ZhuUx commented Jul 25, 2024 •

edited

Loading

Lambdaris commented Sep 7, 2024 •

edited

Loading