From patchwork Wed Jul 19 10:11:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Zeng X-Patchwork-Id: 122509 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2330613vqt; Wed, 19 Jul 2023 03:14:22 -0700 (PDT) X-Google-Smtp-Source: APBJJlHoVjMi6IMhNHjmzUufJQ5tasLG7DrDtgFD6HodZ2dh0Wjd6z/sFfo4aAKM+lC4+w7df3Ro X-Received: by 2002:a17:907:9729:b0:994:19:133b with SMTP id jg41-20020a170907972900b009940019133bmr2361533ejc.14.1689761662663; Wed, 19 Jul 2023 03:14:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689761662; cv=none; d=google.com; s=arc-20160816; b=Ej5rtE8oZXi212yaGmk1n6qTTW3/XgSfOvLoGA6sgjL4P53FyETFgGcs1GG+YEEGCv 3YaBAtKcaKZ+GdXML72qCbjKGNMvVR8/YHy90UwaD5VrpOxrJuM5z4xohfJF69TbQ2rS X/tAtX5XM+AUK9cuE1Zbm4iFyiYg1CcVc7VS3zP2QIx1Hf+9fgVyyhZbzVBS+K1weF6u EVz/OBU5Bia6r61bhHjfm7IJJ2iL0A7QYLOmP5lB23K19k+jOVJTDaXvya4f893QyLYP Hy8lq6SPndajVOlP4TH5jpOB1haZNRWxgC5sMm9FM+4mzQeN0Aakw7Xq+ErlzKri/la4 pzaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:references:in-reply-to :message-id:date:subject:cc:to:from:dmarc-filter:delivered-to; bh=8Z6XZmWCxXOsZGOh0pYXvpN4LeU8qGHpJ+68hVvnIiY=; fh=RFNlyPK9630mAf8kd2ADv1qMCQD1jQUdg/e3En7lF+0=; b=inCb+8KDIuAmXpm3gX09qyX5QNAMzrLtqQooYuyBuk4d0Te6OW7ufU0QgHGVItckz+ NB1fRWvfdUZc033gtlJVnpN3rhVroElnDIQOmHF4tcMzTs+iLYfSniwfSAAe6GZzFlNS 9qu4I1H7dRrg3Clnj0ynuVmJFJhyhpkJcDDXSbSD5fHF9J1D6CUjSGClv5KNgEQSXcXh VOy9KiQBhlecjPsgIRZtup5fRK5aRutGMfxfEoCcAmRWbrRgFy5q9R7XLYoEOnYLO6zf d7jFO1ScykR/pAn8aVO8QsgxjRW07cIPXA5R1bDOeB6Ji9E+Z6rcKvRZLl63o6OO/eK+ Bk2Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id n9-20020a170906700900b0098295eed929si2448905ejj.998.2023.07.19.03.14.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 03:14:22 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.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; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4DD1138319D0 for ; Wed, 19 Jul 2023 10:12:45 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from zg8tmtu5ljg5lje1ms4xmtka.icoremail.net (zg8tmtu5ljg5lje1ms4xmtka.icoremail.net [159.89.151.119]) by sourceware.org (Postfix) with ESMTP id 979C53856DC6 for ; Wed, 19 Jul 2023 10:12:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 979C53856DC6 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=eswincomputing.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=eswincomputing.com Received: from localhost.localdomain (unknown [10.12.130.38]) by app1 (Coremail) with SMTP id EwgMCgDHZMTttrdkrKE0AA--.63411S6; Wed, 19 Jul 2023 18:12:05 +0800 (CST) From: Xiao Zeng To: gcc-patches@gcc.gnu.org Cc: jeffreyalaw@gmail.com, research_trasio@irq.a4lg.com, kito.cheng@gmail.com, zhengyu@eswincomputing.com, eri-sw-toolchain@eswincomputing.com, Xiao Zeng Subject: [PATCH 2/5] [RISC-V] Generate Zicond instruction for basic semantics Date: Wed, 19 Jul 2023 18:11:53 +0800 Message-Id: <20230719101156.21771-3-zengxiao@eswincomputing.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230719101156.21771-1-zengxiao@eswincomputing.com> References: <20230719101156.21771-1-zengxiao@eswincomputing.com> X-CM-TRANSID: EwgMCgDHZMTttrdkrKE0AA--.63411S6 X-Coremail-Antispam: 1UD129KBjvJXoW3Gw4fGF45Xr43uF4xJrWDurg_yoWxJw1kp3 yDC3yakry8XFZ3G3s3KFW8tw1Ykr1fKayY9r97Gr9FyrWDZ34xK3Wvkryaqrn8Aa1fXr43 XayI9r15u3yUK3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB214x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26r4j6ryUM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCY02Avz4vE-syl42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfUe1v3UUUUU X-CM-SenderInfo: p2hqw5xldrqvxvzl0uprps33xlqjhudrp/ X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, 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: 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: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771843525479109314 X-GMAIL-MSGID: 1771843525479109314 This patch completes the recognition of the basic semantics defined in the spec, namely: Conditional zero, if condition is equal to zero rd = (rs2 == 0) ? 0 : rs1 Conditional zero, if condition is non zero rd = (rs2 != 0) ? 0 : rs1 gcc/ChangeLog: * config/riscv/riscv.md: Include zicond.md * config/riscv/zicond.md: New file. gcc/testsuite/ChangeLog: * gcc.target/riscv/zicond-primitiveSemantics.c: New test. --- gcc/config/riscv/riscv.md | 1 + gcc/config/riscv/zicond.md | 84 +++++++++++++++++++ .../riscv/zicond-primitiveSemantics.c | 49 +++++++++++ 3 files changed, 134 insertions(+) create mode 100644 gcc/config/riscv/zicond.md create mode 100644 gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics.c diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md index d63b584a4c1..6b8c2e8e268 100644 --- a/gcc/config/riscv/riscv.md +++ b/gcc/config/riscv/riscv.md @@ -3317,3 +3317,4 @@ (include "sifive-7.md") (include "thead.md") (include "vector.md") +(include "zicond.md") diff --git a/gcc/config/riscv/zicond.md b/gcc/config/riscv/zicond.md new file mode 100644 index 00000000000..1cf28589c87 --- /dev/null +++ b/gcc/config/riscv/zicond.md @@ -0,0 +1,84 @@ +;; Machine description for the RISC-V Zicond extension +;; Copyright (C) 2022-23 Free Software Foundation, Inc. + +;; This file is part of GCC. + +;; GCC is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 3, or (at your option) +;; any later version. + +;; GCC is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GCC; see the file COPYING3. If not see +;; . + +(define_code_iterator eq_or_ne [eq ne]) +(define_code_attr eqz [(eq "nez") (ne "eqz")]) +(define_code_attr nez [(eq "eqz") (ne "nez")]) + +;; Zicond +(define_insn "*czero.." + [(set (match_operand:GPR 0 "register_operand" "=r") + (if_then_else:GPR (eq_or_ne (match_operand:ANYI 1 "register_operand" "r") + (const_int 0)) + (match_operand:GPR 2 "register_operand" "r") + (const_int 0)))] + "TARGET_ZICOND" + "czero.\t%0,%2,%1" +) + +(define_insn "*czero.." + [(set (match_operand:GPR 0 "register_operand" "=r") + (if_then_else:GPR (eq_or_ne (match_operand:ANYI 1 "register_operand" "r") + (const_int 0)) + (const_int 0) + (match_operand:GPR 2 "register_operand" "r")))] + "TARGET_ZICOND" + "czero.\t%0,%2,%1" +) + +;; Special optimization under eq/ne in primitive semantics +(define_insn "*czero.eqz..opt1" + [(set (match_operand:GPR 0 "register_operand" "=r") + (if_then_else:GPR (eq (match_operand:ANYI 1 "register_operand" "r") + (const_int 0)) + (match_operand:GPR 2 "register_operand" "1") + (match_operand:GPR 3 "register_operand" "r")))] + "TARGET_ZICOND && operands[1] == operands[2]" + "czero.eqz\t%0,%3,%1" +) + +(define_insn "*czero.eqz..opt2" + [(set (match_operand:GPR 0 "register_operand" "=r") + (if_then_else:GPR (eq (match_operand:ANYI 1 "register_operand" "r") + (const_int 0)) + (match_operand:GPR 2 "register_operand" "r") + (match_operand:GPR 3 "register_operand" "1")))] + "TARGET_ZICOND && operands[1] == operands[3]" + "czero.nez\t%0,%2,%1" +) + +(define_insn "*czero.nez..opt3" + [(set (match_operand:GPR 0 "register_operand" "=r") + (if_then_else:GPR (ne (match_operand:ANYI 1 "register_operand" "r") + (const_int 0)) + (match_operand:GPR 2 "register_operand" "r") + (match_operand:GPR 3 "register_operand" "1")))] + "TARGET_ZICOND && operands[1] == operands[3]" + "czero.eqz\t%0,%2,%1" +) + +(define_insn "*czero.nez..opt4" + [(set (match_operand:GPR 0 "register_operand" "=r") + (if_then_else:GPR (ne (match_operand:ANYI 1 "register_operand" "r") + (const_int 0)) + (match_operand:GPR 2 "register_operand" "1") + (match_operand:GPR 3 "register_operand" "r")))] + "TARGET_ZICOND && operands[1] == operands[2]" + "czero.nez\t%0,%3,%1" +) diff --git a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics.c new file mode 100644 index 00000000000..76c5019a992 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics.c @@ -0,0 +1,49 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gc_zicond -mabi=lp64d" { target { rv64 } } } */ +/* { dg-options "-march=rv32gc_zicond -mabi=ilp32f" { target { rv32 } } } */ +/* { dg-skip-if "" { *-*-* } {"-O0"} } */ + +long primitiveSemantics_00(long a, long b) { return a == 0 ? 0 : b; } + +long primitiveSemantics_01(long a, long b) { return a != 0 ? 0 : b; } + +long primitiveSemantics_02(long a, long b) { return a == 0 ? b : 0; } + +long primitiveSemantics_03(long a, long b) { return a != 0 ? b : 0; } + +long primitiveSemantics_04(long a, long b) { + if (a) + b = 0; + return b; +} + +long primitiveSemantics_05(long a, long b) { + if (!a) + b = 0; + return b; +} + +int primitiveSemantics_06(int a, int b) { return a == 0 ? 0 : b; } + +int primitiveSemantics_07(int a, int b) { return a != 0 ? 0 : b; } + +int primitiveSemantics_08(int a, int b) { return a == 0 ? b : 0; } + +int primitiveSemantics_09(int a, int b) { return a != 0 ? b : 0; } + +int primitiveSemantics_10(int a, int b) { + if (a) + b = 0; + return b; +} + +int primitiveSemantics_11(int a, int b) { + if (!a) + b = 0; + return b; +} + +/* { dg-final { scan-assembler-times "czero.eqz" 6 } } */ +/* { dg-final { scan-assembler-times "czero.nez" 6 } } */ +/* { dg-final { scan-assembler-not "beq" } } */ +/* { dg-final { scan-assembler-not "bne" } } */