This is an archive of the discontinued LLVM Phabricator instance.

Differential D106017

[InstCombine] Look through invariant group intrinsics when removing malloc
ClosedPublic

Authored by aeubanks on Jul 14 2021, 2:02 PM.

Details

Reviewers
Prazek
rnk
lebedev.ri
Commits
rG04b75c05b033: [InstCombine] Look through invariant group intrinsics when removing malloc
Summary

Fixes some regressions with -fstrict-vtable-pointers in llvm-test-suite.

Diff Detail

Unit TestsFailed

TimeTest
2,530 msx64 debian > libarcher.barrier::barrier.c
2,520 msx64 debian > libarcher.critical::critical.c
2,730 msx64 debian > libarcher.critical::lock.c
2,620 msx64 debian > libarcher.parallel::parallel-firstprivate.c
2,500 msx64 debian > libarcher.races::critical-unrelated.c
View Full Test Results (18 Failed)

Event Timeline

aeubanks created this revision.Jul 14 2021, 2:02 PM
Herald added a subscriber: hiraditya. · View Herald TranscriptJul 14 2021, 2:02 PM
aeubanks requested review of this revision.Jul 14 2021, 2:02 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 14 2021, 2:02 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
lebedev.ri accepted this revision.Jul 14 2021, 2:04 PM
lebedev.ri added a subscriber: lebedev.ri.

LG

llvm/test/Transforms/InstCombine/malloc-free-delete.ll
441

Please precommit

This revision is now accepted and ready to land.Jul 14 2021, 2:04 PM
aeubanks mentioned this in rGd3816ef042d7: Precommit test for D106017.Jul 14 2021, 2:15 PM
aeubanks updated this revision to Diff 358751.Jul 14 2021, 2:17 PM

precommit test

Harbormaster completed remote builds in B114097: Diff 358751.Jul 14 2021, 4:35 PM
This revision was landed with ongoing or failed builds.Jul 15 2021, 9:02 AM
Closed by commit rG04b75c05b033: [InstCombine] Look through invariant group intrinsics when removing malloc (authored by aeubanks). · Explain Why
This revision was automatically updated to reflect the committed changes.
aeubanks added a commit: rG04b75c05b033: [InstCombine] Look through invariant group intrinsics when removing malloc.
Prazek added a comment.Jul 25 2021, 9:45 AM

Sorry for late reply. Although I don't have experience in this pass, it looks good!

Revision Contents

PathSize
llvm/
lib/
Transforms/
InstCombine/
5 lines
test/
Transforms/
InstCombine/
5 lines

Diff 358751

llvm/lib/Transforms/InstCombine/InstructionCombining.cpp

Show First 20 Lines • Show All 2,594 Lines • ▼ Show 20 Lines for (User *U : PI->users()) {
case Intrinsic::assume: case Intrinsic::assume:
case Intrinsic::invariant_start: case Intrinsic::invariant_start:
case Intrinsic::invariant_end: case Intrinsic::invariant_end:
case Intrinsic::lifetime_start: case Intrinsic::lifetime_start:
case Intrinsic::lifetime_end: case Intrinsic::lifetime_end:
case Intrinsic::objectsize: case Intrinsic::objectsize:
Users.emplace_back(I); Users.emplace_back(I);
continue; continue;
case Intrinsic::launder_invariant_group:
case Intrinsic::strip_invariant_group:
Users.emplace_back(I);
Worklist.push_back(I);
continue;
} }
} }
if (isFreeCall(I, TLI)) { if (isFreeCall(I, TLI)) {
Users.emplace_back(I); Users.emplace_back(I);
continue; continue;
} }
return false; return false;
▲ Show 20 Lines • Show All 1,639 Lines • Show Last 20 Lines

llvm/test/Transforms/InstCombine/malloc-free-delete.ll

Show First 20 Lines • Show All 432 Lines • ▼ Show 20 Lines
; ;
call void @free(i8* %foo) call void @free(i8* %foo)
ret void ret void
} }
declare i8* @llvm.launder.invariant.group(i8*) declare i8* @llvm.launder.invariant.group(i8*)
declare i8* @llvm.strip.invariant.group(i8*) declare i8* @llvm.strip.invariant.group(i8*)
define void @test17() { define void @test17() {
lebedev.riUnsubmitted
Not Done
ReplyInline Actions

Please precommit

lebedev.ri: Please precommit
; CHECK-LABEL: @test17( ; CHECK-LABEL: @test17(
; CHECK-NEXT: [[NW1:%.*]] = call dereferenceable(32) i8* @_Znwm(i64 32) #[[ATTR10]]
; CHECK-NEXT: [[NW2:%.*]] = call i8* @llvm.launder.invariant.group.p0i8(i8* nonnull [[NW1]])
; CHECK-NEXT: [[TMP1:%.*]] = call i8* @llvm.strip.invariant.group.p0i8(i8* nonnull [[NW1]])
; CHECK-NEXT: store i8 1, i8* [[TMP1]], align 1
; CHECK-NEXT: call void @_ZdlPv(i8* [[NW2]]) #[[ATTR10]]
; CHECK-NEXT: ret void ; CHECK-NEXT: ret void
; ;
%nw1 = call i8* @_Znwm(i64 32) builtin %nw1 = call i8* @_Znwm(i64 32) builtin
%nw2 = call i8* @llvm.launder.invariant.group(i8* %nw1) %nw2 = call i8* @llvm.launder.invariant.group(i8* %nw1)
%nw3 = call i8* @llvm.strip.invariant.group(i8* %nw2) %nw3 = call i8* @llvm.strip.invariant.group(i8* %nw2)
store i8 1, i8* %nw3 store i8 1, i8* %nw3
call void @_ZdlPv(i8* %nw2) builtin call void @_ZdlPv(i8* %nw2) builtin
ret void ret void
} }