This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: [PATCH] PR gold/17640
- From: Ilya Tocar <tocarip dot intel at gmail dot com>
- To: Cary Coutant <ccoutant at google dot com>
- Cc: "H.J. Lu" <hjl dot tools at gmail dot com>, Ian Lance Taylor <iant at google dot com>, Binutils <binutils at sourceware dot org>
- Date: Fri, 27 Feb 2015 17:20:03 +0300
- Subject: Re: [PATCH] PR gold/17640
- Authentication-results: sourceware.org; auth=none
- References: <20150202134701 dot GA91020 at msticlxl7 dot ims dot intel dot com> <CAMe9rOpzSBoiykoFG+YuAK8QYsguqzZNrvj2sE7EhafUzOjJJw at mail dot gmail dot com> <20150218150011 dot GA40373 at msticlxl7 dot ims dot intel dot com> <CAMe9rOqGecgvSMs937a2b57mGjp-ZF5XuULQoAx3Tr9NG75GcA at mail dot gmail dot com> <20150219142707 dot GA507 at msticlxl7 dot ims dot intel dot com> <CAMe9rOp+6-mKKqE4h1jUvt-wBWVU0YK62yJPgrN0LVuU4JhxRw at mail dot gmail dot com> <CAHACq4poMBVYcg=nS01tPsLuNi=BdtL4gSTz5Q1-auGBX=zA-Q at mail dot gmail dot com> <20150226104626 dot GA16554 at msticlxl7 dot ims dot intel dot com> <CAHACq4ojyujhxYSsMaF_jSVWUg0=YgNawR6=6XYdZie1PMhXYQ at mail dot gmail dot com>
On 26 Feb 10:15, Cary Coutant wrote:
> Thanks for working on this!
>
> Please write a ChangeLog entry.
>
Done.
> > + // If the relocation symbol isn't IFUNC,
> > + // and is local, then we will convert
> > + // mov foo@GOT(%reg), %reg
> > + // to
> > + // lea foo@GOTOFF(%reg), %reg
> > + // in Relocate::relocate
> > + if (view[reloc.get_r_offset() - 2] == 0x8b
>
> You also need to check that reloc.get_r_offset() >= 2. If that's
> false, or if the symbol is an IFUNC symbol, you could avoid getting
> the section contents.
>
Done.
> > + // If we convert this from
> > + // mov foo@GOT(%reg), %reg
> > + // to
> > + // lea foo@GOTOFF(%reg), %reg
> > + // in Relocate::relocate, then there is nothing to do here.
> > + // Avoid converting _DYNAMIC, because it's address may be used.
> > + if (view[reloc.get_r_offset() - 2] == 0x8b
> > + && gsym->type() != elfcpp::STT_GNU_IFUNC
> > + && !gsym->is_undefined()
> > + && !gsym->is_from_dynobj()
> > + && strcmp(gsym->name(), "_DYNAMIC"))
> > + break;
>
> Same here.
>
> s/it's/its/
>
Fixed.
> Could you explain more about the exception for _DYNAMIC? If its
> address is used by some other relocation, won't we end up creating the
> GOT entry anyway when we process that relocation? And if it's not,
> isn't it OK to omit the GOT entry?
>
Comment in bfd/elf32-i386.c (elf_i386_convert_mov_to_lea:2714) says:
We also avoid optimizing _DYNAMIC since ld.so may use its link-time
address.
I've checked mov1 tests in ld/testsuite/ld-i386/
and without this check we optimize it (incorrectly) away.
> > + // If the relocation symbol isn't IFUNC,
> > + // and is local, then we convert
> > + // mov foo@GOT(%reg), %reg
> > + // to
> > + // lea foo@GOTOFF(%reg), %reg
> > + if (view[-2] == 0x8b
>
> Again, you need to check that r_offset is in range. See calls to
> tls::check_tls() later in the source file.
>
Check added.
> > + && ((gsym == NULL && !psymval->is_ifunc_symbol())
> > + || (gsym != NULL
> > + && gsym->type() != elfcpp::STT_GNU_IFUNC
> > + && !gsym->is_from_dynobj()
> > + && !gsym->is_undefined())))
>
> What about _DYNAMIC? You need to make sure you make the same decision
> here that you made in Scan::local or Scan::global.
Why? What's wrong with optimizing access into lea, but leaving GOT
entry?
>
> > +set -e
> > +
> > +grep -q "lea" i386_mov_to_lea.stdout
>
> I'd worry here that "lea" might somehow appear in the objdump output
> in some irrelevant place. Could you make your regex a little bit more
> specific?
>
I've changes it into grep -q "lea -0x[a-f0-9]\+(%ecx),%eax"
Ok for trunk?
---
gold/ChangeLog | 12 ++++
gold/i386.cc | 113 +++++++++++++++++++++++++++-----------
gold/testsuite/Makefile.am | 15 +++++
gold/testsuite/i386_mov_to_lea.s | 10 ++++
gold/testsuite/i386_mov_to_lea.sh | 29 ++++++++++
5 files changed, 147 insertions(+), 32 deletions(-)
create mode 100644 gold/testsuite/i386_mov_to_lea.s
create mode 100755 gold/testsuite/i386_mov_to_lea.sh
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 17b7f44..f00ab7e 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,15 @@
+2015-02-27 Ilya Tocar <ilya.tocar@intel.com>
+
+ PR gold/17640
+ * i386.cc (Target_i386::Scan::local): Don't create GOT entry, when we
+ can convert GOT to GOTOFF.
+ (Target_i386::Scan::global): Ditto.
+ (Target_i386::Relocate::relocate): Convert mov foo@GOT(%reg), %reg to
+ lea foo@GOTOFF(%reg), %reg if possible.
+ * testsuite/Makefile.am (i386_mov_to_lea): New test.
+ * testsuite/i386_mov_to_lea.s: New.
+ * testsuite/i386_mov_to_lea.sh: Ditto.
+
2015-02-11 Will Newton <will.newton@linaro.org>
PR gold/13321
diff --git a/gold/i386.cc b/gold/i386.cc
index 24f4103..154fcf3 100644
--- a/gold/i386.cc
+++ b/gold/i386.cc
@@ -1835,8 +1835,28 @@ Target_i386::Scan::local(Symbol_table* symtab,
case elfcpp::R_386_GOT32:
{
- // The symbol requires a GOT entry.
+
+ // We need GOT section.
Output_data_got<32, false>* got = target->got_section(symtab, layout);
+
+ // If the relocation symbol isn't IFUNC,
+ // and is local, then we will convert
+ // mov foo@GOT(%reg), %reg
+ // to
+ // lea foo@GOTOFF(%reg), %reg
+ // in Relocate::relocate
+ if (reloc.get_r_offset() >= 2
+ && lsym.get_st_type() != elfcpp::STT_GNU_IFUNC)
+ {
+ section_size_type stype;
+ const unsigned char* view = object->section_contents(data_shndx,
+ &stype, true);
+ if (view[reloc.get_r_offset() - 2] == 0x8b)
+ break;
+
+ }
+
+ // Otherwise, the symbol requires a GOT entry.
unsigned int r_sym = elfcpp::elf_r_sym<32>(reloc.get_r_info());
// For a STT_GNU_IFUNC symbol we want the PLT offset. That
@@ -2229,8 +2249,29 @@ Target_i386::Scan::global(Symbol_table* symtab,
case elfcpp::R_386_GOT32:
{
+
// The symbol requires a GOT entry.
Output_data_got<32, false>* got = target->got_section(symtab, layout);
+
+ // If we convert this from
+ // mov foo@GOT(%reg), %reg
+ // to
+ // lea foo@GOTOFF(%reg), %reg
+ // in Relocate::relocate, then there is nothing to do here.
+ // Avoid converting _DYNAMIC, because its address may be used.
+ if (reloc.get_r_offset() >= 2
+ && gsym->type() != elfcpp::STT_GNU_IFUNC
+ && !gsym->is_undefined()
+ && !gsym->is_from_dynobj()
+ && strcmp(gsym->name(), "_DYNAMIC"))
+ {
+ section_size_type stype;
+ const unsigned char* view = object->section_contents(data_shndx,
+ &stype, true);
+ if (view[reloc.get_r_offset() - 2] == 0x8b)
+ break;
+ }
+
if (gsym->final_value_is_known())
{
// For a STT_GNU_IFUNC symbol we want the PLT address.
@@ -2732,35 +2773,6 @@ Target_i386::Relocate::relocate(const Relocate_info<32, false>* relinfo,
}
}
- // Get the GOT offset if needed.
- // The GOT pointer points to the end of the GOT section.
- // We need to subtract the size of the GOT section to get
- // the actual offset to use in the relocation.
- bool have_got_offset = false;
- unsigned int got_offset = 0;
- switch (r_type)
- {
- case elfcpp::R_386_GOT32:
- if (gsym != NULL)
- {
- gold_assert(gsym->has_got_offset(GOT_TYPE_STANDARD));
- got_offset = (gsym->got_offset(GOT_TYPE_STANDARD)
- - target->got_size());
- }
- else
- {
- unsigned int r_sym = elfcpp::elf_r_sym<32>(rel.get_r_info());
- gold_assert(object->local_has_got_offset(r_sym, GOT_TYPE_STANDARD));
- got_offset = (object->local_got_offset(r_sym, GOT_TYPE_STANDARD)
- - target->got_size());
- }
- have_got_offset = true;
- break;
-
- default:
- break;
- }
-
switch (r_type)
{
case elfcpp::R_386_NONE:
@@ -2809,8 +2821,45 @@ Target_i386::Relocate::relocate(const Relocate_info<32, false>* relinfo,
break;
case elfcpp::R_386_GOT32:
- gold_assert(have_got_offset);
- Relocate_functions<32, false>::rel32(view, got_offset);
+ // If the relocation symbol isn't IFUNC,
+ // and is local, then we convert
+ // mov foo@GOT(%reg), %reg
+ // to
+ // lea foo@GOTOFF(%reg), %reg
+ if (view[-2] == 0x8b
+ && ((gsym == NULL && !psymval->is_ifunc_symbol())
+ || (gsym != NULL
+ && gsym->type() != elfcpp::STT_GNU_IFUNC
+ && !gsym->is_from_dynobj()
+ && !gsym->is_undefined())))
+ {
+ view[-2] = 0x8d;
+ elfcpp::Elf_types<32>::Elf_Addr value;
+ value = (psymval->value(object, 0)
+ - target->got_plt_section()->address());
+ Relocate_functions<32, false>::rel32(view, value);
+ }
+ else
+ {
+ // The GOT pointer points to the end of the GOT section.
+ // We need to subtract the size of the GOT section to get
+ // the actual offset to use in the relocation.
+ unsigned int got_offset = 0;
+ if (gsym != NULL)
+ {
+ gold_assert(gsym->has_got_offset(GOT_TYPE_STANDARD));
+ got_offset = (gsym->got_offset(GOT_TYPE_STANDARD)
+ - target->got_size());
+ }
+ else
+ {
+ unsigned int r_sym = elfcpp::elf_r_sym<32>(rel.get_r_info());
+ gold_assert(object->local_has_got_offset(r_sym, GOT_TYPE_STANDARD));
+ got_offset = (object->local_got_offset(r_sym, GOT_TYPE_STANDARD)
+ - target->got_size());
+ }
+ Relocate_functions<32, false>::rel32(view, got_offset);
+ }
break;
case elfcpp::R_386_GOTOFF:
diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index f767c21..e826167 100644
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -957,6 +957,21 @@ endif FN_PTRS_IN_SO_WITHOUT_PIC
endif TLS
+if DEFAULT_TARGET_I386
+
+check_SCRIPTS += i386_mov_to_lea.sh
+check_DATA += i386_mov_to_lea.stdout
+MOSTLYCLEANFILES += i386_mov_to_lea
+
+i386_mov_to_lea.o: i386_mov_to_lea.s
+ $(TEST_AS) --32 -o $@ $<
+i386_mov_to_lea: i386_mov_to_lea.o
+ ../ld-new -m elf_i386 -shared -o $@ $<
+i386_mov_to_lea.stdout: i386_mov_to_lea
+ $(TEST_OBJDUMP) -dw $< > $@
+
+endif DEFAULT_TARGET_I386
+
check_PROGRAMS += many_sections_test
many_sections_test_SOURCES = many_sections_test.cc
many_sections_test_DEPENDENCIES = gcctestdir/ld
diff --git a/gold/testsuite/i386_mov_to_lea.s b/gold/testsuite/i386_mov_to_lea.s
new file mode 100644
index 0000000..65f1bfd
--- /dev/null
+++ b/gold/testsuite/i386_mov_to_lea.s
@@ -0,0 +1,10 @@
+ .text
+ .type foo, @function
+foo:
+ ret
+ .size foo, .-foo
+ .globl bar
+ .type bar, @function
+bar:
+ movl foo@GOT(%ecx), %eax
+ .size bar, .-bar
diff --git a/gold/testsuite/i386_mov_to_lea.sh b/gold/testsuite/i386_mov_to_lea.sh
new file mode 100755
index 0000000..0845f80
--- /dev/null
+++ b/gold/testsuite/i386_mov_to_lea.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# i386_mov_to_lea.sh -- a test for mov2lea conversion.
+
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# Written by Tocar Ilya <ilya.tocar@intel.com>
+
+# This file is part of gold.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+set -e
+
+grep -q "lea -0x[a-f0-9]\+(%ecx),%eax" i386_mov_to_lea.stdout
+
+exit 0
--
1.8.3.1