<div dir="ltr">These tests are broken after the patch <div><a href="http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-autoconf/builds/6467/steps/test%20tsan%20in%20debug%20compiler-rt%20build/logs/stdio">http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-autoconf/builds/6467/steps/test%20tsan%20in%20debug%20compiler-rt%20build/logs/stdio</a><br></div><div><br></div><div><pre style="font-family:"courier new",courier,monotype,monospace;font-size:medium"><span class="inbox-inbox-stdout">Scanning dependencies of target TsanUnitTests
[ 90%] Built target TsanUnitTests
[ 90%] Built target SanitizerLintCheck
-- libcxx_tsan_x86_64 configure command succeeded. See also /mnt/b/sanitizer-buildbot4/sanitizer-x86_64-linux-autoconf/build/tsan_debug_build/tools/clang/runtime/compiler-rt-bins/lib/tsan/libcxx_tsan_x86_64/src/libcxx_tsan_x86_64-stamp/libcxx_tsan_x86_64-configure-*.log
[ 90</span><span class="inbox-inbox-stdout">%] Performing build step for 'libcxx_tsan_x86_64'
</span><span class="inbox-inbox-stdout">make[7]: *** [lib/tsan/CMakeFiles/GotsanRuntimeCheck] Error 139
make[6]: *** [lib/tsan/CMakeFiles/GotsanRuntimeCheck.dir/all] Error 2
make[6]: *** Waiting for unfinished jobs....
-- libcxx_tsan_x86_64 build command succeeded. See also /mnt/b/sanitizer-buildbot4/sanitizer-x86_64-linux-autoconf/build/tsan_debug_build/tools/clang/runtime/compiler-rt-bins/lib/tsan/libcxx_tsan_x86_64/src/libcxx_tsan_x86_64-stamp/libcxx_tsan_x86_64-build-*.log
[ 90%] Performing install step for 'libcxx_tsan_x86_64'
-- libcxx_tsan_x86_64 install command succeeded. See also /mnt/b/sanitizer-buildbot4/sanitizer-x86_64-linux-autoconf/build/tsan_debug_build/tools/clang/runtime/compiler-rt-bins/lib/tsan/libcxx_tsan_x86_64/src/libcxx_tsan_x86_64-stamp/libcxx_tsan_x86_64-install-*.log
[ 95%] Completed 'libcxx_tsan_x86_64'
[ 95%] Built target libcxx_tsan_x86_64
make[5]: *** [test/tsan/CMakeFiles/check-tsan.dir/rule] Error 2
make[4]: *** [check-tsan] Error 2
make[3]: *** [tools/clang/runtime/CMakeFiles/check-tsan] Error 2
make[2]: *** [tools/clang/runtime/CMakeFiles/check-tsan.dir/all] Error 2
make[1]: *** [tools/clang/runtime/CMakeFiles/check-tsan.dir/rule] Error 2
make: *** [check-tsan] Error 2
+ echo @@@STEP_FAILURE@@@
@@@STEP_FAILURE@@@</span></pre><pre style="font-family:"courier new",courier,monotype,monospace;font-size:medium"><span class="inbox-inbox-stdout"><br></span></pre><pre style="font-family:"courier new",courier,monotype,monospace;font-size:medium"><span class="inbox-inbox-stdout">Reproducible locally with</span></pre><pre style="font-family:"courier new",courier,monotype,monospace;font-size:medium"><span class="inbox-inbox-stdout">MAKE_JOBS=30 BUILDBOT_REVISION=298711 BUILDBOT_CLOBBER= llvm/projects/zorg/zorg/buildbot/builders/sanitizers/buildbot_standard.sh</span></pre></div></div><br><div class="gmail_quote"><div dir="ltr">On Fri, Mar 24, 2017 at 10:09 AM Craig Topper via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ctopper<br class="gmail_msg">
Date: Fri Mar 24 11:56:51 2017<br class="gmail_msg">
New Revision: 298711<br class="gmail_msg">
<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=298711&view=rev" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project?rev=298711&view=rev</a><br class="gmail_msg">
Log:<br class="gmail_msg">
[InstCombine] Provide a way to calculate KnownZero/One for Add/Sub in SimplifyDemandedUseBits without recursing into ComputeKnownBits<br class="gmail_msg">
<br class="gmail_msg">
SimplifyDemandedUseBits for Add/Sub already recursed down LHS and RHS for simplifying bits. If that didn't provide any simplifications we fall back to calling computeKnownBits which will recurse again. Instead just take the known bits for LHS and RHS we already have and call into a new function in ValueTracking that can calculate the known bits given the LHS/RHS bits.<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
Modified:<br class="gmail_msg">
llvm/trunk/include/llvm/Analysis/ValueTracking.h<br class="gmail_msg">
llvm/trunk/lib/Analysis/ValueTracking.cpp<br class="gmail_msg">
llvm/trunk/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/include/llvm/Analysis/ValueTracking.h<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/ValueTracking.h?rev=298711&r1=298710&r2=298711&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/ValueTracking.h?rev=298711&r1=298710&r2=298711&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/include/llvm/Analysis/ValueTracking.h (original)<br class="gmail_msg">
+++ llvm/trunk/include/llvm/Analysis/ValueTracking.h Fri Mar 24 11:56:51 2017<br class="gmail_msg">
@@ -55,6 +55,11 @@ template <typename T> class ArrayRef;<br class="gmail_msg">
const Instruction *CxtI = nullptr,<br class="gmail_msg">
const DominatorTree *DT = nullptr,<br class="gmail_msg">
OptimizationRemarkEmitter *ORE = nullptr);<br class="gmail_msg">
+ /// Compute known bits for add/sub using LHS/RHS known bits.<br class="gmail_msg">
+ void computeKnownBitsForAddSub(bool Add, bool NSW,<br class="gmail_msg">
+ APInt &KnownZero, APInt &KnownOne,<br class="gmail_msg">
+ APInt &LHSKnownZero, APInt &LHSKnownOne,<br class="gmail_msg">
+ APInt &RHSKnownZero, APInt &RHSKnownOne);<br class="gmail_msg">
/// Compute known bits from the range metadata.<br class="gmail_msg">
/// \p KnownZero the set of bits that are known to be zero<br class="gmail_msg">
/// \p KnownOne the set of bits that are known to be one<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/lib/Analysis/ValueTracking.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ValueTracking.cpp?rev=298711&r1=298710&r2=298711&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ValueTracking.cpp?rev=298711&r1=298710&r2=298711&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/lib/Analysis/ValueTracking.cpp (original)<br class="gmail_msg">
+++ llvm/trunk/lib/Analysis/ValueTracking.cpp Fri Mar 24 11:56:51 2017<br class="gmail_msg">
@@ -250,37 +250,29 @@ unsigned llvm::ComputeNumSignBits(const<br class="gmail_msg">
return ::ComputeNumSignBits(V, Depth, Query(DL, AC, safeCxtI(V, CxtI), DT));<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
-static void computeKnownBitsAddSub(bool Add, const Value *Op0, const Value *Op1,<br class="gmail_msg">
- bool NSW,<br class="gmail_msg">
- APInt &KnownZero, APInt &KnownOne,<br class="gmail_msg">
- APInt &KnownZero2, APInt &KnownOne2,<br class="gmail_msg">
- unsigned Depth, const Query &Q) {<br class="gmail_msg">
- unsigned BitWidth = KnownZero.getBitWidth();<br class="gmail_msg">
-<br class="gmail_msg">
- // If an initial sequence of bits in the result is not needed, the<br class="gmail_msg">
- // corresponding bits in the operands are not needed.<br class="gmail_msg">
- APInt LHSKnownZero(BitWidth, 0), LHSKnownOne(BitWidth, 0);<br class="gmail_msg">
- computeKnownBits(Op0, LHSKnownZero, LHSKnownOne, Depth + 1, Q);<br class="gmail_msg">
- computeKnownBits(Op1, KnownZero2, KnownOne2, Depth + 1, Q);<br class="gmail_msg">
-<br class="gmail_msg">
+/// Compute known bits for add/sub using LHS/RHS known bits.<br class="gmail_msg">
+void llvm::computeKnownBitsForAddSub(bool Add, bool NSW,<br class="gmail_msg">
+ APInt &KnownZero, APInt &KnownOne,<br class="gmail_msg">
+ APInt &LHSKnownZero, APInt &LHSKnownOne,<br class="gmail_msg">
+ APInt &RHSKnownZero, APInt &RHSKnownOne) {<br class="gmail_msg">
// Carry in a 1 for a subtract, rather than a 0.<br class="gmail_msg">
uint64_t CarryIn = 0;<br class="gmail_msg">
if (!Add) {<br class="gmail_msg">
// Sum = LHS + ~RHS + 1<br class="gmail_msg">
- std::swap(KnownZero2, KnownOne2);<br class="gmail_msg">
+ std::swap(RHSKnownZero, RHSKnownOne);<br class="gmail_msg">
CarryIn = 1;<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
- APInt PossibleSumZero = ~LHSKnownZero + ~KnownZero2 + CarryIn;<br class="gmail_msg">
- APInt PossibleSumOne = LHSKnownOne + KnownOne2 + CarryIn;<br class="gmail_msg">
+ APInt PossibleSumZero = ~LHSKnownZero + ~RHSKnownZero + CarryIn;<br class="gmail_msg">
+ APInt PossibleSumOne = LHSKnownOne + RHSKnownOne + CarryIn;<br class="gmail_msg">
<br class="gmail_msg">
// Compute known bits of the carry.<br class="gmail_msg">
- APInt CarryKnownZero = ~(PossibleSumZero ^ LHSKnownZero ^ KnownZero2);<br class="gmail_msg">
- APInt CarryKnownOne = PossibleSumOne ^ LHSKnownOne ^ KnownOne2;<br class="gmail_msg">
+ APInt CarryKnownZero = ~(PossibleSumZero ^ LHSKnownZero ^ RHSKnownZero);<br class="gmail_msg">
+ APInt CarryKnownOne = PossibleSumOne ^ LHSKnownOne ^ RHSKnownOne;<br class="gmail_msg">
<br class="gmail_msg">
// Compute set of known bits (where all three relevant bits are known).<br class="gmail_msg">
APInt LHSKnown = LHSKnownZero | LHSKnownOne;<br class="gmail_msg">
- APInt RHSKnown = KnownZero2 | KnownOne2;<br class="gmail_msg">
+ APInt RHSKnown = RHSKnownZero | RHSKnownOne;<br class="gmail_msg">
APInt CarryKnown = CarryKnownZero | CarryKnownOne;<br class="gmail_msg">
APInt Known = LHSKnown & RHSKnown & CarryKnown;<br class="gmail_msg">
<br class="gmail_msg">
@@ -296,14 +288,36 @@ static void computeKnownBitsAddSub(bool<br class="gmail_msg">
if (NSW) {<br class="gmail_msg">
// Adding two non-negative numbers, or subtracting a negative number from<br class="gmail_msg">
// a non-negative one, can't wrap into negative.<br class="gmail_msg">
- if (LHSKnownZero.isNegative() && KnownZero2.isNegative())<br class="gmail_msg">
+ if (LHSKnownZero.isNegative() && RHSKnownZero.isNegative())<br class="gmail_msg">
KnownZero.setSignBit();<br class="gmail_msg">
// Adding two negative numbers, or subtracting a non-negative number from<br class="gmail_msg">
// a negative one, can't wrap into non-negative.<br class="gmail_msg">
- else if (LHSKnownOne.isNegative() && KnownOne2.isNegative())<br class="gmail_msg">
+ else if (LHSKnownOne.isNegative() && RHSKnownOne.isNegative())<br class="gmail_msg">
KnownOne.setSignBit();<br class="gmail_msg">
}<br class="gmail_msg">
}<br class="gmail_msg">
+<br class="gmail_msg">
+ // Put the RHS/LHS back how we found them.<br class="gmail_msg">
+ if (!Add) {<br class="gmail_msg">
+ std::swap(RHSKnownZero, RHSKnownOne);<br class="gmail_msg">
+ }<br class="gmail_msg">
+}<br class="gmail_msg">
+<br class="gmail_msg">
+static void computeKnownBitsAddSub(bool Add, const Value *Op0, const Value *Op1,<br class="gmail_msg">
+ bool NSW,<br class="gmail_msg">
+ APInt &KnownZero, APInt &KnownOne,<br class="gmail_msg">
+ APInt &KnownZero2, APInt &KnownOne2,<br class="gmail_msg">
+ unsigned Depth, const Query &Q) {<br class="gmail_msg">
+ unsigned BitWidth = KnownZero.getBitWidth();<br class="gmail_msg">
+<br class="gmail_msg">
+ // If an initial sequence of bits in the result is not needed, the<br class="gmail_msg">
+ // corresponding bits in the operands are not needed.<br class="gmail_msg">
+ APInt LHSKnownZero(BitWidth, 0), LHSKnownOne(BitWidth, 0);<br class="gmail_msg">
+ computeKnownBits(Op0, LHSKnownZero, LHSKnownOne, Depth + 1, Q);<br class="gmail_msg">
+ computeKnownBits(Op1, KnownZero2, KnownOne2, Depth + 1, Q);<br class="gmail_msg">
+<br class="gmail_msg">
+ computeKnownBitsForAddSub(Add, NSW, KnownZero, KnownOne, LHSKnownZero,<br class="gmail_msg">
+ LHSKnownOne, KnownZero2, KnownOne2);<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
static void computeKnownBitsMul(const Value *Op0, const Value *Op1, bool NSW,<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp?rev=298711&r1=298710&r2=298711&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp?rev=298711&r1=298710&r2=298711&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp (original)<br class="gmail_msg">
+++ llvm/trunk/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp Fri Mar 24 11:56:51 2017<br class="gmail_msg">
@@ -538,7 +538,7 @@ Value *InstCombiner::SimplifyDemandedUse<br class="gmail_msg">
LHSKnownZero, LHSKnownOne, Depth + 1) ||<br class="gmail_msg">
ShrinkDemandedConstant(I, 1, DemandedFromOps) ||<br class="gmail_msg">
SimplifyDemandedBits(I->getOperandUse(1), DemandedFromOps,<br class="gmail_msg">
- LHSKnownZero, LHSKnownOne, Depth + 1)) {<br class="gmail_msg">
+ RHSKnownZero, RHSKnownOne, Depth + 1)) {<br class="gmail_msg">
// Disable the nsw and nuw flags here: We can no longer guarantee that<br class="gmail_msg">
// we won't wrap after simplification. Removing the nsw/nuw flags is<br class="gmail_msg">
// legal here because the top bit is not demanded.<br class="gmail_msg">
@@ -549,9 +549,10 @@ Value *InstCombiner::SimplifyDemandedUse<br class="gmail_msg">
}<br class="gmail_msg">
}<br class="gmail_msg">
<br class="gmail_msg">
- // Otherwise just hand the add/sub off to computeKnownBits to fill in<br class="gmail_msg">
- // the known zeros and ones.<br class="gmail_msg">
- computeKnownBits(V, KnownZero, KnownOne, Depth, CxtI);<br class="gmail_msg">
+ // Otherwise compute the known bits using the RHS/LHS known bits.<br class="gmail_msg">
+ bool NSW = cast<OverflowingBinaryOperator>(I)->hasNoSignedWrap();<br class="gmail_msg">
+ computeKnownBitsForAddSub(V, NSW, KnownZero, KnownOne, LHSKnownZero,<br class="gmail_msg">
+ LHSKnownOne, RHSKnownZero, RHSKnownOne);<br class="gmail_msg">
break;<br class="gmail_msg">
}<br class="gmail_msg">
case Instruction::Shl:<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
_______________________________________________<br class="gmail_msg">
llvm-commits mailing list<br class="gmail_msg">
<a href="mailto:llvm-commits@lists.llvm.org" class="gmail_msg" target="_blank">llvm-commits@lists.llvm.org</a><br class="gmail_msg">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" class="gmail_msg" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br class="gmail_msg">
</blockquote></div>