//
// The LLVM Compiler Infrastructure
//
-// This file was developed by Reid Spencer 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.
//
//===----------------------------------------------------------------------===//
//
//
//===----------------------------------------------------------------------===//
-#include "llvm/Assembly/AutoUpgrade.h"
-#include "llvm/DerivedTypes.h"
+#include "llvm/AutoUpgrade.h"
+#include "llvm/Constants.h"
#include "llvm/Function.h"
#include "llvm/Module.h"
#include "llvm/Instructions.h"
#include "llvm/Intrinsics.h"
-#include "llvm/SymbolTable.h"
-#include <iostream>
-
+#include "llvm/ADT/SmallVector.h"
+#include <cstring>
using namespace llvm;
-// Utility function for getting the correct suffix given a type
-static inline const char* get_suffix(const Type* Ty) {
- switch (Ty->getTypeID()) {
- case Type::UIntTyID: return ".i32";
- case Type::UShortTyID: return ".i16";
- case Type::UByteTyID: return ".i8";
- case Type::ULongTyID: return ".i64";
- case Type::FloatTyID: return ".f32";
- case Type::DoubleTyID: return ".f64";
- default: break;
- }
- return 0;
-}
-static inline const Type* get_type(Function* F) {
- // If there's no function, we can't get the argument type.
- if (!F)
- return 0;
+static bool UpgradeIntrinsicFunction1(Function *F, Function *&NewFn) {
+ assert(F && "Illegal to upgrade a non-existent Function.");
// Get the Function's name.
const std::string& Name = F->getName();
- // Quickly eliminate it, if it's not a candidate.
- if (Name.length() <= 5 || Name[0] != 'l' || Name[1] != 'l' || Name[2] !=
- 'v' || Name[3] != 'm' || Name[4] != '.')
- return 0;
+ // Convenience
+ const FunctionType *FTy = F->getFunctionType();
- switch (Name[5]) {
- case 'b':
- if (Name == "llvm.bswap")
- return F->getReturnType();
- break;
- case 'c':
- if (Name == "llvm.ctpop" || Name == "llvm.ctlz" || Name == "llvm.cttz")
- return F->getReturnType();
- break;
- case 'i':
- if (Name == "llvm.isunordered") {
- Function::const_arg_iterator ArgIt = F->arg_begin();
- if (ArgIt != F->arg_end())
- return ArgIt->getType();
- }
- break;
- case 's':
- if (Name == "llvm.sqrt")
- return F->getReturnType();
- break;
- default:
- break;
- }
- return 0;
-}
-
-bool llvm::IsUpgradeableIntrinsicName(const std::string& Name) {
// Quickly eliminate it, if it's not a candidate.
- if (Name.length() <= 5 || Name[0] != 'l' || Name[1] != 'l' || Name[2] !=
- 'v' || Name[3] != 'm' || Name[4] != '.')
+ if (Name.length() <= 8 || Name[0] != 'l' || Name[1] != 'l' ||
+ Name[2] != 'v' || Name[3] != 'm' || Name[4] != '.')
return false;
+ Module *M = F->getParent();
switch (Name[5]) {
- case 'b':
- if (Name == "llvm.bswap")
- return true;
- break;
- case 'c':
- if (Name == "llvm.ctpop" || Name == "llvm.ctlz" || Name == "llvm.cttz")
+ default: break;
+ case 'b':
+ // This upgrades the name of the llvm.bswap intrinsic function to only use
+ // a single type name for overloading. We only care about the old format
+ // 'llvm.bswap.i*.i*', so check for 'bswap.' and then for there being
+ // a '.' after 'bswap.'
+ if (Name.compare(5,6,"bswap.",6) == 0) {
+ std::string::size_type delim = Name.find('.',11);
+
+ if (delim != std::string::npos) {
+ // Construct the new name as 'llvm.bswap' + '.i*'
+ F->setName(Name.substr(0,10)+Name.substr(delim));
+ NewFn = F;
return true;
- break;
- case 'i':
- if (Name == "llvm.isunordered")
+ }
+ }
+ break;
+
+ case 'c':
+ // We only want to fix the 'llvm.ct*' intrinsics which do not have the
+ // correct return type, so we check for the name, and then check if the
+ // return type does not match the parameter type.
+ if ( (Name.compare(5,5,"ctpop",5) == 0 ||
+ Name.compare(5,4,"ctlz",4) == 0 ||
+ Name.compare(5,4,"cttz",4) == 0) &&
+ FTy->getReturnType() != FTy->getParamType(0)) {
+ // We first need to change the name of the old (bad) intrinsic, because
+ // its type is incorrect, but we cannot overload that name. We
+ // arbitrarily unique it here allowing us to construct a correctly named
+ // and typed function below.
+ F->setName("");
+
+ // Now construct the new intrinsic with the correct name and type. We
+ // leave the old function around in order to query its type, whatever it
+ // may be, and correctly convert up to the new type.
+ NewFn = cast<Function>(M->getOrInsertFunction(Name,
+ FTy->getParamType(0),
+ FTy->getParamType(0),
+ (Type *)0));
+ return true;
+ }
+ break;
+
+ case 'p':
+ // This upgrades the llvm.part.select overloaded intrinsic names to only
+ // use one type specifier in the name. We only care about the old format
+ // 'llvm.part.select.i*.i*', and solve as above with bswap.
+ if (Name.compare(5,12,"part.select.",12) == 0) {
+ std::string::size_type delim = Name.find('.',17);
+
+ if (delim != std::string::npos) {
+ // Construct a new name as 'llvm.part.select' + '.i*'
+ F->setName(Name.substr(0,16)+Name.substr(delim));
+ NewFn = F;
return true;
+ }
break;
- case 's':
- if (Name == "llvm.sqrt")
+ }
+
+ // This upgrades the llvm.part.set intrinsics similarly as above, however
+ // we care about 'llvm.part.set.i*.i*.i*', but only the first two types
+ // must match. There is an additional type specifier after these two
+ // matching types that we must retain when upgrading. Thus, we require
+ // finding 2 periods, not just one, after the intrinsic name.
+ if (Name.compare(5,9,"part.set.",9) == 0) {
+ std::string::size_type delim = Name.find('.',14);
+
+ if (delim != std::string::npos &&
+ Name.find('.',delim+1) != std::string::npos) {
+ // Construct a new name as 'llvm.part.select' + '.i*.i*'
+ F->setName(Name.substr(0,13)+Name.substr(delim));
+ NewFn = F;
return true;
+ }
break;
- default:
- break;
+ }
+
+ break;
+ case 'x':
+ // This fixes all MMX shift intrinsic instructions to take a
+ // v1i64 instead of a v2i32 as the second parameter.
+ if (Name.compare(5,10,"x86.mmx.ps",10) == 0 &&
+ (Name.compare(13,4,"psll", 4) == 0 ||
+ Name.compare(13,4,"psra", 4) == 0 ||
+ Name.compare(13,4,"psrl", 4) == 0) && Name[17] != 'i') {
+
+ const llvm::Type *VT = VectorType::get(IntegerType::get(64), 1);
+
+ // We don't have to do anything if the parameter already has
+ // the correct type.
+ if (FTy->getParamType(1) == VT)
+ break;
+
+ // We first need to change the name of the old (bad) intrinsic, because
+ // its type is incorrect, but we cannot overload that name. We
+ // arbitrarily unique it here allowing us to construct a correctly named
+ // and typed function below.
+ F->setName("");
+
+ assert(FTy->getNumParams() == 2 && "MMX shift intrinsics take 2 args!");
+
+ // Now construct the new intrinsic with the correct name and type. We
+ // leave the old function around in order to query its type, whatever it
+ // may be, and correctly convert up to the new type.
+ NewFn = cast<Function>(M->getOrInsertFunction(Name,
+ FTy->getReturnType(),
+ FTy->getParamType(0),
+ VT,
+ (Type *)0));
+ return true;
+ } else if (Name.compare(5,16,"x86.sse2.movl.dq",16) == 0) {
+ // Calls to this intrinsic are transformed into ShuffleVector's.
+ NewFn = 0;
+ return true;
+ }
+
+ break;
}
+
+ // This may not belong here. This function is effectively being overloaded
+ // to both detect an intrinsic which needs upgrading, and to provide the
+ // upgraded form of the intrinsic. We should perhaps have two separate
+ // functions for this.
return false;
}
-// UpgradeIntrinsicFunction - Convert overloaded intrinsic function names to
-// their non-overloaded variants by appending the appropriate suffix based on
-// the argument types.
-Function* llvm::UpgradeIntrinsicFunction(Function* F) {
- // See if its one of the name's we're interested in.
- if (const Type* Ty = get_type(F)) {
- const char* suffix = get_suffix(Ty);
- if (Ty->isSigned())
- suffix = get_suffix(Ty->getUnsignedVersion());
- assert(suffix && "Intrinsic parameter type not recognized");
- const std::string& Name = F->getName();
- std::string new_name = Name + suffix;
- std::cerr << "WARNING: change " << Name << " to " << new_name << "\n";
- SymbolTable& SymTab = F->getParent()->getSymbolTable();
- if (Value* V = SymTab.lookup(F->getType(),new_name))
- if (Function* OtherF = dyn_cast<Function>(V))
- return OtherF;
-
- // There wasn't an existing function for the intrinsic, so now make sure the
- // signedness of the arguments is correct.
- if (Ty->isSigned()) {
- const Type* newTy = Ty->getUnsignedVersion();
- std::vector<const Type*> Params;
- Params.push_back(newTy);
- FunctionType* FT = FunctionType::get(newTy, Params,false);
- return new Function(FT, GlobalValue::ExternalLinkage, new_name,
- F->getParent());
- }
+bool llvm::UpgradeIntrinsicFunction(Function *F, Function *&NewFn) {
+ NewFn = 0;
+ bool Upgraded = UpgradeIntrinsicFunction1(F, NewFn);
- // The argument was the correct type (unsigned or floating), so just
- // rename the function to its correct name and return it.
- F->setName(new_name);
- return F;
- }
- return 0;
+ // Upgrade intrinsic attributes. This does not change the function.
+ if (NewFn)
+ F = NewFn;
+ if (unsigned id = F->getIntrinsicID(true))
+ F->setParamAttrs(Intrinsic::getParamAttrs((Intrinsic::ID)id));
+ return Upgraded;
}
-Instruction* llvm::UpgradeIntrinsicCall(CallInst *CI) {
+// UpgradeIntrinsicCall - Upgrade a call to an old intrinsic to be a call the
+// upgraded intrinsic. All argument and return casting must be provided in
+// order to seamlessly integrate with existing context.
+void llvm::UpgradeIntrinsicCall(CallInst *CI, Function *NewFn) {
Function *F = CI->getCalledFunction();
- if (const Type* Ty = get_type(F)) {
- Function* newF = UpgradeIntrinsicFunction(F);
- std::vector<Value*> Oprnds;
- for (User::op_iterator OI = CI->op_begin(), OE = CI->op_end();
- OI != OE; ++OI)
- Oprnds.push_back(CI);
- CallInst* newCI = new CallInst(newF,Oprnds,"autoupgrade_call",CI);
- if (Ty->isSigned()) {
- const Type* newTy = Ty->getUnsignedVersion();
- newCI->setOperand(1,new CastInst(newCI->getOperand(1), newTy,
- "autoupgrade_cast", newCI));
- CastInst* final = new CastInst(newCI, Ty, "autoupgrade_uncast",newCI);
- newCI->moveBefore(final);
- return final;
+ assert(F && "CallInst has no function associated with it.");
+
+ if (!NewFn) {
+ if (strcmp(F->getNameStart(), "llvm.x86.sse2.movl.dq") == 0) {
+ std::vector<Constant*> Idxs;
+ Constant *Zero = ConstantInt::get(Type::Int32Ty, 0);
+ Idxs.push_back(Zero);
+ Idxs.push_back(Zero);
+ Idxs.push_back(Zero);
+ Idxs.push_back(Zero);
+ Value *ZeroV = ConstantVector::get(Idxs);
+
+ Idxs.clear();
+ Idxs.push_back(ConstantInt::get(Type::Int32Ty, 4));
+ Idxs.push_back(ConstantInt::get(Type::Int32Ty, 5));
+ Idxs.push_back(ConstantInt::get(Type::Int32Ty, 2));
+ Idxs.push_back(ConstantInt::get(Type::Int32Ty, 3));
+ Value *Mask = ConstantVector::get(Idxs);
+ ShuffleVectorInst *SI = new ShuffleVectorInst(ZeroV, CI->getOperand(1),
+ Mask, "upgraded", CI);
+
+ // Handle any uses of the old CallInst.
+ if (!CI->use_empty())
+ // Replace all uses of the old call with the new cast which has the
+ // correct type.
+ CI->replaceAllUsesWith(SI);
+
+ // Clean up the old call now that it has been completely upgraded.
+ CI->eraseFromParent();
+ } else {
+ assert(0 && "Unknown function for CallInst upgrade.");
}
- return newCI;
+ return;
+ }
+
+ switch (NewFn->getIntrinsicID()) {
+ default: assert(0 && "Unknown function for CallInst upgrade.");
+ case Intrinsic::x86_mmx_psll_d:
+ case Intrinsic::x86_mmx_psll_q:
+ case Intrinsic::x86_mmx_psll_w:
+ case Intrinsic::x86_mmx_psra_d:
+ case Intrinsic::x86_mmx_psra_w:
+ case Intrinsic::x86_mmx_psrl_d:
+ case Intrinsic::x86_mmx_psrl_q:
+ case Intrinsic::x86_mmx_psrl_w: {
+ Value *Operands[2];
+
+ Operands[0] = CI->getOperand(1);
+
+ // Cast the second parameter to the correct type.
+ BitCastInst *BC = new BitCastInst(CI->getOperand(2),
+ NewFn->getFunctionType()->getParamType(1),
+ "upgraded", CI);
+ Operands[1] = BC;
+
+ // Construct a new CallInst
+ CallInst *NewCI = CallInst::Create(NewFn, Operands, Operands+2,
+ "upgraded."+CI->getName(), CI);
+ NewCI->setTailCall(CI->isTailCall());
+ NewCI->setCallingConv(CI->getCallingConv());
+
+ // Handle any uses of the old CallInst.
+ if (!CI->use_empty())
+ // Replace all uses of the old call with the new cast which has the
+ // correct type.
+ CI->replaceAllUsesWith(NewCI);
+
+ // Clean up the old call now that it has been completely upgraded.
+ CI->eraseFromParent();
+ break;
+ }
+ case Intrinsic::ctlz:
+ case Intrinsic::ctpop:
+ case Intrinsic::cttz: {
+ // Build a small vector of the 1..(N-1) operands, which are the
+ // parameters.
+ SmallVector<Value*, 8> Operands(CI->op_begin()+1, CI->op_end());
+
+ // Construct a new CallInst
+ CallInst *NewCI = CallInst::Create(NewFn, Operands.begin(), Operands.end(),
+ "upgraded."+CI->getName(), CI);
+ NewCI->setTailCall(CI->isTailCall());
+ NewCI->setCallingConv(CI->getCallingConv());
+
+ // Handle any uses of the old CallInst.
+ if (!CI->use_empty()) {
+ // Check for sign extend parameter attributes on the return values.
+ bool SrcSExt = NewFn->getParamAttrs().paramHasAttr(0, ParamAttr::SExt);
+ bool DestSExt = F->getParamAttrs().paramHasAttr(0, ParamAttr::SExt);
+
+ // Construct an appropriate cast from the new return type to the old.
+ CastInst *RetCast = CastInst::Create(
+ CastInst::getCastOpcode(NewCI, SrcSExt,
+ F->getReturnType(),
+ DestSExt),
+ NewCI, F->getReturnType(),
+ NewCI->getName(), CI);
+ NewCI->moveBefore(RetCast);
+
+ // Replace all uses of the old call with the new cast which has the
+ // correct type.
+ CI->replaceAllUsesWith(RetCast);
+ }
+
+ // Clean up the old call now that it has been completely upgraded.
+ CI->eraseFromParent();
+ }
+ break;
}
- return 0;
}
-bool llvm::UpgradeCallsToIntrinsic(Function* F) {
- if (Function* newF = UpgradeIntrinsicFunction(F)) {
- for (Value::use_iterator UI = F->use_begin(), UE = F->use_end();
- UI != UE; UI) {
- if (CallInst* CI = dyn_cast<CallInst>(*UI++)) {
- std::vector<Value*> Oprnds;
- User::op_iterator OI = CI->op_begin();
- ++OI;
- for (User::op_iterator OE = CI->op_end(); OI != OE; ++OI)
- Oprnds.push_back(*OI);
- CallInst* newCI = new CallInst(newF,Oprnds,"autoupgrade_call",CI);
- const Type* Ty = Oprnds[0]->getType();
- if (Ty->isSigned()) {
- const Type* newTy = Ty->getUnsignedVersion();
- newCI->setOperand(1,new CastInst(newCI->getOperand(1), newTy,
- "autoupgrade_cast", newCI));
- CastInst* final = new CastInst(newCI, Ty, "autoupgrade_uncast",newCI);
- newCI->moveBefore(final);
- CI->replaceAllUsesWith(final);
- } else {
- CI->replaceAllUsesWith(newCI);
- }
- CI->eraseFromParent();
+// This tests each Function to determine if it needs upgrading. When we find
+// one we are interested in, we then upgrade all calls to reflect the new
+// function.
+void llvm::UpgradeCallsToIntrinsic(Function* F) {
+ assert(F && "Illegal attempt to upgrade a non-existent intrinsic.");
+
+ // Upgrade the function and check if it is a totaly new function.
+ Function* NewFn;
+ if (UpgradeIntrinsicFunction(F, NewFn)) {
+ if (NewFn != F) {
+ // Replace all uses to the old function with the new one if necessary.
+ for (Value::use_iterator UI = F->use_begin(), UE = F->use_end();
+ UI != UE; ) {
+ if (CallInst* CI = dyn_cast<CallInst>(*UI++))
+ UpgradeIntrinsicCall(CI, NewFn);
}
- }
- if (newF != F)
+ // Remove old function, no longer used, from the module.
F->eraseFromParent();
- return true;
+ }
}
- return false;
}
+
projects / oota-llvm.git / blobdiff