Add FileCheck annotations to MIR-opt inlining tests #117029

rmehri01 · 2023-10-21T18:20:09Z

Part of #116971, adds FileCheck annotations to MIR-opt tests in tests/mir-opt/inline.

I left out a few (such as inline_cycle) where it mentioned that the particular outcome of inlining isn't important, just that the inliner doesn't get stuck in an infinite loop.

r? cjgillot

cjgillot

Thanks @rmehri01! Looking good.

cjgillot · 2023-10-22T08:27:15Z

tests/mir-opt/inline/asm_unwind.rs

This test verifies that we give the correct unwind block to the inline ASM. Added by #102778
It's only relevant for ASM that unwinds.
Could you:

add a // needs-unwind directive at the top;

add a CHECK that the asm! terminator has an unwind block, and that unwind block is marked (cleanup)?

tests/mir-opt/inline/caller_with_trivial_bound.rs

tests/mir-opt/inline/cycle.rs

tests/mir-opt/inline/dont_ice_on_generic_rust_call.rs

cjgillot · 2023-10-22T08:42:29Z

tests/mir-opt/inline/inline_retag.rs

@@ -9,6 +8,8 @@ fn main() {

 // EMIT_MIR inline_retag.bar.Inline.after.mir
 fn bar() -> bool {
+    // CHECK-LABEL: fn bar(
+    // CHECK: (inlined foo)


The point of this test is to verify that we put the Retag statements in the correct place. Could you add them here?

tests/mir-opt/inline/inline_retag.rs

tests/mir-opt/inline/inline_trait_method.rs

tests/mir-opt/inline/issue_76997_inline_scopes_parenting.rs

cjgillot · 2023-10-23T18:40:07Z

Thanks!
@bors r+ rollup

bors · 2023-10-23T18:40:09Z

📌 Commit 1f35769 has been approved by cjgillot

It is now in the queue for this repository.

…tests, r=cjgillot Add FileCheck annotations to MIR-opt inlining tests Part of rust-lang#116971, adds FileCheck annotations to MIR-opt tests in `tests/mir-opt/inline`. I left out a few (such as `inline_cycle`) where it mentioned that the particular outcome of inlining isn't important, just that the inliner doesn't get stuck in an infinite loop. r? cjgillot

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#116094 (Introduce `-C instrument-coverage=branch` to gate branch coverage) - rust-lang#116396 (Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs`) - rust-lang#116792 (Avoid unnecessary renumbering during borrowck) - rust-lang#116943 (Add target features for LoongArch) - rust-lang#117010 (Add method to convert internal to stable constructs) - rust-lang#117029 (Add FileCheck annotations to MIR-opt inlining tests ) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2023-10-24T17:28:35Z

@bors r-
#117125 (comment)

bors · 2023-10-25T22:10:57Z

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

workingjubilee · 2023-10-31T21:33:17Z

@bors delegate+

bors · 2023-10-31T21:33:20Z

✌️ @rmehri01, you can now approve this pull request!

If @workingjubilee told you to "r=me" after making some further change, please make that change, then do @bors r=@workingjubilee

rmehri01 · 2023-10-31T21:47:58Z

@bors r=cjgillot rollup

bors · 2023-10-31T21:47:59Z

📌 Commit 2fcb4d9 has been approved by cjgillot

It is now in the queue for this repository.

…tests, r=cjgillot Add FileCheck annotations to MIR-opt inlining tests Part of rust-lang#116971, adds FileCheck annotations to MIR-opt tests in `tests/mir-opt/inline`. I left out a few (such as `inline_cycle`) where it mentioned that the particular outcome of inlining isn't important, just that the inliner doesn't get stuck in an infinite loop. r? cjgillot

…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#115626 (Clean up unchecked_math, separate out unchecked_shifts) - rust-lang#117029 (Add FileCheck annotations to MIR-opt inlining tests ) - rust-lang#117397 (Don't emit delayed good-path bugs on panic) - rust-lang#117401 (Refactor: move suggestion functions from demand to suggestions) - rust-lang#117475 (Inline and remove `create_session`.) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2023-11-01T10:29:20Z

@bors r- rollup=iffy
#117481 (comment)

cjgillot · 2023-11-01T11:05:39Z

You need to update the spans in tests/mir-opt/inline/inline_coroutine.main.Inline.panic-abort.diff

rmehri01 · 2023-11-01T14:42:39Z

Oh sorry, I think that's because adding the comments messed up the spans when I did --bless? I just moved them to the bottom of the file instead

rmehri01 · 2023-11-01T14:55:02Z

Oh wait nevermind I didn't realize that the unwind file was changing but not the abort one 🤦

cjgillot · 2023-11-01T20:08:28Z

@bors r+

bors · 2023-11-01T20:08:30Z

📌 Commit 5f75326 has been approved by cjgillot

It is now in the queue for this repository.

bors · 2023-11-01T20:37:42Z

⌛ Testing commit 5f75326 with merge 75b064d...

bors · 2023-11-01T22:36:17Z

☀️ Test successful - checks-actions
Approved by: cjgillot
Pushing 75b064d to master...

rust-timer · 2023-11-01T23:59:35Z

Finished benchmarking commit (75b064d): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	2.4%	[2.4%, 2.4%]	1
Improvements ✅ (primary)	-4.0%	[-4.0%, -4.0%]	1
Improvements ✅ (secondary)	-3.0%	[-3.4%, -2.2%]	3
All ❌✅ (primary)	-4.0%	[-4.0%, -4.0%]	1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 638.942s -> 637.908s (-0.16%)
Artifact size: 304.49 MiB -> 304.52 MiB (0.01%)

80: Automated pull from upstream `master` r=tshepang a=github-actions[bot] This PR pulls the following changes from the upstream repository: * rust-lang/rust#117498 * rust-lang/rust#117488 * rust-lang/rust#117441 * rust-lang/rust#117373 * rust-lang/rust#117298 * rust-lang/rust#117029 * rust-lang/rust#117289 * rust-lang/rust#117307 * rust-lang/rust#114208 * rust-lang/rust#117482 * rust-lang/rust#117475 * rust-lang/rust#117401 * rust-lang/rust#117397 * rust-lang/rust#115626 * rust-lang/rust#117436 * rust-lang/rust#115356 * rust-lang/rust#117422 * rust-lang/rust#116692 Co-authored-by: David CARLIER <devnexen@gmail.com> Co-authored-by: Taiki Endo <te316e89@gmail.com> Co-authored-by: ltdk <usr@ltdk.xyz> Co-authored-by: Ryan Mehri <ryan.mehri1@gmail.com>

rustbot assigned cjgillot Oct 21, 2023

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 21, 2023

cjgillot reviewed Oct 22, 2023

View reviewed changes

rmehri01 force-pushed the mir_opt_filecheck_inline_tests branch from 840e2fd to 1f35769 Compare October 22, 2023 16:32

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 Oct 23, 2023

matthiaskrgr mentioned this pull request Oct 24, 2023

Rollup of 6 pull requests #117125

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 24, 2023

rmehri01 added 15 commits October 25, 2023 15:22

FileCheck asm_unwind

62fe807

FileCheck caller_with_trivial_bound

2d0a34b

FileCheck cycle

2f9aa7d

FileCheck dont_ice_on_generic_rust_call

9b3f5e1

FileCheck dyn_trait

76faae9

FileCheck exponential_runtime

f005d23

FileCheck inline_any_operand

22679cd

FileCheck inline_box_fn

de56d2d

FileCheck inline_closure_borrows_arg

9d61e6a

FileCheck inline_closure_captures

5caee41

FileCheck inline_closure

7ee05d2

FileCheck inline_diverging

d8f33ef

FileCheck inline_coroutine

20e7caa

FileCheck inline_instruction_set

19c36a9

FileCheck inline_into_box_place

de82551

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 31, 2023

matthiaskrgr mentioned this pull request Nov 1, 2023

Rollup of 5 pull requests #117481

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 1, 2023

fix spans for inline_couroutine panic-abort

5f75326

rmehri01 force-pushed the mir_opt_filecheck_inline_tests branch from 6a4bb1f to 5f75326 Compare November 1, 2023 14:59

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 1, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 1, 2023

bors merged commit 75b064d into rust-lang:master Nov 1, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Nov 1, 2023

rmehri01 deleted the mir_opt_filecheck_inline_tests branch November 1, 2023 22:42

github-actions bot mentioned this pull request Nov 2, 2023

Automated pull from upstream master ferrocene/ferrocene#80

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add FileCheck annotations to MIR-opt inlining tests #117029

Add FileCheck annotations to MIR-opt inlining tests #117029

rmehri01 commented Oct 21, 2023

cjgillot left a comment

cjgillot Oct 22, 2023

cjgillot Oct 22, 2023

cjgillot commented Oct 23, 2023

bors commented Oct 23, 2023

matthiaskrgr commented Oct 24, 2023

bors commented Oct 25, 2023

workingjubilee commented Oct 31, 2023

bors commented Oct 31, 2023

rmehri01 commented Oct 31, 2023

bors commented Oct 31, 2023

matthiaskrgr commented Nov 1, 2023

cjgillot commented Nov 1, 2023

rmehri01 commented Nov 1, 2023 •

edited

Loading

rmehri01 commented Nov 1, 2023

cjgillot commented Nov 1, 2023

bors commented Nov 1, 2023

bors commented Nov 1, 2023

bors commented Nov 1, 2023

rust-timer commented Nov 1, 2023

Add FileCheck annotations to MIR-opt inlining tests #117029

Add FileCheck annotations to MIR-opt inlining tests #117029

Conversation

rmehri01 commented Oct 21, 2023

cjgillot left a comment

Choose a reason for hiding this comment

cjgillot Oct 22, 2023

Choose a reason for hiding this comment

cjgillot Oct 22, 2023

Choose a reason for hiding this comment

cjgillot commented Oct 23, 2023

bors commented Oct 23, 2023

matthiaskrgr commented Oct 24, 2023

bors commented Oct 25, 2023

workingjubilee commented Oct 31, 2023

bors commented Oct 31, 2023

rmehri01 commented Oct 31, 2023

bors commented Oct 31, 2023

matthiaskrgr commented Nov 1, 2023

cjgillot commented Nov 1, 2023

rmehri01 commented Nov 1, 2023 • edited Loading

rmehri01 commented Nov 1, 2023

cjgillot commented Nov 1, 2023

bors commented Nov 1, 2023

bors commented Nov 1, 2023

bors commented Nov 1, 2023

rust-timer commented Nov 1, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

rmehri01 commented Nov 1, 2023 •

edited

Loading