Skip to content

Commit e5e6983

Browse files
Fix PR 106601: __builtin_bswap16 code gen could be improved with ZBB enabled
The default expansion for bswap16 is two extractions (shift/and) followed by an insertation (ior) and then a zero extend. This can be improved with ZBB enabled to just full byteswap followed by a (logical) shift right. This patch adds a new pattern for this which does that. OK? Built and tested on riscv32-linux-gnu and riscv64-linux-gnu. gcc/ChangeLog: PR target/106601 * config/riscv/bitmanip.md (bswaphi2): New pattern. gcc/testsuite/ChangeLog: PR target/106601 * gcc.target/riscv/zbb_32_bswap-2.c: New test. * gcc.target/riscv/zbb_bswap-2.c: New test.
1 parent cb2daf5 commit e5e6983

File tree

3 files changed

+48
-0
lines changed

3 files changed

+48
-0
lines changed

gcc/config/riscv/bitmanip.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,30 @@
276276
"rev8\t%0,%1"
277277
[(set_attr "type" "bitmanip")])
278278

279+
;; HI bswap can be emulated using SI/DI bswap followed
280+
;; by a logical shift right
281+
;; SI bswap for TARGET_64BIT is already similarly in
282+
;; the common code.
283+
(define_expand "bswaphi2"
284+
[(set (match_operand:HI 0 "register_operand" "=r")
285+
(bswap:HI (match_operand:HI 1 "register_operand" "r")))]
286+
"TARGET_ZBB"
287+
{
288+
rtx tmp = gen_reg_rtx (word_mode);
289+
rtx newop1 = gen_lowpart (word_mode, operands[1]);
290+
if (TARGET_64BIT)
291+
emit_insn (gen_bswapdi2 (tmp, newop1));
292+
else
293+
emit_insn (gen_bswapsi2 (tmp, newop1));
294+
rtx tmp1 = gen_reg_rtx (word_mode);
295+
if (TARGET_64BIT)
296+
emit_insn (gen_lshrdi3 (tmp1, tmp, GEN_INT (64 - 16)));
297+
else
298+
emit_insn (gen_lshrsi3 (tmp1, tmp, GEN_INT (32 - 16)));
299+
emit_move_insn (operands[0], gen_lowpart (HImode, tmp1));
300+
DONE;
301+
})
302+
279303
(define_insn "<bitmanip_optab><mode>3"
280304
[(set (match_operand:X 0 "register_operand" "=r")
281305
(bitmanip_minmax:X (match_operand:X 1 "register_operand" "r")
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/* { dg-do compile } */
2+
/* { dg-options "-march=rv32gc_zbb -mabi=ilp32" } */
3+
/* { dg-skip-if "" { *-*-* } { "-O0" } } */
4+
5+
int foo(int n)
6+
{
7+
return __builtin_bswap16(n);
8+
}
9+
10+
/* { dg-final { scan-assembler "rev8" } } */
11+
/* { dg-final { scan-assembler "srli" } } */
12+
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/* { dg-do compile } */
2+
/* { dg-options "-march=rv64gc_zbb -mabi=lp64" } */
3+
/* { dg-skip-if "" { *-*-* } { "-O0" } } */
4+
5+
int foo(int n)
6+
{
7+
return __builtin_bswap16(n);
8+
}
9+
10+
/* { dg-final { scan-assembler "rev8" } } */
11+
/* { dg-final { scan-assembler "srli" } } */
12+

0 commit comments

Comments
 (0)