Skip to content

[VPlan] Preserve DT (and SCEV) in VPlan-native path #93287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 28, 2024
Merged

[VPlan] Preserve DT (and SCEV) in VPlan-native path #93287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4c51627
[VPlan] Use DomTreeUpdater to automatically update DT for vector loop.
fhahn May 17, 2024
662499c
Merge remote-tracking branch 'origin/main' into vplan-dtu
fhahn May 23, 2024
0fa9423
Merge remote-tracking branch 'origin/main' into vplan-dtu
fhahn May 24, 2024
93b1932
!fixup update
fhahn May 24, 2024
bcbb639
Merge remote-tracking branch 'origin/main' into vplan-dtu-native
fhahn May 27, 2024
022ee24
!fixup add assert message
fhahn May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7507,9 +7507,8 @@ LoopVectorizationPlanner::executePlan(
LLVM_DEBUG(BestVPlan.dump());

// Perform the actual loop transformation.
VPTransformState State(BestVF, BestUF, LI,
EnableVPlanNativePath ? nullptr : DT, ILV.Builder,
&ILV, &BestVPlan, OrigLoop->getHeader()->getContext());
VPTransformState State(BestVF, BestUF, LI, DT, ILV.Builder, &ILV, &BestVPlan,
OrigLoop->getHeader()->getContext());

// 0. Generate SCEV-dependent code into the preheader, including TripCount,
// before making any changes to the CFG.
Expand Down Expand Up @@ -10370,16 +10369,9 @@ PreservedAnalyses LoopVectorizePass::run(Function &F,
RemoveRedundantDbgInstrs(&BB);
}

// We currently do not preserve dominator analyses with outer loop
// vectorization. Until this is addressed, mark these analyses as preserved
// only for non-VPlan-native path.
// TODO: Preserve Dominator analysis for VPlan-native path.
if (!EnableVPlanNativePath) {
PA.preserve<DominatorTreeAnalysis>();
PA.preserve<ScalarEvolutionAnalysis>();
}

PA.preserve<LoopAnalysis>();
PA.preserve<DominatorTreeAnalysis>();
PA.preserve<ScalarEvolutionAnalysis>();

if (Result.MadeCFGChange) {
// Making CFG changes likely means a loop got vectorized. Indicate that
Expand Down
6 changes: 3 additions & 3 deletions llvm/lib/Transforms/Vectorize/VPlan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,9 +900,9 @@ void VPlan::execute(VPTransformState *State) {
}

State->CFG.DTU.flush();
// DT is currently updated for non-native path only.
assert(EnableVPlanNativePath || State->CFG.DTU.getDomTree().verify(
DominatorTree::VerificationLevel::Fast));
assert(State->CFG.DTU.getDomTree().verify(
DominatorTree::VerificationLevel::Fast) &&
"DT not preserved correctly");
}

#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/Transforms/LoopVectorize/outer_loop_test1.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
; }
; }
;
; RUN: opt -S -passes=loop-vectorize -enable-vplan-native-path -verify-loop-info < %s | FileCheck %s
; RUN: opt -S -passes=loop-vectorize -enable-vplan-native-path -verify-loop-info -verify-dom-info < %s | FileCheck %s
; CHECK-LABEL: vector.ph:
; CHECK: %[[SplatVal:.*]] = insertelement <4 x i32> poison, i32 %n, i64 0
; CHECK: %[[Splat:.*]] = shufflevector <4 x i32> %[[SplatVal]], <4 x i32> poison, <4 x i32> zeroinitializer
Expand Down
Loading