mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-12 12:16:04 +08:00
ebdcad3fdd
According to the commit abd20cb637, an
intersting thing is that - the more relax passes, the more chances of
relaxations are reduced [1]. Originally, we set the boolean `again`
to TRUE once the code is actually deleted, and then we run the relaxations
repeatedly if `again` is still TRUE. But `again` only works for the
relax pass itself, and won't affect others. That is - we can not use
`again` to re-run the relax pass when we already enter into the following
passes (can not run the relax passes backwards). Besides, we must seperate
the PCREL relaxations into two relax passes for some reasons [2], it make
us lose some relax opportunities.
This patch try to fix the problem, and the basic idea was come from Jim
Wilson - we use a new boolean, restart_relax, to determine if we need to
run the whole relax passes again from 0 to 2. Once we have deleted the
code between relax pass 0 to 2, the restart_relax will be set to TRUE,
we should run the whole relaxations again to give them more chances to
shorten the code. We will only enter into the relax pass 3 when the
restart_relax is FALSE, since we can't relax anything else once we start
to handle the alignments.
I have passed the gcc/binutils regressions by riscv-gnu-toolchain, and
looks fine for now.
[1] https://sourceware.org/pipermail/binutils/2020-November/114223.html
[2] https://sourceware.org/pipermail/binutils/2020-November/114235.html
bfd/
* elfnn-riscv.c (riscv_elf_link_hash_table): New boolean restart_relax,
used to check if we need to run the whole relaxations from relax pass 0
to 2 again.
(riscv_elf_link_hash_table_create): Init restart_relax to FALSE.
(_bfd_riscv_relax_align): Remove obsolete sec_flg0 set.
(_bfd_riscv_relax_delete): Set again to TRUE if we do delete the code.
(bfd_elfNN_riscv_restart_relax_sections): New function. Called by
after_allocation to check if we need to run the whole relaxations again.
(_bfd_riscv_relax_section): We will only enter into the relax pass 3 when
the restart_relax is FALSE; At last set restart_relax to TRUE if again is
TRUE, too.
* elfxx-riscv.h (bfd_elf32_riscv_restart_relax_sections): Declaration.
(bfd_elf64_riscv_restart_relax_sections): Likewise.
ld/
* emultempl/riscvelf.em (after_allocation): Run ldelf_map_segments many
times if riscv_restart_relax_sections returns TRUE.
* testsuite/ld-riscv-elf/restart-relax.d: New testcase. Before applying
this patch, the call won't be relaxed to jal; But now we have more chances
to do relaxations.
* testsuite/ld-riscv-elf/restart-relax.s: Likewise.
* testsuite/ld-riscv-elf/ld-riscv-elf.exp: Updated.
96 lines
2.9 KiB
Plaintext
96 lines
2.9 KiB
Plaintext
# This shell script emits a C file. -*- C -*-
|
|
# Copyright (C) 2004-2021 Free Software Foundation, Inc.
|
|
#
|
|
# This file is part of the GNU Binutils.
|
|
#
|
|
# 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.
|
|
|
|
fragment <<EOF
|
|
|
|
#include "ldmain.h"
|
|
#include "ldctor.h"
|
|
#include "elf/riscv.h"
|
|
#include "elfxx-riscv.h"
|
|
|
|
static void
|
|
riscv_elf_before_allocation (void)
|
|
{
|
|
gld${EMULATION_NAME}_before_allocation ();
|
|
|
|
if (link_info.discard == discard_sec_merge)
|
|
link_info.discard = discard_l;
|
|
|
|
if (!bfd_link_relocatable (&link_info))
|
|
{
|
|
/* We always need at least some relaxation to handle code alignment. */
|
|
if (RELAXATION_DISABLED_BY_USER)
|
|
TARGET_ENABLE_RELAXATION;
|
|
else
|
|
ENABLE_RELAXATION;
|
|
}
|
|
|
|
link_info.relax_pass = 4;
|
|
}
|
|
|
|
static void
|
|
gld${EMULATION_NAME}_after_allocation (void)
|
|
{
|
|
int need_layout = 0;
|
|
|
|
/* Don't attempt to discard unused .eh_frame sections until the final link,
|
|
as we can't reliably tell if they're used until after relaxation. */
|
|
if (!bfd_link_relocatable (&link_info))
|
|
{
|
|
need_layout = bfd_elf_discard_info (link_info.output_bfd, &link_info);
|
|
if (need_layout < 0)
|
|
{
|
|
einfo (_("%X%P: .eh_frame/.stab edit: %E\n"));
|
|
return;
|
|
}
|
|
}
|
|
|
|
do
|
|
{
|
|
ldelf_map_segments (need_layout);
|
|
}
|
|
while (bfd_elf${ELFSIZE}_riscv_restart_relax_sections (&link_info));
|
|
}
|
|
|
|
/* This is a convenient point to tell BFD about target specific flags.
|
|
After the output has been created, but before inputs are read. */
|
|
|
|
static void
|
|
riscv_create_output_section_statements (void)
|
|
{
|
|
/* See PR 22920 for an example of why this is necessary. */
|
|
if (strstr (bfd_get_target (link_info.output_bfd), "riscv") == NULL)
|
|
{
|
|
/* The RISC-V backend needs special fields in the output hash structure.
|
|
These will only be created if the output format is a RISC-V format,
|
|
hence we do not support linking and changing output formats at the
|
|
same time. Use a link followed by objcopy to change output formats. */
|
|
einfo (_("%F%P: error: cannot change output format"
|
|
" whilst linking %s binaries\n"), "RISC-V");
|
|
return;
|
|
}
|
|
}
|
|
|
|
EOF
|
|
|
|
LDEMUL_BEFORE_ALLOCATION=riscv_elf_before_allocation
|
|
LDEMUL_AFTER_ALLOCATION=gld${EMULATION_NAME}_after_allocation
|
|
LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=riscv_create_output_section_statements
|