diff options
author | Preston Gurd <preston.gurd@intel.com> | 2012-10-04 21:33:40 +0000 |
---|---|---|
committer | Preston Gurd <preston.gurd@intel.com> | 2012-10-04 21:33:40 +0000 |
commit | 8d662b59f075da67e663ed142ecdd58e381eee98 (patch) | |
tree | 0ff325bb9e5f547682f9b46d0baee62347058406 /lib/Transforms | |
parent | 837c28a84076e1cd63bbf29057b791ebe6b03de0 (diff) | |
download | llvm-8d662b59f075da67e663ed142ecdd58e381eee98.tar.gz llvm-8d662b59f075da67e663ed142ecdd58e381eee98.tar.bz2 llvm-8d662b59f075da67e663ed142ecdd58e381eee98.tar.xz |
This patch corrects commit 165126 by using an integer bit width instead of
a pointer to a type, in order to remove the uses of getGlobalContext().
Patch by Tyler Nowicki.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165255 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms')
-rw-r--r-- | lib/Transforms/Scalar/CodeGenPrepare.cpp | 5 | ||||
-rw-r--r-- | lib/Transforms/Utils/BypassSlowDivision.cpp | 17 |
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/Transforms/Scalar/CodeGenPrepare.cpp b/lib/Transforms/Scalar/CodeGenPrepare.cpp index a2427cffbd..6d0186f9b4 100644 --- a/lib/Transforms/Scalar/CodeGenPrepare.cpp +++ b/lib/Transforms/Scalar/CodeGenPrepare.cpp @@ -154,9 +154,10 @@ bool CodeGenPrepare::runOnFunction(Function &F) { /// This optimization identifies DIV instructions that can be /// profitably bypassed and carried out with a shorter, faster divide. if (TLI && TLI->isSlowDivBypassed()) { - const DenseMap<Type*, Type*> &BypassTypeMap = TLI->getBypassSlowDivTypes(); + const DenseMap<unsigned int, unsigned int> &BypassWidths = + TLI->getBypassSlowDivWidths(); for (Function::iterator I = F.begin(); I != F.end(); I++) - EverMadeChange |= bypassSlowDivision(F, I, BypassTypeMap); + EverMadeChange |= bypassSlowDivision(F, I, BypassWidths); } // Eliminate blocks that contain only PHI nodes and an diff --git a/lib/Transforms/Utils/BypassSlowDivision.cpp b/lib/Transforms/Utils/BypassSlowDivision.cpp index 821b588112..bee2f7bcb6 100644 --- a/lib/Transforms/Utils/BypassSlowDivision.cpp +++ b/lib/Transforms/Utils/BypassSlowDivision.cpp @@ -221,7 +221,7 @@ static bool reuseOrInsertFastDiv(Function &F, // be profitably bypassed and carried out with a shorter, faster divide. bool llvm::bypassSlowDivision(Function &F, Function::iterator &I, - const DenseMap<Type*, Type*> &BypassTypeMap) { + const DenseMap<unsigned int, unsigned int> &BypassWidths) { DivCacheTy DivCache; bool MadeChange = false; @@ -242,18 +242,17 @@ bool llvm::bypassSlowDivision(Function &F, if (!J->getType()->isIntegerTy()) continue; - // Get same type in global context + // Get bitwidth of div/rem instruction IntegerType *T = cast<IntegerType>(J->getType()); - IntegerType *GT = IntegerType::get(getGlobalContext(), T->getBitWidth()); + int bitwidth = T->getBitWidth(); - // Continue if div/rem type is not bypassed - DenseMap<Type *, Type *>::const_iterator BI = BypassTypeMap.find(GT); - if (BI == BypassTypeMap.end()) + // Continue if bitwidth is not bypassed + DenseMap<unsigned int, unsigned int>::const_iterator BI = BypassWidths.find(bitwidth); + if (BI == BypassWidths.end()) continue; - // Get the bypass type in the original context - IntegerType *GBT = cast<IntegerType>(BI->second); - IntegerType *BT = IntegerType::get(J->getContext(), GBT->getBitWidth()); + // Get type for div/rem instruction with bypass bitwidth + IntegerType *BT = IntegerType::get(J->getContext(), BI->second); MadeChange |= reuseOrInsertFastDiv(F, I, J, BT, UseDivOp, UseSignedOp, DivCache); |