[llvm] r202832 - [Modules] Move the TargetFolder into the Analysis library. Historically,
Chandler Carruth
chandlerc at gmail.com
Tue Mar 4 03:59:07 PST 2014
Author: chandlerc
Date: Tue Mar 4 05:59:06 2014
New Revision: 202832
URL: http://llvm.org/viewvc/llvm-project?rev=202832&view=rev
Log:
[Modules] Move the TargetFolder into the Analysis library. Historically,
this would have been required because of the use of DataLayout, but that
has moved into the IR proper. It is still required because this folder
uses the constant folding in the analysis library (which uses the
datalayout) as the more aggressive basis of its folder.
Added:
llvm/trunk/include/llvm/Analysis/TargetFolder.h
- copied, changed from r202827, llvm/trunk/include/llvm/Support/TargetFolder.h
Removed:
llvm/trunk/include/llvm/Support/TargetFolder.h
Modified:
llvm/trunk/include/llvm/Analysis/MemoryBuiltins.h
llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpander.h
llvm/trunk/lib/Transforms/InstCombine/InstCombine.h
llvm/trunk/lib/Transforms/Instrumentation/BoundsChecking.cpp
Modified: llvm/trunk/include/llvm/Analysis/MemoryBuiltins.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/MemoryBuiltins.h?rev=202832&r1=202831&r2=202832&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Analysis/MemoryBuiltins.h (original)
+++ llvm/trunk/include/llvm/Analysis/MemoryBuiltins.h Tue Mar 4 05:59:06 2014
@@ -17,12 +17,12 @@
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallPtrSet.h"
+#include "llvm/Analysis/TargetFolder.h"
#include "llvm/IR/IRBuilder.h"
#include "llvm/IR/Operator.h"
#include "llvm/IR/ValueHandle.h"
#include "llvm/InstVisitor.h"
#include "llvm/Support/DataTypes.h"
-#include "llvm/Support/TargetFolder.h"
namespace llvm {
class CallInst;
Modified: llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpander.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpander.h?rev=202832&r1=202831&r2=202832&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpander.h (original)
+++ llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpander.h Tue Mar 4 05:59:06 2014
@@ -16,9 +16,9 @@
#include "llvm/Analysis/ScalarEvolutionExpressions.h"
#include "llvm/Analysis/ScalarEvolutionNormalization.h"
+#include "llvm/Analysis/TargetFolder.h"
#include "llvm/IR/IRBuilder.h"
#include "llvm/IR/ValueHandle.h"
-#include "llvm/Support/TargetFolder.h"
#include <set>
namespace llvm {
Copied: llvm/trunk/include/llvm/Analysis/TargetFolder.h (from r202827, llvm/trunk/include/llvm/Support/TargetFolder.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/TargetFolder.h?p2=llvm/trunk/include/llvm/Analysis/TargetFolder.h&p1=llvm/trunk/include/llvm/Support/TargetFolder.h&r1=202827&r2=202832&rev=202832&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/TargetFolder.h (original)
+++ llvm/trunk/include/llvm/Analysis/TargetFolder.h Tue Mar 4 05:59:06 2014
@@ -1,4 +1,4 @@
-//====-- llvm/Support/TargetFolder.h - Constant folding helper -*- C++ -*-====//
+//====- TargetFolder.h - Constant folding helper ---------------*- C++ -*-====//
//
// The LLVM Compiler Infrastructure
//
@@ -16,8 +16,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_SUPPORT_TARGETFOLDER_H
-#define LLVM_SUPPORT_TARGETFOLDER_H
+#ifndef LLVM_ANALYSIS_TARGETFOLDER_H
+#define LLVM_ANALYSIS_TARGETFOLDER_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/Analysis/ConstantFolding.h"
Removed: llvm/trunk/include/llvm/Support/TargetFolder.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/TargetFolder.h?rev=202831&view=auto
==============================================================================
--- llvm/trunk/include/llvm/Support/TargetFolder.h (original)
+++ llvm/trunk/include/llvm/Support/TargetFolder.h (removed)
@@ -1,262 +0,0 @@
-//====-- llvm/Support/TargetFolder.h - Constant folding helper -*- C++ -*-====//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines the TargetFolder class, a helper for IRBuilder.
-// It provides IRBuilder with a set of methods for creating constants with
-// target dependent folding, in addition to the same target-independent
-// folding that the ConstantFolder class provides. For general constant
-// creation and folding, use ConstantExpr and the routines in
-// llvm/Analysis/ConstantFolding.h.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_SUPPORT_TARGETFOLDER_H
-#define LLVM_SUPPORT_TARGETFOLDER_H
-
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/Analysis/ConstantFolding.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/InstrTypes.h"
-
-namespace llvm {
-
-class DataLayout;
-
-/// TargetFolder - Create constants with target dependent folding.
-class TargetFolder {
- const DataLayout *DL;
-
- /// Fold - Fold the constant using target specific information.
- Constant *Fold(Constant *C) const {
- if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C))
- if (Constant *CF = ConstantFoldConstantExpression(CE, DL))
- return CF;
- return C;
- }
-
-public:
- explicit TargetFolder(const DataLayout *DL) : DL(DL) {}
-
- //===--------------------------------------------------------------------===//
- // Binary Operators
- //===--------------------------------------------------------------------===//
-
- Constant *CreateAdd(Constant *LHS, Constant *RHS,
- bool HasNUW = false, bool HasNSW = false) const {
- return Fold(ConstantExpr::getAdd(LHS, RHS, HasNUW, HasNSW));
- }
- Constant *CreateFAdd(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getFAdd(LHS, RHS));
- }
- Constant *CreateSub(Constant *LHS, Constant *RHS,
- bool HasNUW = false, bool HasNSW = false) const {
- return Fold(ConstantExpr::getSub(LHS, RHS, HasNUW, HasNSW));
- }
- Constant *CreateFSub(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getFSub(LHS, RHS));
- }
- Constant *CreateMul(Constant *LHS, Constant *RHS,
- bool HasNUW = false, bool HasNSW = false) const {
- return Fold(ConstantExpr::getMul(LHS, RHS, HasNUW, HasNSW));
- }
- Constant *CreateFMul(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getFMul(LHS, RHS));
- }
- Constant *CreateUDiv(Constant *LHS, Constant *RHS, bool isExact = false)const{
- return Fold(ConstantExpr::getUDiv(LHS, RHS, isExact));
- }
- Constant *CreateSDiv(Constant *LHS, Constant *RHS, bool isExact = false)const{
- return Fold(ConstantExpr::getSDiv(LHS, RHS, isExact));
- }
- Constant *CreateFDiv(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getFDiv(LHS, RHS));
- }
- Constant *CreateURem(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getURem(LHS, RHS));
- }
- Constant *CreateSRem(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getSRem(LHS, RHS));
- }
- Constant *CreateFRem(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getFRem(LHS, RHS));
- }
- Constant *CreateShl(Constant *LHS, Constant *RHS,
- bool HasNUW = false, bool HasNSW = false) const {
- return Fold(ConstantExpr::getShl(LHS, RHS, HasNUW, HasNSW));
- }
- Constant *CreateLShr(Constant *LHS, Constant *RHS, bool isExact = false)const{
- return Fold(ConstantExpr::getLShr(LHS, RHS, isExact));
- }
- Constant *CreateAShr(Constant *LHS, Constant *RHS, bool isExact = false)const{
- return Fold(ConstantExpr::getAShr(LHS, RHS, isExact));
- }
- Constant *CreateAnd(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getAnd(LHS, RHS));
- }
- Constant *CreateOr(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getOr(LHS, RHS));
- }
- Constant *CreateXor(Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::getXor(LHS, RHS));
- }
-
- Constant *CreateBinOp(Instruction::BinaryOps Opc,
- Constant *LHS, Constant *RHS) const {
- return Fold(ConstantExpr::get(Opc, LHS, RHS));
- }
-
- //===--------------------------------------------------------------------===//
- // Unary Operators
- //===--------------------------------------------------------------------===//
-
- Constant *CreateNeg(Constant *C,
- bool HasNUW = false, bool HasNSW = false) const {
- return Fold(ConstantExpr::getNeg(C, HasNUW, HasNSW));
- }
- Constant *CreateFNeg(Constant *C) const {
- return Fold(ConstantExpr::getFNeg(C));
- }
- Constant *CreateNot(Constant *C) const {
- return Fold(ConstantExpr::getNot(C));
- }
-
- //===--------------------------------------------------------------------===//
- // Memory Instructions
- //===--------------------------------------------------------------------===//
-
- Constant *CreateGetElementPtr(Constant *C,
- ArrayRef<Constant *> IdxList) const {
- return Fold(ConstantExpr::getGetElementPtr(C, IdxList));
- }
- Constant *CreateGetElementPtr(Constant *C, Constant *Idx) const {
- // This form of the function only exists to avoid ambiguous overload
- // warnings about whether to convert Idx to ArrayRef<Constant *> or
- // ArrayRef<Value *>.
- return Fold(ConstantExpr::getGetElementPtr(C, Idx));
- }
- Constant *CreateGetElementPtr(Constant *C,
- ArrayRef<Value *> IdxList) const {
- return Fold(ConstantExpr::getGetElementPtr(C, IdxList));
- }
-
- Constant *CreateInBoundsGetElementPtr(Constant *C,
- ArrayRef<Constant *> IdxList) const {
- return Fold(ConstantExpr::getInBoundsGetElementPtr(C, IdxList));
- }
- Constant *CreateInBoundsGetElementPtr(Constant *C, Constant *Idx) const {
- // This form of the function only exists to avoid ambiguous overload
- // warnings about whether to convert Idx to ArrayRef<Constant *> or
- // ArrayRef<Value *>.
- return Fold(ConstantExpr::getInBoundsGetElementPtr(C, Idx));
- }
- Constant *CreateInBoundsGetElementPtr(Constant *C,
- ArrayRef<Value *> IdxList) const {
- return Fold(ConstantExpr::getInBoundsGetElementPtr(C, IdxList));
- }
-
- //===--------------------------------------------------------------------===//
- // Cast/Conversion Operators
- //===--------------------------------------------------------------------===//
-
- Constant *CreateCast(Instruction::CastOps Op, Constant *C,
- Type *DestTy) const {
- if (C->getType() == DestTy)
- return C; // avoid calling Fold
- return Fold(ConstantExpr::getCast(Op, C, DestTy));
- }
- Constant *CreateIntCast(Constant *C, Type *DestTy,
- bool isSigned) const {
- if (C->getType() == DestTy)
- return C; // avoid calling Fold
- return Fold(ConstantExpr::getIntegerCast(C, DestTy, isSigned));
- }
- Constant *CreatePointerCast(Constant *C, Type *DestTy) const {
- if (C->getType() == DestTy)
- return C; // avoid calling Fold
- return Fold(ConstantExpr::getPointerCast(C, DestTy));
- }
- Constant *CreateFPCast(Constant *C, Type *DestTy) const {
- if (C->getType() == DestTy)
- return C; // avoid calling Fold
- return Fold(ConstantExpr::getFPCast(C, DestTy));
- }
- Constant *CreateBitCast(Constant *C, Type *DestTy) const {
- return CreateCast(Instruction::BitCast, C, DestTy);
- }
- Constant *CreateIntToPtr(Constant *C, Type *DestTy) const {
- return CreateCast(Instruction::IntToPtr, C, DestTy);
- }
- Constant *CreatePtrToInt(Constant *C, Type *DestTy) const {
- return CreateCast(Instruction::PtrToInt, C, DestTy);
- }
- Constant *CreateZExtOrBitCast(Constant *C, Type *DestTy) const {
- if (C->getType() == DestTy)
- return C; // avoid calling Fold
- return Fold(ConstantExpr::getZExtOrBitCast(C, DestTy));
- }
- Constant *CreateSExtOrBitCast(Constant *C, Type *DestTy) const {
- if (C->getType() == DestTy)
- return C; // avoid calling Fold
- return Fold(ConstantExpr::getSExtOrBitCast(C, DestTy));
- }
- Constant *CreateTruncOrBitCast(Constant *C, Type *DestTy) const {
- if (C->getType() == DestTy)
- return C; // avoid calling Fold
- return Fold(ConstantExpr::getTruncOrBitCast(C, DestTy));
- }
-
- //===--------------------------------------------------------------------===//
- // Compare Instructions
- //===--------------------------------------------------------------------===//
-
- Constant *CreateICmp(CmpInst::Predicate P, Constant *LHS,
- Constant *RHS) const {
- return Fold(ConstantExpr::getCompare(P, LHS, RHS));
- }
- Constant *CreateFCmp(CmpInst::Predicate P, Constant *LHS,
- Constant *RHS) const {
- return Fold(ConstantExpr::getCompare(P, LHS, RHS));
- }
-
- //===--------------------------------------------------------------------===//
- // Other Instructions
- //===--------------------------------------------------------------------===//
-
- Constant *CreateSelect(Constant *C, Constant *True, Constant *False) const {
- return Fold(ConstantExpr::getSelect(C, True, False));
- }
-
- Constant *CreateExtractElement(Constant *Vec, Constant *Idx) const {
- return Fold(ConstantExpr::getExtractElement(Vec, Idx));
- }
-
- Constant *CreateInsertElement(Constant *Vec, Constant *NewElt,
- Constant *Idx) const {
- return Fold(ConstantExpr::getInsertElement(Vec, NewElt, Idx));
- }
-
- Constant *CreateShuffleVector(Constant *V1, Constant *V2,
- Constant *Mask) const {
- return Fold(ConstantExpr::getShuffleVector(V1, V2, Mask));
- }
-
- Constant *CreateExtractValue(Constant *Agg,
- ArrayRef<unsigned> IdxList) const {
- return Fold(ConstantExpr::getExtractValue(Agg, IdxList));
- }
-
- Constant *CreateInsertValue(Constant *Agg, Constant *Val,
- ArrayRef<unsigned> IdxList) const {
- return Fold(ConstantExpr::getInsertValue(Agg, Val, IdxList));
- }
-};
-
-}
-
-#endif
Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombine.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombine.h?rev=202832&r1=202831&r2=202832&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/InstCombine/InstCombine.h (original)
+++ llvm/trunk/lib/Transforms/InstCombine/InstCombine.h Tue Mar 4 05:59:06 2014
@@ -11,13 +11,13 @@
#define INSTCOMBINE_INSTCOMBINE_H
#include "InstCombineWorklist.h"
+#include "llvm/Analysis/TargetFolder.h"
#include "llvm/Analysis/ValueTracking.h"
#include "llvm/IR/IRBuilder.h"
#include "llvm/IR/IntrinsicInst.h"
#include "llvm/IR/Operator.h"
#include "llvm/InstVisitor.h"
#include "llvm/Pass.h"
-#include "llvm/Support/TargetFolder.h"
#include "llvm/Transforms/Utils/SimplifyLibCalls.h"
namespace llvm {
Modified: llvm/trunk/lib/Transforms/Instrumentation/BoundsChecking.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/BoundsChecking.cpp?rev=202832&r1=202831&r2=202832&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/BoundsChecking.cpp (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/BoundsChecking.cpp Tue Mar 4 05:59:06 2014
@@ -16,6 +16,7 @@
#include "llvm/Transforms/Instrumentation.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/Analysis/MemoryBuiltins.h"
+#include "llvm/Analysis/TargetFolder.h"
#include "llvm/IR/DataLayout.h"
#include "llvm/IR/IRBuilder.h"
#include "llvm/IR/InstIterator.h"
@@ -23,7 +24,6 @@
#include "llvm/Pass.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
-#include "llvm/Support/TargetFolder.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetLibraryInfo.h"
using namespace llvm;
More information about the llvm-commits
mailing list