Skip to content

[SLPVectorizer] Clear TreeEntryToStridedPtrInfoMap. #160544

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
Sep 30, 2025
Merged

[SLPVectorizer] Clear TreeEntryToStridedPtrInfoMap. #160544

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
cf12ede
[SLPVectorizer] Clear `TreeEntryToStridedPtrInfoMap`.
Sep 24, 2025
27babc5
[SLPVectorizer] Test `deleteTree`.
Sep 29, 2025
7dc4239
moved the assert
Sep 29, 2025
c55197d
updated test checks and moved the test to RISCV directory.
Sep 29, 2025
15c59c3
re-run CI
Sep 29, 2025
9ab861e
Merge branch 'main' into clear_map
mgudim Sep 29, 2025
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
5 changes: 5 additions & 0 deletions llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2105,6 +2105,7 @@ class BoUpSLP {
UserIgnoreList = nullptr;
PostponedGathers.clear();
ValueToGatherNodes.clear();
TreeEntryToStridedPtrInfoMap.clear();
}

unsigned getTreeSize() const { return VectorizableTree.size(); }
Expand Down Expand Up @@ -8948,6 +8949,8 @@ BoUpSLP::findExternalStoreUsersReorderIndices(TreeEntry *TE) const {
void BoUpSLP::buildTree(ArrayRef<Value *> Roots,
const SmallDenseSet<Value *> &UserIgnoreLst) {
deleteTree();
assert(TreeEntryToStridedPtrInfoMap.empty() &&
"TreeEntryToStridedPtrInfoMap is not cleared");
UserIgnoreList = &UserIgnoreLst;
if (!allSameType(Roots))
return;
Expand All @@ -8956,6 +8959,8 @@ void BoUpSLP::buildTree(ArrayRef<Value *> Roots,

void BoUpSLP::buildTree(ArrayRef<Value *> Roots) {
deleteTree();
assert(TreeEntryToStridedPtrInfoMap.empty() &&
"TreeEntryToStridedPtrInfoMap is not cleared");
if (!allSameType(Roots))
return;
buildTreeRec(Roots, 0, EdgeInfo());
Expand Down
83 changes: 83 additions & 0 deletions llvm/test/Transforms/SLPVectorizer/RISCV/test-delete-tree.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 6
; RUN: opt -mtriple=riscv64 -mattr=+m,+v -passes=slp-vectorizer -S < %s | FileCheck %s

; CHECK-NOT: TreeEntryToStridedPtrInfoMap is not cleared
Copy link
Member

@alexey-bataev alexey-bataev Sep 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add real checks here

define void @const_stride_1_no_reordering(ptr %pl, ptr %ps) {
; CHECK-LABEL: define void @const_stride_1_no_reordering(
; CHECK-SAME: ptr [[PL:%.*]], ptr [[PS:%.*]]) #[[ATTR0:[0-9]+]] {
; CHECK-NEXT: [[GEP_L0:%.*]] = getelementptr inbounds i8, ptr [[PL]], i64 0
; CHECK-NEXT: [[GEP_S0:%.*]] = getelementptr inbounds i8, ptr [[PS]], i64 0
; CHECK-NEXT: [[TMP1:%.*]] = load <16 x i8>, ptr [[GEP_L0]], align 1
; CHECK-NEXT: store <16 x i8> [[TMP1]], ptr [[GEP_S0]], align 1
; CHECK-NEXT: ret void
;
%gep_l0 = getelementptr inbounds i8, ptr %pl, i64 0
%gep_l1 = getelementptr inbounds i8, ptr %pl, i64 1
%gep_l2 = getelementptr inbounds i8, ptr %pl, i64 2
%gep_l3 = getelementptr inbounds i8, ptr %pl, i64 3
%gep_l4 = getelementptr inbounds i8, ptr %pl, i64 4
%gep_l5 = getelementptr inbounds i8, ptr %pl, i64 5
%gep_l6 = getelementptr inbounds i8, ptr %pl, i64 6
%gep_l7 = getelementptr inbounds i8, ptr %pl, i64 7
%gep_l8 = getelementptr inbounds i8, ptr %pl, i64 8
%gep_l9 = getelementptr inbounds i8, ptr %pl, i64 9
%gep_l10 = getelementptr inbounds i8, ptr %pl, i64 10
%gep_l11 = getelementptr inbounds i8, ptr %pl, i64 11
%gep_l12 = getelementptr inbounds i8, ptr %pl, i64 12
%gep_l13 = getelementptr inbounds i8, ptr %pl, i64 13
%gep_l14 = getelementptr inbounds i8, ptr %pl, i64 14
%gep_l15 = getelementptr inbounds i8, ptr %pl, i64 15

%load0 = load i8, ptr %gep_l0
%load1 = load i8, ptr %gep_l1
%load2 = load i8, ptr %gep_l2
%load3 = load i8, ptr %gep_l3
%load4 = load i8, ptr %gep_l4
%load5 = load i8, ptr %gep_l5
%load6 = load i8, ptr %gep_l6
%load7 = load i8, ptr %gep_l7
%load8 = load i8, ptr %gep_l8
%load9 = load i8, ptr %gep_l9
%load10 = load i8, ptr %gep_l10
%load11 = load i8, ptr %gep_l11
%load12 = load i8, ptr %gep_l12
%load13 = load i8, ptr %gep_l13
%load14 = load i8, ptr %gep_l14
%load15 = load i8, ptr %gep_l15

%gep_s0 = getelementptr inbounds i8, ptr %ps, i64 0
%gep_s1 = getelementptr inbounds i8, ptr %ps, i64 1
%gep_s2 = getelementptr inbounds i8, ptr %ps, i64 2
%gep_s3 = getelementptr inbounds i8, ptr %ps, i64 3
%gep_s4 = getelementptr inbounds i8, ptr %ps, i64 4
%gep_s5 = getelementptr inbounds i8, ptr %ps, i64 5
%gep_s6 = getelementptr inbounds i8, ptr %ps, i64 6
%gep_s7 = getelementptr inbounds i8, ptr %ps, i64 7
%gep_s8 = getelementptr inbounds i8, ptr %ps, i64 8
%gep_s9 = getelementptr inbounds i8, ptr %ps, i64 9
%gep_s10 = getelementptr inbounds i8, ptr %ps, i64 10
%gep_s11 = getelementptr inbounds i8, ptr %ps, i64 11
%gep_s12 = getelementptr inbounds i8, ptr %ps, i64 12
%gep_s13 = getelementptr inbounds i8, ptr %ps, i64 13
%gep_s14 = getelementptr inbounds i8, ptr %ps, i64 14
%gep_s15 = getelementptr inbounds i8, ptr %ps, i64 15

store i8 %load0, ptr %gep_s0
store i8 %load1, ptr %gep_s1
store i8 %load2, ptr %gep_s2
store i8 %load3, ptr %gep_s3
store i8 %load4, ptr %gep_s4
store i8 %load5, ptr %gep_s5
store i8 %load6, ptr %gep_s6
store i8 %load7, ptr %gep_s7
store i8 %load8, ptr %gep_s8
store i8 %load9, ptr %gep_s9
store i8 %load10, ptr %gep_s10
store i8 %load11, ptr %gep_s11
store i8 %load12, ptr %gep_s12
store i8 %load13, ptr %gep_s13
store i8 %load14, ptr %gep_s14
store i8 %load15, ptr %gep_s15

ret void
}