From patchwork Wed May 5 19:23:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Christoph_M=C3=BCllner?= X-Patchwork-Id: 1474533 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=sv3x6aKL; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fb68B3226z9sPf for ; Thu, 6 May 2021 05:23:53 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CD400385482A; Wed, 5 May 2021 19:23:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CD400385482A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1620242629; bh=45ULjJXL9CZUhy2PgK3bJiV27ST49LQL8DgCQpEwGtM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=sv3x6aKLvQ2joZekdn8iSbYgW9zyfQrbfSkOkfKp32vz83TjlhQxS7g6e2HbN+ein PQ6S93Srho0NAYtnbcQHAGiqzInKeycvhtvaS9RQ57hJpLY1SL526YV5PQF0O0Ah/N O0RSavYNflKhaf/+rUhJhPF12F/YlCWrtoNKbX2E= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by sourceware.org (Postfix) with ESMTPS id D8B083857C60; Wed, 5 May 2021 19:23:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D8B083857C60 Received: by mail-ej1-f53.google.com with SMTP id zg3so4591668ejb.8; Wed, 05 May 2021 12:23:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=45ULjJXL9CZUhy2PgK3bJiV27ST49LQL8DgCQpEwGtM=; b=GiDUZB9ss+kkKF9PDR4qe9PUSkm4BEHgAQ4KohWnjle0jE9mNu2DWzWTpK2EScFRM2 zKJyeTvyvxVKR/JZ7v8z/54aeTuKZBThMTB/EIOnl3kG00kzBhiSZ7uElgroMIW4Ixil xvrmQ9rq9U8YkWa/xsKIfnvsbz6OSjcmWf19O04YAYI0UxIXD54J2q+GzfpmLkzdwxBi Jk2ytLoUbn34H0rYNki3b0WfXCyEN155r/0YWLXnpBNz/b31xrOE74DE3E03tZyKZ8sr hRgVox+SNzbCGh4jchW5ExNcZpBy2iaot633UL6fR5m5BWWAHzUrM/DARVxzQpgVvP1W 9Nvg== X-Gm-Message-State: AOAM532NAbext5DI2F7z8i3vJBEYP3KmBG4BxNIrZo0qrGa+y+spNftM +G2vrr4sNFUkLepHo/Fbk4OCsaGYOuY4f1mf X-Google-Smtp-Source: ABdhPJyExZXpV5JNlpLKeF+XrwuIljYyuk/PthNP0IHlBNeSuPJLYopke0XRo7cI1t4F61aGvTETLg== X-Received: by 2002:a17:906:c1c5:: with SMTP id bw5mr339626ejb.510.1620242625591; Wed, 05 May 2021 12:23:45 -0700 (PDT) Received: from beast.fritz.box (62-178-148-172.cable.dynamic.surfer.at. [62.178.148.172]) by smtp.gmail.com with ESMTPSA id p21sm51001edw.18.2021.05.05.12.23.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 12:23:45 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] RISC-V: Generate helpers for cbranch4 Date: Wed, 5 May 2021 21:23:41 +0200 Message-Id: <20210505192341.2069742-1-cmuellner@gcc.gnu.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Christoph Muellner via Gcc-patches From: =?utf-8?q?Christoph_M=C3=BCllner?= Reply-To: Christoph Muellner Cc: Kito Cheng Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" On RISC-V we are facing the fact, that our conditional branches require Pmode conditions. Currently, we generate them explicitly with a check for Pmode and then calling the proper generator (i.e. gen_cbranchdi4 on RV64 and gen_cbranchsi4 on RV32). Let's simplify this code by generating the INSN helpers and use gen_cbranch4 (Pmode). gcc/ PR 100266 * config/rsicv/riscv.c (riscv_block_move_loop): Simplify. * config/rsicv/riscv.md (cbranch4): Generate helpers. --- gcc/config/riscv/riscv.c | 5 +---- gcc/config/riscv/riscv.md | 12 ++++-------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c index e1064e374eb0..27665e5b58f9 100644 --- a/gcc/config/riscv/riscv.c +++ b/gcc/config/riscv/riscv.c @@ -3258,10 +3258,7 @@ riscv_block_move_loop (rtx dest, rtx src, unsigned HOST_WIDE_INT length, /* Emit the loop condition. */ test = gen_rtx_NE (VOIDmode, src_reg, final_src); - if (Pmode == DImode) - emit_jump_insn (gen_cbranchdi4 (test, src_reg, final_src, label)); - else - emit_jump_insn (gen_cbranchsi4 (test, src_reg, final_src, label)); + emit_jump_insn (gen_cbranch4 (Pmode, test, src_reg, final_src, label)); /* Mop up any left-over bytes. */ if (leftover) diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md index 0e35960fefaa..f88877fd5966 100644 --- a/gcc/config/riscv/riscv.md +++ b/gcc/config/riscv/riscv.md @@ -2153,7 +2153,7 @@ (label_ref (match_operand 1)) (pc)))]) -(define_expand "cbranch4" +(define_expand "@cbranch4" [(set (pc) (if_then_else (match_operator 0 "comparison_operator" [(match_operand:BR 1 "register_operand") @@ -2167,7 +2167,7 @@ DONE; }) -(define_expand "cbranch4" +(define_expand "@cbranch4" [(set (pc) (if_then_else (match_operator 0 "fp_branch_comparison" [(match_operand:ANYF 1 "register_operand") @@ -2829,12 +2829,8 @@ operands[0], operands[1])); - if (mode == DImode) - emit_jump_insn (gen_cbranchdi4 (gen_rtx_EQ (VOIDmode, result, const0_rtx), - result, const0_rtx, operands[2])); - else - emit_jump_insn (gen_cbranchsi4 (gen_rtx_EQ (VOIDmode, result, const0_rtx), - result, const0_rtx, operands[2])); + rtx cond = gen_rtx_EQ (VOIDmode, result, const0_rtx); + emit_jump_insn (gen_cbranch4 (mode, cond, result, const0_rtx, operands[2])); DONE; })