From cf12ede01e9a62b048c4ad3478871fe135b44ced Mon Sep 17 00:00:00 2001 From: Mikhail Gudim Date: Wed, 24 Sep 2025 08:41:46 -0700 Subject: [PATCH 1/5] [SLPVectorizer] Clear `TreeEntryToStridedPtrInfoMap`. We need to clear `TreeEntryToStridedPtrInfoMap` in `deleteTree`. --- llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp index 065622efc7ecc..ade61b90ea297 100644 --- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp +++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp @@ -2099,6 +2099,7 @@ class BoUpSLP { UserIgnoreList = nullptr; PostponedGathers.clear(); ValueToGatherNodes.clear(); + TreeEntryToStridedPtrInfoMap.clear(); } unsigned getTreeSize() const { return VectorizableTree.size(); } From 27babc534a04e41479aaa9b570da711caac7ff55 Mon Sep 17 00:00:00 2001 From: Mikhail Gudim Date: Mon, 29 Sep 2025 09:25:35 -0700 Subject: [PATCH 2/5] [SLPVectorizer] Test `deleteTree`. --- .../Transforms/Vectorize/SLPVectorizer.cpp | 1 + .../SLPVectorizer/test-delete-tree.ll | 74 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 llvm/test/Transforms/SLPVectorizer/test-delete-tree.ll diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp index ade61b90ea297..c007e138d14f9 100644 --- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp +++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp @@ -2100,6 +2100,7 @@ class BoUpSLP { PostponedGathers.clear(); ValueToGatherNodes.clear(); TreeEntryToStridedPtrInfoMap.clear(); + assert(TreeEntryToStridedPtrInfoMap.empty() && "TreeEntryToStridedPtrInfoMap is not cleared"); } unsigned getTreeSize() const { return VectorizableTree.size(); } diff --git a/llvm/test/Transforms/SLPVectorizer/test-delete-tree.ll b/llvm/test/Transforms/SLPVectorizer/test-delete-tree.ll new file mode 100644 index 0000000000000..5ff6d4c969267 --- /dev/null +++ b/llvm/test/Transforms/SLPVectorizer/test-delete-tree.ll @@ -0,0 +1,74 @@ +; RUN: opt -S --passes=slp-vectorizer < %s | FileCheck %s + +; CHECK-NOT: TreeEntryToStridedPtrInfoMap is not cleared +define void @const_stride_1_no_reordering(ptr %pl, ptr %ps) { + %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 +} From 7dc4239648bf144b3013a084e27415f58941652c Mon Sep 17 00:00:00 2001 From: Mikhail Gudim Date: Mon, 29 Sep 2025 09:49:18 -0700 Subject: [PATCH 3/5] moved the assert --- llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp index c007e138d14f9..20e5551bfd281 100644 --- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp +++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp @@ -2100,7 +2100,6 @@ class BoUpSLP { PostponedGathers.clear(); ValueToGatherNodes.clear(); TreeEntryToStridedPtrInfoMap.clear(); - assert(TreeEntryToStridedPtrInfoMap.empty() && "TreeEntryToStridedPtrInfoMap is not cleared"); } unsigned getTreeSize() const { return VectorizableTree.size(); } @@ -8944,6 +8943,8 @@ BoUpSLP::findExternalStoreUsersReorderIndices(TreeEntry *TE) const { void BoUpSLP::buildTree(ArrayRef Roots, const SmallDenseSet &UserIgnoreLst) { deleteTree(); + assert(TreeEntryToStridedPtrInfoMap.empty() && + "TreeEntryToStridedPtrInfoMap is not cleared"); UserIgnoreList = &UserIgnoreLst; if (!allSameType(Roots)) return; @@ -8952,6 +8953,8 @@ void BoUpSLP::buildTree(ArrayRef Roots, void BoUpSLP::buildTree(ArrayRef Roots) { deleteTree(); + assert(TreeEntryToStridedPtrInfoMap.empty() && + "TreeEntryToStridedPtrInfoMap is not cleared"); if (!allSameType(Roots)) return; buildTreeRec(Roots, 0, EdgeInfo()); From c55197dfdfb3a522c27d77eac9fefe713d3da82c Mon Sep 17 00:00:00 2001 From: Mikhail Gudim Date: Mon, 29 Sep 2025 10:54:15 -0700 Subject: [PATCH 4/5] updated test checks and moved the test to RISCV directory. --- .../{ => RISCV}/test-delete-tree.ll | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) rename llvm/test/Transforms/SLPVectorizer/{ => RISCV}/test-delete-tree.ll (73%) diff --git a/llvm/test/Transforms/SLPVectorizer/test-delete-tree.ll b/llvm/test/Transforms/SLPVectorizer/RISCV/test-delete-tree.ll similarity index 73% rename from llvm/test/Transforms/SLPVectorizer/test-delete-tree.ll rename to llvm/test/Transforms/SLPVectorizer/RISCV/test-delete-tree.ll index 5ff6d4c969267..c4e6c4e5d5db5 100644 --- a/llvm/test/Transforms/SLPVectorizer/test-delete-tree.ll +++ b/llvm/test/Transforms/SLPVectorizer/RISCV/test-delete-tree.ll @@ -1,7 +1,16 @@ -; RUN: opt -S --passes=slp-vectorizer < %s | FileCheck %s +; 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 @@ -19,16 +28,16 @@ define void @const_stride_1_no_reordering(ptr %pl, ptr %ps) { %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 + %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 From 15c59c3de617e9520d194ded241a59fa8054e25a Mon Sep 17 00:00:00 2001 From: Mikhail Gudim Date: Mon, 29 Sep 2025 12:30:49 -0700 Subject: [PATCH 5/5] re-run CI