[llvm-branch-commits] [llvm-branch] r322669 - Merging r321993:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Jan 17 07:47:38 2018
New Revision: 322669

URL: http://llvm.org/viewvc/llvm-project?rev=322669&view=rev
Log:
Merging r321993:
------------------------------------------------------------------------
r321993 | abataev | 2018-01-08 06:33:11 -0800 (Mon, 08 Jan 2018) | 11 lines

[SLP] Fix PR35628: Count external uses on extra reduction arguments.

Summary:
If the vectorized value is marked as extra reduction argument, its users
are not considered as external users. Patch fixes this.

Reviewers: mkuper, hfinkel, RKSimon, spatel

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D41786
------------------------------------------------------------------------

Added:
    llvm/branches/release_60/test/Transforms/SLPVectorizer/X86/PR35628_1.ll
      - copied unchanged from r321993, llvm/trunk/test/Transforms/SLPVectorizer/X86/PR35628_1.ll
    llvm/branches/release_60/test/Transforms/SLPVectorizer/X86/PR35628_2.ll
      - copied unchanged from r321993, llvm/trunk/test/Transforms/SLPVectorizer/X86/PR35628_2.ll
Modified:
    llvm/branches/release_60/   (props changed)
    llvm/branches/release_60/lib/Transforms/Vectorize/SLPVectorizer.cpp

Propchange: llvm/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 17 07:47:38 2018
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,321789,321980,322056,322103,322623
+/llvm/trunk:155241,321789,321980,321993,322056,322103,322623

Modified: llvm/branches/release_60/lib/Transforms/Vectorize/SLPVectorizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/lib/Transforms/Vectorize/SLPVectorizer.cpp?rev=322669&r1=322668&r2=322669&view=diff
==============================================================================
--- llvm/branches/release_60/lib/Transforms/Vectorize/SLPVectorizer.cpp (original)
+++ llvm/branches/release_60/lib/Transforms/Vectorize/SLPVectorizer.cpp Wed Jan 17 07:47:38 2018
@@ -1347,7 +1347,6 @@ void BoUpSLP::buildTree(ArrayRef<Value *
         DEBUG(dbgs() << "SLP: Need to extract: Extra arg from lane " <<
               Lane << " from " << *Scalar << ".\n");
         ExternalUses.emplace_back(Scalar, nullptr, Lane);
-        continue;
       }
       for (User *U : Scalar->users()) {
         DEBUG(dbgs() << "SLP: Checking user:" << *U << ".\n");