[llvm] b77c079 - Revert "[SLP]Fix PR85082: PHI node has multiple entries."

[Alexey Bataev via llvm-commits]

Author: Alexey Bataev
Date: 2024-03-13T12:10:40-07:00
New Revision: b77c079987182748fe1746466a74633cfe057cc1

URL: https://github.com/llvm/llvm-project/commit/b77c079987182748fe1746466a74633cfe057cc1
DIFF: https://github.com/llvm/llvm-project/commit/b77c079987182748fe1746466a74633cfe057cc1.diff

LOG: Revert "[SLP]Fix PR85082: PHI node has multiple entries."

This reverts commit 59ff907fc14aa2d02e57b4af4140949d4f8caca1 to fix
crash revealed in https://lab.llvm.org/buildbot/#/builders/198/builds/8881

Added: 
    

Modified: 
    llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

Removed: 
    llvm/test/Transforms/SLPVectorizer/X86/same-scalar-in-same-phi-extract.ll


################################################################################
diff  --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
index 5e0f5b7efadc40..b8b67609d755fd 100644
--- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
@@ -12592,11 +12592,6 @@ Value *BoUpSLP::vectorizeTree(
           } else {
             Ex = Builder.CreateExtractElement(Vec, Lane);
           }
-          // If necessary, sign-extend or zero-extend ScalarRoot
-          // to the larger type.
-          if (Scalar->getType() != Ex->getType())
-            Ex = Builder.CreateIntCast(Ex, Scalar->getType(),
-                                       MinBWs.find(E)->second.second);
           if (auto *I = dyn_cast<Instruction>(Ex))
             ScalarToEEs[Scalar].try_emplace(Builder.GetInsertBlock(), I);
         }
@@ -12606,6 +12601,11 @@ Value *BoUpSLP::vectorizeTree(
           GatherShuffleExtractSeq.insert(ExI);
           CSEBlocks.insert(ExI->getParent());
         }
+        // If necessary, sign-extend or zero-extend ScalarRoot
+        // to the larger type.
+        if (Scalar->getType() != Ex->getType())
+          return Builder.CreateIntCast(Ex, Scalar->getType(),
+                                       MinBWs.find(E)->second.second);
         return Ex;
       }
       assert(isa<FixedVectorType>(Scalar->getType()) &&

diff  --git a/llvm/test/Transforms/SLPVectorizer/X86/same-scalar-in-same-phi-extract.ll b/llvm/test/Transforms/SLPVectorizer/X86/same-scalar-in-same-phi-extract.ll
deleted file mode 100644
index 35f2f9e052e749..00000000000000
--- a/llvm/test/Transforms/SLPVectorizer/X86/same-scalar-in-same-phi-extract.ll
+++ /dev/null
@@ -1,75 +0,0 @@
-; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 4
-; RUN: opt -S --passes=slp-vectorizer -slp-threshold=-99999 -mtriple=x86_64-unknown-linux-gnu < %s | FileCheck %s
-
-define void @test(i32 %arg) {
-; CHECK-LABEL: define void @test(
-; CHECK-SAME: i32 [[ARG:%.*]]) {
-; CHECK-NEXT:  bb:
-; CHECK-NEXT:    [[TMP0:%.*]] = insertelement <2 x i32> <i32 poison, i32 0>, i32 [[ARG]], i32 0
-; CHECK-NEXT:    br label [[BB2:%.*]]
-; CHECK:       bb2:
-; CHECK-NEXT:    switch i32 0, label [[BB10:%.*]] [
-; CHECK-NEXT:      i32 0, label [[BB9:%.*]]
-; CHECK-NEXT:      i32 11, label [[BB9]]
-; CHECK-NEXT:      i32 1, label [[BB4:%.*]]
-; CHECK-NEXT:    ]
-; CHECK:       bb3:
-; CHECK-NEXT:    [[TMP1:%.*]] = extractelement <2 x i32> [[TMP0]], i32 0
-; CHECK-NEXT:    [[TMP2:%.*]] = zext i32 [[TMP1]] to i64
-; CHECK-NEXT:    switch i32 0, label [[BB10]] [
-; CHECK-NEXT:      i32 18, label [[BB7:%.*]]
-; CHECK-NEXT:      i32 1, label [[BB7]]
-; CHECK-NEXT:      i32 0, label [[BB10]]
-; CHECK-NEXT:    ]
-; CHECK:       bb4:
-; CHECK-NEXT:    [[TMP3:%.*]] = phi <2 x i32> [ [[TMP0]], [[BB2]] ]
-; CHECK-NEXT:    [[TMP4:%.*]] = zext <2 x i32> [[TMP3]] to <2 x i64>
-; CHECK-NEXT:    [[TMP5:%.*]] = extractelement <2 x i64> [[TMP4]], i32 0
-; CHECK-NEXT:    [[GETELEMENTPTR:%.*]] = getelementptr i32, ptr null, i64 [[TMP5]]
-; CHECK-NEXT:    [[TMP6:%.*]] = extractelement <2 x i64> [[TMP4]], i32 1
-; CHECK-NEXT:    [[GETELEMENTPTR6:%.*]] = getelementptr i32, ptr null, i64 [[TMP6]]
-; CHECK-NEXT:    ret void
-; CHECK:       bb7:
-; CHECK-NEXT:    [[PHI8:%.*]] = phi i64 [ [[TMP2]], [[BB3:%.*]] ], [ [[TMP2]], [[BB3]] ]
-; CHECK-NEXT:    br label [[BB9]]
-; CHECK:       bb9:
-; CHECK-NEXT:    ret void
-; CHECK:       bb10:
-; CHECK-NEXT:    ret void
-;
-bb:
-  %zext = zext i32 %arg to i64
-  %zext1 = zext i32 0 to i64
-  br label %bb2
-
-bb2:
-  switch i32 0, label %bb10 [
-  i32 0, label %bb9
-  i32 11, label %bb9
-  i32 1, label %bb4
-  ]
-
-bb3:
-  switch i32 0, label %bb10 [
-  i32 18, label %bb7
-  i32 1, label %bb7
-  i32 0, label %bb10
-  ]
-
-bb4:
-  %phi = phi i64 [ %zext, %bb2 ]
-  %phi5 = phi i64 [ %zext1, %bb2 ]
-  %getelementptr = getelementptr i32, ptr null, i64 %phi
-  %getelementptr6 = getelementptr i32, ptr null, i64 %phi5
-  ret void
-
-bb7:
-  %phi8 = phi i64 [ %zext, %bb3 ], [ %zext, %bb3 ]
-  br label %bb9
-
-bb9:
-  ret void
-
-bb10:
-  ret void
-}