From ccab1dddd1531576e111e574ec04bb5043edcc4e Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Wed, 11 Aug 2010 00:15:13 +0000
Subject: [PATCH] Make it possible to set the cpu used for codegen.
llvm-svn: 110759
---
llvm/include/llvm-c/lto.h | 7 +++++++
llvm/tools/gold/gold-plugin.cpp | 6 ++++++
llvm/tools/lto/LTOCodeGenerator.cpp | 7 ++++++-
llvm/tools/lto/LTOCodeGenerator.h | 2 ++
llvm/tools/lto/lto.cpp | 8 ++++++++
5 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/llvm/include/llvm-c/lto.h b/llvm/include/llvm-c/lto.h
index 34231a22a579..67b27a8e6652 100644
--- a/llvm/include/llvm-c/lto.h
+++ b/llvm/include/llvm-c/lto.h
@@ -205,6 +205,13 @@ extern bool
lto_codegen_set_pic_model(lto_code_gen_t cg, lto_codegen_model);
+/**
+ * Sets the cpu to generate code for.
+ */
+extern void
+lto_codegen_set_cpu(lto_code_gen_t cg, const char *cpu);
+
+
/**
* Sets the location of the "gcc" to run. If not set, libLTO will search for
* "gcc" on the path.
diff --git a/llvm/tools/gold/gold-plugin.cpp b/llvm/tools/gold/gold-plugin.cpp
index d649ccb0485e..db0db3b5b2ec 100644
--- a/llvm/tools/gold/gold-plugin.cpp
+++ b/llvm/tools/gold/gold-plugin.cpp
@@ -70,6 +70,7 @@ namespace options {
static std::vector<std::string> pass_through;
static std::string extra_library_path;
static std::string triple;
+ static std::string mcpu;
// Additional options to pass into the code generator.
// Note: This array will contain all plugin options which are not claimed
// as plugin exclusive to pass to the code generator.
@@ -85,6 +86,8 @@ namespace options {
if (opt == "generate-api-file") {
generate_api_file = true;
+ } else if (opt.startswith("mcpu=")) {
+ mcpu = opt.substr(strlen("mcpu="));
} else if (opt.startswith("as=")) {
if (!as_path.empty()) {
(*message)(LDPL_WARNING, "Path to as specified twice. "
@@ -413,6 +416,9 @@ static ld_plugin_status all_symbols_read_hook(void) {
}
lto_codegen_set_assembler_args(cg, &as_args_p[0], as_args_p.size());
}
+ if (!options::mcpu.empty())
+ lto_codegen_set_cpu(cg, options::mcpu.c_str());
+
// Pass through extra options to the code generator.
if (!options::extra.empty()) {
for (std::vector<std::string>::iterator it = options::extra.begin();
diff --git a/llvm/tools/lto/LTOCodeGenerator.cpp b/llvm/tools/lto/LTOCodeGenerator.cpp
index 7850b5d6d27e..b69bcc35a71b 100644
--- a/llvm/tools/lto/LTOCodeGenerator.cpp
+++ b/llvm/tools/lto/LTOCodeGenerator.cpp
@@ -119,6 +119,11 @@ bool LTOCodeGenerator::setCodePICModel(lto_codegen_model model,
return true;
}
+void LTOCodeGenerator::setCpu(const char* mCpu)
+{
+ _mCpu = mCpu;
+}
+
void LTOCodeGenerator::setAssemblerPath(const char* path)
{
if ( _assemblerPath )
@@ -314,7 +319,7 @@ bool LTOCodeGenerator::determineTarget(std::string& errMsg)
// construct LTModule, hand over ownership of module and target
SubtargetFeatures Features;
- Features.getDefaultSubtargetFeatures("" /* cpu */, llvm::Triple(Triple));
+ Features.getDefaultSubtargetFeatures(_mCpu, llvm::Triple(Triple));
std::string FeatureStr = Features.getString();
_target = march->createTargetMachine(Triple, FeatureStr);
}
diff --git a/llvm/tools/lto/LTOCodeGenerator.h b/llvm/tools/lto/LTOCodeGenerator.h
index 9086befc26dd..71593a5039bb 100644
--- a/llvm/tools/lto/LTOCodeGenerator.h
+++ b/llvm/tools/lto/LTOCodeGenerator.h
@@ -36,6 +36,7 @@ struct LTOCodeGenerator {
bool addModule(struct LTOModule*, std::string& errMsg);
bool setDebugInfo(lto_debug_model, std::string& errMsg);
bool setCodePICModel(lto_codegen_model, std::string& errMsg);
+ void setCpu(const char *cpu);
void setAssemblerPath(const char* path);
void setAssemblerArgs(const char** args, int nargs);
void addMustPreserveSymbol(const char* sym);
@@ -63,6 +64,7 @@ private:
llvm::MemoryBuffer* _nativeObjectFile;
std::vector<const char*> _codegenOptions;
llvm::sys::Path* _assemblerPath;
+ std::string _mCpu;
std::vector<std::string> _assemblerArgs;
};
diff --git a/llvm/tools/lto/lto.cpp b/llvm/tools/lto/lto.cpp
index 703447b499fe..a7ce2a07bbf1 100644
--- a/llvm/tools/lto/lto.cpp
+++ b/llvm/tools/lto/lto.cpp
@@ -210,6 +210,14 @@ bool lto_codegen_set_pic_model(lto_code_gen_t cg, lto_codegen_model model)
return cg->setCodePICModel(model, sLastErrorString);
}
+//
+// sets the cpu to generate code for
+//
+void lto_codegen_set_cpu(lto_code_gen_t cg, const char* cpu)
+{
+ return cg->setCpu(cpu);
+}
+
//
// sets the path to the assembler tool
//