diff options
author | Philipp Tomsich <philipp.tomsich@vrull.eu> | 2022-10-11 23:42:48 +0200 |
---|---|---|
committer | Philipp Tomsich <philipp.tomsich@vrull.eu> | 2022-11-18 21:16:56 +0100 |
commit | bc6beecb4d64fcd82988f840fdad45a69d73c7bb (patch) | |
tree | 1efefde3c6f3273bfa9162d08bd816daf8e659c3 /gcc | |
parent | 787ac95917a666b3d186e2d5afec07ee5b75c6df (diff) | |
download | gcc-bc6beecb4d64fcd82988f840fdad45a69d73c7bb.zip gcc-bc6beecb4d64fcd82988f840fdad45a69d73c7bb.tar.gz gcc-bc6beecb4d64fcd82988f840fdad45a69d73c7bb.tar.bz2 |
RISC-V: Use bseti/bclri/binvi to extend reach of ori/andi/xori
Sequences of the form "a | C" and "a ^ C" with C being the positive
half of a signed immediate's range with one extra bit set in addition
are mapped to ori/xori and one bseti/binvi to avoid using a temporary
(and a multi-insn sequence to load C into that temporary).
Something similar holds for "a & ~C" being representable as either
bclri + bclri or bclri + andi.
gcc/ChangeLog:
* config/riscv/bitmanip.md (*<or_optab>i<mode>_extrabit):
New pattern for binvi+binvi/xori and bseti+bseti/ori
(*andi<mode>_extrabit): New pattern for bclri+bclri/andi
* config/riscv/iterators.md (any_or): Match or and ior
* config/riscv/predicates.md (const_twobits_operand):
New predicate.
(uimm_extra_bit_operand): New predicate.
(uimm_extra_bit_or_twobits): New predicate.
(not_uimm_extra_bit_operand): New predicate.
(not_uimm_extra_bit_or_nottwobits): New predicate.
* config/riscv/riscv.h (UIMM_EXTRA_BIT_OPERAND):
Helper for the uimm_extra_bit_operand and
not_uimm_extra_bit_operand predicates.
gcc/testsuite/ChangeLog:
* gcc.target/riscv/zbs-bclri.c: Rename
* gcc.target/riscv/zbs-bclri-01.c: Renamed from above.
* gcc.target/riscv/zbs-bclri-02.c: New test.
* gcc.target/riscv/zbs-binvi.c: New test.
* gcc.target/riscv/zbs-bseti.c: New test.
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/config/riscv/bitmanip.md | 37 | ||||
-rw-r--r-- | gcc/config/riscv/iterators.md | 8 | ||||
-rw-r--r-- | gcc/config/riscv/predicates.md | 29 | ||||
-rw-r--r-- | gcc/config/riscv/riscv.h | 8 | ||||
-rw-r--r-- | gcc/testsuite/gcc.target/riscv/zbs-bclri-01.c (renamed from gcc/testsuite/gcc.target/riscv/zbs-bclri.c) | 0 | ||||
-rw-r--r-- | gcc/testsuite/gcc.target/riscv/zbs-bclri-02.c | 27 | ||||
-rw-r--r-- | gcc/testsuite/gcc.target/riscv/zbs-binvi.c | 22 | ||||
-rw-r--r-- | gcc/testsuite/gcc.target/riscv/zbs-bseti.c | 27 |
8 files changed, 153 insertions, 5 deletions
diff --git a/gcc/config/riscv/bitmanip.md b/gcc/config/riscv/bitmanip.md index 2f89fd6..681498a 100644 --- a/gcc/config/riscv/bitmanip.md +++ b/gcc/config/riscv/bitmanip.md @@ -558,3 +558,40 @@ "TARGET_ZBS" [(set (match_dup 0) (zero_extract:GPR (match_dup 1) (const_int 1) (match_dup 2))) (set (match_dup 0) (plus:GPR (match_dup 0) (const_int -1)))]) + +;; Catch those cases where we can use a bseti/binvi + ori/xori or +;; bseti/binvi + bseti/binvi instead of a lui + addi + or/xor sequence. +(define_insn_and_split "*<or_optab>i<mode>_extrabit" + [(set (match_operand:X 0 "register_operand" "=r") + (any_or:X (match_operand:X 1 "register_operand" "r") + (match_operand:X 2 "uimm_extra_bit_or_twobits" "i")))] + "TARGET_ZBS" + "#" + "&& reload_completed" + [(set (match_dup 0) (<or_optab>:X (match_dup 1) (match_dup 3))) + (set (match_dup 0) (<or_optab>:X (match_dup 0) (match_dup 4)))] +{ + unsigned HOST_WIDE_INT bits = UINTVAL (operands[2]); + unsigned HOST_WIDE_INT topbit = HOST_WIDE_INT_1U << floor_log2 (bits); + + operands[3] = GEN_INT (bits &~ topbit); + operands[4] = GEN_INT (topbit); +}) + +;; Same to use blcri + andi and blcri + bclri +(define_insn_and_split "*andi<mode>_extrabit" + [(set (match_operand:X 0 "register_operand" "=r") + (and:X (match_operand:X 1 "register_operand" "r") + (match_operand:X 2 "not_uimm_extra_bit_or_nottwobits" "i")))] + "TARGET_ZBS" + "#" + "&& reload_completed" + [(set (match_dup 0) (and:X (match_dup 1) (match_dup 3))) + (set (match_dup 0) (and:X (match_dup 0) (match_dup 4)))] +{ + unsigned HOST_WIDE_INT bits = UINTVAL (operands[2]); + unsigned HOST_WIDE_INT topbit = HOST_WIDE_INT_1U << floor_log2 (~bits); + + operands[3] = GEN_INT (bits | topbit); + operands[4] = GEN_INT (~topbit); +}) diff --git a/gcc/config/riscv/iterators.md b/gcc/config/riscv/iterators.md index 50380ec..ab1f4ee 100644 --- a/gcc/config/riscv/iterators.md +++ b/gcc/config/riscv/iterators.md @@ -136,6 +136,10 @@ ;; from the same template. (define_code_iterator any_bitwise [and ior xor]) +;; This code iterator allows ior and xor instructions to be generated +;; from the same template. +(define_code_iterator any_or [ior xor]) + ;; This code iterator allows unsigned and signed division to be generated ;; from the same template. (define_code_iterator any_div [div udiv mod umod]) @@ -194,6 +198,10 @@ (plus "add") (minus "sub")]) +;; <or_optab> code attributes +(define_code_attr or_optab [(ior "ior") + (xor "xor")]) + ;; <insn> expands to the name of the insn that implements a particular code. (define_code_attr insn [(ashift "sll") (ashiftrt "sra") diff --git a/gcc/config/riscv/predicates.md b/gcc/config/riscv/predicates.md index d5c097e..9976b50 100644 --- a/gcc/config/riscv/predicates.md +++ b/gcc/config/riscv/predicates.md @@ -305,11 +305,30 @@ (match_test "ctz_hwi (INTVAL (op)) > 0") (match_test "SMALL_OPERAND (INTVAL (op) >> ctz_hwi (INTVAL (op)))"))) +;; A CONST_INT operand that has exactly two bits set. +(define_predicate "const_twobits_operand" + (and (match_code "const_int") + (match_test "popcount_hwi (UINTVAL (op)) == 2"))) + ;; A CONST_INT operand that fits into the unsigned half of a -;; signed-immediate after the top bit has been cleared. +;; signed-immediate after the top bit has been cleared (define_predicate "uimm_extra_bit_operand" (and (match_code "const_int") - (not (and (match_test "SMALL_OPERAND (INTVAL (op))") - (match_test "INTVAL (op) > 0"))) - (ior (match_test "SMALL_OPERAND (UINTVAL (op) & ~(HOST_WIDE_INT_1U << floor_log2 (UINTVAL (op))))") - (match_test "popcount_hwi (UINTVAL (op)) == 2")))) + (match_test "UIMM_EXTRA_BIT_OPERAND (UINTVAL (op))"))) + +(define_predicate "uimm_extra_bit_or_twobits" + (and (match_code "const_int") + (ior (match_operand 0 "uimm_extra_bit_operand") + (match_operand 0 "const_twobits_operand")))) + +;; A CONST_INT operand that fits into the negative half of a +;; signed-immediate after a single cleared top bit has been +;; set: i.e., a bitwise-negated uimm_extra_bit_operand +(define_predicate "not_uimm_extra_bit_operand" + (and (match_code "const_int") + (match_test "UIMM_EXTRA_BIT_OPERAND (~UINTVAL (op))"))) + +(define_predicate "not_uimm_extra_bit_or_nottwobits" + (and (match_code "const_int") + (ior (match_operand 0 "not_uimm_extra_bit_operand") + (match_operand 0 "const_nottwobits_operand")))) diff --git a/gcc/config/riscv/riscv.h b/gcc/config/riscv/riscv.h index 2d0d170..b05c3c1 100644 --- a/gcc/config/riscv/riscv.h +++ b/gcc/config/riscv/riscv.h @@ -593,6 +593,14 @@ enum reg_class ? (VALUE) \ : ((VALUE) & ((HOST_WIDE_INT_1U << 32)-1)))) +/* True if VALUE can be represented as an immediate with 1 extra bit + set: we check that it is not a SMALL_OPERAND (as this would be true + for all small operands) unmodified and turns into a small operand + once we clear the top bit. */ +#define UIMM_EXTRA_BIT_OPERAND(VALUE) \ + (!SMALL_OPERAND (VALUE) \ + && SMALL_OPERAND (VALUE & ~(HOST_WIDE_INT_1U << floor_log2 (VALUE)))) + /* Stack layout; function entry, exit and calling. */ #define STACK_GROWS_DOWNWARD 1 diff --git a/gcc/testsuite/gcc.target/riscv/zbs-bclri.c b/gcc/testsuite/gcc.target/riscv/zbs-bclri-01.c index 12e2063..12e2063 100644 --- a/gcc/testsuite/gcc.target/riscv/zbs-bclri.c +++ b/gcc/testsuite/gcc.target/riscv/zbs-bclri-01.c diff --git a/gcc/testsuite/gcc.target/riscv/zbs-bclri-02.c b/gcc/testsuite/gcc.target/riscv/zbs-bclri-02.c new file mode 100644 index 0000000..6125484 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/zbs-bclri-02.c @@ -0,0 +1,27 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gc_zbs -mabi=lp64" } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */ + +long long f3(long long a) +{ + return a & ~0x1100; +} + +long long f4 (long long a) +{ + return a & ~0x80000000000000ffull; +} + +long long f5 (long long a) +{ + return a & ~0x8000001000000000ull; +} + +long long f6 (long long a) +{ + return a & ~0xff7ffffffffffffull; +} + +/* { dg-final { scan-assembler-times "bclri\t" 4 } } */ +/* { dg-final { scan-assembler-times "andi\t" 2 } } */ + diff --git a/gcc/testsuite/gcc.target/riscv/zbs-binvi.c b/gcc/testsuite/gcc.target/riscv/zbs-binvi.c new file mode 100644 index 0000000..c2d6725 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/zbs-binvi.c @@ -0,0 +1,22 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gc_zbs -mabi=lp64" } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */ + +long long f3(long long a) +{ + return a ^ 0x1100; +} + +long long f4 (long long a) +{ + return a ^ 0x80000000000000ffull; +} + +long long f5 (long long a) +{ + return a ^ 0x8000001000000000ull; +} + +/* { dg-final { scan-assembler-times "binvi\t" 4 } } */ +/* { dg-final { scan-assembler-times "xori\t" 2 } } */ + diff --git a/gcc/testsuite/gcc.target/riscv/zbs-bseti.c b/gcc/testsuite/gcc.target/riscv/zbs-bseti.c new file mode 100644 index 0000000..5738add --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/zbs-bseti.c @@ -0,0 +1,27 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gc_zbs -mabi=lp64" } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-Og" } } */ + +long long foo1 (long long a) +{ + return a | 0x1100; +} + +long long foo2 (long long a) +{ + return a | 0x80000000000000ffull; +} + +long long foo3 (long long a) +{ + return a | 0x8000000100000000ull; +} + +long long foo4 (long long a) +{ + return a | 0xfff; +} + +/* { dg-final { scan-assembler-times "bseti\t" 5 } } */ +/* { dg-final { scan-assembler-times "ori\t" 3 } } */ + |