X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fgold%2Fgold-plugin.cpp;h=e7161a64a8e48feb0f7744e568ba5dff46de51ad;hb=cbb170d057aa6692b19f577b1e09a6c1c7a26969;hp=9554b8adc314b55c4df3ae050c0853a793a0caab;hpb=a1bdcedc3879510a874d24c450e07feb170d9cd6;p=oota-llvm.git diff --git a/tools/gold/gold-plugin.cpp b/tools/gold/gold-plugin.cpp index 9554b8adc31..e7161a64a8e 100644 --- a/tools/gold/gold-plugin.cpp +++ b/tools/gold/gold-plugin.cpp @@ -12,6 +12,7 @@ // //===----------------------------------------------------------------------===// +#include "llvm/Config/config.h" #include "plugin-api.h" #include "llvm-c/lto.h" @@ -40,14 +41,13 @@ namespace { ld_plugin_add_symbols add_symbols = NULL; ld_plugin_get_symbols get_symbols = NULL; ld_plugin_add_input_file add_input_file = NULL; + ld_plugin_add_input_library add_input_library = NULL; + ld_plugin_set_extra_library_path set_extra_library_path = NULL; ld_plugin_message message = discard_message; int api_version = 0; int gold_version = 0; - bool generate_api_file = false; - const char *as_path = NULL; - struct claimed_file { lto_module_t M; void *handle; @@ -55,14 +55,73 @@ namespace { }; lto_codegen_model output_type = LTO_CODEGEN_PIC_MODEL_STATIC; + std::string output_name = ""; std::list Modules; std::vector Cleanup; } -ld_plugin_status claim_file_hook(const ld_plugin_input_file *file, - int *claimed); -ld_plugin_status all_symbols_read_hook(void); -ld_plugin_status cleanup_hook(void); +namespace options { + enum generate_bc { BC_NO, BC_ALSO, BC_ONLY }; + static bool generate_api_file = false; + static generate_bc generate_bc_file = BC_NO; + static std::string bc_path; + static std::string as_path; + static std::vector pass_through; + static std::string extra_library_path; + static std::string triple; + // 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. + // For example, "generate-api-file" and "as"options are for the plugin + // use only and will not be passed. + static std::vector extra; + + static void process_plugin_option(const char* opt_) + { + if (opt_ == NULL) + return; + llvm::StringRef opt = opt_; + + if (opt == "generate-api-file") { + generate_api_file = true; + } else if (opt.startswith("as=")) { + if (!as_path.empty()) { + (*message)(LDPL_WARNING, "Path to as specified twice. " + "Discarding %s", opt_); + } else { + as_path = opt.substr(strlen("as=")); + } + } else if (opt.startswith("extra-library-path=")) { + extra_library_path = opt.substr(strlen("extra_library_path=")); + } else if (opt.startswith("pass-through=")) { + llvm::StringRef item = opt.substr(strlen("pass-through=")); + pass_through.push_back(item.str()); + } else if (opt == "mtriple=") { + triple = opt.substr(strlen("mtriple=")); + } else if (opt == "emit-llvm") { + generate_bc_file = BC_ONLY; + } else if (opt == "also-emit-llvm") { + generate_bc_file = BC_ALSO; + } else if (opt.startswith("also-emit-llvm=")) { + llvm::StringRef path = opt.substr(strlen("also-emit-llvm=")); + generate_bc_file = BC_ALSO; + if (!bc_path.empty()) { + (*message)(LDPL_WARNING, "Path to the output IL file specified twice. " + "Discarding %s", opt_); + } else { + bc_path = path; + } + } else { + // Save this option to pass to the code generator. + extra.push_back(opt); + } + } +} + +static ld_plugin_status claim_file_hook(const ld_plugin_input_file *file, + int *claimed); +static ld_plugin_status all_symbols_read_hook(void); +static ld_plugin_status cleanup_hook(void); extern "C" ld_plugin_status onload(ld_plugin_tv *tv); ld_plugin_status onload(ld_plugin_tv *tv) { @@ -73,8 +132,6 @@ ld_plugin_status onload(ld_plugin_tv *tv) { // for services. bool registeredClaimFile = false; - bool registeredAllSymbolsRead = false; - bool registeredCleanup = false; for (; tv->tv_tag != LDPT_NULL; ++tv) { switch (tv->tv_tag) { @@ -84,6 +141,9 @@ ld_plugin_status onload(ld_plugin_tv *tv) { case LDPT_GOLD_VERSION: // major * 100 + minor gold_version = tv->tv_u.tv_val; break; + case LDPT_OUTPUT_NAME: + output_name = tv->tv_u.tv_string; + break; case LDPT_LINKER_OUTPUT: switch (tv->tv_u.tv_val) { case LDPO_REL: // .o @@ -102,18 +162,7 @@ ld_plugin_status onload(ld_plugin_tv *tv) { //output_type = LTO_CODEGEN_PIC_MODEL_DYNAMIC_NO_PIC; break; case LDPT_OPTION: - if (strcmp("generate-api-file", tv->tv_u.tv_string) == 0) { - generate_api_file = true; - } else if (strncmp("as=", tv->tv_u.tv_string, 3) == 0) { - if (as_path) { - (*message)(LDPL_WARNING, "Path to as specified twice. " - "Discarding %s", tv->tv_u.tv_string); - } else { - as_path = strdup(tv->tv_u.tv_string + 3); - } - } else { - (*message)(LDPL_WARNING, "Ignoring flag %s", tv->tv_u.tv_string); - } + options::process_plugin_option(tv->tv_u.tv_string); break; case LDPT_REGISTER_CLAIM_FILE_HOOK: { ld_plugin_register_claim_file callback; @@ -130,8 +179,6 @@ ld_plugin_status onload(ld_plugin_tv *tv) { if ((*callback)(all_symbols_read_hook) != LDPS_OK) return LDPS_ERR; - - registeredAllSymbolsRead = true; } break; case LDPT_REGISTER_CLEANUP_HOOK: { ld_plugin_register_cleanup callback; @@ -139,8 +186,6 @@ ld_plugin_status onload(ld_plugin_tv *tv) { if ((*callback)(cleanup_hook) != LDPS_OK) return LDPS_ERR; - - registeredCleanup = true; } break; case LDPT_ADD_SYMBOLS: add_symbols = tv->tv_u.tv_add_symbols; @@ -151,6 +196,12 @@ ld_plugin_status onload(ld_plugin_tv *tv) { case LDPT_ADD_INPUT_FILE: add_input_file = tv->tv_u.tv_add_input_file; break; + case LDPT_ADD_INPUT_LIBRARY: + add_input_library = tv->tv_u.tv_add_input_file; + break; + case LDPT_SET_EXTRA_LIBRARY_PATH: + set_extra_library_path = tv->tv_u.tv_set_extra_library_path; + break; case LDPT_MESSAGE: message = tv->tv_u.tv_message; break; @@ -174,15 +225,15 @@ ld_plugin_status onload(ld_plugin_tv *tv) { /// claim_file_hook - called by gold to see whether this file is one that /// our plugin can handle. We'll try to open it and register all the symbols /// with add_symbol if possible. -ld_plugin_status claim_file_hook(const ld_plugin_input_file *file, - int *claimed) { +static ld_plugin_status claim_file_hook(const ld_plugin_input_file *file, + int *claimed) { void *buf = NULL; if (file->offset) { // Gold has found what might be IR part-way inside of a file, such as // an .a archive. if (lseek(file->fd, file->offset, SEEK_SET) == -1) { (*message)(LDPL_ERROR, - "Failed to seek to archive member of %s at offset %d: %s\n", + "Failed to seek to archive member of %s at offset %d: %s\n", file->name, file->offset, sys::StrError(errno).c_str()); return LDPS_ERR; @@ -190,7 +241,7 @@ ld_plugin_status claim_file_hook(const ld_plugin_input_file *file, buf = malloc(file->filesize); if (!buf) { (*message)(LDPL_ERROR, - "Failed to allocate buffer for archive member of size: %d\n", + "Failed to allocate buffer for archive member of size: %d\n", file->filesize); return LDPS_ERR; } @@ -222,6 +273,10 @@ ld_plugin_status claim_file_hook(const ld_plugin_input_file *file, lto_get_error_message()); return LDPS_ERR; } + + if (!options::triple.empty()) + lto_module_set_target_triple(cf.M, options::triple.c_str()); + cf.handle = file->handle; unsigned sym_count = lto_module_get_num_symbols(cf.M); cf.syms.reserve(sym_count); @@ -298,7 +353,7 @@ ld_plugin_status claim_file_hook(const ld_plugin_input_file *file, /// At this point, we use get_symbols to see if any of our definitions have /// been overridden by a native object file. Then, perform optimization and /// codegen. -ld_plugin_status all_symbols_read_hook(void) { +static ld_plugin_status all_symbols_read_hook(void) { lto_code_gen_t cg = lto_codegen_create(); for (std::list::iterator I = Modules.begin(), @@ -306,7 +361,7 @@ ld_plugin_status all_symbols_read_hook(void) { lto_codegen_add_module(cg, I->M); std::ofstream api_file; - if (generate_api_file) { + if (options::generate_api_file) { api_file.open("apifile.txt", std::ofstream::out | std::ofstream::trunc); if (!api_file.is_open()) { (*message)(LDPL_FATAL, "Unable to open apifile.txt for writing."); @@ -316,41 +371,59 @@ ld_plugin_status all_symbols_read_hook(void) { // If we don't preserve any symbols, libLTO will assume that all symbols are // needed. Keep all symbols unless we're producing a final executable. - if (output_type == LTO_CODEGEN_PIC_MODEL_STATIC) { - bool anySymbolsPreserved = false; - for (std::list::iterator I = Modules.begin(), + bool anySymbolsPreserved = false; + for (std::list::iterator I = Modules.begin(), E = Modules.end(); I != E; ++I) { - (*get_symbols)(I->handle, I->syms.size(), &I->syms[0]); - for (unsigned i = 0, e = I->syms.size(); i != e; i++) { - if (I->syms[i].resolution == LDPR_PREVAILING_DEF || - (I->syms[i].def == LDPK_COMMON && - I->syms[i].resolution == LDPR_RESOLVED_IR)) { - lto_codegen_add_must_preserve_symbol(cg, I->syms[i].name); - anySymbolsPreserved = true; - - if (generate_api_file) - api_file << I->syms[i].name << "\n"; - } + (*get_symbols)(I->handle, I->syms.size(), &I->syms[0]); + for (unsigned i = 0, e = I->syms.size(); i != e; i++) { + if (I->syms[i].resolution == LDPR_PREVAILING_DEF) { + lto_codegen_add_must_preserve_symbol(cg, I->syms[i].name); + anySymbolsPreserved = true; + + if (options::generate_api_file) + api_file << I->syms[i].name << "\n"; } } + } - if (generate_api_file) - api_file.close(); + if (options::generate_api_file) + api_file.close(); - if (!anySymbolsPreserved) { - // This entire file is unnecessary! - lto_codegen_dispose(cg); - return LDPS_OK; - } + if (!anySymbolsPreserved) { + // All of the IL is unnecessary! + lto_codegen_dispose(cg); + return LDPS_OK; } lto_codegen_set_pic_model(cg, output_type); lto_codegen_set_debug_model(cg, LTO_DEBUG_MODEL_DWARF); - if (as_path) { - sys::Path p = sys::Program::FindProgramByName(as_path); + if (!options::as_path.empty()) { + sys::Path p = sys::Program::FindProgramByName(options::as_path); lto_codegen_set_assembler_path(cg, p.c_str()); } + // Pass through extra options to the code generator. + if (!options::extra.empty()) { + for (std::vector::iterator it = options::extra.begin(); + it != options::extra.end(); ++it) { + lto_codegen_debug_options(cg, (*it).c_str()); + } + } + + if (options::generate_bc_file != options::BC_NO) { + std::string path; + if (options::generate_bc_file == options::BC_ONLY) + path = output_name; + else if (!options::bc_path.empty()) + path = options::bc_path; + else + path = output_name + ".bc"; + bool err = lto_codegen_write_merged_modules(cg, path.c_str()); + if (err) + (*message)(LDPL_FATAL, "Failed to write the output file."); + if (options::generate_bc_file == options::BC_ONLY) + exit(0); + } size_t bufsize = 0; const char *buffer = static_cast(lto_codegen_compile(cg, &bufsize)); @@ -362,33 +435,54 @@ ld_plugin_status all_symbols_read_hook(void) { (*message)(LDPL_ERROR, "%s", ErrMsg.c_str()); return LDPS_ERR; } - raw_fd_ostream *objFile = new raw_fd_ostream(uniqueObjPath.c_str(), - /*Binary=*/true, - /*Force=*/true, - ErrMsg); + raw_fd_ostream objFile(uniqueObjPath.c_str(), ErrMsg, + raw_fd_ostream::F_Binary); if (!ErrMsg.empty()) { - delete objFile; (*message)(LDPL_ERROR, "%s", ErrMsg.c_str()); return LDPS_ERR; } - objFile->write(buffer, bufsize); - objFile->close(); + objFile.write(buffer, bufsize); + objFile.close(); lto_codegen_dispose(cg); - if ((*add_input_file)(const_cast(uniqueObjPath.c_str())) != LDPS_OK) { + if ((*add_input_file)(uniqueObjPath.c_str()) != LDPS_OK) { (*message)(LDPL_ERROR, "Unable to add .o file to the link."); (*message)(LDPL_ERROR, "File left behind in: %s", uniqueObjPath.c_str()); return LDPS_ERR; } + if (!options::extra_library_path.empty() && + set_extra_library_path(options::extra_library_path.c_str()) != LDPS_OK) { + (*message)(LDPL_ERROR, "Unable to set the extra library path."); + return LDPS_ERR; + } + + for (std::vector::iterator i = options::pass_through.begin(), + e = options::pass_through.end(); + i != e; ++i) { + std::string &item = *i; + const char *item_p = item.c_str(); + if (llvm::StringRef(item).startswith("-l")) { + if (add_input_library(item_p + 2) != LDPS_OK) { + (*message)(LDPL_ERROR, "Unable to add library to the link."); + return LDPS_ERR; + } + } else { + if (add_input_file(item_p) != LDPS_OK) { + (*message)(LDPL_ERROR, "Unable to add .o file to the link."); + return LDPS_ERR; + } + } + } + Cleanup.push_back(uniqueObjPath); return LDPS_OK; } -ld_plugin_status cleanup_hook(void) { +static ld_plugin_status cleanup_hook(void) { std::string ErrMsg; for (int i = 0, e = Cleanup.size(); i != e; ++i)