From patchwork Mon Apr 26 12:45:51 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: 1470285 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=xuPJBX9R; dkim-atps=neutral Received: from sourceware.org (server2.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 4FTPm23Z5jz9t19 for ; Mon, 26 Apr 2021 22:46:42 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 517823950C81; Mon, 26 Apr 2021 12:46:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 517823950C81 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1619441169; bh=LMmwRIbh4JbC0gvAAZNYB2Mxbqs+J/d5C5P3EypC8vs=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=xuPJBX9RVncGW9cow4+NwvHLVNRjeWjTAH/e94OsjFhdf12OTQtTGYxWznXSfYLdo txUoLmULYv99+UrVtVpTQ6vbdG5BvYEYB414qEx77qqoGVbfRmpfxyCdpzetwKz/Ut JYZiaCBUBImWBenEhNjrsS60IdXeZQEiCP9+TGa0= 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 16D78394FC10; Mon, 26 Apr 2021 12:46:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 16D78394FC10 Received: by mail-ej1-f53.google.com with SMTP id l4so84189735ejc.10; Mon, 26 Apr 2021 05:46:06 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=LMmwRIbh4JbC0gvAAZNYB2Mxbqs+J/d5C5P3EypC8vs=; b=EhMDFPoOQzYL88Ko/SmuwZyGB7Y6tlLlB1CcVHusn4KNfab5+c9fIW4SDBBxDiVzlq 4QvLzOaUIrlsKvZguhUfpIeMWHABQaBKgNBBJY3QgzGeK5heKG8xXe+sZ5maJK3I6B4K 0fPjXsZ+gnAQoVMKD9eE6UEbX3x4qFPHMfSPOYvKsTtHR/5qcxzbnA1GTyat65VUo4Bl qocuuYSdu/1oSDNZcmCNvEhCHsB8MOQbB4OqvF2b0ICNuwGSFPvrRwDZMtKjLeE2Hcfp E6sFWLdgAaJplO0TIr/KupPGQ0Vf69p1lsII6FUVRfRdql6pLLqk0qia0ZTPVlQF7ODs jUWQ== X-Gm-Message-State: AOAM530wv3mDz+Er7tOOKMR81SxzaysRdy6RVLIa3FfD6f9kigmH2RG2 s++rGVRqkXoQOpD3iRqeeA11joFWX8rdTw== X-Google-Smtp-Source: ABdhPJz+cDl8CKrkR4Vj+ulUUdJ+T6gv4TLiGtkVjp9tvUXRn9UFNBSJF/SluvMxvGUGN9JNUrcDwQ== X-Received: by 2002:a17:906:e949:: with SMTP id jw9mr19194032ejb.433.1619441164863; Mon, 26 Apr 2021 05:46:04 -0700 (PDT) Received: from beast.fritz.box (62-178-178-158.cable.dynamic.surfer.at. [62.178.178.158]) by smtp.gmail.com with ESMTPSA id o20sm14126755eds.65.2021.04.26.05.46.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Apr 2021 05:46:04 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH 09/10] RISC-V: Generate helpers for cbranch4 [PR 100266] Date: Mon, 26 Apr 2021 14:45:51 +0200 Message-Id: <20210426124552.3316789-10-cmuellner@gcc.gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210426124552.3316789-1-cmuellner@gcc.gnu.org> References: <20210426124552.3316789-1-cmuellner@gcc.gnu.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.7 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, 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 make simplify this code by using 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 | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c index 87cdde73ae21..6e97b38db6db 100644 --- a/gcc/config/riscv/riscv.c +++ b/gcc/config/riscv/riscv.c @@ -3250,10 +3250,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 c3687d57047b..52f8a321ac23 100644 --- a/gcc/config/riscv/riscv.md +++ b/gcc/config/riscv/riscv.md @@ -1908,7 +1908,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")