From patchwork Tue Dec 12 06:47:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Ruoyao X-Patchwork-Id: 177106 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp7548377vqy; Mon, 11 Dec 2023 22:49:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IHliinyh+9c+mEuz7GEbaEknZJszJ2hODGUrxzrRc5QQXQUrJm3twkGFMhUJ/mr1skJ+Jok X-Received: by 2002:a05:622a:452:b0:423:a4f6:9aa2 with SMTP id o18-20020a05622a045200b00423a4f69aa2mr7035025qtx.6.1702363780721; Mon, 11 Dec 2023 22:49:40 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702363780; cv=pass; d=google.com; s=arc-20160816; b=jcRyScKNe5VpkLGmivIRr/qrveQsfl7hA7YITAIqEdc+y/NP10E3xFa70jDf9aTVMV 4+vKzd9k9M5LyLb+oswnckkMpf34QBM1sOp2JQWNHXGRBTchdIkGEnLDuNxHzqRNty2K IKWtZ1rT1jav+nUWAfdNhyJyvK0UrggmpwiI4oegsic5lGV4GCTJYXmKF/G4QwkM0hvG QZNrX9x6kruSpSTXb1SwGVraJtoXX5nSx3bLG2jU/SaqJrW9Z2ioS/L1iVxvTyjl43t/ ajaJKZo9YObqG0MACtCLX48EDwZFkbgxztvxYZ5rPcYVIOwOUG3NOEEX4e+RNtbl4T/V QIRA== 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:message-id:date:subject:cc:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=e74AvjLJt0KVDNmIjA/Y8Ry0IA9rEAy4gfhFyjHMwtw=; fh=oUCfM/eMlWtMCtZZKY1bglzxCo7b3kw9D5LTFFWuz38=; b=xCfSWtDUtpxzP+9Bm3tQerkE4i4RyjbHORxH4wboeuwyJuT3rzqwJYMwhA0co6a5w1 x5MIyIwBiAIONixQ6dvG87CZBozbuG7WdKnWFOiO2wz0YgTBHXgeMm9eKJVtwKvrgCGa nSd/R6y6EH4KOLmZqv8DcNYXCjned5IyDaMJHAYR+yLvZQDmJDuXz8MuB065i7CGruo3 f2LW/owQ402vVNaE++ovkeG+WZHaErzrxeHcJdKk16yaGreSoLhzqklL1E1+/DiFN30d xOHvSxpQC57A5VOBcDyDqXFtaALXPPX5Fc2ro9gIZqiMaWZaQebhrTqvW4orgG9G32pB eHBQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@xry111.site header.s=default header.b=OoyJlM12; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=xry111.site Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id fg5-20020a05622a580500b004239fd7fc33si10793762qtb.751.2023.12.11.22.49.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 22:49:40 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@xry111.site header.s=default header.b=OoyJlM12; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=xry111.site Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 794F43857837 for ; Tue, 12 Dec 2023 06:49:40 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from xry111.site (xry111.site [89.208.246.23]) by sourceware.org (Postfix) with ESMTPS id 11A7C3858C29 for ; Tue, 12 Dec 2023 06:49:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 11A7C3858C29 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=xry111.site Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=xry111.site ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 11A7C3858C29 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=89.208.246.23 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702363758; cv=none; b=wGc+DNTKYqGd+bGSiXrYK6rUmAX2N145kN5WpMtlp7ILuG9/ZHMkzNI7/8Hf3L5/v76IaYyy6llG+RnbzbDBkDCYtzY4oJheNjBLEugVgB2rZ4HOUwr75Bpi4fbo6524GBj4kdi7wnr70g7oXMzROydqJjBBS7Ipc40LOK4NEBE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702363758; c=relaxed/simple; bh=cSX9YuK47XaJNLROhkDcWRu1dj93TH2nQta7Fo8ENaQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=wNg0cdmIWfi9tCTj4TPNuTk+WfxSUil+R0iFDAq9kOyYJtL/X21OvPcdLXeHZiorhGe3O6DknlTZiWPbrf+kfFf5jmUGPEUzNyq5tkZ0jCK/yZaFu7e24DE7qmFWRH70eZ6HUWRs8Lu7PKiqd8KAn3eS3Vv8M+T51fHexTTMcds= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xry111.site; s=default; t=1702363752; bh=cSX9YuK47XaJNLROhkDcWRu1dj93TH2nQta7Fo8ENaQ=; h=From:To:Cc:Subject:Date:From; b=OoyJlM12vHSXxM73AgpKgNYBuhtzE0NL2THwl6t2iLWuFymuobx5Fx69jvnjIb8sF uEzrjIkmoKDfLW8B2hlocJVbKiyPQOmW3UrQUbAi56dkhpjctE0hMjDRxtjznObb9W VUxnQo5p8lYj4VFN3zeHnycwaKkm8BiU1zZqKjNc= Received: from stargazer.. (unknown [IPv6:240e:358:11c3:9b00:dc73:854d:832e:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) (Authenticated sender: xry111@xry111.site) by xry111.site (Postfix) with ESMTPSA id 5259E66F32; Tue, 12 Dec 2023 01:49:08 -0500 (EST) From: Xi Ruoyao To: gcc-patches@gcc.gnu.org Cc: chenglulu , i@xen0n.name, xuchenghua@loongson.cn, Xi Ruoyao Subject: [PATCH] LoongArch: Replace -mexplicit-relocs=auto simple-used address peephole2 with combine Date: Tue, 12 Dec 2023 14:47:28 +0800 Message-ID: <20231212064754.6623-1-xry111@xry111.site> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-9.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, LIKELY_SPAM_FROM, SPF_HELO_PASS, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785057803853878294 X-GMAIL-MSGID: 1785057803853878294 The problem with peephole2 is it uses a naive sliding-window algorithm and misses many cases. For example: float a[10000]; float t() { return a[0] + a[8000]; } is compiled to: la.local $r13,a la.local $r12,a+32768 fld.s $f1,$r13,0 fld.s $f0,$r12,-768 fadd.s $f0,$f1,$f0 by trunk. But as we've explained in r14-4851, the following would be better with -mexplicit-relocs=auto: pcalau12i $r13,%pc_hi20(a) pcalau12i $r12,%pc_hi20(a+32000) fld.s $f1,$r13,%pc_lo12(a) fld.s $f0,$r12,%pc_lo12(a+32000) fadd.s $f0,$f1,$f0 However the sliding-window algorithm just won't detect the pcalau12i/fld pair to be optimized. Use a define_insn_and_split in combine pass will work around the issue. gcc/ChangeLog: * config/loongarch/loongarch.md: (simple_load): New define_insn_and_split. (simple_load_off): Likewise. (simple_load_ext): Likewise. (simple_load_offext): Likewise. (simple_store): Likewise. (simple_store_off): Likewise. (define_peephole2): Remove la.local/[f]ld peepholes. gcc/testsuite/ChangeLog: * gcc.target/loongarch/explicit-relocs-auto-single-load-store-2.c: New test. --- Bootstrapped & regtested on loongarch64-linux-gnu. Ok for trunk? gcc/config/loongarch/loongarch.md | 165 +++++++++--------- ...explicit-relocs-auto-single-load-store-2.c | 11 ++ 2 files changed, 98 insertions(+), 78 deletions(-) create mode 100644 gcc/testsuite/gcc.target/loongarch/explicit-relocs-auto-single-load-store-2.c diff --git a/gcc/config/loongarch/loongarch.md b/gcc/config/loongarch/loongarch.md index 7b26d15aa4e..4009de408fb 100644 --- a/gcc/config/loongarch/loongarch.md +++ b/gcc/config/loongarch/loongarch.md @@ -4033,101 +4033,110 @@ (define_insn "loongarch_crcc_w__w" ;; ;; And if the pseudo op cannot be relaxed, we'll get a worse result (with ;; 3 instructions). -(define_peephole2 - [(set (match_operand:P 0 "register_operand") - (match_operand:P 1 "symbolic_pcrel_operand")) - (set (match_operand:LD_AT_LEAST_32_BIT 2 "register_operand") - (mem:LD_AT_LEAST_32_BIT (match_dup 0)))] - "la_opt_explicit_relocs == EXPLICIT_RELOCS_AUTO \ - && (TARGET_CMODEL_NORMAL || TARGET_CMODEL_MEDIUM) \ - && (peep2_reg_dead_p (2, operands[0]) \ - || REGNO (operands[0]) == REGNO (operands[2]))" - [(set (match_dup 2) - (mem:LD_AT_LEAST_32_BIT (lo_sum:P (match_dup 0) (match_dup 1))))] +(define_insn_and_split "simple_load" + [(set (match_operand:LD_AT_LEAST_32_BIT 0 "register_operand" "=r,f") + (mem:LD_AT_LEAST_32_BIT + (match_operand:P 1 "symbolic_pcrel_operand" "")))] + "loongarch_pre_reload_split () \ + && la_opt_explicit_relocs == EXPLICIT_RELOCS_AUTO \ + && (TARGET_CMODEL_NORMAL || TARGET_CMODEL_MEDIUM)" + "#" + "" + [(set (match_dup 0) + (mem:LD_AT_LEAST_32_BIT (lo_sum:P (match_dup 2) (match_dup 1))))] { - emit_insn (gen_pcalau12i_gr (operands[0], operands[1])); + operands[2] = gen_reg_rtx (Pmode); + emit_insn (gen_pcalau12i_gr (operands[2], operands[1])); }) -(define_peephole2 - [(set (match_operand:P 0 "register_operand") - (match_operand:P 1 "symbolic_pcrel_operand")) - (set (match_operand:LD_AT_LEAST_32_BIT 2 "register_operand") - (mem:LD_AT_LEAST_32_BIT (plus (match_dup 0) - (match_operand 3 "const_int_operand"))))] - "la_opt_explicit_relocs == EXPLICIT_RELOCS_AUTO \ - && (TARGET_CMODEL_NORMAL || TARGET_CMODEL_MEDIUM) \ - && (peep2_reg_dead_p (2, operands[0]) \ - || REGNO (operands[0]) == REGNO (operands[2]))" - [(set (match_dup 2) - (mem:LD_AT_LEAST_32_BIT (lo_sum:P (match_dup 0) (match_dup 1))))] +(define_insn_and_split "simple_load_off" + [(set (match_operand:LD_AT_LEAST_32_BIT 0 "register_operand" "=r,f") + (mem:LD_AT_LEAST_32_BIT + (plus (match_operand:P 1 "symbolic_pcrel_operand" "") + (match_operand 2 "const_int_operand" ""))))] + "loongarch_pre_reload_split () \ + && la_opt_explicit_relocs == EXPLICIT_RELOCS_AUTO \ + && (TARGET_CMODEL_NORMAL || TARGET_CMODEL_MEDIUM)" + "#" + "" + [(set (match_dup 0) + (mem:LD_AT_LEAST_32_BIT (lo_sum:P (match_dup 2) (match_dup 1))))] { - operands[1] = plus_constant (Pmode, operands[1], INTVAL (operands[3])); - emit_insn (gen_pcalau12i_gr (operands[0], operands[1])); + HOST_WIDE_INT offset = INTVAL (operands[2]); + operands[2] = gen_reg_rtx (Pmode); + operands[1] = plus_constant (Pmode, operands[1], offset); + emit_insn (gen_pcalau12i_gr (operands[2], operands[1])); }) -(define_peephole2 - [(set (match_operand:P 0 "register_operand") - (match_operand:P 1 "symbolic_pcrel_operand")) - (set (match_operand:GPR 2 "register_operand") - (any_extend:GPR (mem:SUBDI (match_dup 0))))] - "la_opt_explicit_relocs == EXPLICIT_RELOCS_AUTO \ - && (TARGET_CMODEL_NORMAL || TARGET_CMODEL_MEDIUM) \ - && (peep2_reg_dead_p (2, operands[0]) \ - || REGNO (operands[0]) == REGNO (operands[2]))" - [(set (match_dup 2) - (any_extend:GPR (mem:SUBDI (lo_sum:P (match_dup 0) - (match_dup 1)))))] +(define_insn_and_split "simple_load_ext" + [(set (match_operand:GPR 0 "register_operand" "=r") + (any_extend:GPR + (mem:SUBDI (match_operand:P 1 "symbolic_pcrel_operand" ""))))] + "loongarch_pre_reload_split () \ + && la_opt_explicit_relocs == EXPLICIT_RELOCS_AUTO \ + && (TARGET_CMODEL_NORMAL || TARGET_CMODEL_MEDIUM)" + "#" + "" + [(set (match_dup 0) + (any_extend:GPR + (mem:SUBDI (lo_sum:P (match_dup 2) (match_dup 1)))))] { - emit_insn (gen_pcalau12i_gr (operands[0], operands[1])); + operands[2] = gen_reg_rtx (Pmode); + emit_insn (gen_pcalau12i_gr (operands[2], operands[1])); }) -(define_peephole2 - [(set (match_operand:P 0 "register_operand") - (match_operand:P 1 "symbolic_pcrel_operand")) - (set (match_operand:GPR 2 "register_operand") +(define_insn_and_split + "simple_load_off_ext" + [(set (match_operand:GPR 0 "register_operand" "=r") + (any_extend:GPR + (mem:SUBDI + (plus (match_operand:P 1 "symbolic_pcrel_operand" "") + (match_operand 2 "const_int_operand" "")))))] + "loongarch_pre_reload_split () \ + && la_opt_explicit_relocs == EXPLICIT_RELOCS_AUTO \ + && (TARGET_CMODEL_NORMAL || TARGET_CMODEL_MEDIUM)" + "#" + "" + [(set (match_dup 0) (any_extend:GPR - (mem:SUBDI (plus (match_dup 0) - (match_operand 3 "const_int_operand")))))] - "la_opt_explicit_relocs == EXPLICIT_RELOCS_AUTO \ - && (TARGET_CMODEL_NORMAL || TARGET_CMODEL_MEDIUM) \ - && (peep2_reg_dead_p (2, operands[0]) \ - || REGNO (operands[0]) == REGNO (operands[2]))" - [(set (match_dup 2) - (any_extend:GPR (mem:SUBDI (lo_sum:P (match_dup 0) - (match_dup 1)))))] + (mem:SUBDI (lo_sum:P (match_dup 2) (match_dup 1)))))] { - operands[1] = plus_constant (Pmode, operands[1], INTVAL (operands[3])); - emit_insn (gen_pcalau12i_gr (operands[0], operands[1])); + HOST_WIDE_INT offset = INTVAL (operands[2]); + operands[2] = gen_reg_rtx (Pmode); + operands[1] = plus_constant (Pmode, operands[1], offset); + emit_insn (gen_pcalau12i_gr (operands[2], operands[1])); }) -(define_peephole2 - [(set (match_operand:P 0 "register_operand") - (match_operand:P 1 "symbolic_pcrel_operand")) - (set (mem:ST_ANY (match_dup 0)) - (match_operand:ST_ANY 2 "register_operand"))] - "la_opt_explicit_relocs == EXPLICIT_RELOCS_AUTO \ - && (TARGET_CMODEL_NORMAL || TARGET_CMODEL_MEDIUM) \ - && (peep2_reg_dead_p (2, operands[0])) \ - && REGNO (operands[0]) != REGNO (operands[2])" - [(set (mem:ST_ANY (lo_sum:P (match_dup 0) (match_dup 1))) (match_dup 2))] +(define_insn_and_split "simple_store" + [(set (mem:ST_ANY (match_operand:P 0 "symbolic_pcrel_operand")) + (match_operand:ST_ANY 1 "register_operand" "r,f"))] + "loongarch_pre_reload_split () \ + && la_opt_explicit_relocs == EXPLICIT_RELOCS_AUTO \ + && (TARGET_CMODEL_NORMAL || TARGET_CMODEL_MEDIUM)" + "#" + "" + [(set (mem:ST_ANY (lo_sum:P (match_dup 2) (match_dup 0))) (match_dup 1))] { - emit_insn (gen_pcalau12i_gr (operands[0], operands[1])); + operands[2] = gen_reg_rtx (Pmode); + emit_insn (gen_pcalau12i_gr (operands[2], operands[0])); }) -(define_peephole2 - [(set (match_operand:P 0 "register_operand") - (match_operand:P 1 "symbolic_pcrel_operand")) - (set (mem:ST_ANY (plus (match_dup 0) - (match_operand 3 "const_int_operand"))) - (match_operand:ST_ANY 2 "register_operand"))] - "la_opt_explicit_relocs == EXPLICIT_RELOCS_AUTO \ - && (TARGET_CMODEL_NORMAL || TARGET_CMODEL_MEDIUM) \ - && (peep2_reg_dead_p (2, operands[0])) \ - && REGNO (operands[0]) != REGNO (operands[2])" - [(set (mem:ST_ANY (lo_sum:P (match_dup 0) (match_dup 1))) (match_dup 2))] +(define_insn_and_split "simple_store_off" + [(set (mem:ST_ANY + (plus (match_operand:P 0 "symbolic_pcrel_operand" "") + (match_operand 1 "const_int_operand" ""))) + (match_operand:ST_ANY 2 "register_operand" "r,f"))] + "loongarch_pre_reload_split () \ + && la_opt_explicit_relocs == EXPLICIT_RELOCS_AUTO \ + && (TARGET_CMODEL_NORMAL || TARGET_CMODEL_MEDIUM)" + "#" + "" + [(set (mem:ST_ANY (lo_sum:P (match_dup 1) (match_dup 0))) (match_dup 2))] { - operands[1] = plus_constant (Pmode, operands[1], INTVAL (operands[3])); - emit_insn (gen_pcalau12i_gr (operands[0], operands[1])); + HOST_WIDE_INT offset = INTVAL (operands[1]); + operands[1] = gen_reg_rtx (Pmode); + operands[0] = plus_constant (Pmode, operands[0], offset); + emit_insn (gen_pcalau12i_gr (operands[1], operands[0])); }) ;; Synchronization instructions. diff --git a/gcc/testsuite/gcc.target/loongarch/explicit-relocs-auto-single-load-store-2.c b/gcc/testsuite/gcc.target/loongarch/explicit-relocs-auto-single-load-store-2.c new file mode 100644 index 00000000000..42cb966d1e0 --- /dev/null +++ b/gcc/testsuite/gcc.target/loongarch/explicit-relocs-auto-single-load-store-2.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -march=loongarch64 -mabi=lp64d -mexplicit-relocs=auto" } */ + +float a[8001]; +float +t (void) +{ + return a[0] + a[8000]; +} + +/* { dg-final { scan-assembler-not "la.local" } } */