From patchwork Thu Dec 28 03:39:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: changjiachen X-Patchwork-Id: 183631 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp1790475dyb; Wed, 27 Dec 2023 19:42:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IEXBAkxKznzrEtpMnnAJvX8avnUwaNNNJhbg6vnSIli+X+60wXAe56+kuhzMb0WXLwnRjpH X-Received: by 2002:a05:6214:4205:b0:680:235a:1e4d with SMTP id nd5-20020a056214420500b00680235a1e4dmr4574241qvb.76.1703734944754; Wed, 27 Dec 2023 19:42:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1703734944; cv=pass; d=google.com; s=arc-20160816; b=P5QdMOb5h/F5+uPy3Q7opdf3vXRJoi3MC0kDrW8+actRwQXAVjg81eayxg1c2BJBjU hEU3i1xKSvdjdlfIq+LljafDXZ+Vpf0Ua/ZfFFe+TUIgnQ9ImAwyZaFQuTic3vuiZviG zDRqCSiaSWRWYn2la2OmB6SyX49Cq+K+Um4f+HYscOObBds78T9Z7nOrG7H6/qcZuhth xNPg9z1DJAM5mOedZ6Xnwrs7Dn2pZ43jMHJdQ6OtvLOPQ+h3pavjUabPMKVxJh0z/2lQ +QGBxhp97obfvQ37NOYgJRwa7dn/IQb1r7VH3TLlGgEd1Ix8OFGm7VZCGnJ0rYbpUBt5 ffug== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to; bh=yLAV+IGBuES2wLZxu8DdcWZv9aYWdP245VPuIhCPoaw=; fh=uTF/VfpCAq2GtcL5NdCKul3VKQPlBSDYmUlZE/0CcYM=; b=GEGFqT/C0puXwRwp8GVeg3alhxAz7XE0c9zFV5YlHJISRGeHJPs7h4/+4wKGcxroO+ NBsETOPYv5TV7L+ARujZJTLGSEdxMkhhqebF1OGo+JV3jf4GBX4LRA/aoYzQaMrV5M2J HsBJRwyT3bJUZmVQJQZk6FbqPmWSEBzpLvN6B0y8mobuFJ9VXKdVqJIBfw8C68whL+TX vskbAdM1ojzB14nfhf8ZswbqflBrpyLzZo9WhgHFkyjeQ4rrYqFBZRHItL13NDUuSpsX T2yIDrLk62qV648XkvrE6zGftFVLzeu3Jz4jRIFJZERpofzT/q4HZs6z1V0+9wmHmTde zDsg== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=xupt.edu.cn Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id j14-20020a05621419ce00b0068028d3a037si6163141qvc.154.2023.12.27.19.42.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 19:42:24 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=xupt.edu.cn Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 66BE5385840A for ; Thu, 28 Dec 2023 03:42:24 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-m25471.xmail.ntesmail.com (mail-m25471.xmail.ntesmail.com [103.129.254.71]) by sourceware.org (Postfix) with ESMTPS id 7123E3858CD1 for ; Thu, 28 Dec 2023 03:40:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7123E3858CD1 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=stu.xupt.edu.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=stu.xupt.edu.cn ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7123E3858CD1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=103.129.254.71 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703734818; cv=none; b=hVNqtYKLzz9aXmC/u6Ll4XhYjWLV3AiblLQOKCDE24D+OLL43/8xyhZkxszo60qsVPaWlsZ3HXpfmFgoTbNnwPYxN836/f/1pML66E0K1gsjvJK0GzU4Dz91hjoTp3Y7Vf0NzuS/z5DGyDJnBe83BAE0KL/f3Fy0FwA4XOzj0ew= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703734818; c=relaxed/simple; bh=UzyppQPyI+0xydRILNAXL1EQXnp9g8va8cEug7rL+Ew=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=ZBN3JtSZqf3e9HvzpW0x5rb5xKljhboUrar0mKTo1kcpyVIENPWbA4zd7FlyhLIwAcbtGVyo0geXtRLd2+FZt5piLTGhyCooC92pcfw+LJ/LV2I1E5CBC58mBiexZyR9fXlCbcsSVke0aIpcVSIMPPEyiokmst7D7Xzohnx1q1I= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from ubuntu.localdomain (unknown [111.18.37.154]) by mail-m121144.qiye.163.com (Hmail) with ESMTPA id E86C7AC00BE; Thu, 28 Dec 2023 11:40:08 +0800 (CST) From: changjiachen To: binutils@sourceware.org Cc: xuchenghua@loongson.cn, chenglulu@loongson.cn, liuzhensong@loongson.cn, xry111@xry111.site, i.swmail@xen0n.name, maskray@google.com, cailulu@loongson.cn, luweining@loongson.cn, wanglei@loongson.cn, hejinyang@loongson.cn, Lazy_Linux@126.com, mengqinggang@loongson.cn, changjiachen Subject: [PATCH v5 5/5] LoongArch: ld: Add support for tls le relax. Date: Thu, 28 Dec 2023 11:39:57 +0800 Message-Id: <20231228033957.108449-6-changjiachen@stu.xupt.edu.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231228033957.108449-1-changjiachen@stu.xupt.edu.cn> References: <20231228033957.108449-1-changjiachen@stu.xupt.edu.cn> MIME-Version: 1.0 X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFITzdXWS1ZQUlXWQ8JGhUIEh9ZQVlCQk1PVk9DQ01ITR9NShlPGVUTARMWGhIXJBQOD1 lXWRgSC1lBWUpKSlVKQ1VITFVKTk9ZV1kWGg8SFR0UWUFZT0tIVUpMSk9MQ1VKS0tVSkJLS1kG X-HM-Tid: 0a8cae82137eb039kuuue86c7ac00be X-HM-MType: 10 X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6N006Tyo5EzwwCQ8WDTk6AkMR HhYKFCxVSlVKTEtITEhPQ0pLSEtDVTMWGhIXVRgTGhUcERIaGBMeFTsIDw5VAw4LD1UeHw5VGBVF WVdZEgtZQVlKSkpVSkNVSExVSk5PWVdZCAFZQUpITkNPNwY+ X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, 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+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786495573184820303 X-GMAIL-MSGID: 1786495573184820303 Add tls le relax related testsuites in ld. The new test cases are mainly tested in three aspects: 1. tls le relax function correctness test. 2. tls le relax boundary check test. 3. tls le relax function compatibility test. ld/testsuite/ChangeLog: * ld/testsuite/ld-loongarch-elf/relax.exp: Modify test. * ld/testsuite/ld-loongarch-elf/old-tls-le.s: New test. * ld/testsuite/ld-loongarch-elf/relax-bound-check-tls-le.s: Likewise. * ld/testsuite/ld-loongarch-elf/tls-relax-compatible-check-new.s: Likewise. * ld/testsuite/ld-loongarch-elf/relax-tls-le.s: Likewise. * ld/testsuite/ld-loongarch-elf/tls-relax-compatible-check-old.s: Likewise. --- ld/testsuite/ld-loongarch-elf/old-tls-le.s | 23 +++ .../relax-bound-check-tls-le.s | 53 ++++++ ld/testsuite/ld-loongarch-elf/relax-tls-le.s | 26 +++ ld/testsuite/ld-loongarch-elf/relax.exp | 151 +++++++++++++++++- .../tls-relax-compatible-check-new.s | 35 ++++ .../tls-relax-compatible-check-old.s | 33 ++++ 6 files changed, 320 insertions(+), 1 deletion(-) create mode 100644 ld/testsuite/ld-loongarch-elf/old-tls-le.s create mode 100644 ld/testsuite/ld-loongarch-elf/relax-bound-check-tls-le.s create mode 100644 ld/testsuite/ld-loongarch-elf/relax-tls-le.s create mode 100644 ld/testsuite/ld-loongarch-elf/tls-relax-compatible-check-new.s create mode 100644 ld/testsuite/ld-loongarch-elf/tls-relax-compatible-check-old.s diff --git a/ld/testsuite/ld-loongarch-elf/old-tls-le.s b/ld/testsuite/ld-loongarch-elf/old-tls-le.s new file mode 100644 index 00000000000..be3d2b9c5c6 --- /dev/null +++ b/ld/testsuite/ld-loongarch-elf/old-tls-le.s @@ -0,0 +1,23 @@ +/* This test case mainly tests whether the original + tls le assembly instruction can be linked normally + after tls le relax is added to the current ld. */ + + .text + .globl aa + .section .tbss,"awT",@nobits + .align 2 + .type aa, @object + .size aa, 4 +aa: + .space 4 + .text + .align 2 + .globl main + .type main, @function +main: + lu12i.w $r12,%le_hi20(aa) + ori $r12,$r12,%le_lo12(aa) + add.d $r12,$r12,$r2 + addi.w $r13,$r0,2 # 0x2 + stptr.w $r13,$r12,0 + diff --git a/ld/testsuite/ld-loongarch-elf/relax-bound-check-tls-le.s b/ld/testsuite/ld-loongarch-elf/relax-bound-check-tls-le.s new file mode 100644 index 00000000000..b2a64b5d154 --- /dev/null +++ b/ld/testsuite/ld-loongarch-elf/relax-bound-check-tls-le.s @@ -0,0 +1,53 @@ +/* This test case mainly tests whether the address of the + tls le symbol can be resolved normally when the offset + of the symbol is greater than 0x800. (When the symbol + offset is greater than 0x800, relax is not performed). */ + + .text + .globl count1 + .section .tbss,"awT",@nobits + .align 2 + .type count1, @object + .size count1, 4 +count1: + .space 0x400 + .globl count2 + .align 2 + .type count2, @object + .size count2, 4 +count2: + .space 0x400 + .globl count3 + .align 2 + .type count3, @object + .size count3, 4 +count3: + .space 0x400 + .globl count4 + .align 2 + .type count4, @object + .size count4, 4 +count4: + .space 4 + .text + .align 2 + .globl main + .type main, @function +main: + lu12i.w $r12,%le_hi20_r(count1) + add.d $r12,$r12,$r2,%le_add_r(count1) + addi.w $r13,$r0,1 + st.w $r13,$r12,%le_lo12_r(count1) + lu12i.w $r12,%le_hi20_r(count2) + add.d $r12,$r12,$r2,%le_add_r(count2) + addi.w $r13,$r0,2 + st.w $r13,$r12,%le_lo12_r(count2) + lu12i.w $r12,%le_hi20(count3) + add.d $r12,$r12,$r2,%le_add_r(count3) + addi.w $r13,$r0,3 + st.w $r13,$r12,%le_lo12_r(count3) + lu12i.w $r12,%le_hi20(count4) + add.d $r12,$r12,$r2,%le_add_r(count4) + addi.w $r13,$r0,4 + st.w $r13,$r12,%le_lo12_r(count4) + diff --git a/ld/testsuite/ld-loongarch-elf/relax-tls-le.s b/ld/testsuite/ld-loongarch-elf/relax-tls-le.s new file mode 100644 index 00000000000..1ea53baf8f7 --- /dev/null +++ b/ld/testsuite/ld-loongarch-elf/relax-tls-le.s @@ -0,0 +1,26 @@ +/* This test case mainly tests whether the tls le variable + address acquisition can be relax normally. + + before relax: after relax: + + lu12i.w $r12,%le_hi20_r(sym) ====> (instruction deleted). + add.d $r12,$r12,$r2,%le_add_r(sym) ====> (instruction deleted). + st.w $r13,$r12,%le_lo12_r(sym) ====> st.w $r13,$r2,%le_lo12_r(sym). */ + + .text + .globl a + .section .tbss,"awT",@nobits + .align 2 + .type a, @object + .size a, 4 +a: + .space 4 + .text + .align 2 + .globl main + .type main, @function +main: + lu12i.w $r12,%le_hi20_r(a) + add.d $r12,$r12,$r2,%le_add_r(a) + addi.w $r13,$r0,1 # 0x1 + st.w $r13,$r12,%le_lo12_r(a) diff --git a/ld/testsuite/ld-loongarch-elf/relax.exp b/ld/testsuite/ld-loongarch-elf/relax.exp index 77323d8d7a3..b697d01563c 100644 --- a/ld/testsuite/ld-loongarch-elf/relax.exp +++ b/ld/testsuite/ld-loongarch-elf/relax.exp @@ -33,8 +33,90 @@ if [istarget loongarch64-*-*] { "relax" \ ] \ ] + set tls_relax_builds [list \ + [list \ + "tls_relax_builds" \ + "" \ + "" \ + {relax-tls-le.s} \ + {} \ + "relax-tls-le" \ + ] \ + ] + set tls_no_relax_builds [list \ + [list \ + "tls_no_relax_builds" \ + "-Wl,--no-relax" \ + "" \ + {relax-tls-le.s} \ + {} \ + "no-relax-tls-le" \ + ] \ + ] + + set relax_bound_check [list \ + [list \ + "relax_bound_check" \ + "" \ + "" \ + {relax-bound-check-tls-le.s} \ + {} \ + "relax-bound-check-tls-le" \ + ] \ + ] + set no_relax_bound_check [list \ + [list \ + "no_relax_bound_check" \ + "-Wl,--no-relax" \ + "" \ + {relax-bound-check-tls-le.s} \ + {} \ + "no-relax-bound-check-tls-le" \ + ] \ + ] + + set old_tls_le [list \ + [list \ + "old_tls_le" \ + "" \ + "" \ + {old-tls-le.s} \ + {} \ + "old-tls-le" \ + ] \ + ] + + set relax_compatible [list \ + [list \ + "relax_compatible" \ + "" \ + "" \ + {tls-relax-compatible-check-new.s tls-relax-compatible-check-old.s} \ + {} \ + "realx-compatible" \ + ] \ + ] + + set no_relax_compatible [list \ + [list \ + "no_relax_compatible" \ + "-Wl,--no-relax" \ + "" \ + {tls-relax-compatible-check-new.s tls-relax-compatible-check-old.s} \ + {} \ + "no-realx-compatible" \ + ] \ + ] + run_cc_link_tests $pre_builds + run_cc_link_tests $tls_relax_builds + run_cc_link_tests $tls_no_relax_builds + run_cc_link_tests $relax_bound_check + run_cc_link_tests $no_relax_bound_check + run_cc_link_tests $old_tls_le + run_cc_link_tests $relax_compatible + run_cc_link_tests $no_relax_compatible if [file exist "tmpdir/relax"] { set objdump_output [run_host_cmd "objdump" "-d tmpdir/relax"] @@ -114,8 +196,75 @@ if [istarget loongarch64-*-*] { "relax-segment-max" \ ] \ ] - } + if [file exist "tmpdir/relax-tls-le"] { + set objdump_output1 [run_host_cmd "objdump" "-d tmpdir/relax-tls-le"] + if { [ regexp ".addi.*st.*" $objdump_output1] } { + pass "loongarch relax success" + } { + fail "loongarch relax fail" + } + } + if [file exist "tmpdir/no-relax-tls-le"] { + set objdump_output2 [run_host_cmd "objdump" "-d tmpdir/no-relax-tls-le"] + if { [ regexp ".*lu12i.*add.*addi.*st.*" $objdump_output2] } { + pass "loongarch no-relax success" + } { + fail "loongarch no-relax fail" + } + + } + if [file exist "tmpdir/old-tls-le"] { + set objdump_output3 [run_host_cmd "objdump" "-d tmpdir/old-tls-le"] + if { [ regexp ".*lu12i.*ori.*add.*addi.*stptr.*" $objdump_output3] } { + pass "loongarch old tls le success" + } { + fail "loongarch old tls le fail" + } + + } + + if [file exist "tmpdir/realx-compatible"] { + set objdump_output4 [run_host_cmd "objdump" "-d tmpdir/realx-compatible"] + if { [ regexp ".addi.*st.*" $objdump_output4] && \ + [ regexp ".*lu12i.*ori.*add.*addi.*stptr.*" $objdump_output4] } { + pass "loongarch tls le relax compatible check success" + } { + fail "loongarch tls le relax compatible check fail" + } + } + + if [file exist "tmpdir/no-realx-compatible"] { + set objdump_output4 [run_host_cmd "objdump" "-d tmpdir/realx-compatible"] + if { [ regexp ".*lu12i.*add.*addi.*st.*" $objdump_output4] && \ + [ regexp ".*lu12i.*ori.*add.*addi.*stptr.*" $objdump_output4] } { + pass "loongarch tls le no-relax compatible check success" + } { + fail "loongarch tls le no-relax compatible check fail" + } + } + + + if [file exist "tmpdir/relax-bound-check-tls-le"] { + set objdump_output5 [run_host_cmd "objdump" "-d tmpdir/relax-bound-check-tls-le"] + if { [ regexp ".*lu12i.*add.*addi.*st.*" $objdump_output5] && \ + [ regexp ".addi.*st.*" $objdump_output5] } { + pass "loongarch no-relax success" + } { + fail "loongarch no-relax fail" + } + + } + if [file exist "tmpdir/no-relax-bound-check-tls-le"] { + set objdump_output5 [run_host_cmd "objdump" "-d tmpdir/no-relax-bound-check-tls-le"] + if { [ regexp ".*addi.*st.*" $objdump_output5] } { + pass "loongarch no-relax success" + } { + fail "loongarch no-relax fail" + } + } + + } run_ld_link_tests \ [list \ [list \ diff --git a/ld/testsuite/ld-loongarch-elf/tls-relax-compatible-check-new.s b/ld/testsuite/ld-loongarch-elf/tls-relax-compatible-check-new.s new file mode 100644 index 00000000000..059ca0b97ae --- /dev/null +++ b/ld/testsuite/ld-loongarch-elf/tls-relax-compatible-check-new.s @@ -0,0 +1,35 @@ +/* This test case mainly carries out ld compatibility test. + This test case is the new tls le instruction sequence, + which will be linked with tls-relax-compatible-check-old.s. + If the link is normal, it indicates that there is no + compatibility problem. */ + + .text + .globl new + .section .tbss,"awT",@nobits + .align 2 + .type new, @object + .size new, 4 +new: + .space 4 + .text + .align 2 + .globl main + .type main, @function +main: +.LFB0 = . + addi.d $r3,$r3,-16 + st.d $r1,$r3,8 + stptr.d $r22,$r3,0 + addi.d $r22,$r3,16 + bl %plt(old) + lu12i.w $r12,%le_hi20_r(new) + add.d $r12,$r12,$r2,%le_add_r(new) + addi.w $r13,$r0,2 # 0x2 + st.w $r13,$r12,%le_lo12_r(new) + or $r12,$r0,$r0 + or $r4,$r12,$r0 + ld.d $r1,$r3,8 + ldptr.d $r22,$r3,0 + addi.d $r3,$r3,16 + jr $r1 diff --git a/ld/testsuite/ld-loongarch-elf/tls-relax-compatible-check-old.s b/ld/testsuite/ld-loongarch-elf/tls-relax-compatible-check-old.s new file mode 100644 index 00000000000..083a26887e5 --- /dev/null +++ b/ld/testsuite/ld-loongarch-elf/tls-relax-compatible-check-old.s @@ -0,0 +1,33 @@ +/* This test case mainly carries out ld compatibility test. + This test case is the old tls le instruction sequence, + which will be linked with tls-relax-compatible-check-new.s. + If the link is normal, it indicates that there is no + compatibility problem. */ + + .text + .globl older + .section .tbss,"awT",@nobits + .align 2 + .type older, @object + .size older, 4 +older: + .space 4 + .text + .align 2 + .globl old + .type old, @function +old: +.LFB0 = . + addi.d $r3,$r3,-16 + st.d $r22,$r3,8 + addi.d $r22,$r3,16 + lu12i.w $r12,%le_hi20(older) + ori $r12,$r12,%le_lo12(older) + add.d $r12,$r12,$r2 + addi.w $r13,$r0,1 # 0x1 + stptr.w $r13,$r12,0 + nop + or $r4,$r12,$r0 + ld.d $r22,$r3,8 + addi.d $r3,$r3,16 + jr $r1