shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

[SLPVectorizer] Clear TreeEntryToStridedPtrInfoMap. (#160544)

Browse Source 
We need to clear `TreeEntryToStridedPtrInfoMap` in `deleteTree`.
This commit is contained in:
Mikhail Gudim 2025-09-30 09:25:32 -04:00 committed by GitHub
parent 6f1f00c243
commit e485d5e77a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 88 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
View File

@ -2105,6 +2105,7 @@ public:
UserIgnoreList = nullptr;
PostponedGathers.clear();
ValueToGatherNodes.clear();
TreeEntryToStridedPtrInfoMap.clear();
}
unsigned getTreeSize() const { return VectorizableTree.size(); }
@ -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;
@ -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());

83
llvm/test/Transforms/SLPVectorizer/RISCV/test-delete-tree.ll Normal file
View File

@ -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
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
}