diff options
author | Benjamin Kramer <benny.kra@googlemail.com> | 2014-02-13 16:48:38 +0000 |
---|---|---|
committer | Benjamin Kramer <benny.kra@googlemail.com> | 2014-02-13 16:48:38 +0000 |
commit | 8ed2c8e99fd6f988e272cd2173b10855ce29f3fb (patch) | |
tree | bf5b456085a3b49cfe640d55f88fa25ffc4d389f /lib | |
parent | 7fd806d94af22b95587439898ffe61314f04aca1 (diff) | |
download | llvm-8ed2c8e99fd6f988e272cd2173b10855ce29f3fb.tar.gz llvm-8ed2c8e99fd6f988e272cd2173b10855ce29f3fb.tar.bz2 llvm-8ed2c8e99fd6f988e272cd2173b10855ce29f3fb.tar.xz |
Reduce code duplication resulting from the ConstantVector/ConstantDataVector split.
No intended functionality change.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201344 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Analysis/CostModel.cpp | 12 | ||||
-rw-r--r-- | lib/Transforms/Vectorize/BBVectorize.cpp | 23 | ||||
-rw-r--r-- | lib/Transforms/Vectorize/LoopVectorize.cpp | 8 |
3 files changed, 11 insertions, 32 deletions
diff --git a/lib/Analysis/CostModel.cpp b/lib/Analysis/CostModel.cpp index 898da8d0e8..8eb5f6857e 100644 --- a/lib/Analysis/CostModel.cpp +++ b/lib/Analysis/CostModel.cpp @@ -99,17 +99,9 @@ static TargetTransformInfo::OperandValueKind getOperandInfo(Value *V) { TargetTransformInfo::OK_AnyValue; // Check for a splat of a constant or for a non uniform vector of constants. - ConstantDataVector *CDV = 0; - if ((CDV = dyn_cast<ConstantDataVector>(V))) { + if (isa<ConstantVector>(V) || isa<ConstantDataVector>(V)) { OpInfo = TargetTransformInfo::OK_NonUniformConstantValue; - if (CDV->getSplatValue() != NULL) - OpInfo = TargetTransformInfo::OK_UniformConstantValue; - } - - ConstantVector *CV = 0; - if ((CV = dyn_cast<ConstantVector>(V))) { - OpInfo = TargetTransformInfo::OK_NonUniformConstantValue; - if (CV->getSplatValue() != NULL) + if (cast<Constant>(V)->getSplatValue() != NULL) OpInfo = TargetTransformInfo::OK_UniformConstantValue; } diff --git a/lib/Transforms/Vectorize/BBVectorize.cpp b/lib/Transforms/Vectorize/BBVectorize.cpp index f59dd2160a..6ef2020130 100644 --- a/lib/Transforms/Vectorize/BBVectorize.cpp +++ b/lib/Transforms/Vectorize/BBVectorize.cpp @@ -1043,22 +1043,13 @@ namespace { // of constants. Value *IOp = I->getOperand(1); Value *JOp = J->getOperand(1); - if (ConstantDataVector *CDVI = dyn_cast<ConstantDataVector>(IOp)) { - if (ConstantDataVector *CDVJ = dyn_cast<ConstantDataVector>(JOp)) { - Op2VK = TargetTransformInfo::OK_NonUniformConstantValue; - Constant *SplatValue = CDVI->getSplatValue(); - if (SplatValue != NULL && SplatValue == CDVJ->getSplatValue()) - Op2VK = TargetTransformInfo::OK_UniformConstantValue; - } - } - - if (ConstantVector *CVI = dyn_cast<ConstantVector>(IOp)) { - if (ConstantVector *CVJ = dyn_cast<ConstantVector>(JOp)) { - Op2VK = TargetTransformInfo::OK_NonUniformConstantValue; - Constant *SplatValue = CVI->getSplatValue(); - if (SplatValue != NULL && SplatValue == CVJ->getSplatValue()) - Op2VK = TargetTransformInfo::OK_UniformConstantValue; - } + if ((isa<ConstantVector>(IOp) || isa<ConstantDataVector>(IOp)) && + (isa<ConstantVector>(JOp) || isa<ConstantDataVector>(JOp))) { + Op2VK = TargetTransformInfo::OK_NonUniformConstantValue; + Constant *SplatValue = cast<Constant>(IOp)->getSplatValue(); + if (SplatValue != NULL && + SplatValue == cast<Constant>(JOp)->getSplatValue()) + Op2VK = TargetTransformInfo::OK_UniformConstantValue; } } } diff --git a/lib/Transforms/Vectorize/LoopVectorize.cpp b/lib/Transforms/Vectorize/LoopVectorize.cpp index ecbab63acf..d7d66e7916 100644 --- a/lib/Transforms/Vectorize/LoopVectorize.cpp +++ b/lib/Transforms/Vectorize/LoopVectorize.cpp @@ -5496,13 +5496,9 @@ LoopVectorizationCostModel::getInstructionCost(Instruction *I, unsigned VF) { // Check for a splat of a constant or for a non uniform vector of constants. if (isa<ConstantInt>(Op2)) Op2VK = TargetTransformInfo::OK_UniformConstantValue; - else if (ConstantDataVector *CDV = dyn_cast<ConstantDataVector>(Op2)) { + else if (isa<ConstantVector>(Op2) || isa<ConstantDataVector>(Op2)) { Op2VK = TargetTransformInfo::OK_NonUniformConstantValue; - if (CDV->getSplatValue() != NULL) - Op2VK = TargetTransformInfo::OK_UniformConstantValue; - } else if (ConstantVector *CV = dyn_cast<ConstantVector>(Op2)) { - Op2VK = TargetTransformInfo::OK_NonUniformConstantValue; - if (CV->getSplatValue() != NULL) + if (cast<Constant>(Op2)->getSplatValue() != NULL) Op2VK = TargetTransformInfo::OK_UniformConstantValue; } |