date:20160822

[llvm-branch-commits] [llvm-branch] r279468 - Fix gather-root.ll SLP vectorizer test to not expose UB.

2016-08-22 Thread Hans Wennborg via llvm-branch-commits

Author: hans
Date: Mon Aug 22 15:27:42 2016
New Revision: 279468

URL: http://llvm.org/viewvc/llvm-project?rev=279468&view=rev
Log:
Fix gather-root.ll SLP vectorizer test to not expose UB.

The undefined behaviour (signed integer overflow) is not a regression
in itself as it was already there, but the test exposing it is a
regression compared to rc1, i.e. the lit tests no longer run ubsan-clean.

This commit fixes the test based on Matt's change in r279125 to not
expose the undefined behaviour.

Modified:

llvm/branches/release_39/test/Transforms/SLPVectorizer/AArch64/gather-root.ll

Modified: 
llvm/branches/release_39/test/Transforms/SLPVectorizer/AArch64/gather-root.ll
URL: 
http://llvm.org/viewvc/llvm-project/llvm/branches/release_39/test/Transforms/SLPVectorizer/AArch64/gather-root.ll?rev=279468&r1=279467&r2=279468&view=diff
==
--- 
llvm/branches/release_39/test/Transforms/SLPVectorizer/AArch64/gather-root.ll 
(original)
+++ 
llvm/branches/release_39/test/Transforms/SLPVectorizer/AArch64/gather-root.ll 
Mon Aug 22 15:27:42 2016
@@ -8,7 +8,6 @@ target triple = "aarch64--linux-gnu"
 
 ; DEFAULT-LABEL: @PR28330(
 ; DEFAULT: %tmp17 = phi i32 [ %tmp34, %for.body ], [ 0, %entry ]
-; DEFAULT: %tmp18 = phi i32 [ %tmp35, %for.body ], [ %n, %entry ]
 ; DEFAULT: %[[S0:.+]] = select <8 x i1> %1, <8 x i32> , <8 x i32> 
 ; DEFAULT: %[[R0:.+]] = shufflevector <8 x i32> %[[S0]], <8 x i32> undef, <8 x 
i32> 
 ; DEFAULT: %[[R1:.+]] = add <8 x i32> %[[S0]], %[[R0]]
@@ -21,7 +20,6 @@ target triple = "aarch64--linux-gnu"
 ;
 ; GATHER-LABEL: @PR28330(
 ; GATHER: %tmp17 = phi i32 [ %tmp34, %for.body ], [ 0, %entry ]
-; GATHER: %tmp18 = phi i32 [ %tmp35, %for.body ], [ %n, %entry ]
 ; GATHER: %tmp19 = select i1 %tmp1, i32 -720, i32 -80
 ; GATHER: %tmp21 = select i1 %tmp3, i32 -720, i32 -80
 ; GATHER: %tmp23 = select i1 %tmp5, i32 -720, i32 -80
@@ -69,7 +67,6 @@ entry:
 
 for.body:
   %tmp17 = phi i32 [ %tmp34, %for.body ], [ 0, %entry ]
-  %tmp18 = phi i32 [ %tmp35, %for.body ], [ %n, %entry ]
   %tmp19 = select i1 %tmp1, i32 -720, i32 -80
   %tmp20 = add i32 %tmp17, %tmp19
   %tmp21 = select i1 %tmp3, i32 -720, i32 -80
@@ -86,10 +83,5 @@ for.body:
   %tmp32 = add i32 %tmp30, %tmp31
   %tmp33 = select i1 %tmp15, i32 -720, i32 -80
   %tmp34 = add i32 %tmp32, %tmp33
-  %tmp35 = add nsw i32 %tmp18, -1
-  %tmp36 = icmp eq i32 %tmp35, 0
-  br i1 %tmp36, label %for.end, label %for.body
-
-for.end:
-  ret void
+  br label %for.body
 }


___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits

[llvm-branch-commits] [compiler-rt-branch] r279471 - Merging r279352:

2016-08-22 Thread Hans Wennborg via llvm-branch-commits

Author: hans
Date: Mon Aug 22 15:44:16 2016
New Revision: 279471

URL: http://llvm.org/viewvc/llvm-project?rev=279471&view=rev
Log:
Merging r279352:

r279352 | eugenis | 2016-08-19 17:38:55 -0700 (Fri, 19 Aug 2016) | 1 line

[msan] Disable prlimit test on glibc < 2.13.


Modified:
compiler-rt/branches/release_39/   (props changed)
compiler-rt/branches/release_39/lib/msan/tests/msan_test.cc

Propchange: compiler-rt/branches/release_39/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 22 15:44:16 2016
@@ -1 +1 @@
-/compiler-rt/trunk:275946,275948,276015,277297,277300,278454
+/compiler-rt/trunk:275946,275948,276015,277297,277300,278454,279352

Modified: compiler-rt/branches/release_39/lib/msan/tests/msan_test.cc
URL: 
http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_39/lib/msan/tests/msan_test.cc?rev=279471&r1=279470&r2=279471&view=diff
==
--- compiler-rt/branches/release_39/lib/msan/tests/msan_test.cc (original)
+++ compiler-rt/branches/release_39/lib/msan/tests/msan_test.cc Mon Aug 22 
15:44:16 2016
@@ -2825,6 +2825,12 @@ TEST(MemorySanitizer, LongStruct) {
   EXPECT_POISONED(s2.a8);
 }
 
+#ifdef __GLIBC__
+#define MSAN_TEST_PRLIMIT __GLIBC_PREREQ(2, 13)
+#else
+#define MSAN_TEST_PRLIMIT 1
+#endif
+
 TEST(MemorySanitizer, getrlimit) {
   struct rlimit limit;
   __msan_poison(&limit, sizeof(limit));
@@ -2833,6 +2839,7 @@ TEST(MemorySanitizer, getrlimit) {
   EXPECT_NOT_POISONED(limit.rlim_cur);
   EXPECT_NOT_POISONED(limit.rlim_max);
 
+#if MSAN_TEST_PRLIMIT
   struct rlimit limit2;
   __msan_poison(&limit2, sizeof(limit2));
   result = prlimit(getpid(), RLIMIT_DATA, &limit, &limit2);
@@ -2848,6 +2855,7 @@ TEST(MemorySanitizer, getrlimit) {
 
   result = prlimit(getpid(), RLIMIT_DATA, &limit, nullptr);
   ASSERT_EQ(result, 0);
+#endif
 }
 
 TEST(MemorySanitizer, getrusage) {


___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits

[llvm-branch-commits] [llvm-branch] r279474 - Merging r279369 and update the test:

2016-08-22 Thread Hans Wennborg via llvm-branch-commits

Author: hans
Date: Mon Aug 22 16:04:17 2016
New Revision: 279474

URL: http://llvm.org/viewvc/llvm-project?rev=279474&view=rev
Log:
Merging r279369 and update the test:

r279369 | mssimpso | 2016-08-20 07:10:06 -0700 (Sat, 20 Aug 2016) | 1 line

[SLP] Add command line option for minimum tree size (NFC)


Modified:
llvm/branches/release_39/   (props changed)
llvm/branches/release_39/lib/Transforms/Vectorize/SLPVectorizer.cpp

llvm/branches/release_39/test/Transforms/SLPVectorizer/AArch64/gather-root.ll

Propchange: llvm/branches/release_39/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 22 16:04:17 2016
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,275868-275870,275879,275898,275928,275935,275946,275978,275981,276015,276051,276077,276109,276119,276181,276209,276236-276237,276358,276364,276368,276389,276435,276438,276479,276510,276648,276676,276712,276740,276823,276956,276980,277093,277114,277135,277371,277399,277500,277504,277625,277691,277693,23,278002,278086,278133,278157,278343,278370,278413,278558-278559,278562,278569,278571,278573,278575,278584,278841,278900,278938,278999,279125
+/llvm/trunk:155241,275868-275870,275879,275898,275928,275935,275946,275978,275981,276015,276051,276077,276109,276119,276181,276209,276236-276237,276358,276364,276368,276389,276435,276438,276479,276510,276648,276676,276712,276740,276823,276956,276980,277093,277114,277135,277371,277399,277500,277504,277625,277691,277693,23,278002,278086,278133,278157,278343,278370,278413,278558-278559,278562,278569,278571,278573,278575,278584,278841,278900,278938,278999,279125,279369

Modified: llvm/branches/release_39/lib/Transforms/Vectorize/SLPVectorizer.cpp
URL: 
http://llvm.org/viewvc/llvm-project/llvm/branches/release_39/lib/Transforms/Vectorize/SLPVectorizer.cpp?rev=279474&r1=279473&r2=279474&view=diff
==
--- llvm/branches/release_39/lib/Transforms/Vectorize/SLPVectorizer.cpp 
(original)
+++ llvm/branches/release_39/lib/Transforms/Vectorize/SLPVectorizer.cpp Mon Aug 
22 16:04:17 2016
@@ -86,6 +86,10 @@ static cl::opt RecursionMaxDep
 "slp-recursion-max-depth", cl::init(12), cl::Hidden,
 cl::desc("Limit the recursion depth when building a vectorizable tree"));
 
+static cl::opt MinTreeSize(
+"slp-min-tree-size", cl::init(3), cl::Hidden,
+cl::desc("Only vectorize small trees if they are fully vectorizable"));
+
 // Limit the number of alias checks. The limit is chosen so that
 // it has no negative effect on the llvm benchmarks.
 static const unsigned AliasedCheckLimit = 10;
@@ -1843,7 +1847,7 @@ int BoUpSLP::getTreeCost() {
 VectorizableTree.size() << ".\n");
 
   // We only vectorize tiny trees if it is fully vectorizable.
-  if (VectorizableTree.size() < 3 && !isFullyVectorizableTinyTree()) {
+  if (VectorizableTree.size() < MinTreeSize && !isFullyVectorizableTinyTree()) 
{
 if (VectorizableTree.empty()) {
   assert(!ExternalUses.size() && "We should not have any external users");
 }

Modified: 
llvm/branches/release_39/test/Transforms/SLPVectorizer/AArch64/gather-root.ll
URL: 
http://llvm.org/viewvc/llvm-project/llvm/branches/release_39/test/Transforms/SLPVectorizer/AArch64/gather-root.ll?rev=279474&r1=279473&r2=279474&view=diff
==
--- 
llvm/branches/release_39/test/Transforms/SLPVectorizer/AArch64/gather-root.ll 
(original)
+++ 
llvm/branches/release_39/test/Transforms/SLPVectorizer/AArch64/gather-root.ll 
Mon Aug 22 16:04:17 2016
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -slp-vectorizer -S | FileCheck %s --check-prefix=DEFAULT
-; RUN: opt < %s -slp-recursion-max-depth=0 -slp-vectorizer -S | FileCheck %s 
--check-prefix=GATHER
+; RUN: opt < %s -slp-schedule-budget=0 -slp-min-tree-size=0 -slp-threshold=-30 
-slp-vectorizer -S | FileCheck %s --check-prefix=GATHER
 
 target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
 target triple = "aarch64--linux-gnu"


___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits

[llvm-branch-commits] [llvm-branch] r279477 - Merging r279268:

2016-08-22 Thread Hans Wennborg via llvm-branch-commits

Author: hans
Date: Mon Aug 22 16:23:55 2016
New Revision: 279477

URL: http://llvm.org/viewvc/llvm-project?rev=279477&view=rev
Log:
Merging r279268:

r279268 | majnemer | 2016-08-19 09:37:40 -0700 (Fri, 19 Aug 2016) | 5 lines

[CloneFunction] Don't remove unrelated nodes from the CGSSC

CGSCC use a WeakVH to track call sites.  RAUW a call within a function
can result in that WeakVH getting confused about whether or not the call
site is still around.


Modified:
llvm/branches/release_39/   (props changed)
llvm/branches/release_39/lib/Transforms/Utils/CloneFunction.cpp
llvm/branches/release_39/test/Transforms/Inline/inline_constprop.ll

Propchange: llvm/branches/release_39/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 22 16:23:55 2016
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,275868-275870,275879,275898,275928,275935,275946,275978,275981,276015,276051,276077,276109,276119,276181,276209,276236-276237,276358,276364,276368,276389,276435,276438,276479,276510,276648,276676,276712,276740,276823,276956,276980,277093,277114,277135,277371,277399,277500,277504,277625,277691,277693,23,278002,278086,278133,278157,278343,278370,278413,278558-278559,278562,278569,278571,278573,278575,278584,278841,278900,278938,278999,279125,279369
+/llvm/trunk:155241,275868-275870,275879,275898,275928,275935,275946,275978,275981,276015,276051,276077,276109,276119,276181,276209,276236-276237,276358,276364,276368,276389,276435,276438,276479,276510,276648,276676,276712,276740,276823,276956,276980,277093,277114,277135,277371,277399,277500,277504,277625,277691,277693,23,278002,278086,278133,278157,278343,278370,278413,278558-278559,278562,278569,278571,278573,278575,278584,278841,278900,278938,278999,279125,279268,279369

Modified: llvm/branches/release_39/lib/Transforms/Utils/CloneFunction.cpp
URL: 
http://llvm.org/viewvc/llvm-project/llvm/branches/release_39/lib/Transforms/Utils/CloneFunction.cpp?rev=279477&r1=279476&r2=279477&view=diff
==
--- llvm/branches/release_39/lib/Transforms/Utils/CloneFunction.cpp (original)
+++ llvm/branches/release_39/lib/Transforms/Utils/CloneFunction.cpp Mon Aug 22 
16:23:55 2016
@@ -566,6 +566,12 @@ void llvm::CloneAndPruneIntoFromInst(Fun
 if (!I)
   continue;
 
+// Skip over non-intrinsic callsites, we don't want to remove any nodes 
from
+// the CGSCC.
+CallSite CS = CallSite(I);
+if (CS && CS.getCalledFunction() && !CS.getCalledFunction()->isIntrinsic())
+  continue;
+
 // See if this instruction simplifies.
 Value *SimpleV = SimplifyInstruction(I, DL);
 if (!SimpleV)

Modified: llvm/branches/release_39/test/Transforms/Inline/inline_constprop.ll
URL: 
http://llvm.org/viewvc/llvm-project/llvm/branches/release_39/test/Transforms/Inline/inline_constprop.ll?rev=279477&r1=279476&r2=279477&view=diff
==
--- llvm/branches/release_39/test/Transforms/Inline/inline_constprop.ll 
(original)
+++ llvm/branches/release_39/test/Transforms/Inline/inline_constprop.ll Mon Aug 
22 16:23:55 2016
@@ -299,8 +299,8 @@ entry:
 }
 
 ; CHECK-LABEL: define i32 @PR28802(
-; CHECK: call i32 @PR28802.external(i32 0)
-; CHECK: ret i32 0
+; CHECK: %[[call:.*]] = call i32 @PR28802.external(i32 0)
+; CHECK: ret i32 %[[call]]
 
 define internal i32 @PR28848.callee(i32 %p2, i1 %c) {
 entry:
@@ -322,3 +322,25 @@ entry:
 }
 ; CHECK-LABEL: define i32 @PR28848(
 ; CHECK: ret i32 0
+
+define internal void @callee7(i16 %param1, i16 %param2) {
+entry:
+  br label %bb
+
+bb:
+  %phi = phi i16 [ %param2, %entry ]
+  %add = add i16 %phi, %param1
+  ret void
+}
+
+declare i16 @caller7.external(i16 returned)
+
+define void @caller7() {
+bb1:
+  %call = call i16 @caller7.external(i16 1)
+  call void @callee7(i16 0, i16 %call)
+  ret void
+}
+; CHECK-LABEL: define void @caller7(
+; CHECK: %call = call i16 @caller7.external(i16 1)
+; CHECK-NEXT: ret void


___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits

[llvm-branch-commits] [llvm-branch] r279468 - Fix gather-root.ll SLP vectorizer test to not expose UB.

[llvm-branch-commits] [compiler-rt-branch] r279471 - Merging r279352:

[llvm-branch-commits] [llvm-branch] r279474 - Merging r279369 and update the test:

[llvm-branch-commits] [llvm-branch] r279477 - Merging r279268:

4 matches

Site Navigation

Mail list logo

Footer information