Skip to content

Commit

Permalink
RISC-V: Add conditional sqrt autovec pattern
Browse files Browse the repository at this point in the history
This patch adds a combined pattern for combining vfsqrt.v and vcond_mask.

gcc/ChangeLog:

	* config/riscv/autovec-opt.md (*cond_<optab><mode>):
	Add sqrt + vcond_mask combine pattern.
	* config/riscv/autovec.md (<optab><mode>2):
	Change define_expand to define_insn_and_split.

gcc/testsuite/ChangeLog:

	* gcc.target/riscv/rvv/autovec/cond/cond_sqrt-1.c: New test.
	* gcc.target/riscv/rvv/autovec/cond/cond_sqrt-2.c: New test.
	* gcc.target/riscv/rvv/autovec/cond/cond_sqrt_run-1.c: New test.
	* gcc.target/riscv/rvv/autovec/cond/cond_sqrt_run-2.c: New test.
  • Loading branch information
lhtin authored and Liaoshihua committed Mar 25, 2024
1 parent ac506f6 commit b41b928
Show file tree
Hide file tree
Showing 6 changed files with 131 additions and 2 deletions.
20 changes: 20 additions & 0 deletions gcc/config/riscv/autovec-opt.md
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,26 @@
DONE;
})

;; Combine vfsqrt.v and cond_mask
(define_insn_and_split "*cond_<optab><mode>"
[(set (match_operand:VF 0 "register_operand")
(if_then_else:VF
(match_operand:<VM> 1 "register_operand")
(any_float_unop:VF
(match_operand:VF 2 "register_operand"))
(match_operand:VF 3 "register_operand")))]
"TARGET_VECTOR && can_create_pseudo_p ()"
"#"
"&& 1"
[(const_int 0)]
{
insn_code icode = code_for_pred (<CODE>, <MODE>mode);
rtx ops[] = {operands[0], operands[1], operands[2], operands[3],
gen_int_mode (GET_MODE_NUNITS (<MODE>mode), Pmode)};
riscv_vector::expand_cond_len_unop (icode, ops);
DONE;
})

