Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-25 23:00:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "New interface function is added to VectorUtils Value *getSplatValue(Value *Val);"

Browse Source 
This reverts commit r246371, as it cause a rather obscure bug in AArch64
test-suite paq8p (time outs, seg-faults). I'll investigate it before
reapplying.

llvm-svn: 246379
This commit is contained in:
Renato Golin 2015-08-30 10:05:30 +00:00
parent 5543fbc9b2
commit c7be31736c
3 changed files with 17 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/include/llvm/Analysis/VectorUtils.h
View File

@ -79,11 +79,6 @@ Value *getStrideFromPointer(Value *Ptr, ScalarEvolution *SE, Loop *Lp);
/// from the vector.
Value *findScalarElement(Value *V, unsigned EltNo);
/// \brief Get splat value if the input is a splat vector or return nullptr.
/// The value may be extracted from a splat constants vector or from
/// a sequence of instructions that broadcast a single value into a vector.
Value *getSplatValue(Value *V);
} // llvm namespace
#endif

26
llvm/lib/Analysis/VectorUtils.cpp
View File

@ -18,8 +18,6 @@
#include "llvm/IR/GetElementPtrTypeIterator.h"
#include "llvm/IR/PatternMatch.h"
#include "llvm/IR/Value.h"
#include "llvm/IR/Constants.h"
using namespace llvm;
using namespace llvm::PatternMatch;
@ -408,27 +406,3 @@ Value *llvm::findScalarElement(Value *V, unsigned EltNo) {
// Otherwise, we don't know.
return nullptr;
}
/// \brief Get splat value if the input is a splat vector or return nullptr.
/// The value may be extracted from a splat constants vector or from
/// a sequence of instructions that broadcast a single value into a vector.
llvm::Value *llvm::getSplatValue(Value *V) {
llvm::ConstantDataVector *CV = dyn_cast<llvm::ConstantDataVector>(V);
if (CV)
return CV->getSplatValue();
llvm::ShuffleVectorInst *ShuffleInst = dyn_cast<llvm::ShuffleVectorInst>(V);
if (!ShuffleInst)
return nullptr;
// All-zero (our undef) shuffle mask elements.
for (int i : ShuffleInst->getShuffleMask())
if (i != 0 && i != -1)
return nullptr;
// The first shuffle source is 'insertelement' with index 0.
llvm::InsertElementInst *InsertEltInst =
dyn_cast<llvm::InsertElementInst>(ShuffleInst->getOperand(0));
if (!InsertEltInst || !isa<ConstantInt>(InsertEltInst->getOperand(2)) ||
!cast<ConstantInt>(InsertEltInst->getOperand(2))->isNullValue())
return nullptr;
return InsertEltInst->getOperand(1);
}

30
llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
View File

@ -22,7 +22,6 @@
#include "llvm/Analysis/ConstantFolding.h"
#include "llvm/Analysis/TargetLibraryInfo.h"
#include "llvm/Analysis/ValueTracking.h"
#include "llvm/Analysis/VectorUtils.h"
#include "llvm/CodeGen/FastISel.h"
#include "llvm/CodeGen/FunctionLoweringInfo.h"
#include "llvm/CodeGen/GCMetadata.h"
@ -3151,32 +3150,37 @@ static bool getUniformBase(Value *& Ptr, SDValue& Base, SDValue& Index,
SelectionDAGBuilder* SDB) {
assert(Ptr->getType()->isVectorTy() && "Unexpected pointer type");
GetElementPtrInst *GEP = dyn_cast<GetElementPtrInst>(Ptr);
if (!GEP || GEP->getNumOperands() > 2)
GetElementPtrInst *Gep = dyn_cast<GetElementPtrInst>(Ptr);
if (!Gep || Gep->getNumOperands() > 2)
return false;
Value *GEPPtrs = GEP->getPointerOperand();
if (!(Ptr = getSplatValue(GEPPtrs)))
ShuffleVectorInst *ShuffleInst =
dyn_cast<ShuffleVectorInst>(Gep->getPointerOperand());
if (!ShuffleInst || !ShuffleInst->getMask()->isNullValue() ||
cast<Instruction>(ShuffleInst->getOperand(0))->getOpcode() !=
Instruction::InsertElement)
return false;
Ptr = cast<InsertElementInst>(ShuffleInst->getOperand(0))->getOperand(1);
SelectionDAG& DAG = SDB->DAG;
const TargetLowering &TLI = DAG.getTargetLoweringInfo();
// Check is the Ptr is inside current basic block
// If not, look for the shuffle instruction
if (SDB->findValue(Ptr))
Base = SDB->getValue(Ptr);
else if (SDB->findValue(GEPPtrs)) {
SDValue GEPPtrsVal = SDB->getValue(GEPPtrs);
SDLoc sdl = GEPPtrsVal;
EVT IdxVT = TLI.getVectorIdxTy(DAG.getDataLayout());
Base = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, sdl,
GEPPtrsVal.getValueType().getScalarType(), GEPPtrsVal,
DAG.getConstant(0, sdl, IdxVT));
else if (SDB->findValue(ShuffleInst)) {
SDValue ShuffleNode = SDB->getValue(ShuffleInst);
SDLoc sdl = ShuffleNode;
Base = DAG.getNode(
ISD::EXTRACT_VECTOR_ELT, sdl,
ShuffleNode.getValueType().getScalarType(), ShuffleNode,
DAG.getConstant(0, sdl, TLI.getVectorIdxTy(DAG.getDataLayout())));
SDB->setValue(Ptr, Base);
}
else
return false;
Value *IndexVal = GEP->getOperand(1);
Value *IndexVal = Gep->getOperand(1);
if (SDB->findValue(IndexVal)) {
Index = SDB->getValue(IndexVal);