Skip to content

Erase regions even when failing to normalize type in MIR opts#108787

Merged
bors merged 3 commits intorust-lang:masterfrom
cjgillot:sroa-lifetime
Mar 6, 2023
Merged

Erase regions even when failing to normalize type in MIR opts#108787
bors merged 3 commits intorust-lang:masterfrom
cjgillot:sroa-lifetime

Conversation

@cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Mar 5, 2023

The first commit just moves the tests around.

Fixes #108720

cc @saethlin

@rustbot
Copy link
Collaborator

rustbot commented Mar 5, 2023

r? @michaelwoerister

(rustbot has picked a reviewer for you, use r? to override)

@rustbot 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 Mar 5, 2023
@rustbot
Copy link
Collaborator

rustbot commented Mar 5, 2023

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@compiler-errors
Copy link
Contributor

compiler-errors commented Mar 5, 2023 •
edited
Loading

makes sense. i wonder if we should just make a variant of try_normalize_erasing_regions that does this "or else, just try to erase regions with no normalization" behavior... "normalize_erasing_regions_if_possible" or something... maybe not, other call-sites may misuse it.

r=me with ci green

@cjgillot
Copy link
Contributor Author

cjgillot commented Mar 5, 2023

I'm not sure which combination happens most often.

@bors r=compiler-errors rollup

@bors
Copy link
Collaborator

bors commented Mar 5, 2023

📌 Commit 708536b has been approved by compiler-errors

It is now in the queue for this repository.

@bors 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 Mar 5, 2023
@bors
Copy link
Collaborator

bors commented Mar 6, 2023

⌛ Testing commit 708536b with merge df129e2850354767ded55c25fc8ee78c37dc3054...

@bors
Copy link
Collaborator

bors commented Mar 6, 2023

💔 Test failed - checks-actions

@bors 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 Mar 6, 2023
@cjgillot
Copy link
Contributor Author

cjgillot commented Mar 6, 2023

@bors retry could not create temporary file whilst writing archive: no more archived files

@bors 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 Mar 6, 2023
@bors
Copy link
Collaborator

bors commented Mar 6, 2023

⌛ Testing commit 708536b with merge ac4379f...

@bors
Copy link
Collaborator

bors commented Mar 6, 2023

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing ac4379f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 6, 2023
@bors bors merged commit ac4379f into rust-lang:master Mar 6, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 6, 2023
@cjgillot cjgillot deleted the sroa-lifetime branch March 6, 2023 11:18
@rust-timer
Copy link
Collaborator

rust-timer commented Mar 6, 2023

Finished benchmarking commit (ac4379f): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -1.0% [-1.1%, -1.0%] 2
Improvements ✅
(secondary)		 -2.2% [-2.6%, -2.0%] 6
All ❌✅ (primary) -1.0% [-1.1%, -1.0%] 2

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)		 4.0% [4.0%, 4.0%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -1.1% [-1.1%, -1.1%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 1.4% [-1.1%, 4.0%] 2

Cycles

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

@rust-log-analyzer
Copy link
Collaborator

rust-log-analyzer commented Mar 6, 2023

The job i686-mingw-2 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
[1899/3021] Linking CXX static library lib\libLLVMARMDesc.a
[1900/3021] Building CXX object lib/Target/BPF/CMakeFiles/LLVMBPFCodeGen.dir/BPFIRPeephole.cpp.obj
[1901/3021] Linking CXX static library lib\libLLVMARMDisassembler.a
FAILED: lib/libLLVMARMDisassembler.a 
cmd.exe /C "cd . && "C:\Program Files\CMake\bin\cmake.exe" -E rm -f lib\libLLVMARMDisassembler.a && D:\a\rust\rust\mingw32\bin\ar.exe qc lib\libLLVMARMDisassembler.a  lib/Target/ARM/Disassembler/CMakeFiles/LLVMARMDisassembler.dir/ARMDisassembler.cpp.obj && D:\a\rust\rust\mingw32\bin\ranlib.exe lib\libLLVMARMDisassembler.a && cd ."
D:\a\rust\rust\mingw32\bin\ar.exe: could not create temporary file whilst writing archive: no more archived files
[1902/3021] Linking CXX static library lib\libLLVMARMAsmParser.a
[1903/3021] Building CXX object lib/Target/BPF/CMakeFiles/LLVMBPFCodeGen.dir/BPFAbstractMemberAccess.cpp.obj
[1904/3021] Building CXX object lib/Target/BPF/CMakeFiles/LLVMBPFCodeGen.dir/BPFFrameLowering.cpp.obj
[1905/3021] Building CXX object lib/Target/BPF/CMakeFiles/LLVMBPFCodeGen.dir/BPFAsmPrinter.cpp.obj
[1905/3021] Building CXX object lib/Target/BPF/CMakeFiles/LLVMBPFCodeGen.dir/BPFAsmPrinter.cpp.obj
[1906/3021] Building CXX object lib/Target/BPF/CMakeFiles/LLVMBPFCodeGen.dir/BPFCheckAndAdjustIR.cpp.obj
[1907/3021] Building CXX object lib/Target/BPF/CMakeFiles/LLVMBPFCodeGen.dir/BPFInstrInfo.cpp.obj
[1908/3021] Building CXX object lib/Target/BPF/CMakeFiles/LLVMBPFCodeGen.dir/BPFAdjustOpt.cpp.obj
ninja: build stopped: subcommand failed.
command did not execute successfully, got: exit code: 1


build script failed, must exit now', C:\Users\runneradmin\.cargo\registry\src\index.crates.io-1cd66030c949c28d\cmake-0.1.48\src\lib.rs:975:5
 finished in 190.674 seconds
Build completed unsuccessfully in 0:04:48
Build completed unsuccessfully in 0:04:48
make: *** [Makefile:80: ci-mingw-subset-2] Error 1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@compiler-errors compiler-errors

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.70.0

Development

Successfully merging this pull request may close these issues.

Free regions in optimized MIR when compiling futures-util with -Zmir-opt-level=3

7 participants

@cjgillot @rustbot @compiler-errors @bors @rust-timer @rust-log-analyzer @michaelwoerister