;; Combine vlmax neg and UNSPEC_VCOPYSIGN
(define_insn_and_split "*copysign<mode>_neg"
[(set (match_operand:VF 0 "register_operand")
Expand Down
7 changes: 5 additions & 2 deletions gcc/config/riscv/autovec.md
Original file line number Diff line number Diff line change
Expand Up @@ -994,11 +994,14 @@
;; Includes:
;; - vfsqrt.v
;; -------------------------------------------------------------------------------
(define_expand "<optab><mode>2"
(define_insn_and_split "<optab><mode>2"
[(set (match_operand:VF 0 "register_operand")
(any_float_unop:VF
(match_operand:VF 1 "register_operand")))]
"TARGET_VECTOR"
"TARGET_VECTOR && can_create_pseudo_p ()"
"#"
"&& 1"
[(const_int 0)]
{
insn_code icode = code_for_pred (<CODE>, <MODE>mode);
riscv_vector::emit_vlmax_insn (icode, riscv_vector::UNARY_OP_FRM_DYN, operands);
Expand Down
24 changes: 24 additions & 0 deletions gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_sqrt-1.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/* { dg-do compile } */
/* { dg-additional-options "-march=rv64gcv_zvfh -mabi=lp64d --param riscv-autovec-preference=scalable -fno-vect-cost-model -ffast-math" } */

#include <stdint.h>

#define DEF_LOOP(TYPE, OP) \
void __attribute__ ((noipa)) \
test_##TYPE##_##OP (TYPE *__restrict r, TYPE *__restrict a, \
TYPE *__restrict pred, int n) \
{ \
for (int i = 0; i < n; ++i) \
r[i] = pred[i] ? OP (a[i]) : a[i]; \
}

#define TEST_ALL(T) \
T (_Float16, __builtin_sqrtf16) \
T (float, __builtin_sqrtf) \
T (double, __builtin_sqrt)

TEST_ALL (DEF_LOOP)

/* { dg-final { scan-assembler-times {\tvfsqrt\.v\tv[0-9]+,v[0-9]+,v0\.t} 3 } } */

/* { dg-final { scan-assembler {\tvsetvli\t[a-z0-9]+,[a-z0-9]+,e[0-9]+,m[f0-9]+,t[au],mu} } } */
24 changes: 24 additions & 0 deletions gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_sqrt-2.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/* { dg-do compile } */
/* { dg-additional-options "-march=rv64gcv_zvfh -mabi=lp64d --param riscv-autovec-preference=scalable -fno-vect-cost-model -ffast-math" } */

#include <stdint.h>

#define DEF_LOOP(TYPE, OP) \
void __attribute__ ((noipa)) \
test_##TYPE##_##OP (TYPE *__restrict r, TYPE *__restrict a, \
TYPE *__restrict b, TYPE *__restrict pred, int n) \
{ \
for (int i = 0; i < n; ++i) \
r[i] = pred[i] ? OP (a[i]) : b[i]; \
}

#define TEST_ALL(T) \
T (_Float16, __builtin_sqrtf16) \
T (float, __builtin_sqrtf) \
T (double, __builtin_sqrt)

TEST_ALL (DEF_LOOP)

/* { dg-final { scan-assembler-times {\tvfsqrt\.v\tv[0-9]+,v[0-9]+,v0\.t} 3 } } */

/* { dg-final { scan-assembler {\tvsetvli\t[a-z0-9]+,[a-z0-9]+,e[0-9]+,m[f0-9]+,t[au],mu} } } */
29 changes: 29 additions & 0 deletions gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_sqrt_run-1.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/* { dg-do run { target { riscv_vector } } } */
/* { dg-additional-options "--param riscv-autovec-preference=scalable -fno-vect-cost-model -ffast-math " } */

#include "cond_sqrt-1.c"
#include <stdio.h>

#define N 99

#define TEST_LOOP(TYPE, OP) \
{ \
TYPE r[N], a[N], pred[N]; \
for (int i = 0; i < N; ++i) \
{ \
a[i] = (i & 1 ? i : 3 * i) * (i % 3 == 0 ? 1 : 2); \
pred[i] = (i % 7 < 4); \
asm volatile("" ::: "memory"); \
} \
test_##TYPE##_##OP (r, a, pred, N); \
for (int i = 0; i < N; ++i) \
if (r[i] != (pred[i] ? OP (a[i]) : a[i])) \
__builtin_abort (); \
}

int
main ()
{
TEST_ALL (TEST_LOOP)
return 0;
}
29 changes: 29 additions & 0 deletions gcc/testsuite/gcc.target/riscv/rvv/autovec/cond/cond_sqrt_run-2.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/* { dg-do run { target { riscv_vector } } } */
/* { dg-additional-options "--param riscv-autovec-preference=scalable -fno-vect-cost-model -ffast-math" } */

#include "cond_sqrt-2.c"

#define N 99

#define TEST_LOOP(TYPE, OP) \
{ \
TYPE r[N], a[N], b[N], pred[N]; \
for (int i = 0; i < N; ++i) \
{ \
a[i] = (i & 1 ? i : 3 * i) * (i % 3 == 0 ? 1 : 2); \
b[i] = (i % 9) * (i % 7 + 1); \
pred[i] = (i % 7 < 4); \
asm volatile("" ::: "memory"); \
} \
test_##TYPE##_##OP (r, a, b, pred, N); \
for (int i = 0; i < N; ++i) \
if (r[i] != (pred[i] ? OP (a[i]) : b[i])) \
__builtin_abort (); \
}

int
main ()
{
TEST_ALL (TEST_LOOP)
return 0;
}

0 comments on commit b41b928

Please sign in to comment.