diff options
| author | bors <bors@rust-lang.org> | 2013-08-11 07:29:07 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-08-11 07:29:07 -0700 |
| commit | f08851e31ab95da3b5bc446744d6dc89905335d9 (patch) | |
| tree | 1d5bdf20d9f69978745d8b3b8bc32376b854c6d1 | |
| parent | 45da2a5f48300eff8ccfd524a0bad5c351c20298 (diff) | |
| parent | 2f3fde60c316031f657e149c56ff3eaa8ae2c7fa (diff) | |
| download | rust-f08851e31ab95da3b5bc446744d6dc89905335d9.tar.gz rust-f08851e31ab95da3b5bc446744d6dc89905335d9.zip | |
auto merge of #8421 : alexcrichton/rust/unnamed-addr, r=thestinger
This can be applied to statics and it will indicate that LLVM will attempt to merge the constant in .data with other statics. I have preliminarily applied this to all of the statics generated by the new `ifmt!` syntax extension. I compiled a file with 1000 calls to `ifmt!` and a separate file with 1000 calls to `fmt!` to compare the sizes, and the results were: ``` fmt 310k ifmt (before) 529k ifmt (after) 202k ``` This now means that ifmt! is both faster and smaller than fmt!, yay!
| -rw-r--r-- | src/librustc/lib/llvm.rs | 9 | ||||
| -rw-r--r-- | src/librustc/middle/trans/base.rs | 34 | ||||
| -rw-r--r-- | src/libsyntax/ext/ifmt.rs | 13 | ||||
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 4 | ||||
| -rw-r--r-- | src/rustllvm/rustllvm.def.in | 1 |
5 files changed, 46 insertions, 15 deletions
diff --git a/src/librustc/lib/llvm.rs b/src/librustc/lib/llvm.rs index 5801e43a54c..8a157ebc988 100644 --- a/src/librustc/lib/llvm.rs +++ b/src/librustc/lib/llvm.rs @@ -2082,6 +2082,9 @@ pub mod llvm { Elements: ValueRef, RunTimeLang: c_uint) -> ValueRef; + + #[fast_ffi] + pub fn LLVMSetUnnamedAddr(GlobalVar: ValueRef, UnnamedAddr: Bool); } } @@ -2101,6 +2104,12 @@ pub fn SetLinkage(Global: ValueRef, Link: Linkage) { } } +pub fn SetUnnamedAddr(Global: ValueRef, Unnamed: bool) { + unsafe { + llvm::LLVMSetUnnamedAddr(Global, Unnamed as Bool); + } +} + pub fn ConstICmp(Pred: IntPredicate, V1: ValueRef, V2: ValueRef) -> ValueRef { unsafe { llvm::LLVMConstICmp(Pred as c_ushort, V1, V2) diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs index d1b8da85440..4a2cefd2685 100644 --- a/src/librustc/middle/trans/base.rs +++ b/src/librustc/middle/trans/base.rs @@ -2180,19 +2180,18 @@ pub fn trans_item(ccx: @mut CrateContext, item: &ast::item) { } ast::item_static(_, m, expr) => { consts::trans_const(ccx, m, item.id); - // Do static_assert checking. It can't really be done much earlier because we need to get - // the value of the bool out of LLVM - for attr in item.attrs.iter() { - if "static_assert" == attr.name() { - if m == ast::m_mutbl { - ccx.sess.span_fatal(expr.span, - "cannot have static_assert on a mutable static"); - } - let v = ccx.const_values.get_copy(&item.id); - unsafe { - if !(llvm::LLVMConstIntGetZExtValue(v) as bool) { - ccx.sess.span_fatal(expr.span, "static assertion failed"); - } + // Do static_assert checking. It can't really be done much earlier + // because we need to get the value of the bool out of LLVM + if attr::contains_name(item.attrs, "static_assert") { + if m == ast::m_mutbl { + ccx.sess.span_fatal(expr.span, + "cannot have static_assert on a mutable \ + static"); + } + let v = ccx.const_values.get_copy(&item.id); + unsafe { + if !(llvm::LLVMConstIntGetZExtValue(v) as bool) { + ccx.sess.span_fatal(expr.span, "static assertion failed"); } } } @@ -2452,6 +2451,15 @@ pub fn get_item_val(ccx: @mut CrateContext, id: ast::NodeId) -> ValueRef { llvm::LLVMAddGlobal(ccx.llmod, llty, buf) }; + // Apply the `unnamed_addr` attribute if + // requested + if attr::contains_name(i.attrs, + "address_insignificant"){ + lib::llvm::SetUnnamedAddr(g, true); + lib::llvm::SetLinkage(g, + lib::llvm::InternalLinkage); + } + ccx.item_symbols.insert(i.id, sym); g } diff --git a/src/libsyntax/ext/ifmt.rs b/src/libsyntax/ext/ifmt.rs index a3adb42425a..65d2f798f31 100644 --- a/src/libsyntax/ext/ifmt.rs +++ b/src/libsyntax/ext/ifmt.rs @@ -429,7 +429,12 @@ impl Context { let st = ast::item_static(ty, ast::m_imm, method); let static_name = self.ecx.ident_of(fmt!("__static_method_%u", self.method_statics.len())); - let item = self.ecx.item(sp, static_name, ~[], st); + // Flag these statics as `address_insignificant` so LLVM can + // merge duplicate globals as much as possible (which we're + // generating a whole lot of). + let unnamed = self.ecx.meta_word(self.fmtsp, @"address_insignificant"); + let unnamed = self.ecx.attribute(self.fmtsp, unnamed); + let item = self.ecx.item(sp, static_name, ~[unnamed], st); self.method_statics.push(item); self.ecx.expr_ident(sp, static_name) }; @@ -550,7 +555,10 @@ impl Context { let ty = self.ecx.ty(self.fmtsp, ty); let st = ast::item_static(ty, ast::m_imm, fmt); let static_name = self.ecx.ident_of("__static_fmtstr"); - let item = self.ecx.item(self.fmtsp, static_name, ~[], st); + // see above comment for `address_insignificant` and why we do it + let unnamed = self.ecx.meta_word(self.fmtsp, @"address_insignificant"); + let unnamed = self.ecx.attribute(self.fmtsp, unnamed); + let item = self.ecx.item(self.fmtsp, static_name, ~[unnamed], st); let decl = respan(self.fmtsp, ast::decl_item(item)); lets.push(@respan(self.fmtsp, ast::stmt_decl(@decl, self.ecx.next_id()))); @@ -613,6 +621,7 @@ impl Context { if ty == Unknown { ty = Known(@"?"); } + let argptr = self.ecx.expr_addr_of(sp, self.ecx.expr_ident(sp, ident)); match ty { Known(tyname) => { diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index 04c062072d6..db353036336 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -833,3 +833,7 @@ extern "C" LLVMValueRef LLVMDIBuilderCreateUnionType( unwrapDI<DIArray>(Elements), RunTimeLang)); } + +extern "C" void LLVMSetUnnamedAddr(LLVMValueRef Value, LLVMBool Unnamed) { + unwrap<GlobalValue>(Value)->setUnnamedAddr(Unnamed); +} diff --git a/src/rustllvm/rustllvm.def.in b/src/rustllvm/rustllvm.def.in index 260a16dab98..a2af7a18b4f 100644 --- a/src/rustllvm/rustllvm.def.in +++ b/src/rustllvm/rustllvm.def.in @@ -613,3 +613,4 @@ LLVMDIBuilderInsertDeclareBefore LLVMDIBuilderCreateEnumerator LLVMDIBuilderCreateEnumerationType LLVMDIBuilderCreateUnionType +LLVMSetUnnamedAddr |
