From 2f440b1452f79a670d2927abd42f95b79272c5d9 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 13 May 2011 16:47:37 -0400 Subject: rustc: lowercase the link and link::write modules --- src/comp/back/Link.rs | 189 --------------------------------------------- src/comp/back/link.rs | 189 +++++++++++++++++++++++++++++++++++++++++++++ src/comp/driver/rustc.rs | 24 +++--- src/comp/driver/session.rs | 2 +- src/comp/middle/trans.rs | 4 +- src/comp/rustc.rc | 2 +- 6 files changed, 205 insertions(+), 205 deletions(-) delete mode 100644 src/comp/back/Link.rs create mode 100644 src/comp/back/link.rs (limited to 'src/comp') diff --git a/src/comp/back/Link.rs b/src/comp/back/Link.rs deleted file mode 100644 index 50b07915..00000000 --- a/src/comp/back/Link.rs +++ /dev/null @@ -1,189 +0,0 @@ -import driver::session; -import lib::llvm::llvm; -import middle::trans; -import std::_str; -import std::fs; - -import lib::llvm::llvm::ModuleRef; -import lib::llvm::llvm::ValueRef; -import lib::llvm::mk_pass_manager; -import lib::llvm::mk_target_data; -import lib::llvm::mk_type_names; -import lib::llvm::False; -import lib::llvm::True; - -tag output_type { - output_type_none; - output_type_bitcode; - output_type_assembly; - output_type_object; -} - -fn llvm_err(session::session sess, str msg) { - auto buf = llvm::LLVMRustGetLastError(); - if ((buf as uint) == 0u) { - sess.err(msg); - } else { - sess.err(msg + ": " + _str::str_from_cstr(buf)); - } - fail; -} - -fn link_intrinsics(session::session sess, ModuleRef llmod) { - auto path = fs::connect(sess.get_opts().sysroot, "intrinsics.bc"); - auto membuf = - llvm::LLVMRustCreateMemoryBufferWithContentsOfFile(_str::buf(path)); - if ((membuf as uint) == 0u) { - llvm_err(sess, "installation problem: couldn't open intrinstics.bc"); - fail; - } - - auto llintrinsicsmod = llvm::LLVMRustParseBitcode(membuf); - if ((llintrinsicsmod as uint) == 0u) { - llvm_err(sess, "installation problem: couldn't parse intrinstics.bc"); - fail; - } - - if (llvm::LLVMLinkModules(llmod, llintrinsicsmod) == False) { - llvm_err(sess, "couldn't link the module with the intrinsics"); - fail; - } -} - -mod Write { - fn is_object_or_assembly(output_type ot) -> bool { - if (ot == output_type_assembly) { - ret true; - } - if (ot == output_type_object) { - ret true; - } - ret false; - } - - // Decides what to call an intermediate file, given the name of the output - // and the extension to use. - fn mk_intermediate_name(str output_path, str extension) -> str { - auto dot_pos = _str::index(output_path, '.' as u8); - auto stem; - if (dot_pos < 0) { - stem = output_path; - } else { - stem = _str::substr(output_path, 0u, dot_pos as uint); - } - ret stem + "." + extension; - } - - fn run_passes(session::session sess, ModuleRef llmod, str output) { - - auto opts = sess.get_opts(); - - if (opts.time_llvm_passes) { - llvm::LLVMRustEnableTimePasses(); - } - - link_intrinsics(sess, llmod); - - auto pm = mk_pass_manager(); - auto td = mk_target_data(x86::get_data_layout()); - llvm::LLVMAddTargetData(td.lltd, pm.llpm); - - // TODO: run the linter here also, once there are llvm-c bindings for - // it. - - // Generate a pre-optimization intermediate file if -save-temps was - // specified. - if (opts.save_temps) { - alt (opts.output_type) { - case (output_type_bitcode) { - if (opts.optimize) { - auto filename = mk_intermediate_name(output, - "no-opt.bc"); - llvm::LLVMWriteBitcodeToFile(llmod, - _str::buf(filename)); - } - } - case (_) { - auto filename = mk_intermediate_name(output, "bc"); - llvm::LLVMWriteBitcodeToFile(llmod, _str::buf(filename)); - } - } - } - - // FIXME: This is mostly a copy of the bits of opt's -O2 that are - // available in the C api. - // FIXME2: We might want to add optimization levels like -O1, -O2, - // -Os, etc - // FIXME3: Should we expose and use the pass lists used by the opt - // tool? - if (opts.optimize) { - auto fpm = mk_pass_manager(); - llvm::LLVMAddTargetData(td.lltd, fpm.llpm); - llvm::LLVMAddStandardFunctionPasses(fpm.llpm, 2u); - llvm::LLVMRunPassManager(fpm.llpm, llmod); - - // TODO: On -O3, use 275 instead of 225 for the inlining - // threshold. - llvm::LLVMAddStandardModulePasses(pm.llpm, - 2u, // optimization level - False, // optimize for size - True, // unit-at-a-time - True, // unroll loops - True, // simplify lib calls - True, // have exceptions - 225u); // inlining threshold - } - - if (opts.verify) { - llvm::LLVMAddVerifierPass(pm.llpm); - } - - // TODO: Write .s if -c was specified and -save-temps was on. - if (is_object_or_assembly(opts.output_type)) { - let int LLVMAssemblyFile = 0; - let int LLVMObjectFile = 1; - let int LLVMNullFile = 2; - auto FileType; - if (opts.output_type == output_type_object) { - FileType = LLVMObjectFile; - } else { - FileType = LLVMAssemblyFile; - } - - // Write optimized bitcode if --save-temps was on. - if (opts.save_temps) { - alt (opts.output_type) { - case (output_type_bitcode) { /* nothing to do */ } - case (_) { - auto filename = mk_intermediate_name(output, - "opt.bc"); - llvm::LLVMRunPassManager(pm.llpm, llmod); - llvm::LLVMWriteBitcodeToFile(llmod, - _str::buf(filename)); - pm = mk_pass_manager(); - } - } - } - - llvm::LLVMRustWriteOutputFile(pm.llpm, llmod, - _str::buf(x86::get_target_triple()), - _str::buf(output), - FileType); - llvm::LLVMDisposeModule(llmod); - if (opts.time_llvm_passes) { - llvm::LLVMRustPrintPassTimings(); - } - ret; - } - - llvm::LLVMRunPassManager(pm.llpm, llmod); - - llvm::LLVMWriteBitcodeToFile(llmod, _str::buf(output)); - llvm::LLVMDisposeModule(llmod); - - if (opts.time_llvm_passes) { - llvm::LLVMRustPrintPassTimings(); - } - } -} - diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs new file mode 100644 index 00000000..830264d3 --- /dev/null +++ b/src/comp/back/link.rs @@ -0,0 +1,189 @@ +import driver::session; +import lib::llvm::llvm; +import middle::trans; +import std::_str; +import std::fs; + +import lib::llvm::llvm::ModuleRef; +import lib::llvm::llvm::ValueRef; +import lib::llvm::mk_pass_manager; +import lib::llvm::mk_target_data; +import lib::llvm::mk_type_names; +import lib::llvm::False; +import lib::llvm::True; + +tag output_type { + output_type_none; + output_type_bitcode; + output_type_assembly; + output_type_object; +} + +fn llvm_err(session::session sess, str msg) { + auto buf = llvm::LLVMRustGetLastError(); + if ((buf as uint) == 0u) { + sess.err(msg); + } else { + sess.err(msg + ": " + _str::str_from_cstr(buf)); + } + fail; +} + +fn link_intrinsics(session::session sess, ModuleRef llmod) { + auto path = fs::connect(sess.get_opts().sysroot, "intrinsics.bc"); + auto membuf = + llvm::LLVMRustCreateMemoryBufferWithContentsOfFile(_str::buf(path)); + if ((membuf as uint) == 0u) { + llvm_err(sess, "installation problem: couldn't open intrinstics.bc"); + fail; + } + + auto llintrinsicsmod = llvm::LLVMRustParseBitcode(membuf); + if ((llintrinsicsmod as uint) == 0u) { + llvm_err(sess, "installation problem: couldn't parse intrinstics.bc"); + fail; + } + + if (llvm::LLVMLinkModules(llmod, llintrinsicsmod) == False) { + llvm_err(sess, "couldn't link the module with the intrinsics"); + fail; + } +} + +mod write { + fn is_object_or_assembly(output_type ot) -> bool { + if (ot == output_type_assembly) { + ret true; + } + if (ot == output_type_object) { + ret true; + } + ret false; + } + + // Decides what to call an intermediate file, given the name of the output + // and the extension to use. + fn mk_intermediate_name(str output_path, str extension) -> str { + auto dot_pos = _str::index(output_path, '.' as u8); + auto stem; + if (dot_pos < 0) { + stem = output_path; + } else { + stem = _str::substr(output_path, 0u, dot_pos as uint); + } + ret stem + "." + extension; + } + + fn run_passes(session::session sess, ModuleRef llmod, str output) { + + auto opts = sess.get_opts(); + + if (opts.time_llvm_passes) { + llvm::LLVMRustEnableTimePasses(); + } + + link_intrinsics(sess, llmod); + + auto pm = mk_pass_manager(); + auto td = mk_target_data(x86::get_data_layout()); + llvm::LLVMAddTargetData(td.lltd, pm.llpm); + + // TODO: run the linter here also, once there are llvm-c bindings for + // it. + + // Generate a pre-optimization intermediate file if -save-temps was + // specified. + if (opts.save_temps) { + alt (opts.output_type) { + case (output_type_bitcode) { + if (opts.optimize) { + auto filename = mk_intermediate_name(output, + "no-opt.bc"); + llvm::LLVMWriteBitcodeToFile(llmod, + _str::buf(filename)); + } + } + case (_) { + auto filename = mk_intermediate_name(output, "bc"); + llvm::LLVMWriteBitcodeToFile(llmod, _str::buf(filename)); + } + } + } + + // FIXME: This is mostly a copy of the bits of opt's -O2 that are + // available in the C api. + // FIXME2: We might want to add optimization levels like -O1, -O2, + // -Os, etc + // FIXME3: Should we expose and use the pass lists used by the opt + // tool? + if (opts.optimize) { + auto fpm = mk_pass_manager(); + llvm::LLVMAddTargetData(td.lltd, fpm.llpm); + llvm::LLVMAddStandardFunctionPasses(fpm.llpm, 2u); + llvm::LLVMRunPassManager(fpm.llpm, llmod); + + // TODO: On -O3, use 275 instead of 225 for the inlining + // threshold. + llvm::LLVMAddStandardModulePasses(pm.llpm, + 2u, // optimization level + False, // optimize for size + True, // unit-at-a-time + True, // unroll loops + True, // simplify lib calls + True, // have exceptions + 225u); // inlining threshold + } + + if (opts.verify) { + llvm::LLVMAddVerifierPass(pm.llpm); + } + + // TODO: Write .s if -c was specified and -save-temps was on. + if (is_object_or_assembly(opts.output_type)) { + let int LLVMAssemblyFile = 0; + let int LLVMObjectFile = 1; + let int LLVMNullFile = 2; + auto FileType; + if (opts.output_type == output_type_object) { + FileType = LLVMObjectFile; + } else { + FileType = LLVMAssemblyFile; + } + + // Write optimized bitcode if --save-temps was on. + if (opts.save_temps) { + alt (opts.output_type) { + case (output_type_bitcode) { /* nothing to do */ } + case (_) { + auto filename = mk_intermediate_name(output, + "opt.bc"); + llvm::LLVMRunPassManager(pm.llpm, llmod); + llvm::LLVMWriteBitcodeToFile(llmod, + _str::buf(filename)); + pm = mk_pass_manager(); + } + } + } + + llvm::LLVMRustWriteOutputFile(pm.llpm, llmod, + _str::buf(x86::get_target_triple()), + _str::buf(output), + FileType); + llvm::LLVMDisposeModule(llmod); + if (opts.time_llvm_passes) { + llvm::LLVMRustPrintPassTimings(); + } + ret; + } + + llvm::LLVMRunPassManager(pm.llpm, llmod); + + llvm::LLVMWriteBitcodeToFile(llmod, _str::buf(output)); + llvm::LLVMDisposeModule(llmod); + + if (opts.time_llvm_passes) { + llvm::LLVMRustPrintPassTimings(); + } + } +} + diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs index 4940e7a0..6effc44f 100644 --- a/src/comp/driver/rustc.rs +++ b/src/comp/driver/rustc.rs @@ -10,7 +10,7 @@ import middle::resolve; import middle::ty; import middle::typeck; import middle::typestate_check; -import back::Link; +import back::link; import lib::llvm; import util::common; @@ -29,7 +29,7 @@ import std::getopts::optmulti; import std::getopts::optflag; import std::getopts::opt_present; -import back::Link::output_type; +import back::link::output_type; fn default_environment(session::session sess, str argv0, @@ -87,7 +87,7 @@ fn compile_input(session::session sess, auto p = parser::new_parser(sess, env, def, input, 0u, 0u); auto crate = time(time_passes, "parsing", bind parse_input(sess, p, input)); - if (sess.get_opts().output_type == Link::output_type_none) {ret;} + if (sess.get_opts().output_type == link::output_type_none) {ret;} crate = time(time_passes, "external crate reading", bind creader::read_crates(sess, crate)); @@ -112,7 +112,7 @@ fn compile_input(session::session sess, type_cache, output)); time[()](time_passes, "LLVM passes", - bind Link::Write::run_passes(sess, llmod, output)); + bind link::write::run_passes(sess, llmod, output)); } fn pretty_print_input(session::session sess, @@ -241,13 +241,13 @@ fn main(vec[str] args) { auto output_file = getopts::opt_maybe_str(match, "o"); auto library_search_paths = getopts::opt_strs(match, "L"); - auto output_type = Link::output_type_bitcode; + auto output_type = link::output_type_bitcode; if (opt_present(match, "parse-only")) { - output_type = Link::output_type_none; + output_type = link::output_type_none; } else if (opt_present(match, "S")) { - output_type = Link::output_type_assembly; + output_type = link::output_type_assembly; } else if (opt_present(match, "c")) { - output_type = Link::output_type_object; + output_type = link::output_type_object; } auto verify = !opt_present(match, "noverify"); @@ -317,10 +317,10 @@ fn main(vec[str] args) { let vec[str] parts = _str::split(ifile, '.' as u8); _vec::pop[str](parts); alt (output_type) { - case (Link::output_type_none) { parts += vec("pp"); } - case (Link::output_type_bitcode) { parts += vec("bc"); } - case (Link::output_type_assembly) { parts += vec("s"); } - case (Link::output_type_object) { parts += vec("o"); } + case (link::output_type_none) { parts += vec("pp"); } + case (link::output_type_bitcode) { parts += vec("bc"); } + case (link::output_type_assembly) { parts += vec("s"); } + case (link::output_type_object) { parts += vec("o"); } } auto ofile = _str::connect(parts, "."); compile_input(sess, env, ifile, ofile); diff --git a/src/comp/driver/session.rs b/src/comp/driver/session.rs index 12129a93..71d4d9d2 100644 --- a/src/comp/driver/session.rs +++ b/src/comp/driver/session.rs @@ -34,7 +34,7 @@ type options = rec(bool shared, bool stats, bool time_passes, bool time_llvm_passes, - back::Link::output_type output_type, + back::link::output_type output_type, vec[str] library_search_paths, str sysroot); diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index d822be17..4f1636d4 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -14,7 +14,7 @@ import front::ast; import front::creader; import driver::session; import middle::ty; -import back::Link; +import back::link; import back::x86; import back::abi; import back::upcall; @@ -7892,7 +7892,7 @@ fn make_common_glue(&session::session sess, &str output) { trans::trans_exit_task_glue(glues, new_str_hash[ValueRef](), tn, llmod); - Link::Write::run_passes(sess, llmod, output); + link::write::run_passes(sess, llmod, output); } fn create_module_map(&@crate_ctxt ccx) -> ValueRef { diff --git a/src/comp/rustc.rc b/src/comp/rustc.rc index a0fb45c4..47682235 100644 --- a/src/comp/rustc.rc +++ b/src/comp/rustc.rc @@ -39,7 +39,7 @@ mod front { } mod back { - mod Link; + mod link; mod abi; mod upcall; mod x86; -- cgit v1.2.3