6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-12 13:30:51 +00:00
Code Issues Projects Releases Wiki Activity

Simplify and rename function overrideFunctionAttributes. NFC.

Browse Source 
This is in preparation to making changes needed to stop resetting
NoFramePointerElim in resetTargetOptions.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238079 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Akira Hatanaka 2015-05-23 01:12:26 +00:00
parent 4ea4cb3197
commit c17da7166d
7 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/llvm/CodeGen/CommandFlags.h
View File

@ -287,15 +287,4 @@ static inline std::string getFeaturesStr() {
return Features.getString();
}
static inline void overrideFunctionAttributes(StringRef CPU, StringRef Features,
Module &M) {
for (auto &F : M) {
if (!CPU.empty())
llvm::overrideFunctionAttribute("target-cpu", CPU, F);
if (!Features.empty())
llvm::overrideFunctionAttribute("target-features", Features, F);
}
}
#endif

3
include/llvm/IR/Function.h
View File

@ -591,9 +591,6 @@ ilist_traits<Argument>::getSymTab(Function *F) {
return F ? &F->getValueSymbolTable() : nullptr;
}
/// \brief Overwrite attribute Kind in function F.
void overrideFunctionAttribute(StringRef Kind, StringRef Value, Function &F);
} // End llvm namespace
#endif

4
include/llvm/Target/TargetOptions.h
View File

@ -222,6 +222,10 @@ namespace llvm {
MCTargetOptions MCOptions;
};
/// \brief Set function attributes of functions in Module M based on CPU and
/// Features.
void setFunctionAttributes(StringRef CPU, StringRef Features, Module &M);
// Comparison operators:

20
lib/CodeGen/TargetOptionsImpl.cpp
View File

@ -51,3 +51,23 @@ bool TargetOptions::HonorSignDependentRoundingFPMath() const {
StringRef TargetOptions::getTrapFunctionName() const {
return TrapFuncName;
}
void llvm::setFunctionAttributes(StringRef CPU, StringRef Features, Module &M) {
for (auto &F : M) {
auto &Ctx = F.getContext();
AttributeSet Attrs = F.getAttributes(), NewAttrs;
if (!CPU.empty())
NewAttrs = NewAttrs.addAttribute(Ctx, AttributeSet::FunctionIndex,
"target-cpu", CPU);
if (!Features.empty())
NewAttrs = NewAttrs.addAttribute(Ctx, AttributeSet::FunctionIndex,
"target-features", Features);
// Let NewAttrs override Attrs.
NewAttrs = Attrs.addAttributes(Ctx, AttributeSet::FunctionIndex, NewAttrs);
F.setAttributes(NewAttrs);
}
}

13
lib/IR/Function.cpp
View File

@ -959,19 +959,6 @@ void Function::setPrologueData(Constant *PrologueData) {
setValueSubclassData(PDData);
}
void llvm::overrideFunctionAttribute(StringRef Kind, StringRef Value,
Function &F) {
auto &Ctx = F.getContext();
AttributeSet Attrs = F.getAttributes(), AttrsToRemove;
AttrsToRemove =
AttrsToRemove.addAttribute(Ctx, AttributeSet::FunctionIndex, Kind);
Attrs = Attrs.removeAttributes(Ctx, AttributeSet::FunctionIndex,
AttrsToRemove);
Attrs = Attrs.addAttribute(Ctx, AttributeSet::FunctionIndex, Kind, Value);
F.setAttributes(Attrs);
}
void Function::setEntryCount(uint64_t Count) {
MDBuilder MDB(getContext());
setMetadata(LLVMContext::MD_prof, MDB.createFunctionEntryCount(Count));

4
tools/llc/llc.cpp
View File

@ -304,8 +304,8 @@ static int compileModule(char **argv, LLVMContext &Context) {
if (const DataLayout *DL = Target->getDataLayout())
M->setDataLayout(*DL);
// Override function attributes.
overrideFunctionAttributes(CPUStr, FeaturesStr, *M);
// Override function attributes based on CPUStr and FeaturesStr.
setFunctionAttributes(CPUStr, FeaturesStr, *M);
if (RelaxAll.getNumOccurrences() > 0 &&
FileType != TargetMachine::CGFT_ObjectFile)

5
tools/opt/opt.cpp
View File

@ -386,6 +386,7 @@ int main(int argc, char **argv) {
Triple ModuleTriple(M->getTargetTriple());
std::string CPUStr, FeaturesStr;
TargetMachine *Machine = nullptr;
if (ModuleTriple.getArch()) {
CPUStr = getCPUStr();
FeaturesStr = getFeaturesStr();
@ -394,8 +395,8 @@ int main(int argc, char **argv) {
std::unique_ptr<TargetMachine> TM(Machine);
// Override function attributes.
overrideFunctionAttributes(CPUStr, FeaturesStr, *M);
// Override function attributes based on CPUStr and FeaturesStr.
setFunctionAttributes(CPUStr, FeaturesStr, *M);
// If the output is set to be emitted to standard out, and standard out is a
// console, print out a warning message and refuse to do it. We don't