Remove an iteration pass over the entire scalarmap for each function created
by not allowing integer constants to get into the scalar map in the first place. llvm-svn: 20764
This commit is contained in:
parent
250726ec25
commit
495f00946e
|
@ -82,7 +82,8 @@ namespace {
|
||||||
FunctionCalls(&fc) {
|
FunctionCalls(&fc) {
|
||||||
|
|
||||||
// Create scalar nodes for all pointer arguments...
|
// Create scalar nodes for all pointer arguments...
|
||||||
for (Function::arg_iterator I = f.arg_begin(), E = f.arg_end(); I != E; ++I)
|
for (Function::arg_iterator I = f.arg_begin(), E = f.arg_end();
|
||||||
|
I != E; ++I)
|
||||||
if (isPointerType(I->getType()))
|
if (isPointerType(I->getType()))
|
||||||
getValueDest(*I);
|
getValueDest(*I);
|
||||||
|
|
||||||
|
@ -177,13 +178,6 @@ DSGraph::DSGraph(EquivalenceClasses<GlobalValue*> &ECs, const TargetData &td,
|
||||||
Timer::addPeakMemoryMeasurement();
|
Timer::addPeakMemoryMeasurement();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Remove all integral constants from the scalarmap!
|
|
||||||
for (DSScalarMap::iterator I = ScalarMap.begin(); I != ScalarMap.end();)
|
|
||||||
if (isa<ConstantIntegral>(I->first))
|
|
||||||
ScalarMap.erase(I++);
|
|
||||||
else
|
|
||||||
++I;
|
|
||||||
|
|
||||||
// If there are any constant globals referenced in this function, merge their
|
// If there are any constant globals referenced in this function, merge their
|
||||||
// initializers into the local graph from the globals graph.
|
// initializers into the local graph from the globals graph.
|
||||||
if (ScalarMap.global_begin() != ScalarMap.global_end()) {
|
if (ScalarMap.global_begin() != ScalarMap.global_end()) {
|
||||||
|
@ -228,9 +222,12 @@ DSNodeHandle GraphBuilder::getValueDest(Value &Val) {
|
||||||
N->addGlobal(GV);
|
N->addGlobal(GV);
|
||||||
} else if (Constant *C = dyn_cast<Constant>(V)) {
|
} else if (Constant *C = dyn_cast<Constant>(V)) {
|
||||||
if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C)) {
|
if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C)) {
|
||||||
if (CE->getOpcode() == Instruction::Cast)
|
if (CE->getOpcode() == Instruction::Cast) {
|
||||||
NH = getValueDest(*CE->getOperand(0));
|
if (isa<PointerType>(CE->getOperand(0)->getType()))
|
||||||
else if (CE->getOpcode() == Instruction::GetElementPtr) {
|
NH = getValueDest(*CE->getOperand(0));
|
||||||
|
else
|
||||||
|
NH = createNode()->setUnknownNodeMarker();
|
||||||
|
} else if (CE->getOpcode() == Instruction::GetElementPtr) {
|
||||||
visitGetElementPtrInst(*CE);
|
visitGetElementPtrInst(*CE);
|
||||||
DSScalarMap::iterator I = ScalarMap.find(CE);
|
DSScalarMap::iterator I = ScalarMap.find(CE);
|
||||||
assert(I != ScalarMap.end() && "GEP didn't get processed right?");
|
assert(I != ScalarMap.end() && "GEP didn't get processed right?");
|
||||||
|
@ -244,10 +241,6 @@ DSNodeHandle GraphBuilder::getValueDest(Value &Val) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
return NH;
|
return NH;
|
||||||
|
|
||||||
} else if (ConstantIntegral *CI = dyn_cast<ConstantIntegral>(C)) {
|
|
||||||
// Random constants are unknown mem
|
|
||||||
return NH = createNode()->setUnknownNodeMarker();
|
|
||||||
} else if (isa<UndefValue>(C)) {
|
} else if (isa<UndefValue>(C)) {
|
||||||
ScalarMap.erase(V);
|
ScalarMap.erase(V);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue