[llvm] r339009 - Fix modules build with different technique to suppress Knuth debugging
Tim Northover via llvm-commits
llvm-commits at lists.llvm.org
Mon Aug 6 04:43:11 PDT 2018
Author: tnorthover
Date: Mon Aug 6 04:43:11 2018
New Revision: 339009
URL: http://llvm.org/viewvc/llvm-project?rev=339009&view=rev
Log:
Fix modules build with different technique to suppress Knuth debugging
Currently we use #pragma push_macro(LLVM_DEBUG) to fiddle with the LLVM_DEBUG
macro so that we can silence debugging the Knuth division algorithm unless it's
actually desired. Unfortunately this is incompatible with enabling modules
while building LLVM (via LLVM_ENABLE_MODULES=ON), probably due to a bug being
fixed by D33004.
Modified:
llvm/trunk/lib/Support/APInt.cpp
Modified: llvm/trunk/lib/Support/APInt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/APInt.cpp?rev=339009&r1=339008&r2=339009&view=diff
==============================================================================
--- llvm/trunk/lib/Support/APInt.cpp (original)
+++ llvm/trunk/lib/Support/APInt.cpp Mon Aug 6 04:43:11 2018
@@ -1254,20 +1254,18 @@ static void KnuthDiv(uint32_t *u, uint32
// The DEBUG macros here tend to be spam in the debug output if you're not
// debugging this code. Disable them unless KNUTH_DEBUG is defined.
-#pragma push_macro("LLVM_DEBUG")
-#ifndef KNUTH_DEBUG
-#undef LLVM_DEBUG
-#define LLVM_DEBUG(X) \
- do { \
- } while (false)
+#ifdef KNUTH_DEBUG
+#define DEBUG_KNUTH(X) LLVM_DEBUG(X)
+#else
+#define DEBUG_KNUTH(X) do {} while(false)
#endif
- LLVM_DEBUG(dbgs() << "KnuthDiv: m=" << m << " n=" << n << '\n');
- LLVM_DEBUG(dbgs() << "KnuthDiv: original:");
- LLVM_DEBUG(for (int i = m + n; i >= 0; i--) dbgs() << " " << u[i]);
- LLVM_DEBUG(dbgs() << " by");
- LLVM_DEBUG(for (int i = n; i > 0; i--) dbgs() << " " << v[i - 1]);
- LLVM_DEBUG(dbgs() << '\n');
+ DEBUG_KNUTH(dbgs() << "KnuthDiv: m=" << m << " n=" << n << '\n');
+ DEBUG_KNUTH(dbgs() << "KnuthDiv: original:");
+ DEBUG_KNUTH(for (int i = m + n; i >= 0; i--) dbgs() << " " << u[i]);
+ DEBUG_KNUTH(dbgs() << " by");
+ DEBUG_KNUTH(for (int i = n; i > 0; i--) dbgs() << " " << v[i - 1]);
+ DEBUG_KNUTH(dbgs() << '\n');
// D1. [Normalize.] Set d = b / (v[n-1] + 1) and multiply all the digits of
// u and v by d. Note that we have taken Knuth's advice here to use a power
// of 2 value for d such that d * v[n-1] >= b/2 (b is the base). A power of
@@ -1293,16 +1291,16 @@ static void KnuthDiv(uint32_t *u, uint32
}
u[m+n] = u_carry;
- LLVM_DEBUG(dbgs() << "KnuthDiv: normal:");
- LLVM_DEBUG(for (int i = m + n; i >= 0; i--) dbgs() << " " << u[i]);
- LLVM_DEBUG(dbgs() << " by");
- LLVM_DEBUG(for (int i = n; i > 0; i--) dbgs() << " " << v[i - 1]);
- LLVM_DEBUG(dbgs() << '\n');
+ DEBUG_KNUTH(dbgs() << "KnuthDiv: normal:");
+ DEBUG_KNUTH(for (int i = m + n; i >= 0; i--) dbgs() << " " << u[i]);
+ DEBUG_KNUTH(dbgs() << " by");
+ DEBUG_KNUTH(for (int i = n; i > 0; i--) dbgs() << " " << v[i - 1]);
+ DEBUG_KNUTH(dbgs() << '\n');
// D2. [Initialize j.] Set j to m. This is the loop counter over the places.
int j = m;
do {
- LLVM_DEBUG(dbgs() << "KnuthDiv: quotient digit #" << j << '\n');
+ DEBUG_KNUTH(dbgs() << "KnuthDiv: quotient digit #" << j << '\n');
// D3. [Calculate q'.].
// Set qp = (u[j+n]*b + u[j+n-1]) / v[n-1]. (qp=qprime=q')
// Set rp = (u[j+n]*b + u[j+n-1]) % v[n-1]. (rp=rprime=r')
@@ -1312,7 +1310,7 @@ static void KnuthDiv(uint32_t *u, uint32
// value qp is one too large, and it eliminates all cases where qp is two
// too large.
uint64_t dividend = Make_64(u[j+n], u[j+n-1]);
- LLVM_DEBUG(dbgs() << "KnuthDiv: dividend == " << dividend << '\n');
+ DEBUG_KNUTH(dbgs() << "KnuthDiv: dividend == " << dividend << '\n');
uint64_t qp = dividend / v[n-1];
uint64_t rp = dividend % v[n-1];
if (qp == b || qp*v[n-2] > b*rp + u[j+n-2]) {
@@ -1321,7 +1319,7 @@ static void KnuthDiv(uint32_t *u, uint32
if (rp < b && (qp == b || qp*v[n-2] > b*rp + u[j+n-2]))
qp--;
}
- LLVM_DEBUG(dbgs() << "KnuthDiv: qp == " << qp << ", rp == " << rp << '\n');
+ DEBUG_KNUTH(dbgs() << "KnuthDiv: qp == " << qp << ", rp == " << rp << '\n');
// D4. [Multiply and subtract.] Replace (u[j+n]u[j+n-1]...u[j]) with
// (u[j+n]u[j+n-1]..u[j]) - qp * (v[n-1]...v[1]v[0]). This computation
@@ -1337,15 +1335,15 @@ static void KnuthDiv(uint32_t *u, uint32
int64_t subres = int64_t(u[j+i]) - borrow - Lo_32(p);
u[j+i] = Lo_32(subres);
borrow = Hi_32(p) - Hi_32(subres);
- LLVM_DEBUG(dbgs() << "KnuthDiv: u[j+i] = " << u[j + i]
+ DEBUG_KNUTH(dbgs() << "KnuthDiv: u[j+i] = " << u[j + i]
<< ", borrow = " << borrow << '\n');
}
bool isNeg = u[j+n] < borrow;
u[j+n] -= Lo_32(borrow);
- LLVM_DEBUG(dbgs() << "KnuthDiv: after subtraction:");
- LLVM_DEBUG(for (int i = m + n; i >= 0; i--) dbgs() << " " << u[i]);
- LLVM_DEBUG(dbgs() << '\n');
+ DEBUG_KNUTH(dbgs() << "KnuthDiv: after subtraction:");
+ DEBUG_KNUTH(for (int i = m + n; i >= 0; i--) dbgs() << " " << u[i]);
+ DEBUG_KNUTH(dbgs() << '\n');
// D5. [Test remainder.] Set q[j] = qp. If the result of step D4 was
// negative, go to step D6; otherwise go on to step D7.
@@ -1366,16 +1364,16 @@ static void KnuthDiv(uint32_t *u, uint32
}
u[j+n] += carry;
}
- LLVM_DEBUG(dbgs() << "KnuthDiv: after correction:");
- LLVM_DEBUG(for (int i = m + n; i >= 0; i--) dbgs() << " " << u[i]);
- LLVM_DEBUG(dbgs() << "\nKnuthDiv: digit result = " << q[j] << '\n');
+ DEBUG_KNUTH(dbgs() << "KnuthDiv: after correction:");
+ DEBUG_KNUTH(for (int i = m + n; i >= 0; i--) dbgs() << " " << u[i]);
+ DEBUG_KNUTH(dbgs() << "\nKnuthDiv: digit result = " << q[j] << '\n');
// D7. [Loop on j.] Decrease j by one. Now if j >= 0, go back to D3.
} while (--j >= 0);
- LLVM_DEBUG(dbgs() << "KnuthDiv: quotient:");
- LLVM_DEBUG(for (int i = m; i >= 0; i--) dbgs() << " " << q[i]);
- LLVM_DEBUG(dbgs() << '\n');
+ DEBUG_KNUTH(dbgs() << "KnuthDiv: quotient:");
+ DEBUG_KNUTH(for (int i = m; i >= 0; i--) dbgs() << " " << q[i]);
+ DEBUG_KNUTH(dbgs() << '\n');
// D8. [Unnormalize]. Now q[...] is the desired quotient, and the desired
// remainder may be obtained by dividing u[...] by d. If r is non-null we
@@ -1386,23 +1384,21 @@ static void KnuthDiv(uint32_t *u, uint32
// shift right here.
if (shift) {
uint32_t carry = 0;
- LLVM_DEBUG(dbgs() << "KnuthDiv: remainder:");
+ DEBUG_KNUTH(dbgs() << "KnuthDiv: remainder:");
for (int i = n-1; i >= 0; i--) {
r[i] = (u[i] >> shift) | carry;
carry = u[i] << (32 - shift);
- LLVM_DEBUG(dbgs() << " " << r[i]);
+ DEBUG_KNUTH(dbgs() << " " << r[i]);
}
} else {
for (int i = n-1; i >= 0; i--) {
r[i] = u[i];
- LLVM_DEBUG(dbgs() << " " << r[i]);
+ DEBUG_KNUTH(dbgs() << " " << r[i]);
}
}
- LLVM_DEBUG(dbgs() << '\n');
+ DEBUG_KNUTH(dbgs() << '\n');
}
- LLVM_DEBUG(dbgs() << '\n');
-
-#pragma pop_macro("LLVM_DEBUG")
+ DEBUG_KNUTH(dbgs() << '\n');
}
void APInt::divide(const WordType *LHS, unsigned lhsWords, const WordType *RHS,
More information about the llvm-commits
mailing list