maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[TBAAVerifier] Memoize validity of scalar tbaa nodes; NFCI 

llvm-svn: 290711
This commit is contained in:
Sanjoy Das 2016-12-29 15:46:57 +00:00
parent 25478d821b
commit 55f12d9de9
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/include/llvm/IR/Verifier.h
View File

@ -50,6 +50,10 @@ class TBAAVerifier {
typedef std::pair<bool, unsigned> TBAABaseNodeSummary;
DenseMap<MDNode *, TBAABaseNodeSummary> TBAABaseNodes;
/// Maps an alleged scalar TBAA node to a boolean that is true if the said
/// TBAA node is a valid scalar TBAA node or false otherwise.
DenseMap<const MDNode *, bool> TBAAScalarNodes;
/// \name Helper functions used by \c visitTBAAMetadata.
/// @{
MDNode *getFieldNodeFromTBAABaseNode(Instruction &I, MDNode *BaseNode,
@ -57,6 +61,8 @@ class TBAAVerifier {
TBAAVerifier::TBAABaseNodeSummary verifyTBAABaseNode(Instruction &I,
MDNode *BaseNode);
TBAABaseNodeSummary verifyTBAABaseNodeImpl(Instruction &I, MDNode *BaseNode);
bool isValidScalarTBAANode(const MDNode *MD);
/// @}
public:

19
llvm/lib/IR/Verifier.cpp
View File

@ -4655,9 +4655,18 @@ static bool IsScalarTBAANodeImpl(const MDNode *MD,
(IsRootTBAANode(Parent) || IsScalarTBAANodeImpl(Parent, Visited));
}
static bool IsScalarTBAANode(const MDNode *MD) {
bool TBAAVerifier::isValidScalarTBAANode(const MDNode *MD) {
auto ResultIt = TBAAScalarNodes.find(MD);
if (ResultIt != TBAAScalarNodes.end())
return ResultIt->second;
SmallPtrSet<const MDNode *, 4> Visited;
return IsScalarTBAANodeImpl(MD, Visited);
bool Result = IsScalarTBAANodeImpl(MD, Visited);
auto InsertResult = TBAAScalarNodes.insert({MD, Result});
(void)InsertResult;
assert(InsertResult.second && "Just checked!");
return Result;
}
/// Returns the field node at the offset \p Offset in \p BaseNode. Update \p
@ -4735,8 +4744,8 @@ bool TBAAVerifier::visitTBAAMetadata(Instruction &I, MDNode *MD) {
"should be non-null and point to Metadata nodes",
&I, MD, BaseNode, AccessType);
AssertTBAA(IsScalarTBAANode(AccessType), "Access type node must be scalar",
&I, MD, AccessType);
AssertTBAA(isValidScalarTBAANode(AccessType),
"Access type node must be scalar", &I, MD, AccessType);
auto *OffsetCI = mdconst::dyn_extract_or_null<ConstantInt>(MD->getOperand(2));
AssertTBAA(OffsetCI, "Offset must be constant integer", &I, MD);
@ -4764,7 +4773,7 @@ bool TBAAVerifier::visitTBAAMetadata(Instruction &I, MDNode *MD) {
SeenAccessTypeInPath |= BaseNode == AccessType;
if (IsScalarTBAANode(BaseNode) || BaseNode == AccessType)
if (isValidScalarTBAANode(BaseNode) || BaseNode == AccessType)
AssertTBAA(Offset == 0, "Offset not zero at the point of scalar access",
&I, MD, &Offset);