From patchwork Thu Nov 16 11:19:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mengqinggang X-Patchwork-Id: 80011 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D2E443858435 for ; Thu, 16 Nov 2023 11:20:11 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by sourceware.org (Postfix) with ESMTP id 851AF3858D35 for ; Thu, 16 Nov 2023 11:19:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 851AF3858D35 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=loongson.cn ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 851AF3858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700133564; cv=none; b=KVXZC7C2Pi8NvAgX5+PmSiYW78P6KIHQYochQefhulnmvN9o8dZJbcEns0sXQNfrhPwPv5OtODFPb/46BBJI145usbts6kZPqkJpumY2sw5j2x6QXD/Ixr81AKg884d5Gwb5v8TJJ1CEqGnvUEfyWJsUTOzQI3T1Z+crLx7fxv0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700133564; c=relaxed/simple; bh=DUw6tEYZIR82l8Ute+G+nKboSwJC2H3CYWgvbnGKiUU=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=NdHFW60M2EJGDkRdT7KXYltFduLESpDGv1GDzJIxwsO/bbXDfQKTHKzA541i+DdFcMYJlDdS2Lok+42q9x0wl6d/I9LerHT3BRrUJH3RE8E6Ir+xI8mjQ9T6RY+UGQ49vBepugEU34ifA8xWvpllDAngE5iYLHYZZfZCI4DvGrM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from loongson.cn (unknown [10.2.6.5]) by gateway (Coremail) with SMTP id _____8CxNvG3+lVleIc6AA--.49447S3; Thu, 16 Nov 2023 19:19:19 +0800 (CST) Received: from 5.5.5 (unknown [10.2.6.5]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Ax3ty2+lVlTg5EAA--.17299S3; Thu, 16 Nov 2023 19:19:19 +0800 (CST) From: mengqinggang To: binutils@sourceware.org Cc: xuchenghua@loongson.cn, chenglulu@loongson.cn, liuzhensong@loongson.cn, xry111@xry111.site, i.swmail@xen0n.name, maskray@google.com, mengqinggang Subject: [PATCH v2 1/6] LoongArch: Fix ld --no-relax bug Date: Thu, 16 Nov 2023 19:19:11 +0800 Message-Id: <20231116111916.3648176-2-mengqinggang@loongson.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20231116111916.3648176-1-mengqinggang@loongson.cn> References: <20231116111916.3648176-1-mengqinggang@loongson.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAf8Ax3ty2+lVlTg5EAA--.17299S3 X-CM-SenderInfo: 5phqw15lqjwttqj6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBj93XoW7WFyUCr4rGFWDGw1Uuw4xKrX_yoW8Xr15pa 4fury8JF4rCFn3WwnrJrWUuF4DJFy8Kr12ya43t3s7Ca1DCFy5XF4rAryIgFWDG3WIgrW8 Zr10g347uFn7AabCm3ZEXasCq-sJn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUk2b4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r126r1DMcIj6I8E87Iv 67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUcDDGUUUUU X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+patchwork=sourceware.org@sourceware.org When calling ld with --no-relax, pcalau12i + ld.d still can be relaxed. This patch fix this bug and pcalau12i + ld.d can be relaxed with --relax. --- bfd/elfnn-loongarch.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c index 18ad3cc91ca..1162cb35cd6 100644 --- a/bfd/elfnn-loongarch.c +++ b/bfd/elfnn-loongarch.c @@ -3996,29 +3996,22 @@ loongarch_elf_relax_section (bfd *abfd, asection *sec, loongarch_relax_align (abfd, sec, sym_sec, info, rel, symval); break; case R_LARCH_DELETE: - if (info->relax_pass == 1) + if (1 == info->relax_pass) { loongarch_relax_delete_bytes (abfd, sec, rel->r_offset, 4, info); rel->r_info = ELFNN_R_INFO (0, R_LARCH_NONE); } break; case R_LARCH_PCALA_HI20: - if (info->relax_pass == 0) - { - if (i + 4 > sec->reloc_count) - break; - loongarch_relax_pcala_addi (abfd, sec, rel, symval); - } + if (0 == info->relax_pass && (i + 4) <= sec->reloc_count) + loongarch_relax_pcala_addi (abfd, sec, rel, symval); break; case R_LARCH_GOT_PC_HI20: - if (local_got) + if (local_got && 0 == info->relax_pass + && (i + 4) <= sec->reloc_count) { - if (i + 4 > sec->reloc_count) - break; if (loongarch_relax_pcala_ld (abfd, sec, rel)) - { - loongarch_relax_pcala_addi (abfd, sec, rel, symval); - } + loongarch_relax_pcala_addi (abfd, sec, rel, symval); } break; default: From patchwork Thu Nov 16 11:19:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mengqinggang X-Patchwork-Id: 80013 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 442793858C60 for ; Thu, 16 Nov 2023 11:20:42 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by sourceware.org (Postfix) with ESMTP id 23AC33858D20 for ; Thu, 16 Nov 2023 11:19:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 23AC33858D20 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=loongson.cn ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 23AC33858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700133564; cv=none; b=OqMn9stgcMDGaNvB8g91rBcdm8njggETBve2ydiP7hWxLwsHgh1va8Cus8w0IuALeFEdviWYSStZCLATCRzPoNHE+rVcayJ+Sl5CaGh5d8R2dGpzGx8hkaFAhs6zF73HokhRonrVpw7XE7pzF86U8rUKgevZcvFWGyQ0gUc/32M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700133564; c=relaxed/simple; bh=XclaRs/KpEX0o0Ln4u2dbEa5u6NErnn91+jLo+Es8sE=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=LnJ3aqKRMxXHb+SRJwVUST2sBMrZZjXdO0U22lK3ZSfChyG3raR31wWsrxgO5HHlVLLwaDTs1wdhklg5/qNVUViyBULaMsuzAWE3dlM/G+wAddqdws8nZ6iNvMrvZgNRA3oXucT226da3vYfnevxg59DK9cxh3cYy3AHCrKdErc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from loongson.cn (unknown [10.2.6.5]) by gateway (Coremail) with SMTP id _____8AxV_G4+lVlf4c6AA--.50540S3; Thu, 16 Nov 2023 19:19:20 +0800 (CST) Received: from 5.5.5 (unknown [10.2.6.5]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Ax3ty2+lVlTg5EAA--.17299S4; Thu, 16 Nov 2023 19:19:20 +0800 (CST) From: mengqinggang To: binutils@sourceware.org Cc: xuchenghua@loongson.cn, chenglulu@loongson.cn, liuzhensong@loongson.cn, xry111@xry111.site, i.swmail@xen0n.name, maskray@google.com, mengqinggang Subject: [PATCH v2 2/6] LoongArch: Directly delete relaxed instuctions in first relaxation pass Date: Thu, 16 Nov 2023 19:19:12 +0800 Message-Id: <20231116111916.3648176-3-mengqinggang@loongson.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20231116111916.3648176-1-mengqinggang@loongson.cn> References: <20231116111916.3648176-1-mengqinggang@loongson.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAf8Ax3ty2+lVlTg5EAA--.17299S4 X-CM-SenderInfo: 5phqw15lqjwttqj6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBj93XoW7uF1fWF48Jw4UJF1UXFyfXwc_yoW8CFW5pa y3uryrJF4ruFn3W3WDZrWUWFs8Jry8Gr12qa43Kwn7CFsrGFyFqr4rAr17WFW5Kw1xurWv vr18Ka47ZFn7CwcCm3ZEXasCq-sJn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUk2b4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r106r15M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv 67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUcHUqUUUUU X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+patchwork=sourceware.org@sourceware.org Directly delete relaxed instuctions in first relaxation pass, not use R_LARCH_DELETE relocation. If not, the PC-relative offset may increase. --- bfd/elfnn-loongarch.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c index 1162cb35cd6..9d4ea7e4ae7 100644 --- a/bfd/elfnn-loongarch.c +++ b/bfd/elfnn-loongarch.c @@ -3739,7 +3739,8 @@ loongarch_relax_delete_bytes (bfd *abfd, /* Relax pcalau12i,addi.d => pcaddi. */ static bool loongarch_relax_pcala_addi (bfd *abfd, asection *sec, - Elf_Internal_Rela *rel_hi, bfd_vma symval) + Elf_Internal_Rela *rel_hi, bfd_vma symval, + struct bfd_link_info *info) { bfd_byte *contents = elf_section_data (sec)->this_hdr.contents; Elf_Internal_Rela *rel_lo = rel_hi + 2; @@ -3771,8 +3772,9 @@ loongarch_relax_pcala_addi (bfd *abfd, asection *sec, /* Adjust relocations. */ rel_hi->r_info = ELFNN_R_INFO (ELFNN_R_SYM (rel_hi->r_info), R_LARCH_PCREL20_S2); - rel_lo->r_info = ELFNN_R_INFO (ELFNN_R_SYM (rel_hi->r_info), - R_LARCH_DELETE); + rel_lo->r_info = ELFNN_R_INFO (0, R_LARCH_NONE); + + loongarch_relax_delete_bytes (abfd, sec, rel_lo->r_offset, 4, info); return true; } @@ -4004,14 +4006,14 @@ loongarch_elf_relax_section (bfd *abfd, asection *sec, break; case R_LARCH_PCALA_HI20: if (0 == info->relax_pass && (i + 4) <= sec->reloc_count) - loongarch_relax_pcala_addi (abfd, sec, rel, symval); + loongarch_relax_pcala_addi (abfd, sec, rel, symval, info); break; case R_LARCH_GOT_PC_HI20: if (local_got && 0 == info->relax_pass && (i + 4) <= sec->reloc_count) { if (loongarch_relax_pcala_ld (abfd, sec, rel)) - loongarch_relax_pcala_addi (abfd, sec, rel, symval); + loongarch_relax_pcala_addi (abfd, sec, rel, symval, info); } break; default: From patchwork Thu Nov 16 11:19:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mengqinggang X-Patchwork-Id: 80010 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7F6693858438 for ; Thu, 16 Nov 2023 11:19:50 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by sourceware.org (Postfix) with ESMTP id 0BA0D3858D39 for ; Thu, 16 Nov 2023 11:19:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0BA0D3858D39 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=loongson.cn ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0BA0D3858D39 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700133564; cv=none; b=IF/AD5S0pnu475dbHHbUUyhBf/I4QG1QsNdI9ejmOa8o9ZR6kTQ2NzDqgdqijJoxRcm+yYOqsVY9p0gl3mjjp6JFow+nNtwMQ5i6gRBITpXCNHTCm0ugxNl/rbFL/6lVx8jV2Dh9TWZWY+C0MqxLDA3rK0j5EbgqwTAlMGPTGdI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700133564; c=relaxed/simple; bh=CQs06HlOMvk+rInvyq+S5uYTonmtx1kgw7uzvYZm79c=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=cjYVcLEtFsTMVqFvryXGA7pSVhc7W2uvJqdi0RgI8iiewyLPaviE70+TvTPJyQePxoIYP+/CHSzFoZJt1tmNnjCphvKwsjv9+AGYhPhzYNLIV5+694N/0WkbhPHZQoBA3jJlyzJk6smN5qRPKLOGIt8zIfRKxyw2ne1ApyIi8ZQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from loongson.cn (unknown [10.2.6.5]) by gateway (Coremail) with SMTP id _____8Dx_+u5+lVlgoc6AA--.48567S3; Thu, 16 Nov 2023 19:19:21 +0800 (CST) Received: from 5.5.5 (unknown [10.2.6.5]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Ax3ty2+lVlTg5EAA--.17299S5; Thu, 16 Nov 2023 19:19:21 +0800 (CST) From: mengqinggang To: binutils@sourceware.org Cc: xuchenghua@loongson.cn, chenglulu@loongson.cn, liuzhensong@loongson.cn, xry111@xry111.site, i.swmail@xen0n.name, maskray@google.com, mengqinggang Subject: [PATCH v2 3/6] LoongArch: Multiple relax_trip in one relax_pass Date: Thu, 16 Nov 2023 19:19:13 +0800 Message-Id: <20231116111916.3648176-4-mengqinggang@loongson.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20231116111916.3648176-1-mengqinggang@loongson.cn> References: <20231116111916.3648176-1-mengqinggang@loongson.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAf8Ax3ty2+lVlTg5EAA--.17299S5 X-CM-SenderInfo: 5phqw15lqjwttqj6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBj93XoW7CF13uw43GrW5Jr4xuF15Awc_yoW8Ww4xp3 y3Z34rGa1ru3Z3WwnrZ3y5urs8tFyxGryI9a43t3s7CFWUGF18XF4rGry7CF45Kw1xWFZ2 vr18ta47ZFn7AabCm3ZEXasCq-sJn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUkIb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r106r15M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv 67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_Gr0_Xr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWxJVW8Jr1lIxAIcVC2z280aV CY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU8QJ57UUUUU== X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+patchwork=sourceware.org@sourceware.org If deleting instructions in one relax_trip, set again to true to start the next relax_trip. --- bfd/elfnn-loongarch.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c index 9d4ea7e4ae7..7436a14441f 100644 --- a/bfd/elfnn-loongarch.c +++ b/bfd/elfnn-loongarch.c @@ -3740,7 +3740,7 @@ loongarch_relax_delete_bytes (bfd *abfd, static bool loongarch_relax_pcala_addi (bfd *abfd, asection *sec, Elf_Internal_Rela *rel_hi, bfd_vma symval, - struct bfd_link_info *info) + struct bfd_link_info *info, bool *again) { bfd_byte *contents = elf_section_data (sec)->this_hdr.contents; Elf_Internal_Rela *rel_lo = rel_hi + 2; @@ -3766,6 +3766,9 @@ loongarch_relax_pcala_addi (bfd *abfd, asection *sec, || ((bfd_signed_vma)(symval - pc) > (bfd_signed_vma)(int32_t)0x1ffffc)) return false; + /* Continue next relax trip. */ + *again = true; + pca = pcaddi | rd; bfd_put (32, abfd, pca, contents + rel_hi->r_offset); @@ -4006,14 +4009,15 @@ loongarch_elf_relax_section (bfd *abfd, asection *sec, break; case R_LARCH_PCALA_HI20: if (0 == info->relax_pass && (i + 4) <= sec->reloc_count) - loongarch_relax_pcala_addi (abfd, sec, rel, symval, info); + loongarch_relax_pcala_addi (abfd, sec, rel, symval, info, again); break; case R_LARCH_GOT_PC_HI20: if (local_got && 0 == info->relax_pass && (i + 4) <= sec->reloc_count) { if (loongarch_relax_pcala_ld (abfd, sec, rel)) - loongarch_relax_pcala_addi (abfd, sec, rel, symval, info); + loongarch_relax_pcala_addi (abfd, sec, rel, symval, + info, again); } break; default: From patchwork Thu Nov 16 11:19:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mengqinggang X-Patchwork-Id: 80012 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 49A5F3858C74 for ; Thu, 16 Nov 2023 11:20:21 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by sourceware.org (Postfix) with ESMTP id 5AB233858C60 for ; Thu, 16 Nov 2023 11:19:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5AB233858C60 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=loongson.cn ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5AB233858C60 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700133568; cv=none; b=hF/3h77/j2EfM2yCE4RAZf/oBy/+Jw+rHrmN9xL6iDaLujquQFXftAjxbYKDitB4Py1BuukB3YNr+1u8t8UntSdCIWBU/5fw9Haf3G82Q7msxCHqGvSgroecypJ4BwQBZu3SysiMil4DgqD/iB7aPHUlqVUF0ATr6TPyULMAA38= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700133568; c=relaxed/simple; bh=4RiuWceyLgDXx0zCzCcnsHh+jDlmdiBoymNQJQZ8U10=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=S+rB6kbBNeCJfPN/IlSeWpNNUqYvi54nVc/R8L77NWkf1SZdaVdO1KsGMGRWmvSAhdaAoRyUyBQ4bjmx2e40GNBizLN+FrnrIsK4Pq2XQ7BaC64A50bE3tXiAjEO9BG370DYuwt9P0U3zvUOdrpYOxYns2fWwVCZcvdLg/V/Vok= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from loongson.cn (unknown [10.2.6.5]) by gateway (Coremail) with SMTP id _____8DxVui6+lVlh4c6AA--.14736S3; Thu, 16 Nov 2023 19:19:22 +0800 (CST) Received: from 5.5.5 (unknown [10.2.6.5]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Ax3ty2+lVlTg5EAA--.17299S6; Thu, 16 Nov 2023 19:19:21 +0800 (CST) From: mengqinggang To: binutils@sourceware.org Cc: xuchenghua@loongson.cn, chenglulu@loongson.cn, liuzhensong@loongson.cn, xry111@xry111.site, i.swmail@xen0n.name, maskray@google.com, mengqinggang Subject: [PATCH v2 4/6] LoongArch: Remove "elf_seg_map (info->output_bfd) == NULL" relaxation condition Date: Thu, 16 Nov 2023 19:19:14 +0800 Message-Id: <20231116111916.3648176-5-mengqinggang@loongson.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20231116111916.3648176-1-mengqinggang@loongson.cn> References: <20231116111916.3648176-1-mengqinggang@loongson.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAf8Ax3ty2+lVlTg5EAA--.17299S6 X-CM-SenderInfo: 5phqw15lqjwttqj6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBj93XoWxAFWkXFW7WFWfGr47AF1xtFc_yoWrWrWxpa 98u34rGa1rAFn3WwnFv3yrWFn8t34xur12qasxK3s7Ar4DWry0qF4rtFy7CF4DKw1UJrWI vr18ta17ZFn7CabCm3ZEXasCq-sJn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUkIb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r106r15M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv 67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_Gr0_Xr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWxJVW8Jr1lIxAIcVC2z280aV CY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU8QJ57UUUUU== X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+patchwork=sourceware.org@sourceware.org Previously the condition prevented shared objects from being relaxed. To remove the limitation, we need to update program header size and .eh_frame_hdr size before relaxation. --- bfd/elfnn-loongarch.c | 25 +++++++++++++++++++++---- ld/emultempl/loongarchelf.em | 18 ++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c index 7436a14441f..987e5b98bc0 100644 --- a/bfd/elfnn-loongarch.c +++ b/bfd/elfnn-loongarch.c @@ -3738,7 +3738,7 @@ loongarch_relax_delete_bytes (bfd *abfd, /* Relax pcalau12i,addi.d => pcaddi. */ static bool -loongarch_relax_pcala_addi (bfd *abfd, asection *sec, +loongarch_relax_pcala_addi (bfd *abfd, asection *sec, asection *sym_sec, Elf_Internal_Rela *rel_hi, bfd_vma symval, struct bfd_link_info *info, bool *again) { @@ -3747,7 +3747,24 @@ loongarch_relax_pcala_addi (bfd *abfd, asection *sec, uint32_t pca = bfd_get (32, abfd, contents + rel_hi->r_offset); uint32_t add = bfd_get (32, abfd, contents + rel_lo->r_offset); uint32_t rd = pca & 0x1f; + + /* This section's output_offset need to subtract the bytes of instructions + relaxed by the previous sections, so it needs to be updated beforehand. + size_input_section already took care of updating it after relaxation, + so we additionally update once here. */ + sec->output_offset = sec->output_section->size; bfd_vma pc = sec_addr (sec) + rel_hi->r_offset; + + /* If pc and symbol not in the same segment, add/sub segment alignment. + FIXME: if there are multiple readonly segments? */ + if (!(sym_sec->flags & SEC_READONLY)) + { + if (symval > pc) + pc -= info->maxpagesize; + else if (symval < pc) + pc += info->maxpagesize; + } + const uint32_t addi_d = 0x02c00000; const uint32_t pcaddi = 0x18000000; @@ -3889,7 +3906,6 @@ loongarch_elf_relax_section (bfd *abfd, asection *sec, || sec->sec_flg0 || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 - || elf_seg_map (info->output_bfd) == NULL || (info->disable_target_specific_optimizations && info->relax_pass == 0) /* The exp_seg_relro_adjust is enum phase_enum (0x4), @@ -4009,14 +4025,15 @@ loongarch_elf_relax_section (bfd *abfd, asection *sec, break; case R_LARCH_PCALA_HI20: if (0 == info->relax_pass && (i + 4) <= sec->reloc_count) - loongarch_relax_pcala_addi (abfd, sec, rel, symval, info, again); + loongarch_relax_pcala_addi (abfd, sec, sym_sec, rel, symval, + info, again); break; case R_LARCH_GOT_PC_HI20: if (local_got && 0 == info->relax_pass && (i + 4) <= sec->reloc_count) { if (loongarch_relax_pcala_ld (abfd, sec, rel)) - loongarch_relax_pcala_addi (abfd, sec, rel, symval, + loongarch_relax_pcala_addi (abfd, sec, sym_sec, rel, symval, info, again); } break; diff --git a/ld/emultempl/loongarchelf.em b/ld/emultempl/loongarchelf.em index 4850feb8767..d81c99da48b 100644 --- a/ld/emultempl/loongarchelf.em +++ b/ld/emultempl/loongarchelf.em @@ -62,6 +62,24 @@ gld${EMULATION_NAME}_after_allocation (void) } } + /* The program header size of executable file may increase. */ + if (bfd_get_flavour (link_info.output_bfd) == bfd_target_elf_flavour + && !bfd_link_relocatable (&link_info)) + { + if (lang_phdr_list == NULL) + elf_seg_map (link_info.output_bfd) = NULL; + if (!_bfd_elf_map_sections_to_segments (link_info.output_bfd, + &link_info, + NULL)) + einfo (_("%F%P: map sections to segments failed: %E\n")); + } + + /* Adjust program header size and .eh_frame_hdr size before + lang_relax_sections. Without it, the vma of data segment may increase. */ + lang_do_assignments (lang_allocating_phase_enum); + lang_reset_memory_regions (); + lang_size_sections (NULL, true); + enum phase_enum *phase = &(expld.dataseg.phase); bfd_elf${ELFSIZE}_loongarch_set_data_segment_info (&link_info, (int *) phase); /* gld${EMULATION_NAME}_map_segments (need_layout); */ From patchwork Thu Nov 16 11:19:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mengqinggang X-Patchwork-Id: 80014 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5B37D3858C30 for ; Thu, 16 Nov 2023 11:21:12 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by sourceware.org (Postfix) with ESMTP id AF67D3858D3C for ; Thu, 16 Nov 2023 11:19:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AF67D3858D3C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=loongson.cn ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AF67D3858D3C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700133566; cv=none; b=ia/+4UV2tCxGkuuYHNqg/WB6lLddJUx/eR6qWcn2WaiG3Oc3Uy08f/MU3VwgtlbubH8H0iWN0YGz1NH1JbQ30gX1OGVJqFt3tP+FVFjC6okjIfu4oU7rdh34Gy6UpQpfk483RMkUSh3Sex9A3D4A+Y2ovz3DKmuRD7clTTAbFyE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700133566; c=relaxed/simple; bh=9kbMEik/F+5svw0oHns+Q7JJvNA7EUysAMRybSE6duA=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=nG3WdMgJwxA9h7q2wVqAj9CTaMaJ/0xoR2UQeS/ktd5CPrT4Swh570RTTEttAVwiLQKnSmW6duX5mU79RHMzife9gUFjFKg5zwz0J9ucmSoAucxr1wX+qs6/bCQkzevExaUBIc0Dmd/x5rzlNoQeCevQvzJCWruefSBjHxU41SA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from loongson.cn (unknown [10.2.6.5]) by gateway (Coremail) with SMTP id _____8CxNvG7+lVljIc6AA--.49450S3; Thu, 16 Nov 2023 19:19:23 +0800 (CST) Received: from 5.5.5 (unknown [10.2.6.5]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Ax3ty2+lVlTg5EAA--.17299S7; Thu, 16 Nov 2023 19:19:22 +0800 (CST) From: mengqinggang To: binutils@sourceware.org Cc: xuchenghua@loongson.cn, chenglulu@loongson.cn, liuzhensong@loongson.cn, xry111@xry111.site, i.swmail@xen0n.name, maskray@google.com, mengqinggang Subject: [PATCH v2 5/6] LoongArch: Modify link_info.relax_pass from 3 to 2 Date: Thu, 16 Nov 2023 19:19:15 +0800 Message-Id: <20231116111916.3648176-6-mengqinggang@loongson.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20231116111916.3648176-1-mengqinggang@loongson.cn> References: <20231116111916.3648176-1-mengqinggang@loongson.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAf8Ax3ty2+lVlTg5EAA--.17299S7 X-CM-SenderInfo: 5phqw15lqjwttqj6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBj9xXoWrtFy3JFy7Cr4fXrWxuFy7XFc_yoWDKFbEga 4SqryUCFWxAay8twnIqryrC34Fva1xJFnxZFyqgr4xG3WUZrs8KrWDX3Z3ur1jyw4rWFn8 WrWFqr13CFW7KosvyTuYvTs0mTUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUj1kv1TuYvT s0mT0YCTnIWjqI5I8CrVACY4xI64kE6c02F40Ex7xfYxn0WfASr-VFAUDa7-sFnT9fnUUI cSsGvfJTRUUUb2xYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I6I8E6xAIw20EY4v20x vaj40_Wr0E3s1l1IIY67AEw4v_JrI_Jryl8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6r4UJVWxJr1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqjxCEc2xF0cIa020Ex4CE44I27w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jw0_WrylYx0Ex4A2jsIE 14v26r4j6F4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVW5JVW7JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26F4j6r4UJwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUcHUqUUUUU X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_NUMSUBJECT, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+patchwork=sourceware.org@sourceware.org The first pass handles R_LARCH_RELAX relocations, the second pass handles R_LARCH_ALIGN relocations. --- bfd/elfnn-loongarch.c | 2 +- ld/emultempl/loongarchelf.em | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c index 987e5b98bc0..024c5d4cd96 100644 --- a/bfd/elfnn-loongarch.c +++ b/bfd/elfnn-loongarch.c @@ -4013,7 +4013,7 @@ loongarch_elf_relax_section (bfd *abfd, asection *sec, switch (ELFNN_R_TYPE (rel->r_info)) { case R_LARCH_ALIGN: - if (2 == info->relax_pass) + if (1 == info->relax_pass) loongarch_relax_align (abfd, sec, sym_sec, info, rel, symval); break; case R_LARCH_DELETE: diff --git a/ld/emultempl/loongarchelf.em b/ld/emultempl/loongarchelf.em index d81c99da48b..9974989489c 100644 --- a/ld/emultempl/loongarchelf.em +++ b/ld/emultempl/loongarchelf.em @@ -42,7 +42,7 @@ larch_elf_before_allocation (void) ENABLE_RELAXATION; } - link_info.relax_pass = 3; + link_info.relax_pass = 2; } static void From patchwork Thu Nov 16 11:19:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mengqinggang X-Patchwork-Id: 80015 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5EA383858D39 for ; Thu, 16 Nov 2023 11:21:42 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by sourceware.org (Postfix) with ESMTP id 56A063858409 for ; Thu, 16 Nov 2023 11:19:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 56A063858409 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=loongson.cn ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 56A063858409 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700133568; cv=none; b=dNZZaDq24Up02aSLdg7otZed+mlHA7oghYYPzF/YuODHTwklrTGgGVs8kqSvQjR+iOharcggOEjBf7K0U2izLCnBLixftrm8Y42dcKVbfCG/hQmL4ZJgg6NU8almFgPaQOey/3aNL/GUXat9DBOgfO4Yduh7nlGY1HvufPCAX6w= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700133568; c=relaxed/simple; bh=HCaO7awimZ3bwchkBmyQoo8eo0AhRchF3mtG2A72ziU=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=HoASVxNbj/AXFnIlh288ryrgg4+GDm5UXebrgxcHlJJT2W4ZOFB7PXJ55Mt8UC0kJJvO5t3Bq/B8I5KepAfETcj5jJi/yygeyeIWC7uDOwOe0c4YMPGIVEGlov83aHmSLjYfzSOa2rXn19vCOhc9Tb7ZO2ukKIo/TsRSaNguOV0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from loongson.cn (unknown [10.2.6.5]) by gateway (Coremail) with SMTP id _____8Cx2eq8+lVlkYc6AA--.44484S3; Thu, 16 Nov 2023 19:19:24 +0800 (CST) Received: from 5.5.5 (unknown [10.2.6.5]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Ax3ty2+lVlTg5EAA--.17299S8; Thu, 16 Nov 2023 19:19:23 +0800 (CST) From: mengqinggang To: binutils@sourceware.org Cc: xuchenghua@loongson.cn, chenglulu@loongson.cn, liuzhensong@loongson.cn, xry111@xry111.site, i.swmail@xen0n.name, maskray@google.com, mengqinggang Subject: [PATCH v2 6/6] LoongArch: Add more relaxation testcases Date: Thu, 16 Nov 2023 19:19:16 +0800 Message-Id: <20231116111916.3648176-7-mengqinggang@loongson.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20231116111916.3648176-1-mengqinggang@loongson.cn> References: <20231116111916.3648176-1-mengqinggang@loongson.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAf8Ax3ty2+lVlTg5EAA--.17299S8 X-CM-SenderInfo: 5phqw15lqjwttqj6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBj93XoWxWw1rGrWkGrW3GF48Jr45twc_yoWruw13p3 43Zr4SkF48AF1DJr9xGay3Xas8Gan7Kryxuas7tr409Fs5WryxXF40yr9xXFnxJ3y5Wryj vF1Iq3W5WFs8XwcCm3ZEXasCq-sJn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUkab4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv 67AKxVWxJVW8Jr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28Icx kI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2Iq xVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42 IY6xIIjxv20xvE14v26ryj6F1UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY 6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvEx4A2js IEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jUSdgUUUUU= X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+patchwork=sourceware.org@sourceware.org 1. .so relaxation testcase 2. ld --no-relax testcase 3. segment alignment testcase --- .../ld-loongarch-elf/relax-segment-max.s | 12 +++ .../ld-loongarch-elf/relax-segment-min.s | 12 +++ ld/testsuite/ld-loongarch-elf/relax-so.s | 4 + ld/testsuite/ld-loongarch-elf/relax.exp | 80 +++++++++++++++++-- 4 files changed, 103 insertions(+), 5 deletions(-) create mode 100644 ld/testsuite/ld-loongarch-elf/relax-segment-max.s create mode 100644 ld/testsuite/ld-loongarch-elf/relax-segment-min.s create mode 100644 ld/testsuite/ld-loongarch-elf/relax-so.s diff --git a/ld/testsuite/ld-loongarch-elf/relax-segment-max.s b/ld/testsuite/ld-loongarch-elf/relax-segment-max.s new file mode 100644 index 00000000000..df15d4cab09 --- /dev/null +++ b/ld/testsuite/ld-loongarch-elf/relax-segment-max.s @@ -0,0 +1,12 @@ +# The .align may cause overflow because deleting nops. + .text # 0x120004000 + .align 3 + la.local $r12, .L1 + +# .fill 0x1f7ffc # max fill without overflow, .data address is 0x120200000 +# .fill 0x1f8000 # min fill with overflow, .data address is 0x120204000 + .fill 0x1fbff4 # max fill with overflow, .data address is 0x120204000 + + .data +.L1: + .byte 2 diff --git a/ld/testsuite/ld-loongarch-elf/relax-segment-min.s b/ld/testsuite/ld-loongarch-elf/relax-segment-min.s new file mode 100644 index 00000000000..476b9fba78c --- /dev/null +++ b/ld/testsuite/ld-loongarch-elf/relax-segment-min.s @@ -0,0 +1,12 @@ +# The .align may cause overflow because deleting nops. + .text # 0x120004000 + .align 3 + la.local $r12, .L1 + +# .fill 0x1f7ffc # max fill without overflow, .data address is 0x120200000 + .fill 0x1f8000 # min fill with overflow, .data address is 0x120204000 +# .fill 0x1fbff4 # max fill with overflow, .data address is 0x120204000 + + .data +.L1: + .byte 2 diff --git a/ld/testsuite/ld-loongarch-elf/relax-so.s b/ld/testsuite/ld-loongarch-elf/relax-so.s new file mode 100644 index 00000000000..01a404a8b47 --- /dev/null +++ b/ld/testsuite/ld-loongarch-elf/relax-so.s @@ -0,0 +1,4 @@ +.text +.align 2 +.L1: + la.local $r12, .L1 diff --git a/ld/testsuite/ld-loongarch-elf/relax.exp b/ld/testsuite/ld-loongarch-elf/relax.exp index 7ff876d7914..24d79ed5c20 100644 --- a/ld/testsuite/ld-loongarch-elf/relax.exp +++ b/ld/testsuite/ld-loongarch-elf/relax.exp @@ -22,7 +22,7 @@ if [istarget loongarch64-*-*] { if [isbuild loongarch64-*-*] { - set testname "loongarch relax build" + set testname "loongarch relax .exe build" set pre_builds [list \ [list \ "$testname" \ @@ -39,17 +39,87 @@ if [istarget loongarch64-*-*] { if [file exist "tmpdir/relax"] { set objdump_output [run_host_cmd "objdump" "-d tmpdir/relax"] if { [ regexp ".*pcaddi.*pcaddi.*" $objdump_output] } { - pass "loongarch relax" + pass "loongarch relax .exe" } { - fail "loongarch relax" + fail "loongarch relax .exe" } } + + set testname "loongarch ld --no-relax build" + set pre_builds [list \ + [list \ + "$testname" \ + "-Wl,--no-relax" \ + "" \ + {relax.s} \ + {} \ + "norelax" \ + ] \ + ] + + run_cc_link_tests $pre_builds + + if [file exist "tmpdir/norelax"] { + set objdump_output [run_host_cmd "objdump" "-d tmpdir/norelax"] + if { [ regexp ".*pcaddi.*" $objdump_output] } { + fail "loongarch ld --no-relax" + } { + pass "loongarch ld --no-relax" + } + } + + run_ld_link_tests \ + [list \ + [list \ + "loongarch relax .so build" \ + "-shared -e 0x0" "" \ + "" \ + {relax-so.s} \ + {} \ + "relax-so" \ + ] \ + ] + + if [file exist "tmpdir/relax-so"] { + set objdump_output [run_host_cmd "objdump" "-d tmpdir/relax-so"] + if { [ regexp ".*pcaddi.*" $objdump_output] } { + pass "loongarch relax .so" + } { + fail "loongarch relax .so" + } + } + + # If symbol in data segment, offset need to sub segment align to prevent + # overflow. + run_ld_link_tests \ + [list \ + [list \ + "loongarch relax segment alignment min" \ + "-e0 -Ttext 0x120004000 -pie -z relro" "" \ + "" \ + {relax-segment-min.s} \ + {} \ + "relax-segment-min" \ + ] \ + ] + + run_ld_link_tests \ + [list \ + [list \ + "loongarch relax segment alignment max" \ + "-e0 -Ttext 0x120004000 -pie -z relro" "" \ + "" \ + {relax-segment-max.s} \ + {} \ + "relax-segment-max" \ + ] \ + ] } run_ld_link_tests \ [list \ [list \ - "relax-align" \ + "loongarch relax-align" \ "-e 0x0 -z relro" "" \ "" \ {relax-align.s} \ @@ -64,7 +134,7 @@ if [istarget loongarch64-*-*] { run_ld_link_tests \ [list \ [list \ - "uleb128" \ + "loongarch uleb128" \ "-e 0x0" "" \ "" \ {uleb128.s} \