Re-enable "[NFC] Unify guards detection"
rL340921 has been reverted by rL340923 due to linkage dependency from Transform/Utils to Analysis which is not allowed. In this patch this has been fixed, a new utility function moved to Analysis. Differential Revision: https://reviews.llvm.org/D51152 llvm-svn: 341014
This commit is contained in:
parent
a986a31242
commit
3c284bde3f
|
@ -0,0 +1,26 @@
|
|||
//===-- GuardUtils.h - Utils for work with guards ---------------*- C++ -*-===//
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file is distributed under the University of Illinois Open Source
|
||||
// License. See LICENSE.TXT for details.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
// Utils that are used to perform analyzes related to guards and their
|
||||
// conditions.
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#ifndef LLVM_ANALYSIS_GUARDUTILS_H
|
||||
#define LLVM_ANALYSIS_GUARDUTILS_H
|
||||
|
||||
namespace llvm {
|
||||
|
||||
class User;
|
||||
|
||||
/// Returns true iff \p U has semantics of a guard.
|
||||
bool isGuard(const User *U);
|
||||
|
||||
} // llvm
|
||||
|
||||
#endif // LLVM_ANALYSIS_GUARDUTILS_H
|
||||
|
|
@ -13,6 +13,7 @@
|
|||
|
||||
#include "llvm/Analysis/AliasSetTracker.h"
|
||||
#include "llvm/Analysis/AliasAnalysis.h"
|
||||
#include "llvm/Analysis/GuardUtils.h"
|
||||
#include "llvm/Analysis/MemoryLocation.h"
|
||||
#include "llvm/Config/llvm-config.h"
|
||||
#include "llvm/IR/CallSite.h"
|
||||
|
@ -172,8 +173,7 @@ void AliasSet::addUnknownInst(Instruction *I, AliasAnalysis &AA) {
|
|||
// Guards are marked as modifying memory for control flow modelling purposes,
|
||||
// but don't actually modify any specific memory location.
|
||||
using namespace PatternMatch;
|
||||
bool MayWriteMemory = I->mayWriteToMemory() &&
|
||||
!match(I, m_Intrinsic<Intrinsic::experimental_guard>()) &&
|
||||
bool MayWriteMemory = I->mayWriteToMemory() && !isGuard(I) &&
|
||||
!(I->use_empty() && match(I, m_Intrinsic<Intrinsic::invariant_start>()));
|
||||
if (!MayWriteMemory) {
|
||||
Alias = SetMayAlias;
|
||||
|
|
|
@ -30,6 +30,7 @@ add_llvm_library(LLVMAnalysis
|
|||
DominanceFrontier.cpp
|
||||
EHPersonalities.cpp
|
||||
GlobalsModRef.cpp
|
||||
GuardUtils.cpp
|
||||
IVUsers.cpp
|
||||
IndirectCallPromotionAnalysis.cpp
|
||||
InlineCost.cpp
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
//===-- GuardUtils.cpp - Utils for work with guards -------------*- C++ -*-===//
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file is distributed under the University of Illinois Open Source
|
||||
// License. See LICENSE.TXT for details.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
// Utils that are used to perform analyzes related to guards and their
|
||||
// conditions.
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "llvm/Analysis/GuardUtils.h"
|
||||
#include "llvm/IR/PatternMatch.h"
|
||||
|
||||
using namespace llvm;
|
||||
|
||||
bool llvm::isGuard(const User *U) {
|
||||
using namespace llvm::PatternMatch;
|
||||
return match(U, m_Intrinsic<Intrinsic::experimental_guard>());
|
||||
}
|
|
@ -26,6 +26,7 @@
|
|||
#include "llvm/ADT/iterator_range.h"
|
||||
#include "llvm/Analysis/AliasAnalysis.h"
|
||||
#include "llvm/Analysis/AssumptionCache.h"
|
||||
#include "llvm/Analysis/GuardUtils.h"
|
||||
#include "llvm/Analysis/InstructionSimplify.h"
|
||||
#include "llvm/Analysis/Loads.h"
|
||||
#include "llvm/Analysis/LoopInfo.h"
|
||||
|
@ -1902,8 +1903,7 @@ static bool isKnownNonNullFromDominatingCondition(const Value *V,
|
|||
BasicBlockEdge Edge(BI->getParent(), NonNullSuccessor);
|
||||
if (Edge.isSingleEdge() && DT->dominates(Edge, CtxI->getParent()))
|
||||
return true;
|
||||
} else if (Pred == ICmpInst::ICMP_NE &&
|
||||
match(Curr, m_Intrinsic<Intrinsic::experimental_guard>()) &&
|
||||
} else if (Pred == ICmpInst::ICMP_NE && isGuard(Curr) &&
|
||||
DT->dominates(cast<Instruction>(Curr), CtxI)) {
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#include "llvm/ADT/Statistic.h"
|
||||
#include "llvm/Analysis/AssumptionCache.h"
|
||||
#include "llvm/Analysis/GlobalsModRef.h"
|
||||
#include "llvm/Analysis/GuardUtils.h"
|
||||
#include "llvm/Analysis/InstructionSimplify.h"
|
||||
#include "llvm/Analysis/MemorySSA.h"
|
||||
#include "llvm/Analysis/MemorySSAUpdater.h"
|
||||
|
@ -54,6 +55,7 @@
|
|||
#include "llvm/Support/RecyclingAllocator.h"
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
#include "llvm/Transforms/Scalar.h"
|
||||
#include "llvm/Transforms/Utils/GuardUtils.h"
|
||||
#include <cassert>
|
||||
#include <deque>
|
||||
#include <memory>
|
||||
|
@ -863,7 +865,7 @@ bool EarlyCSE::processNode(DomTreeNode *Node) {
|
|||
continue;
|
||||
}
|
||||
|
||||
if (match(Inst, m_Intrinsic<Intrinsic::experimental_guard>())) {
|
||||
if (isGuard(Inst)) {
|
||||
if (auto *CondI =
|
||||
dyn_cast<Instruction>(cast<CallInst>(Inst)->getArgOperand(0))) {
|
||||
if (SimpleValue::canHandle(CondI)) {
|
||||
|
|
|
@ -45,6 +45,7 @@
|
|||
#include "llvm/ADT/DepthFirstIterator.h"
|
||||
#include "llvm/ADT/Statistic.h"
|
||||
#include "llvm/Analysis/BranchProbabilityInfo.h"
|
||||
#include "llvm/Analysis/GuardUtils.h"
|
||||
#include "llvm/Analysis/LoopInfo.h"
|
||||
#include "llvm/Analysis/LoopPass.h"
|
||||
#include "llvm/Analysis/PostDominators.h"
|
||||
|
@ -107,12 +108,6 @@ static void setCondition(Instruction *I, Value *NewCond) {
|
|||
cast<BranchInst>(I)->setCondition(NewCond);
|
||||
}
|
||||
|
||||
// Whether or not the particular instruction \p I is a guard.
|
||||
static bool isGuard(const Instruction *I) {
|
||||
using namespace llvm::PatternMatch;
|
||||
return match(I, m_Intrinsic<Intrinsic::experimental_guard>());
|
||||
}
|
||||
|
||||
// Eliminates the guard instruction properly.
|
||||
static void eliminateGuard(Instruction *GuardInst) {
|
||||
GuardInst->eraseFromParent();
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include "llvm/Analysis/CFG.h"
|
||||
#include "llvm/Analysis/ConstantFolding.h"
|
||||
#include "llvm/Analysis/GlobalsModRef.h"
|
||||
#include "llvm/Analysis/GuardUtils.h"
|
||||
#include "llvm/Analysis/InstructionSimplify.h"
|
||||
#include "llvm/Analysis/LazyValueInfo.h"
|
||||
#include "llvm/Analysis/Loads.h"
|
||||
|
@ -2607,9 +2608,8 @@ bool JumpThreadingPass::ProcessGuards(BasicBlock *BB) {
|
|||
|
||||
if (auto *BI = dyn_cast<BranchInst>(Parent->getTerminator()))
|
||||
for (auto &I : *BB)
|
||||
if (match(&I, m_Intrinsic<Intrinsic::experimental_guard>()))
|
||||
if (ThreadGuard(BB, cast<IntrinsicInst>(&I), BI))
|
||||
return true;
|
||||
if (isGuard(&I) && ThreadGuard(BB, cast<IntrinsicInst>(&I), BI))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -38,6 +38,7 @@
|
|||
#include "llvm/Analysis/CaptureTracking.h"
|
||||
#include "llvm/Analysis/ConstantFolding.h"
|
||||
#include "llvm/Analysis/GlobalsModRef.h"
|
||||
#include "llvm/Analysis/GuardUtils.h"
|
||||
#include "llvm/Analysis/Loads.h"
|
||||
#include "llvm/Analysis/LoopInfo.h"
|
||||
#include "llvm/Analysis/LoopPass.h"
|
||||
|
@ -528,7 +529,7 @@ bool llvm::hoistRegion(DomTreeNode *N, AliasAnalysis *AA, LoopInfo *LI,
|
|||
using namespace PatternMatch;
|
||||
if (((I.use_empty() &&
|
||||
match(&I, m_Intrinsic<Intrinsic::invariant_start>())) ||
|
||||
match(&I, m_Intrinsic<Intrinsic::experimental_guard>())) &&
|
||||
isGuard(&I)) &&
|
||||
IsMustExecute && IsMemoryNotModified &&
|
||||
CurLoop->hasLoopInvariantOperands(&I)) {
|
||||
hoist(I, DT, CurLoop, SafetyInfo, ORE);
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
|
||||
#include "llvm/Transforms/Scalar/LowerGuardIntrinsic.h"
|
||||
#include "llvm/ADT/SmallVector.h"
|
||||
#include "llvm/Analysis/GuardUtils.h"
|
||||
#include "llvm/IR/BasicBlock.h"
|
||||
#include "llvm/IR/Function.h"
|
||||
#include "llvm/IR/InstIterator.h"
|
||||
|
@ -49,10 +50,8 @@ static bool lowerGuardIntrinsic(Function &F) {
|
|||
|
||||
SmallVector<CallInst *, 8> ToLower;
|
||||
for (auto &I : instructions(F))
|
||||
if (auto *CI = dyn_cast<CallInst>(&I))
|
||||
if (auto *F = CI->getCalledFunction())
|
||||
if (F->getIntrinsicID() == Intrinsic::experimental_guard)
|
||||
ToLower.push_back(CI);
|
||||
if (isGuard(&I))
|
||||
ToLower.push_back(cast<CallInst>(&I));
|
||||
|
||||
if (ToLower.empty())
|
||||
return false;
|
||||
|
|
Loading…
Reference in New Issue