From patchwork Fri Sep 29 22:37:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Law X-Patchwork-Id: 146805 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp79361vqb; Fri, 29 Sep 2023 15:38:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGSXAycxXYeb1+Jcx9had9HdZfpfrEsz/iCu3FnVHAgOdaIC/PbxUZK95BQqJUXZbz/Igrl X-Received: by 2002:a05:6402:d0:b0:530:ccf7:37af with SMTP id i16-20020a05640200d000b00530ccf737afmr4992500edu.12.1696027130584; Fri, 29 Sep 2023 15:38:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696027130; cv=none; d=google.com; s=arc-20160816; b=sUHn5/R8aYC3m9amJB6jQNilq8nYYmUSraApkSMu1YEo9cQXHe0j1hXcRaxrMBgrNk M2QZlOFlKX0F/WY03WOQVUxuGJ4w6hE6AWe+r+jRc2Sct7OrblTF/HrYfz++4EPBIhuw S2MvGHgq8DDY3+Nvh3CSAW6SOHr4Mgb2MexF4F2RjtBb/4H6dBwcIzDKf9fUM2wJzZ1t C2NOYk/DLv9zszgpdG/j3ije0vCb3N6i0Pw6pvvg8pHK4sXADvm6itqMT4q04djGiNqe flEW6+CJwbBAo65w9c39ymhYiktqSW2js5U5gXmAKDgDce7vLLEji+QQHoQZE4PxBc5R TAMA== ARC-Message-Signature: i=1; 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:to:subject:from :content-language:user-agent:mime-version:date:message-id :dkim-signature:dmarc-filter:delivered-to; bh=66X8kCd023xU52dERsUe2jHwiaHEsiAV/r6iR1qVzS0=; fh=XNn3asQvIblazGK92GBt13dVv+YmGV3pBS0JC29ZQco=; b=c7fH/Izx4MqvkO260DSNNxAmw2j7Fc7PBcBgv2mguPmHe2sZE5r/0d9vY3RqSTiiwU NbNzCilvK6hrXpkRsiMJ4w3F3De1UOJObjFElmw1CT8FPoOOf5XxCF8DEvsALgLe8/9K rHCQBMvEE5qPkPZYowuFX1EjP4j8udbg9HoDwEuNRE3esD2LMt7s1QX4a7jOA7DWQwJF FSbCs0PfYbrR7ZT1MJ+Rg7W0sdEOY+p5tlgTLCC3awZby1WYF9JT1yRIrixe7fJKoWY3 dRuQ2Bec1LLQ72LkC011s4xry1r4VHk67L2Qq34z2P12Jex5beQoUacT9PPgk+NhpkkC eokA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=AJ8SEacd; 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"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id g2-20020aa7c582000000b0053632e47301si1656367edq.464.2023.09.29.15.38.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 15:38:50 -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; dkim=pass header.i=@gmail.com header.s=20230601 header.b=AJ8SEacd; 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"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7584438323CE for ; Fri, 29 Sep 2023 22:38:38 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) by sourceware.org (Postfix) with ESMTPS id 01C603870C38 for ; Fri, 29 Sep 2023 22:37:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 01C603870C38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-il1-x136.google.com with SMTP id e9e14a558f8ab-3512b425662so39824035ab.0 for ; Fri, 29 Sep 2023 15:37:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696027043; x=1696631843; darn=gcc.gnu.org; h=to:subject:from:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=66X8kCd023xU52dERsUe2jHwiaHEsiAV/r6iR1qVzS0=; b=AJ8SEacdN8Be/OXsAkqPtr/EA28gUMFMxw8gQb8yRrurgxJPh1ZiBRrSmqptP21jfr 1FB/MkjIODHt8tiMQ7fkYjO3OcgDnyd5Jj/67L/T6H5ZYz9btX3jzzBpE0tnYI2KwBRS 6VzVnCI9eY8e1zD5/ZzLKUUk6ZUBFJOQAnvKNnk+UzvcBp4DnML8s83IRyUnTsirWZ1q 9oKAxltyOjDclAmRtjYcMRpqYSyhFNF3n4Y58V6dG0M5NKneJDokkX9ZpFiwx8ZUTWri CEXU+ChNfFUKpli1oyTFQ6BktCQfUhIyz5hlcqEChM2bUr0la0s5NTaG7yA/XvGDkX5l Vmrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696027043; x=1696631843; h=to:subject:from:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=66X8kCd023xU52dERsUe2jHwiaHEsiAV/r6iR1qVzS0=; b=dFxCxU6+VpuOI6W58+bchxmiPX6yDAiH2UJTWxSG5YbGPI3JuIgq+cviKGrxnONPCZ 1h/Gt393Pa+8PQ1FcnEDZ+276ANluOKCiZvWhmBHvwfMGb4KrBVn3hP1Ny1ticrIexSt cAIck0Yac0funelM3/Jd/wlpDyRxWCVbLvHorvLVk3vyuRpkhNNgfP23pg1LBnQtBWBX Cl6TkxUhTA7h3VL+J/sdVweIkfv62UGQxayuxqh3f3y437m7GkaLWDf9GN4+9gn8iyR9 Lq0DhHwgX1R5kGdekAuk4L3amRg1j8P9menyZ3rKExilXmVXqsd4UoH8O+rh89PMHFg9 qgcQ== X-Gm-Message-State: AOJu0YyVxCJI804/G3kdXg8ctWZ1CwAEu0bKsvLjfnJejxsDjzPZnqOx On+WJMxpi466JID/JNlExEbrufX6apk= X-Received: by 2002:a05:6e02:1c46:b0:34f:d665:4c2e with SMTP id d6-20020a056e021c4600b0034fd6654c2emr6554185ilg.30.1696027043315; Fri, 29 Sep 2023 15:37:23 -0700 (PDT) Received: from [172.31.0.109] ([136.36.130.248]) by smtp.gmail.com with ESMTPSA id a17-20020a056638005100b0042bb1c9b59csm5525937jap.126.2023.09.29.15.37.22 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 29 Sep 2023 15:37:22 -0700 (PDT) Message-ID: Date: Fri, 29 Sep 2023 16:37:21 -0600 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Jeff Law Subject: [committed] RISC-V: Fix INSN costing and more zicond tests To: "gcc-patches@gcc.gnu.org" X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, LIKELY_SPAM_BODY, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, URIBL_BLACK 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: 1778413344524738766 X-GMAIL-MSGID: 1778413344524738766 So this ends up looking a lot like the bits that I had to revert several weeks ago :-) The core issue we have is given an INSN the generic code will cost the SET_SRC and SET_DEST and sum them. But that's far from ideal on a RISC target. For a register destination, the cost can be determined be looking at just the SET_SRC. Which is precisely what this patch does. When the outer code is an INSN and we're presented with a SET we take one of two paths. If the destination is a register, then we recurse just on the SET_SRC and we're done. Otherwise we fall back to the existing code which sums the cost of the SET_SRC and SET_DEST. That fallback path isn't great and probably could be further improved (just costing SET_DEST in that case is probably quite reasonable). The difference between this version and the bits that slipped through by accident several weeks ago is that old version mis-used the API due to a thinko on my part. This tightens up various zicond tests to avoid undesirable matching. This has been tested on rv64gc -- the only difference it makes on the testsuite is the new tests (included in this patch) flip from failing to passing. Pushed to the trunk. Jeff commit 44efc743acc01354b6b9eb1939aedfdcc44e71f3 Author: Xiao Zeng Date: Fri Sep 29 16:29:02 2023 -0600 Fix INSN costing and more zicond tests So this ends up looking a lot like the bits that I had to revert several weeks ago :-) The core issue we have is given an INSN the generic code will cost the SET_SRC and SET_DEST and sum them. But that's far from ideal on a RISC target. For a register destination, the cost can be determined be looking at just the SET_SRC. Which is precisely what this patch does. When the outer code is an INSN and we're presented with a SET we take one of two paths. If the destination is a register, then we recurse just on the SET_SRC and we're done. Otherwise we fall back to the existing code which sums the cost of the SET_SRC and SET_DEST. That fallback path isn't great and probably could be further improved (just costing SET_DEST in that case is probably quite reasonable). The difference between this version and the bits that slipped through by accident several weeks ago is that old version mis-used the API due to a thinko on my part. This tightens up various zicond tests to avoid undesirable matching. This has been tested on rv64gc -- the only difference it makes on the testsuite is the new tests (included in this patch) flip from failing to passing. Pushed to the trunk. gcc/ * config/riscv/riscv.cc (riscv_rtx_costs): Better handle costing SETs when the outer code is INSN. gcc/testsuite * gcc.target/riscv/zicond-primitiveSemantics_compare_imm.c: New test. * gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_0_imm.c: Likewise. * gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_imm_imm.c: Likewise. * gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_imm_reg.c: Likewise. * gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_reg_reg.c: Likewise. * gcc.target/riscv/zicond-primitiveSemantics_compare_reg.c: Likewise. * gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_0_imm.c: Likewise. * gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_imm_imm.c: Likewise. * gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_imm_reg.c: Likewise. * gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_reg_reg.c: Likewise. * gcc.target/riscv/zicond-primitiveSemantics.c: Tighten expected regexp. * gcc.target/riscv/zicond-primitiveSemantics_return_0_imm.c: Likewise. * gcc.target/riscv/zicond-primitiveSemantics_return_imm_imm.c: Likewise. * gcc.target/riscv/zicond-primitiveSemantics_return_imm_reg.c: Likewise. * gcc.target/riscv/zicond-primitiveSemantics_return_reg_reg.c: Likewise. * gcc.target/riscv/zicond-xor-01.c: Likewise. diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc index 6e7a719e7a0..d5446b63dbf 100644 --- a/gcc/config/riscv/riscv.cc +++ b/gcc/config/riscv/riscv.cc @@ -2768,6 +2768,19 @@ riscv_rtx_costs (rtx x, machine_mode mode, int outer_code, int opno ATTRIBUTE_UN switch (GET_CODE (x)) { + case SET: + /* If we are called for an INSN that's a simple set of a register, + then cost based on the SET_SRC alone. */ + if (outer_code == INSN && REG_P (SET_DEST (x))) + { + riscv_rtx_costs (SET_SRC (x), mode, outer_code, opno, total, speed); + return true; + } + + /* Otherwise return FALSE indicating we should recurse into both the + SET_DEST and SET_SRC combining the cost of both. */ + return false; + case CONST_INT: /* trivial constants checked using OUTER_CODE in case they are encodable in insn itself w/o need for additional insn(s). */ diff --git a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics.c index bcfa04bef91..276dac70852 100644 --- a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics.c +++ b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics.c @@ -45,5 +45,5 @@ int primitiveSemantics_11(int a, int b) { /* { dg-final { scan-assembler-times {\mczero\.eqz\M} 6 } } */ /* { dg-final { scan-assembler-times {\mczero\.nez\M} 6 } } */ -/* { dg-final { scan-assembler-not {\mbeq} } } */ -/* { dg-final { scan-assembler-not {\mbne} } } */ +/* { dg-final { scan-assembler-not {\mbeq\M} } } */ +/* { dg-final { scan-assembler-not {\mbne\M} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm.c new file mode 100644 index 00000000000..a53a908ff25 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm.c @@ -0,0 +1,57 @@ +/* { 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" "-Og" "-Os" "-Oz"} } */ + +long primitiveSemantics_compare_imm_00(long a, long b) { + return a == 2 ? 0 : b; +} + +long primitiveSemantics_compare_imm_01(long a, long b) { + return a != 2 ? 0 : b; +} + +long primitiveSemantics_compare_imm_02(long a, long b) { + return a == 2 ? b : 0; +} + +long primitiveSemantics_compare_imm_03(long a, long b) { + return a != 2 ? b : 0; +} + +long primitiveSemantics_compare_imm_04(long a, long b) { + if (a == 2) + b = 0; + return b; +} + +long primitiveSemantics_compare_imm_05(long a, long b) { + if (!(a == 2)) + b = 0; + return b; +} + +int primitiveSemantics_compare_imm_06(int a, int b) { return a == 2 ? 0 : b; } + +int primitiveSemantics_compare_imm_07(int a, int b) { return a != 2 ? 0 : b; } + +int primitiveSemantics_compare_imm_08(int a, int b) { return a == 2 ? b : 0; } + +int primitiveSemantics_compare_imm_09(int a, int b) { return a != 2 ? b : 0; } + +int primitiveSemantics_compare_imm_10(int a, int b) { + if ((a == 2)) + b = 0; + return b; +} + +int primitiveSemantics_compare_imm_11(int a, int b) { + if (!(a == 2)) + b = 0; + return b; +} + +/* { dg-final { scan-assembler-times {\mczero.eqz\M} 6 } } */ +/* { dg-final { scan-assembler-times {\mczero.nez\M} 6 } } */ +/* { dg-final { scan-assembler-not {\mbeq\M} } } */ +/* { dg-final { scan-assembler-not {\mbne\M} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_0_imm.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_0_imm.c new file mode 100644 index 00000000000..c90ed100b30 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_0_imm.c @@ -0,0 +1,73 @@ +/* { 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" "-Og" "-Os" "-Oz"} } */ + +long primitiveSemantics_compare_imm_return_0_imm_00(long a, long b) { + return a == 2 ? 0 : 5; +} + +long primitiveSemantics_compare_imm_return_0_imm_01(long a, long b) { + return a != 2 ? 0 : 5; +} + +long primitiveSemantics_compare_imm_return_0_imm_02(long a, long b) { + return a == 2 ? 5 : 0; +} + +long primitiveSemantics_compare_imm_return_0_imm_03(long a, long b) { + return a != 2 ? 5 : 0; +} + +long primitiveSemantics_compare_imm_return_0_imm_04(long a, long b) { + if (a == 2) + b = 0; + else + b = 5; + return b; +} + +long primitiveSemantics_compare_imm_return_0_imm_05(long a, long b) { + if (!(a == 2)) + b = 0; + else + b = 5; + return b; +} + +int primitiveSemantics_compare_imm_return_0_imm_06(int a, int b) { + return a == 2 ? 0 : 5; +} + +int primitiveSemantics_compare_imm_return_0_imm_07(int a, int b) { + return a != 2 ? 0 : 5; +} + +int primitiveSemantics_compare_imm_return_0_imm_08(int a, int b) { + return a == 2 ? 5 : 0; +} + +int primitiveSemantics_compare_imm_return_0_imm_09(int a, int b) { + return a != 2 ? 5 : 0; +} + +int primitiveSemantics_compare_imm_return_0_imm_10(int a, int b) { + if ((a == 2)) + b = 0; + else + b = 5; + return b; +} + +int primitiveSemantics_compare_imm_return_0_imm_11(int a, int b) { + if (!(a == 2)) + b = 0; + else + b = 5; + return b; +} + +/* { dg-final { scan-assembler-times {\mczero.eqz\M} 6 } } */ +/* { dg-final { scan-assembler-times {\mczero.nez\M} 6 } } */ +/* { dg-final { scan-assembler-not {\mbeq\M} } } */ +/* { dg-final { scan-assembler-not {\mbne\M} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_imm_imm.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_imm_imm.c new file mode 100644 index 00000000000..e806f6f0807 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_imm_imm.c @@ -0,0 +1,73 @@ +/* { 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" "-Og" "-Os" "-Oz"} } */ + +long primitiveSemantics_compare_imm_return_imm_imm_00(long a, long b) { + return a == 2 ? 7 : 4; +} + +long primitiveSemantics_compare_imm_return_imm_imm_01(long a, long b) { + return a != 2 ? 7 : 4; +} + +long primitiveSemantics_compare_imm_return_imm_imm_02(long a, long b) { + return a == 2 ? 7 : 4; +} + +long primitiveSemantics_compare_imm_return_imm_imm_03(long a, long b) { + return a != 2 ? 7 : 4; +} + +long primitiveSemantics_compare_imm_return_imm_imm_04(long a, long b) { + if (a == 2) + b = 7; + else + b = 4; + return b; +} + +long primitiveSemantics_compare_imm_return_imm_imm_05(long a, long b) { + if (!(a == 2)) + b = 7; + else + b = 4; + return b; +} + +int primitiveSemantics_compare_imm_return_imm_imm_06(int a, int b) { + return a == 2 ? 7 : 4; +} + +int primitiveSemantics_compare_imm_return_imm_imm_07(int a, int b) { + return a != 2 ? 7 : 4; +} + +int primitiveSemantics_compare_imm_return_imm_imm_08(int a, int b) { + return a == 2 ? 7 : 4; +} + +int primitiveSemantics_compare_imm_return_imm_imm_09(int a, int b) { + return a != 2 ? 7 : 4; +} + +int primitiveSemantics_compare_imm_return_imm_imm_10(int a, int b) { + if ((a == 2)) + b = 7; + else + b = 4; + return b; +} + +int primitiveSemantics_compare_imm_return_imm_imm_11(int a, int b) { + if (!(a == 2)) + b = 7; + else + b = 4; + return b; +} + +/* { dg-final { scan-assembler-times {\mczero.eqz\M} 6 } } */ +/* { dg-final { scan-assembler-times {\mczero.nez\M} 6 } } */ +/* { dg-final { scan-assembler-not {\mbeq\M} } } */ +/* { dg-final { scan-assembler-not {\mbne\M} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_imm_reg.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_imm_reg.c new file mode 100644 index 00000000000..f976d608a03 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_imm_reg.c @@ -0,0 +1,65 @@ +/* { 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" "-Og" "-Os" "-Oz"} } */ + +long primitiveSemantics_compare_imm_return_imm_reg_00(long a, long b) { + return a == 2 ? 3 : b; +} + +long primitiveSemantics_compare_imm_return_imm_reg_01(long a, long b) { + return a != 2 ? 3 : b; +} + +long primitiveSemantics_compare_imm_return_imm_reg_02(long a, long b) { + return a == 2 ? b : 3; +} + +long primitiveSemantics_compare_imm_return_imm_reg_03(long a, long b) { + return a != 2 ? b : 3; +} + +long primitiveSemantics_compare_imm_return_imm_reg_04(long a, long b) { + if (a == 2) + b = 3; + return b; +} + +long primitiveSemantics_compare_imm_return_imm_reg_05(long a, long b) { + if (!(a == 2)) + b = 3; + return b; +} + +int primitiveSemantics_compare_imm_return_imm_reg_06(int a, int b) { + return a == 2 ? 3 : b; +} + +int primitiveSemantics_compare_imm_return_imm_reg_07(int a, int b) { + return a != 2 ? 3 : b; +} + +int primitiveSemantics_compare_imm_return_imm_reg_08(int a, int b) { + return a == 2 ? b : 3; +} + +int primitiveSemantics_compare_imm_return_imm_reg_09(int a, int b) { + return a != 2 ? b : 3; +} + +int primitiveSemantics_compare_imm_return_imm_reg_10(int a, int b) { + if ((a == 2)) + b = 3; + return b; +} + +int primitiveSemantics_compare_imm_return_imm_reg_11(int a, int b) { + if (!(a == 2)) + b = 3; + return b; +} + +/* { dg-final { scan-assembler-times {\mczero.eqz\M} 6 } } */ +/* { dg-final { scan-assembler-times {\mczero.nez\M} 6 } } */ +/* { dg-final { scan-assembler-not {\mbeq\M} } } */ +/* { dg-final { scan-assembler-not {\mbne\M} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_reg_reg.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_reg_reg.c new file mode 100644 index 00000000000..90e91192373 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_reg_reg.c @@ -0,0 +1,65 @@ +/* { 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" "-Og" "-Os" "-Oz"} } */ + +long primitiveSemantics_compare_imm_return_reg_reg_00(long a, long b, long c) { + return a == 2 ? c : b; +} + +long primitiveSemantics_compare_imm_return_reg_reg_01(long a, long b, long c) { + return a != 2 ? c : b; +} + +long primitiveSemantics_compare_imm_return_reg_reg_02(long a, long b, long c) { + return a == 2 ? b : c; +} + +long primitiveSemantics_compare_imm_return_reg_reg_03(long a, long b, long c) { + return a != 2 ? b : c; +} + +long primitiveSemantics_compare_imm_return_reg_reg_04(long a, long b, long c) { + if (a == 2) + b = c; + return b; +} + +long primitiveSemantics_compare_imm_return_reg_reg_05(long a, long b, long c) { + if (!(a == 2)) + b = c; + return b; +} + +int primitiveSemantics_compare_imm_return_reg_reg_06(int a, int b, int c) { + return a == 2 ? c : b; +} + +int primitiveSemantics_compare_imm_return_reg_reg_07(int a, int b, int c) { + return a != 2 ? c : b; +} + +int primitiveSemantics_compare_imm_return_reg_reg_08(int a, int b, int c) { + return a == 2 ? b : c; +} + +int primitiveSemantics_compare_imm_return_reg_reg_09(int a, int b, int c) { + return a != 2 ? b : c; +} + +int primitiveSemantics_compare_imm_return_reg_reg_10(int a, int b, int c) { + if ((a == 2)) + b = c; + return b; +} + +int primitiveSemantics_compare_imm_return_reg_reg_11(int a, int b, int c) { + if (!(a == 2)) + b = c; + return b; +} + +/* { dg-final { scan-assembler-times {\mczero.eqz\M} 12 } } */ +/* { dg-final { scan-assembler-times {\mczero.nez\M} 12 } } */ +/* { dg-final { scan-assembler-not {\mbeq\M} } } */ +/* { dg-final { scan-assembler-not {\mbne\M} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg.c new file mode 100644 index 00000000000..bfe8c06e1a9 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg.c @@ -0,0 +1,65 @@ +/* { 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" "-Og" "-Os" "-Oz"} } */ + +long primitiveSemantics_compare_reg_00(long a, long b, long c) { + return a == c ? 0 : b; +} + +long primitiveSemantics_compare_reg_01(long a, long b, long c) { + return a != c ? 0 : b; +} + +long primitiveSemantics_compare_reg_02(long a, long b, long c) { + return a == c ? b : 0; +} + +long primitiveSemantics_compare_reg_03(long a, long b, long c) { + return a != c ? b : 0; +} + +long primitiveSemantics_compare_reg_04(long a, long b, long c) { + if (a == c) + b = 0; + return b; +} + +long primitiveSemantics_compare_reg_05(long a, long b, long c) { + if (!(a == c)) + b = 0; + return b; +} + +int primitiveSemantics_compare_reg_06(int a, int b, int c) { + return a == c ? 0 : b; +} + +int primitiveSemantics_compare_reg_07(int a, int b, int c) { + return a != c ? 0 : b; +} + +int primitiveSemantics_compare_reg_08(int a, int b, int c) { + return a == c ? b : 0; +} + +int primitiveSemantics_compare_reg_09(int a, int b, int c) { + return a != c ? b : 0; +} + +int primitiveSemantics_compare_reg_10(int a, int b, int c) { + if ((a == c)) + b = 0; + return b; +} + +int primitiveSemantics_compare_reg_11(int a, int b, int c) { + if (!(a == c)) + b = 0; + return b; +} + +/* { dg-final { scan-assembler-times {\mczero.eqz\M} 6 } } */ +/* { dg-final { scan-assembler-times {\mczero.nez\M} 6 } } */ +/* { dg-final { scan-assembler-not {\mbeq\M} } } */ +/* { dg-final { scan-assembler-not {\mbne\M} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_0_imm.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_0_imm.c new file mode 100644 index 00000000000..164de069539 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_0_imm.c @@ -0,0 +1,73 @@ +/* { 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" "-Og" "-Os" "-Oz"} } */ + +long primitiveSemantics_compare_reg_return_0_imm_00(long a, long b, long c) { + return a == c ? 0 : 9; +} + +long primitiveSemantics_compare_reg_return_0_imm_01(long a, long b, long c) { + return a != c ? 0 : 9; +} + +long primitiveSemantics_compare_reg_return_0_imm_02(long a, long b, long c) { + return a == c ? 9 : 0; +} + +long primitiveSemantics_compare_reg_return_0_imm_03(long a, long b, long c) { + return a != c ? 9 : 0; +} + +long primitiveSemantics_compare_reg_return_0_imm_04(long a, long b, long c) { + if (a == c) + b = 0; + else + b = 9; + return b; +} + +long primitiveSemantics_compare_reg_return_0_imm_05(long a, long b, long c) { + if (!(a == c)) + b = 0; + else + b = 9; + return b; +} + +int primitiveSemantics_compare_reg_return_0_imm_06(int a, int b, int c) { + return a == c ? 0 : 9; +} + +int primitiveSemantics_compare_reg_return_0_imm_07(int a, int b, int c) { + return a != c ? 0 : 9; +} + +int primitiveSemantics_compare_reg_return_0_imm_08(int a, int b, int c) { + return a == c ? 9 : 0; +} + +int primitiveSemantics_compare_reg_return_0_imm_09(int a, int b, int c) { + return a != c ? 9 : 0; +} + +int primitiveSemantics_compare_reg_return_0_imm_10(int a, int b, int c) { + if ((a == c)) + b = 0; + else + b = 9; + return b; +} + +int primitiveSemantics_compare_reg_return_0_imm_11(int a, int b, int c) { + if (!(a == c)) + b = 0; + else + b = 9; + return b; +} + +/* { dg-final { scan-assembler-times {\mczero.eqz\M} 6 } } */ +/* { dg-final { scan-assembler-times {\mczero.nez\M} 6 } } */ +/* { dg-final { scan-assembler-not {\mbeq\M} } } */ +/* { dg-final { scan-assembler-not {\mbne\M} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_imm_imm.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_imm_imm.c new file mode 100644 index 00000000000..8ad97abc320 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_imm_imm.c @@ -0,0 +1,73 @@ +/* { 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" "-Og" "-Os" "-Oz"} } */ + +long primitiveSemantics_compare_reg_return_imm_imm_00(long a, long b, long c) { + return a == c ? 7 : 4; +} + +long primitiveSemantics_compare_reg_return_imm_imm_01(long a, long b, long c) { + return a != c ? 7 : 4; +} + +long primitiveSemantics_compare_reg_return_imm_imm_02(long a, long b, long c) { + return a == c ? 7 : 4; +} + +long primitiveSemantics_compare_reg_return_imm_imm_03(long a, long b, long c) { + return a != c ? 7 : 4; +} + +long primitiveSemantics_compare_reg_return_imm_imm_04(long a, long b, long c) { + if (a == c) + b = 7; + else + b = 4; + return b; +} + +long primitiveSemantics_compare_reg_return_imm_imm_05(long a, long b, long c) { + if (!(a == c)) + b = 7; + else + b = 4; + return b; +} + +int primitiveSemantics_compare_reg_return_imm_imm_06(int a, int b, int c) { + return a == c ? 7 : 4; +} + +int primitiveSemantics_compare_reg_return_imm_imm_07(int a, int b, int c) { + return a != c ? 7 : 4; +} + +int primitiveSemantics_compare_reg_return_imm_imm_08(int a, int b, int c) { + return a == c ? 7 : 4; +} + +int primitiveSemantics_compare_reg_return_imm_imm_09(int a, int b, int c) { + return a != c ? 7 : 4; +} + +int primitiveSemantics_compare_reg_return_imm_imm_10(int a, int b, int c) { + if ((a == c)) + b = 7; + else + b = 4; + return b; +} + +int primitiveSemantics_compare_reg_return_imm_imm_11(int a, int b, int c) { + if (!(a == c)) + b = 7; + else + b = 4; + return b; +} + +/* { dg-final { scan-assembler-times {\mczero.eqz\M} 6 } } */ +/* { dg-final { scan-assembler-times {\mczero.nez\M} 6 } } */ +/* { dg-final { scan-assembler-not {\mbeq\M} } } */ +/* { dg-final { scan-assembler-not {\mbne\M} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_imm_reg.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_imm_reg.c new file mode 100644 index 00000000000..5199ba71ef4 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_imm_reg.c @@ -0,0 +1,65 @@ +/* { 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" "-Og" "-Os" "-Oz"} } */ + +long primitiveSemantics_compare_reg_return_imm_reg_00(long a, long b, long c) { + return a == c ? 10 : b; +} + +long primitiveSemantics_compare_reg_return_imm_reg_01(long a, long b, long c) { + return a != c ? 10 : b; +} + +long primitiveSemantics_compare_reg_return_imm_reg_02(long a, long b, long c) { + return a == c ? b : 10; +} + +long primitiveSemantics_compare_reg_return_imm_reg_03(long a, long b, long c) { + return a != c ? b : 10; +} + +long primitiveSemantics_compare_reg_return_imm_reg_04(long a, long b, long c) { + if (a == c) + b = 10; + return b; +} + +long primitiveSemantics_compare_reg_return_imm_reg_05(long a, long b, long c) { + if (!(a == c)) + b = 10; + return b; +} + +int primitiveSemantics_compare_reg_return_imm_reg_06(int a, int b, int c) { + return a == c ? 10 : b; +} + +int primitiveSemantics_compare_reg_return_imm_reg_07(int a, int b, int c) { + return a != c ? 10 : b; +} + +int primitiveSemantics_compare_reg_return_imm_reg_08(int a, int b, int c) { + return a == c ? b : 10; +} + +int primitiveSemantics_compare_reg_return_imm_reg_09(int a, int b, int c) { + return a != c ? b : 10; +} + +int primitiveSemantics_compare_reg_return_imm_reg_10(int a, int b, int c) { + if ((a == c)) + b = 10; + return b; +} + +int primitiveSemantics_compare_reg_return_imm_reg_11(int a, int b, int c) { + if (!(a == c)) + b = 10; + return b; +} + +/* { dg-final { scan-assembler-times {\mczero.eqz\M} 6 } } */ +/* { dg-final { scan-assembler-times {\mczero.nez\M} 6 } } */ +/* { dg-final { scan-assembler-not {\mbeq\M} } } */ +/* { dg-final { scan-assembler-not {\mbne\M} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_reg_reg.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_reg_reg.c new file mode 100644 index 00000000000..eecb95688f4 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_reg_reg.c @@ -0,0 +1,77 @@ +/* { 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" "-Og" "-Os" "-Oz"} } */ + +long primitiveSemantics_compare_reg_return_reg_reg_00(long a, long b, long c, + long d) { + return a == c ? d : b; +} + +long primitiveSemantics_compare_reg_return_reg_reg_01(long a, long b, long c, + long d) { + return a != c ? d : b; +} + +long primitiveSemantics_compare_reg_return_reg_reg_02(long a, long b, long c, + long d) { + return a == c ? b : d; +} + +long primitiveSemantics_compare_reg_return_reg_reg_03(long a, long b, long c, + long d) { + return a != c ? b : d; +} + +long primitiveSemantics_compare_reg_return_reg_reg_04(long a, long b, long c, + long d) { + if (a == c) + b = d; + return b; +} + +long primitiveSemantics_compare_reg_return_reg_reg_05(long a, long b, long c, + long d) { + if (!(a == c)) + b = d; + return b; +} + +int primitiveSemantics_compare_reg_return_reg_reg_06(int a, int b, int c, + int d) { + return a == c ? d : b; +} + +int primitiveSemantics_compare_reg_return_reg_reg_07(int a, int b, int c, + int d) { + return a != c ? d : b; +} + +int primitiveSemantics_compare_reg_return_reg_reg_08(int a, int b, int c, + int d) { + return a == c ? b : d; +} + +int primitiveSemantics_compare_reg_return_reg_reg_09(int a, int b, int c, + int d) { + return a != c ? b : d; +} + +int primitiveSemantics_compare_reg_return_reg_reg_10(int a, int b, int c, + int d) { + if ((a == c)) + b = d; + return b; +} + +int primitiveSemantics_compare_reg_return_reg_reg_11(int a, int b, int c, + int d) { + if (!(a == c)) + b = d; + return b; +} + +/* { dg-final { scan-assembler-times {\mczero.eqz\M} 12 } } */ +/* { dg-final { scan-assembler-times {\mczero.nez\M} 12 } } */ +/* { dg-final { scan-assembler-not {\mbeq\M} } } */ +/* { dg-final { scan-assembler-not {\mbne\M} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_0_imm.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_0_imm.c index 0764d2919d4..e3ccb17032e 100644 --- a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_0_imm.c +++ b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_0_imm.c @@ -61,5 +61,5 @@ int primitiveSemantics_return_0_imm_11(int a, int b) { /* { dg-final { scan-assembler-times {\mczero\.eqz\M} 6 } } */ /* { dg-final { scan-assembler-times {\mczero\.nez\M} 6 } } */ -/* { dg-final { scan-assembler-not {\mbeq} } } */ -/* { dg-final { scan-assembler-not {\mbne} } } */ +/* { dg-final { scan-assembler-not {\mbeq\M} } } */ +/* { dg-final { scan-assembler-not {\mbne\M} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_imm_imm.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_imm_imm.c index 2ff5033bb04..62f9fb29169 100644 --- a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_imm_imm.c +++ b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_imm_imm.c @@ -69,5 +69,5 @@ int primitiveSemantics_return_imm_imm_11(int a, int b) { /* { dg-final { scan-assembler-times {\mczero\.eqz\M} 6 } } */ /* { dg-final { scan-assembler-times {\mczero\.nez\M} 6 } } */ -/* { dg-final { scan-assembler-not {\mbeq} } } */ -/* { dg-final { scan-assembler-not {\mbne} } } */ +/* { dg-final { scan-assembler-not {\mbeq\M} } } */ +/* { dg-final { scan-assembler-not {\mbne\M} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_imm_reg.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_imm_reg.c index 93844d166c3..0866f86e6ce 100644 --- a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_imm_reg.c +++ b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_imm_reg.c @@ -61,5 +61,5 @@ int primitiveSemantics_return_imm_reg_11(int a, int b) { /* { dg-final { scan-assembler-times {\mczero\.eqz\M} 6 } } */ /* { dg-final { scan-assembler-times {\mczero\.nez\M} 6 } } */ -/* { dg-final { scan-assembler-not {\mbeq} } } */ -/* { dg-final { scan-assembler-not {\mbne} } } */ +/* { dg-final { scan-assembler-not {\mbeq\M} } } */ +/* { dg-final { scan-assembler-not {\mbne\M} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_reg_reg.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_reg_reg.c index 619ad8ecf7d..eb1764a27ba 100644 --- a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_reg_reg.c +++ b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_reg_reg.c @@ -61,5 +61,5 @@ int primitiveSemantics_return_reg_reg_11(int a, int b, int c) { /* { dg-final { scan-assembler-times {\mczero\.eqz\M} 12 } } */ /* { dg-final { scan-assembler-times {\mczero\.nez\M} 12 } } */ -/* { dg-final { scan-assembler-not {\mbeq} } } */ -/* { dg-final { scan-assembler-not {\mbne} } } */ +/* { dg-final { scan-assembler-not {\mbeq\M} } } */ +/* { dg-final { scan-assembler-not {\mbne\M} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/zicond-xor-01.c b/gcc/testsuite/gcc.target/riscv/zicond-xor-01.c index 8362ffaf5ab..20079fd4351 100644 --- a/gcc/testsuite/gcc.target/riscv/zicond-xor-01.c +++ b/gcc/testsuite/gcc.target/riscv/zicond-xor-01.c @@ -10,5 +10,5 @@ long xor1(long crc, long poly) return crc; } -/* { dg-final { scan-assembler-times "czero.eqz\t" 1 } } */ +/* { dg-final { scan-assembler-times {\mczero.eqz\M} 1 } } */ /* { dg-final { scan-assembler-times "xor\t" 1 } } */