X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FCodeGen%2FIntrinsicLowering.cpp;h=5b4de27b8a9db6ca2ad17016329d0788cbc2faa3;hb=236aa8a5032282d8793b537c0f3f7ffb381a83d4;hp=d92ee3fbbc1fa43d4b3ca2f6b3373c77ad880d5b;hpb=52eec548206d0b135b55ba52dd0e82e978f15ae5;p=oota-llvm.git diff --git a/lib/CodeGen/IntrinsicLowering.cpp b/lib/CodeGen/IntrinsicLowering.cpp index d92ee3fbbc1..5b4de27b8a9 100644 --- a/lib/CodeGen/IntrinsicLowering.cpp +++ b/lib/CodeGen/IntrinsicLowering.cpp @@ -2,8 +2,8 @@ // // The LLVM Compiler Infrastructure // -// This file was developed by the LLVM research group and is distributed under -// the University of Illinois Open Source License. See LICENSE.TXT for details. +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. // //===----------------------------------------------------------------------===// // @@ -20,6 +20,7 @@ #include "llvm/Support/Streams.h" #include "llvm/Target/TargetData.h" #include "llvm/ADT/SmallVector.h" +#include "llvm/ADT/STLExtras.h" using namespace llvm; template @@ -33,6 +34,28 @@ static void EnsureFunctionExists(Module &M, const char *Name, M.getOrInsertFunction(Name, FunctionType::get(RetTy, ParamTys, false)); } +static void EnsureFPIntrinsicsExist(Module &M, Function *Fn, + const char *FName, + const char *DName, const char *LDName) { + // Insert definitions for all the floating point types. + switch((int)Fn->arg_begin()->getType()->getTypeID()) { + case Type::FloatTyID: + EnsureFunctionExists(M, FName, Fn->arg_begin(), Fn->arg_end(), + Type::FloatTy); + break; + case Type::DoubleTyID: + EnsureFunctionExists(M, DName, Fn->arg_begin(), Fn->arg_end(), + Type::DoubleTy); + break; + case Type::X86_FP80TyID: + case Type::FP128TyID: + case Type::PPC_FP128TyID: + EnsureFunctionExists(M, LDName, Fn->arg_begin(), Fn->arg_end(), + Fn->arg_begin()->getType()); + break; + } +} + /// ReplaceCallWith - This function is used when we want to lower an intrinsic /// call to a call of an external function. This handles hard cases such as /// when there was already a prototype for the external function, and if that @@ -54,8 +77,8 @@ static CallInst *ReplaceCallWith(const char *NewFn, CallInst *CI, } SmallVector Args(ArgBegin, ArgEnd); - CallInst *NewCI = new CallInst(FCache, Args.begin(), Args.end(), - CI->getName(), CI); + CallInst *NewCI = CallInst::Create(FCache, Args.begin(), Args.end(), + CI->getName(), CI); if (!CI->use_empty()) CI->replaceAllUsesWith(NewCI); return NewCI; @@ -78,34 +101,50 @@ void IntrinsicLowering::AddPrototypes(Module &M) { EnsureFunctionExists(M, "abort", I->arg_end(), I->arg_end(), Type::VoidTy); break; - case Intrinsic::memcpy_i32: - case Intrinsic::memcpy_i64: - M.getOrInsertFunction("memcpy", PointerType::get(Type::Int8Ty), - PointerType::get(Type::Int8Ty), - PointerType::get(Type::Int8Ty), + case Intrinsic::memcpy: + M.getOrInsertFunction("memcpy", PointerType::getUnqual(Type::Int8Ty), + PointerType::getUnqual(Type::Int8Ty), + PointerType::getUnqual(Type::Int8Ty), TD.getIntPtrType(), (Type *)0); break; - case Intrinsic::memmove_i32: - case Intrinsic::memmove_i64: - M.getOrInsertFunction("memmove", PointerType::get(Type::Int8Ty), - PointerType::get(Type::Int8Ty), - PointerType::get(Type::Int8Ty), + case Intrinsic::memmove: + M.getOrInsertFunction("memmove", PointerType::getUnqual(Type::Int8Ty), + PointerType::getUnqual(Type::Int8Ty), + PointerType::getUnqual(Type::Int8Ty), TD.getIntPtrType(), (Type *)0); break; - case Intrinsic::memset_i32: - case Intrinsic::memset_i64: - M.getOrInsertFunction("memset", PointerType::get(Type::Int8Ty), - PointerType::get(Type::Int8Ty), Type::Int32Ty, + case Intrinsic::memset: + M.getOrInsertFunction("memset", PointerType::getUnqual(Type::Int8Ty), + PointerType::getUnqual(Type::Int8Ty), + Type::Int32Ty, TD.getIntPtrType(), (Type *)0); break; - case Intrinsic::sqrt_f32: - case Intrinsic::sqrt_f64: - if(I->arg_begin()->getType() == Type::FloatTy) - EnsureFunctionExists(M, "sqrtf", I->arg_begin(), I->arg_end(), - Type::FloatTy); - else - EnsureFunctionExists(M, "sqrt", I->arg_begin(), I->arg_end(), - Type::DoubleTy); + case Intrinsic::sqrt: + EnsureFPIntrinsicsExist(M, I, "sqrtf", "sqrt", "sqrtl"); + break; + case Intrinsic::sin: + EnsureFPIntrinsicsExist(M, I, "sinf", "sin", "sinl"); + break; + case Intrinsic::cos: + EnsureFPIntrinsicsExist(M, I, "cosf", "cos", "cosl"); + break; + case Intrinsic::pow: + EnsureFPIntrinsicsExist(M, I, "powf", "pow", "powl"); + break; + case Intrinsic::log: + EnsureFPIntrinsicsExist(M, I, "logf", "log", "logl"); + break; + case Intrinsic::log2: + EnsureFPIntrinsicsExist(M, I, "log2f", "log2", "log2l"); + break; + case Intrinsic::log10: + EnsureFPIntrinsicsExist(M, I, "log10f", "log10", "log10l"); + break; + case Intrinsic::exp: + EnsureFPIntrinsicsExist(M, I, "expf", "exp", "expl"); + break; + case Intrinsic::exp2: + EnsureFPIntrinsicsExist(M, I, "exp2f", "exp2", "exp2l"); break; } } @@ -120,76 +159,76 @@ static Value *LowerBSWAP(Value *V, Instruction *IP) { switch(BitSize) { default: assert(0 && "Unhandled type size of value to byteswap!"); case 16: { - Value *Tmp1 = BinaryOperator::createShl(V, + Value *Tmp1 = BinaryOperator::CreateShl(V, ConstantInt::get(V->getType(),8),"bswap.2",IP); - Value *Tmp2 = BinaryOperator::createLShr(V, + Value *Tmp2 = BinaryOperator::CreateLShr(V, ConstantInt::get(V->getType(),8),"bswap.1",IP); - V = BinaryOperator::createOr(Tmp1, Tmp2, "bswap.i16", IP); + V = BinaryOperator::CreateOr(Tmp1, Tmp2, "bswap.i16", IP); break; } case 32: { - Value *Tmp4 = BinaryOperator::createShl(V, + Value *Tmp4 = BinaryOperator::CreateShl(V, ConstantInt::get(V->getType(),24),"bswap.4", IP); - Value *Tmp3 = BinaryOperator::createShl(V, + Value *Tmp3 = BinaryOperator::CreateShl(V, ConstantInt::get(V->getType(),8),"bswap.3",IP); - Value *Tmp2 = BinaryOperator::createLShr(V, + Value *Tmp2 = BinaryOperator::CreateLShr(V, ConstantInt::get(V->getType(),8),"bswap.2",IP); - Value *Tmp1 = BinaryOperator::createLShr(V, + Value *Tmp1 = BinaryOperator::CreateLShr(V, ConstantInt::get(V->getType(),24),"bswap.1", IP); - Tmp3 = BinaryOperator::createAnd(Tmp3, + Tmp3 = BinaryOperator::CreateAnd(Tmp3, ConstantInt::get(Type::Int32Ty, 0xFF0000), "bswap.and3", IP); - Tmp2 = BinaryOperator::createAnd(Tmp2, + Tmp2 = BinaryOperator::CreateAnd(Tmp2, ConstantInt::get(Type::Int32Ty, 0xFF00), "bswap.and2", IP); - Tmp4 = BinaryOperator::createOr(Tmp4, Tmp3, "bswap.or1", IP); - Tmp2 = BinaryOperator::createOr(Tmp2, Tmp1, "bswap.or2", IP); - V = BinaryOperator::createOr(Tmp4, Tmp2, "bswap.i32", IP); + Tmp4 = BinaryOperator::CreateOr(Tmp4, Tmp3, "bswap.or1", IP); + Tmp2 = BinaryOperator::CreateOr(Tmp2, Tmp1, "bswap.or2", IP); + V = BinaryOperator::CreateOr(Tmp4, Tmp2, "bswap.i32", IP); break; } case 64: { - Value *Tmp8 = BinaryOperator::createShl(V, + Value *Tmp8 = BinaryOperator::CreateShl(V, ConstantInt::get(V->getType(),56),"bswap.8", IP); - Value *Tmp7 = BinaryOperator::createShl(V, + Value *Tmp7 = BinaryOperator::CreateShl(V, ConstantInt::get(V->getType(),40),"bswap.7", IP); - Value *Tmp6 = BinaryOperator::createShl(V, + Value *Tmp6 = BinaryOperator::CreateShl(V, ConstantInt::get(V->getType(),24),"bswap.6", IP); - Value *Tmp5 = BinaryOperator::createShl(V, + Value *Tmp5 = BinaryOperator::CreateShl(V, ConstantInt::get(V->getType(),8),"bswap.5", IP); - Value* Tmp4 = BinaryOperator::createLShr(V, + Value* Tmp4 = BinaryOperator::CreateLShr(V, ConstantInt::get(V->getType(),8),"bswap.4", IP); - Value* Tmp3 = BinaryOperator::createLShr(V, + Value* Tmp3 = BinaryOperator::CreateLShr(V, ConstantInt::get(V->getType(),24),"bswap.3", IP); - Value* Tmp2 = BinaryOperator::createLShr(V, + Value* Tmp2 = BinaryOperator::CreateLShr(V, ConstantInt::get(V->getType(),40),"bswap.2", IP); - Value* Tmp1 = BinaryOperator::createLShr(V, + Value* Tmp1 = BinaryOperator::CreateLShr(V, ConstantInt::get(V->getType(),56),"bswap.1", IP); - Tmp7 = BinaryOperator::createAnd(Tmp7, + Tmp7 = BinaryOperator::CreateAnd(Tmp7, ConstantInt::get(Type::Int64Ty, 0xFF000000000000ULL), "bswap.and7", IP); - Tmp6 = BinaryOperator::createAnd(Tmp6, + Tmp6 = BinaryOperator::CreateAnd(Tmp6, ConstantInt::get(Type::Int64Ty, 0xFF0000000000ULL), "bswap.and6", IP); - Tmp5 = BinaryOperator::createAnd(Tmp5, + Tmp5 = BinaryOperator::CreateAnd(Tmp5, ConstantInt::get(Type::Int64Ty, 0xFF00000000ULL), "bswap.and5", IP); - Tmp4 = BinaryOperator::createAnd(Tmp4, + Tmp4 = BinaryOperator::CreateAnd(Tmp4, ConstantInt::get(Type::Int64Ty, 0xFF000000ULL), "bswap.and4", IP); - Tmp3 = BinaryOperator::createAnd(Tmp3, + Tmp3 = BinaryOperator::CreateAnd(Tmp3, ConstantInt::get(Type::Int64Ty, 0xFF0000ULL), "bswap.and3", IP); - Tmp2 = BinaryOperator::createAnd(Tmp2, + Tmp2 = BinaryOperator::CreateAnd(Tmp2, ConstantInt::get(Type::Int64Ty, 0xFF00ULL), "bswap.and2", IP); - Tmp8 = BinaryOperator::createOr(Tmp8, Tmp7, "bswap.or1", IP); - Tmp6 = BinaryOperator::createOr(Tmp6, Tmp5, "bswap.or2", IP); - Tmp4 = BinaryOperator::createOr(Tmp4, Tmp3, "bswap.or3", IP); - Tmp2 = BinaryOperator::createOr(Tmp2, Tmp1, "bswap.or4", IP); - Tmp8 = BinaryOperator::createOr(Tmp8, Tmp6, "bswap.or5", IP); - Tmp4 = BinaryOperator::createOr(Tmp4, Tmp2, "bswap.or6", IP); - V = BinaryOperator::createOr(Tmp8, Tmp4, "bswap.i64", IP); + Tmp8 = BinaryOperator::CreateOr(Tmp8, Tmp7, "bswap.or1", IP); + Tmp6 = BinaryOperator::CreateOr(Tmp6, Tmp5, "bswap.or2", IP); + Tmp4 = BinaryOperator::CreateOr(Tmp4, Tmp3, "bswap.or3", IP); + Tmp2 = BinaryOperator::CreateOr(Tmp2, Tmp1, "bswap.or4", IP); + Tmp8 = BinaryOperator::CreateOr(Tmp8, Tmp6, "bswap.or5", IP); + Tmp4 = BinaryOperator::CreateOr(Tmp4, Tmp2, "bswap.or6", IP); + V = BinaryOperator::CreateOr(Tmp8, Tmp4, "bswap.i64", IP); break; } } @@ -216,22 +255,22 @@ static Value *LowerCTPOP(Value *V, Instruction *IP) { for (unsigned i = 1, ct = 0; i < (BitSize>64 ? 64 : BitSize); i <<= 1, ++ct) { Value *MaskCst = ConstantInt::get(V->getType(), MaskValues[ct]); - Value *LHS = BinaryOperator::createAnd( + Value *LHS = BinaryOperator::CreateAnd( PartValue, MaskCst, "cppop.and1", IP); - Value *VShift = BinaryOperator::createLShr(PartValue, + Value *VShift = BinaryOperator::CreateLShr(PartValue, ConstantInt::get(V->getType(), i), "ctpop.sh", IP); - Value *RHS = BinaryOperator::createAnd(VShift, MaskCst, "cppop.and2", IP); - PartValue = BinaryOperator::createAdd(LHS, RHS, "ctpop.step", IP); + Value *RHS = BinaryOperator::CreateAnd(VShift, MaskCst, "cppop.and2", IP); + PartValue = BinaryOperator::CreateAdd(LHS, RHS, "ctpop.step", IP); } - Count = BinaryOperator::createAdd(PartValue, Count, "ctpop.part", IP); + Count = BinaryOperator::CreateAdd(PartValue, Count, "ctpop.part", IP); if (BitSize > 64) { - V = BinaryOperator::createLShr(V, ConstantInt::get(V->getType(), 64), + V = BinaryOperator::CreateLShr(V, ConstantInt::get(V->getType(), 64), "ctpop.part.sh", IP); BitSize -= 64; } } - return CastInst::createIntegerCast(Count, Type::Int32Ty, false, "ctpop", IP); + return Count; } /// LowerCTLZ - Emit the code to lower ctlz of V before the specified @@ -241,11 +280,11 @@ static Value *LowerCTLZ(Value *V, Instruction *IP) { unsigned BitSize = V->getType()->getPrimitiveSizeInBits(); for (unsigned i = 1; i < BitSize; i <<= 1) { Value *ShVal = ConstantInt::get(V->getType(), i); - ShVal = BinaryOperator::createLShr(V, ShVal, "ctlz.sh", IP); - V = BinaryOperator::createOr(V, ShVal, "ctlz.step", IP); + ShVal = BinaryOperator::CreateLShr(V, ShVal, "ctlz.sh", IP); + V = BinaryOperator::CreateOr(V, ShVal, "ctlz.step", IP); } - V = BinaryOperator::createNot(V, "", IP); + V = BinaryOperator::CreateNot(V, "", IP); return LowerCTPOP(V, IP); } @@ -286,26 +325,26 @@ static Instruction *LowerPartSelect(CallInst *CI) { Function::arg_iterator args = F->arg_begin(); Value* Val = args++; Val->setName("Val"); Value* Lo = args++; Lo->setName("Lo"); - Value* Hi = args++; Hi->setName("High"); + Value* Hi = args++; Hi->setName("High"); // We want to select a range of bits here such that [Hi, Lo] is shifted // down to the low bits. However, it is quite possible that Hi is smaller // than Lo in which case the bits have to be reversed. // Create the blocks we will need for the two cases (forward, reverse) - BasicBlock* CurBB = new BasicBlock("entry", F); - BasicBlock *RevSize = new BasicBlock("revsize", CurBB->getParent()); - BasicBlock *FwdSize = new BasicBlock("fwdsize", CurBB->getParent()); - BasicBlock *Compute = new BasicBlock("compute", CurBB->getParent()); - BasicBlock *Reverse = new BasicBlock("reverse", CurBB->getParent()); - BasicBlock *RsltBlk = new BasicBlock("result", CurBB->getParent()); + BasicBlock* CurBB = BasicBlock::Create("entry", F); + BasicBlock *RevSize = BasicBlock::Create("revsize", CurBB->getParent()); + BasicBlock *FwdSize = BasicBlock::Create("fwdsize", CurBB->getParent()); + BasicBlock *Compute = BasicBlock::Create("compute", CurBB->getParent()); + BasicBlock *Reverse = BasicBlock::Create("reverse", CurBB->getParent()); + BasicBlock *RsltBlk = BasicBlock::Create("result", CurBB->getParent()); // Cast Hi and Lo to the size of Val so the widths are all the same if (Hi->getType() != Val->getType()) - Hi = CastInst::createIntegerCast(Hi, Val->getType(), false, + Hi = CastInst::CreateIntegerCast(Hi, Val->getType(), false, "tmp", CurBB); if (Lo->getType() != Val->getType()) - Lo = CastInst::createIntegerCast(Lo, Val->getType(), false, + Lo = CastInst::CreateIntegerCast(Lo, Val->getType(), false, "tmp", CurBB); // Compute a few things that both cases will need, up front. @@ -316,17 +355,17 @@ static Instruction *LowerPartSelect(CallInst *CI) { // Compare the Hi and Lo bit positions. This is used to determine // which case we have (forward or reverse) ICmpInst *Cmp = new ICmpInst(ICmpInst::ICMP_ULT, Hi, Lo, "less",CurBB); - new BranchInst(RevSize, FwdSize, Cmp, CurBB); + BranchInst::Create(RevSize, FwdSize, Cmp, CurBB); // First, copmute the number of bits in the forward case. Instruction* FBitSize = - BinaryOperator::createSub(Hi, Lo,"fbits", FwdSize); - new BranchInst(Compute, FwdSize); + BinaryOperator::CreateSub(Hi, Lo,"fbits", FwdSize); + BranchInst::Create(Compute, FwdSize); // Second, compute the number of bits in the reverse case. Instruction* RBitSize = - BinaryOperator::createSub(Lo, Hi, "rbits", RevSize); - new BranchInst(Compute, RevSize); + BinaryOperator::CreateSub(Lo, Hi, "rbits", RevSize); + BranchInst::Create(Compute, RevSize); // Now, compute the bit range. Start by getting the bitsize and the shift // amount (either Hi or Lo) from PHI nodes. Then we compute a mask for @@ -336,83 +375,83 @@ static Instruction *LowerPartSelect(CallInst *CI) { // reversed. // Get the BitSize from one of the two subtractions - PHINode *BitSize = new PHINode(Val->getType(), "bits", Compute); + PHINode *BitSize = PHINode::Create(Val->getType(), "bits", Compute); BitSize->reserveOperandSpace(2); BitSize->addIncoming(FBitSize, FwdSize); BitSize->addIncoming(RBitSize, RevSize); // Get the ShiftAmount as the smaller of Hi/Lo - PHINode *ShiftAmt = new PHINode(Val->getType(), "shiftamt", Compute); + PHINode *ShiftAmt = PHINode::Create(Val->getType(), "shiftamt", Compute); ShiftAmt->reserveOperandSpace(2); ShiftAmt->addIncoming(Lo, FwdSize); ShiftAmt->addIncoming(Hi, RevSize); // Increment the bit size Instruction *BitSizePlusOne = - BinaryOperator::createAdd(BitSize, One, "bits", Compute); + BinaryOperator::CreateAdd(BitSize, One, "bits", Compute); // Create a Mask to zero out the high order bits. Instruction* Mask = - BinaryOperator::createShl(AllOnes, BitSizePlusOne, "mask", Compute); - Mask = BinaryOperator::createNot(Mask, "mask", Compute); + BinaryOperator::CreateShl(AllOnes, BitSizePlusOne, "mask", Compute); + Mask = BinaryOperator::CreateNot(Mask, "mask", Compute); // Shift the bits down and apply the mask Instruction* FRes = - BinaryOperator::createLShr(Val, ShiftAmt, "fres", Compute); - FRes = BinaryOperator::createAnd(FRes, Mask, "fres", Compute); - new BranchInst(Reverse, RsltBlk, Cmp, Compute); + BinaryOperator::CreateLShr(Val, ShiftAmt, "fres", Compute); + FRes = BinaryOperator::CreateAnd(FRes, Mask, "fres", Compute); + BranchInst::Create(Reverse, RsltBlk, Cmp, Compute); // In the Reverse block we have the mask already in FRes but we must reverse // it by shifting FRes bits right and putting them in RRes by shifting them // in from left. // First set up our loop counters - PHINode *Count = new PHINode(Val->getType(), "count", Reverse); + PHINode *Count = PHINode::Create(Val->getType(), "count", Reverse); Count->reserveOperandSpace(2); Count->addIncoming(BitSizePlusOne, Compute); // Next, get the value that we are shifting. - PHINode *BitsToShift = new PHINode(Val->getType(), "val", Reverse); + PHINode *BitsToShift = PHINode::Create(Val->getType(), "val", Reverse); BitsToShift->reserveOperandSpace(2); BitsToShift->addIncoming(FRes, Compute); // Finally, get the result of the last computation - PHINode *RRes = new PHINode(Val->getType(), "rres", Reverse); + PHINode *RRes = PHINode::Create(Val->getType(), "rres", Reverse); RRes->reserveOperandSpace(2); RRes->addIncoming(Zero, Compute); // Decrement the counter - Instruction *Decr = BinaryOperator::createSub(Count, One, "decr", Reverse); + Instruction *Decr = BinaryOperator::CreateSub(Count, One, "decr", Reverse); Count->addIncoming(Decr, Reverse); // Compute the Bit that we want to move Instruction *Bit = - BinaryOperator::createAnd(BitsToShift, One, "bit", Reverse); + BinaryOperator::CreateAnd(BitsToShift, One, "bit", Reverse); // Compute the new value for next iteration. Instruction *NewVal = - BinaryOperator::createLShr(BitsToShift, One, "rshift", Reverse); + BinaryOperator::CreateLShr(BitsToShift, One, "rshift", Reverse); BitsToShift->addIncoming(NewVal, Reverse); // Shift the bit into the low bits of the result. Instruction *NewRes = - BinaryOperator::createShl(RRes, One, "lshift", Reverse); - NewRes = BinaryOperator::createOr(NewRes, Bit, "addbit", Reverse); + BinaryOperator::CreateShl(RRes, One, "lshift", Reverse); + NewRes = BinaryOperator::CreateOr(NewRes, Bit, "addbit", Reverse); RRes->addIncoming(NewRes, Reverse); // Terminate loop if we've moved all the bits. ICmpInst *Cond = new ICmpInst(ICmpInst::ICMP_EQ, Decr, Zero, "cond", Reverse); - new BranchInst(RsltBlk, Reverse, Cond, Reverse); + BranchInst::Create(RsltBlk, Reverse, Cond, Reverse); // Finally, in the result block, select one of the two results with a PHI // node and return the result; CurBB = RsltBlk; - PHINode *BitSelect = new PHINode(Val->getType(), "part_select", CurBB); + PHINode *BitSelect = PHINode::Create(Val->getType(), "part_select", CurBB); BitSelect->reserveOperandSpace(2); BitSelect->addIncoming(FRes, Compute); BitSelect->addIncoming(NewRes, Reverse); - new ReturnInst(BitSelect, CurBB); + ReturnInst::Create(BitSelect, CurBB); } // Return a call to the implementation function @@ -421,7 +460,7 @@ static Instruction *LowerPartSelect(CallInst *CI) { CI->getOperand(2), CI->getOperand(3) }; - return new CallInst(F, Args, Args+sizeof(Args)/sizeof(Args[0]), CI->getName(), CI); + return CallInst::Create(F, Args, array_endof(Args), CI->getName(), CI); } /// Convert the llvm.part.set.iX.iY.iZ intrinsic. This intrinsic takes @@ -478,44 +517,46 @@ static Instruction *LowerPartSet(CallInst *CI) { ConstantInt* ValZero = ConstantInt::get(ValTy, 0); // Basic blocks we fill in below. - BasicBlock* entry = new BasicBlock("entry", F, 0); - BasicBlock* large = new BasicBlock("large", F, 0); - BasicBlock* small = new BasicBlock("small", F, 0); - BasicBlock* reverse = new BasicBlock("reverse", F, 0); - BasicBlock* result = new BasicBlock("result", F, 0); + BasicBlock* entry = BasicBlock::Create("entry", F, 0); + BasicBlock* large = BasicBlock::Create("large", F, 0); + BasicBlock* small = BasicBlock::Create("small", F, 0); + BasicBlock* reverse = BasicBlock::Create("reverse", F, 0); + BasicBlock* result = BasicBlock::Create("result", F, 0); // BASIC BLOCK: entry // First, get the number of bits that we're placing as an i32 ICmpInst* is_forward = new ICmpInst(ICmpInst::ICMP_ULT, Lo, Hi, "", entry); - SelectInst* Hi_pn = new SelectInst(is_forward, Hi, Lo, "", entry); - SelectInst* Lo_pn = new SelectInst(is_forward, Lo, Hi, "", entry); - BinaryOperator* NumBits = BinaryOperator::createSub(Hi_pn, Lo_pn, "",entry); - NumBits = BinaryOperator::createAdd(NumBits, One, "", entry); + SelectInst* Hi_pn = SelectInst::Create(is_forward, Hi, Lo, "", entry); + SelectInst* Lo_pn = SelectInst::Create(is_forward, Lo, Hi, "", entry); + BinaryOperator* NumBits = BinaryOperator::CreateSub(Hi_pn, Lo_pn, "",entry); + NumBits = BinaryOperator::CreateAdd(NumBits, One, "", entry); // Now, convert Lo and Hi to ValTy bit width if (ValBits > 32) { Lo = new ZExtInst(Lo_pn, ValTy, "", entry); } else if (ValBits < 32) { Lo = new TruncInst(Lo_pn, ValTy, "", entry); + } else { + Lo = Lo_pn; } // Determine if the replacement bits are larger than the number of bits we // are replacing and deal with it. ICmpInst* is_large = new ICmpInst(ICmpInst::ICMP_ULT, NumBits, RepBitWidth, "", entry); - new BranchInst(large, small, is_large, entry); + BranchInst::Create(large, small, is_large, entry); // BASIC BLOCK: large Instruction* MaskBits = - BinaryOperator::createSub(RepBitWidth, NumBits, "", large); - MaskBits = CastInst::createIntegerCast(MaskBits, RepMask->getType(), + BinaryOperator::CreateSub(RepBitWidth, NumBits, "", large); + MaskBits = CastInst::CreateIntegerCast(MaskBits, RepMask->getType(), false, "", large); BinaryOperator* Mask1 = - BinaryOperator::createLShr(RepMask, MaskBits, "", large); - BinaryOperator* Rep2 = BinaryOperator::createAnd(Mask1, Rep, "", large); - new BranchInst(small, large); + BinaryOperator::CreateLShr(RepMask, MaskBits, "", large); + BinaryOperator* Rep2 = BinaryOperator::CreateAnd(Mask1, Rep, "", large); + BranchInst::Create(small, large); // BASIC BLOCK: small - PHINode* Rep3 = new PHINode(RepTy, "", small); + PHINode* Rep3 = PHINode::Create(RepTy, "", small); Rep3->reserveOperandSpace(2); Rep3->addIncoming(Rep2, large); Rep3->addIncoming(Rep, entry); @@ -524,60 +565,60 @@ static Instruction *LowerPartSet(CallInst *CI) { Rep4 = new ZExtInst(Rep3, ValTy, "", small); else if (ValBits < RepBits) Rep4 = new TruncInst(Rep3, ValTy, "", small); - new BranchInst(result, reverse, is_forward, small); + BranchInst::Create(result, reverse, is_forward, small); // BASIC BLOCK: reverse (reverses the bits of the replacement) // Set up our loop counter as a PHI so we can decrement on each iteration. // We will loop for the number of bits in the replacement value. - PHINode *Count = new PHINode(Type::Int32Ty, "count", reverse); + PHINode *Count = PHINode::Create(Type::Int32Ty, "count", reverse); Count->reserveOperandSpace(2); Count->addIncoming(NumBits, small); // Get the value that we are shifting bits out of as a PHI because // we'll change this with each iteration. - PHINode *BitsToShift = new PHINode(Val->getType(), "val", reverse); + PHINode *BitsToShift = PHINode::Create(Val->getType(), "val", reverse); BitsToShift->reserveOperandSpace(2); BitsToShift->addIncoming(Rep4, small); // Get the result of the last computation or zero on first iteration - PHINode *RRes = new PHINode(Val->getType(), "rres", reverse); + PHINode *RRes = PHINode::Create(Val->getType(), "rres", reverse); RRes->reserveOperandSpace(2); RRes->addIncoming(ValZero, small); // Decrement the loop counter by one - Instruction *Decr = BinaryOperator::createSub(Count, One, "", reverse); + Instruction *Decr = BinaryOperator::CreateSub(Count, One, "", reverse); Count->addIncoming(Decr, reverse); // Get the bit that we want to move into the result - Value *Bit = BinaryOperator::createAnd(BitsToShift, ValOne, "", reverse); + Value *Bit = BinaryOperator::CreateAnd(BitsToShift, ValOne, "", reverse); // Compute the new value of the bits to shift for the next iteration. - Value *NewVal = BinaryOperator::createLShr(BitsToShift, ValOne,"", reverse); + Value *NewVal = BinaryOperator::CreateLShr(BitsToShift, ValOne,"", reverse); BitsToShift->addIncoming(NewVal, reverse); // Shift the bit we extracted into the low bit of the result. - Instruction *NewRes = BinaryOperator::createShl(RRes, ValOne, "", reverse); - NewRes = BinaryOperator::createOr(NewRes, Bit, "", reverse); + Instruction *NewRes = BinaryOperator::CreateShl(RRes, ValOne, "", reverse); + NewRes = BinaryOperator::CreateOr(NewRes, Bit, "", reverse); RRes->addIncoming(NewRes, reverse); // Terminate loop if we've moved all the bits. ICmpInst *Cond = new ICmpInst(ICmpInst::ICMP_EQ, Decr, Zero, "", reverse); - new BranchInst(result, reverse, Cond, reverse); + BranchInst::Create(result, reverse, Cond, reverse); // BASIC BLOCK: result - PHINode *Rplcmnt = new PHINode(Val->getType(), "", result); + PHINode *Rplcmnt = PHINode::Create(Val->getType(), "", result); Rplcmnt->reserveOperandSpace(2); Rplcmnt->addIncoming(NewRes, reverse); Rplcmnt->addIncoming(Rep4, small); - Value* t0 = CastInst::createIntegerCast(NumBits,ValTy,false,"",result); - Value* t1 = BinaryOperator::createShl(ValMask, Lo, "", result); - Value* t2 = BinaryOperator::createNot(t1, "", result); - Value* t3 = BinaryOperator::createShl(t1, t0, "", result); - Value* t4 = BinaryOperator::createOr(t2, t3, "", result); - Value* t5 = BinaryOperator::createAnd(t4, Val, "", result); - Value* t6 = BinaryOperator::createShl(Rplcmnt, Lo, "", result); - Value* Rslt = BinaryOperator::createOr(t5, t6, "part_set", result); - new ReturnInst(Rslt, result); + Value* t0 = CastInst::CreateIntegerCast(NumBits,ValTy,false,"",result); + Value* t1 = BinaryOperator::CreateShl(ValMask, Lo, "", result); + Value* t2 = BinaryOperator::CreateNot(t1, "", result); + Value* t3 = BinaryOperator::CreateShl(t1, t0, "", result); + Value* t4 = BinaryOperator::CreateOr(t2, t3, "", result); + Value* t5 = BinaryOperator::CreateAnd(t4, Val, "", result); + Value* t6 = BinaryOperator::CreateShl(Rplcmnt, Lo, "", result); + Value* Rslt = BinaryOperator::CreateOr(t5, t6, "part_set", result); + ReturnInst::Create(Rslt, result); } // Return a call to the implementation function @@ -587,9 +628,31 @@ static Instruction *LowerPartSet(CallInst *CI) { CI->getOperand(3), CI->getOperand(4) }; - return new CallInst(F, Args, Args+sizeof(Args)/sizeof(Args[0]), CI->getName(), CI); + return CallInst::Create(F, Args, array_endof(Args), CI->getName(), CI); } +static void ReplaceFPIntrinsicWithCall(CallInst *CI, Constant *FCache, + Constant *DCache, Constant *LDCache, + const char *Fname, const char *Dname, + const char *LDname) { + switch (CI->getOperand(1)->getType()->getTypeID()) { + default: assert(0 && "Invalid type in intrinsic"); abort(); + case Type::FloatTyID: + ReplaceCallWith(Fname, CI, CI->op_begin()+1, CI->op_end(), + Type::FloatTy, FCache); + break; + case Type::DoubleTyID: + ReplaceCallWith(Dname, CI, CI->op_begin()+1, CI->op_end(), + Type::DoubleTy, DCache); + break; + case Type::X86_FP80TyID: + case Type::FP128TyID: + case Type::PPC_FP128TyID: + ReplaceCallWith(LDname, CI, CI->op_begin()+1, CI->op_end(), + CI->getOperand(1)->getType(), LDCache); + break; + } +} void IntrinsicLowering::LowerIntrinsicCall(CallInst *CI) { Function *Callee = CI->getCalledFunction(); @@ -651,10 +714,10 @@ void IntrinsicLowering::LowerIntrinsicCall(CallInst *CI) { case Intrinsic::cttz: { // cttz(x) -> ctpop(~X & (X-1)) Value *Src = CI->getOperand(1); - Value *NotSrc = BinaryOperator::createNot(Src, Src->getName()+".not", CI); - Value *SrcM1 = ConstantInt::get(Src->getType(), 1); - SrcM1 = BinaryOperator::createSub(Src, SrcM1, "", CI); - Src = LowerCTPOP(BinaryOperator::createAnd(NotSrc, SrcM1, "", CI), CI); + Value *NotSrc = BinaryOperator::CreateNot(Src, Src->getName()+".not", CI); + Value *SrcM1 = ConstantInt::get(Src->getType(), 1); + SrcM1 = BinaryOperator::CreateSub(Src, SrcM1, "", CI); + Src = LowerCTPOP(BinaryOperator::CreateAnd(NotSrc, SrcM1, "", CI), CI); CI->replaceAllUsesWith(Src); break; } @@ -709,11 +772,13 @@ void IntrinsicLowering::LowerIntrinsicCall(CallInst *CI) { break; // Simply strip out debugging intrinsics case Intrinsic::eh_exception: - case Intrinsic::eh_selector: + case Intrinsic::eh_selector_i32: + case Intrinsic::eh_selector_i64: CI->replaceAllUsesWith(Constant::getNullValue(CI->getType())); break; - case Intrinsic::eh_typeid_for: + case Intrinsic::eh_typeid_for_i32: + case Intrinsic::eh_typeid_for_i64: // Return something different to eh_selector. CI->replaceAllUsesWith(ConstantInt::get(CI->getType(), 1)); break; @@ -721,8 +786,7 @@ void IntrinsicLowering::LowerIntrinsicCall(CallInst *CI) { case Intrinsic::var_annotation: break; // Strip out annotate intrinsic - case Intrinsic::memcpy_i32: - case Intrinsic::memcpy_i64: { + case Intrinsic::memcpy: { static Constant *MemcpyFCache = 0; Value *Size = CI->getOperand(3); const Type *IntPtr = TD.getIntPtrType(); @@ -740,8 +804,7 @@ void IntrinsicLowering::LowerIntrinsicCall(CallInst *CI) { MemcpyFCache); break; } - case Intrinsic::memmove_i32: - case Intrinsic::memmove_i64: { + case Intrinsic::memmove: { static Constant *MemmoveFCache = 0; Value *Size = CI->getOperand(3); const Type *IntPtr = TD.getIntPtrType(); @@ -759,8 +822,7 @@ void IntrinsicLowering::LowerIntrinsicCall(CallInst *CI) { MemmoveFCache); break; } - case Intrinsic::memset_i32: - case Intrinsic::memset_i64: { + case Intrinsic::memset: { static Constant *MemsetFCache = 0; Value *Size = CI->getOperand(3); const Type *IntPtr = TD.getIntPtrType(); @@ -779,18 +841,67 @@ void IntrinsicLowering::LowerIntrinsicCall(CallInst *CI) { MemsetFCache); break; } - case Intrinsic::sqrt_f32: { - static Constant *sqrtfFCache = 0; - ReplaceCallWith("sqrtf", CI, CI->op_begin()+1, CI->op_end(), - Type::FloatTy, sqrtfFCache); + case Intrinsic::sqrt: { + static Constant *sqrtFCache = 0; + static Constant *sqrtDCache = 0; + static Constant *sqrtLDCache = 0; + ReplaceFPIntrinsicWithCall(CI, sqrtFCache, sqrtDCache, sqrtLDCache, + "sqrtf", "sqrt", "sqrtl"); break; } - case Intrinsic::sqrt_f64: { - static Constant *sqrtFCache = 0; - ReplaceCallWith("sqrt", CI, CI->op_begin()+1, CI->op_end(), - Type::DoubleTy, sqrtFCache); + case Intrinsic::log: { + static Constant *logFCache = 0; + static Constant *logDCache = 0; + static Constant *logLDCache = 0; + ReplaceFPIntrinsicWithCall(CI, logFCache, logDCache, logLDCache, + "logf", "log", "logl"); + break; + } + case Intrinsic::log2: { + static Constant *log2FCache = 0; + static Constant *log2DCache = 0; + static Constant *log2LDCache = 0; + ReplaceFPIntrinsicWithCall(CI, log2FCache, log2DCache, log2LDCache, + "log2f", "log2", "log2l"); + break; + } + case Intrinsic::log10: { + static Constant *log10FCache = 0; + static Constant *log10DCache = 0; + static Constant *log10LDCache = 0; + ReplaceFPIntrinsicWithCall(CI, log10FCache, log10DCache, log10LDCache, + "log10f", "log10", "log10l"); break; } + case Intrinsic::exp: { + static Constant *expFCache = 0; + static Constant *expDCache = 0; + static Constant *expLDCache = 0; + ReplaceFPIntrinsicWithCall(CI, expFCache, expDCache, expLDCache, + "expf", "exp", "expl"); + break; + } + case Intrinsic::exp2: { + static Constant *exp2FCache = 0; + static Constant *exp2DCache = 0; + static Constant *exp2LDCache = 0; + ReplaceFPIntrinsicWithCall(CI, exp2FCache, exp2DCache, exp2LDCache, + "exp2f", "exp2", "exp2l"); + break; + } + case Intrinsic::pow: { + static Constant *powFCache = 0; + static Constant *powDCache = 0; + static Constant *powLDCache = 0; + ReplaceFPIntrinsicWithCall(CI, powFCache, powDCache, powLDCache, + "powf", "pow", "powl"); + break; + } + case Intrinsic::flt_rounds: + // Lower to "round to the nearest" + if (CI->getType() != Type::VoidTy) + CI->replaceAllUsesWith(ConstantInt::get(CI->getType(), 1)); + break; } assert(CI->use_empty() &&