123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984 |
- From 84cb63829b5b224c4c0b0f6236f894dad7e4550c Mon Sep 17 00:00:00 2001
- From: Xiao Zeng <zengxiao@eswincomputing.com>
- Date: Fri, 29 Sep 2023 16:29:02 -0600
- Subject: [PATCH 21/30] 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.
- gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_0_imm.c
- gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_imm_imm.c
- gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_imm_reg.c
- gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_reg_reg.c
- ---
- gcc/config/riscv/riscv.cc | 13 ++++
- .../riscv/zicond-primitiveSemantics.c | 8 +-
- .../zicond-primitiveSemantics_compare_imm.c | 57 ++++++++++++++
- ...mitiveSemantics_compare_imm_return_0_imm.c | 73 ++++++++++++++++++
- ...tiveSemantics_compare_imm_return_imm_imm.c | 73 ++++++++++++++++++
- ...tiveSemantics_compare_imm_return_imm_reg.c | 65 ++++++++++++++++
- ...tiveSemantics_compare_imm_return_reg_reg.c | 65 ++++++++++++++++
- .../zicond-primitiveSemantics_compare_reg.c | 65 ++++++++++++++++
- ...mitiveSemantics_compare_reg_return_0_imm.c | 73 ++++++++++++++++++
- ...tiveSemantics_compare_reg_return_imm_imm.c | 73 ++++++++++++++++++
- ...tiveSemantics_compare_reg_return_imm_reg.c | 65 ++++++++++++++++
- ...tiveSemantics_compare_reg_return_reg_reg.c | 77 +++++++++++++++++++
- .../zicond-primitiveSemantics_return_0_imm.c | 8 +-
- ...zicond-primitiveSemantics_return_imm_imm.c | 8 +-
- ...zicond-primitiveSemantics_return_imm_reg.c | 8 +-
- ...zicond-primitiveSemantics_return_reg_reg.c | 8 +-
- .../gcc.target/riscv/zicond-xor-01.c | 2 +-
- 17 files changed, 720 insertions(+), 21 deletions(-)
- create mode 100644 gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm.c
- create mode 100644 gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_0_imm.c
- create mode 100644 gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_imm_imm.c
- create mode 100644 gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_imm_reg.c
- create mode 100644 gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_imm_return_reg_reg.c
- create mode 100644 gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg.c
- create mode 100644 gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_0_imm.c
- create mode 100644 gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_imm_imm.c
- create mode 100644 gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_imm_reg.c
- create mode 100644 gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_compare_reg_return_reg_reg.c
- diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc
- index 14be2d7654a..c11223475eb 100644
- --- a/gcc/config/riscv/riscv.cc
- +++ b/gcc/config/riscv/riscv.cc
- @@ -2280,6 +2280,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:
- if (riscv_immediate_operand_p (outer_code, INTVAL (x)))
- {
- diff --git a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics.c
- index 47d4e4c5683..276dac70852 100644
- --- a/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics.c
- +++ b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics.c
- @@ -43,7 +43,7 @@ int primitiveSemantics_11(int a, int b) {
- 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" } } */
- +/* { 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.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 76773d32a8b..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
- @@ -59,7 +59,7 @@ int primitiveSemantics_return_0_imm_11(int a, int b) {
- 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" } } */
- +/* { 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_return_imm_imm.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_imm_imm.c
- index 2b4ee956eb7..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
- @@ -67,7 +67,7 @@ int primitiveSemantics_return_imm_imm_11(int a, int b) {
- 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" } } */
- +/* { 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_return_imm_reg.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_imm_reg.c
- index 4a96560eb61..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
- @@ -59,7 +59,7 @@ int primitiveSemantics_return_imm_reg_11(int a, int b) {
- 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" } } */
- +/* { 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_return_reg_reg.c b/gcc/testsuite/gcc.target/riscv/zicond-primitiveSemantics_return_reg_reg.c
- index 0624b6f16d4..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
- @@ -59,7 +59,7 @@ int primitiveSemantics_return_reg_reg_11(int a, int b, int c) {
- return b;
- }
-
- -/* { dg-final { scan-assembler-times "czero.eqz" 12 } } */
- -/* { dg-final { scan-assembler-times "czero.nez" 12 } } */
- -/* { dg-final { scan-assembler-not "beq" } } */
- -/* { dg-final { scan-assembler-not "bne" } } */
- +/* { 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-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 } } */
- --
- 2.25.1
|