From 44f9e95d2f6564433fbe9ebd2de5781c4518cd8a Mon Sep 17 00:00:00 2001
From: Simon Hosie <shosie@rivosinc.com>
Date: Mon, 22 Jan 2024 17:54:38 -0800
Subject: [PATCH] Add helperrvv.h inline header defines.

---
 src/arch/helperrvv.h    | 30 ++++++++++++++++++++++++++++++
 src/common/keywords.txt |  2 ++
 2 files changed, 32 insertions(+)

diff --git a/src/arch/helperrvv.h b/src/arch/helperrvv.h
index 5ec5d73f..0e5b994f 100644
--- a/src/arch/helperrvv.h
+++ b/src/arch/helperrvv.h
@@ -55,14 +55,18 @@
 #define LOG2VECTLENSP (LOG2VECTLENDP+1)
 
 #define ENABLE_SP
+//@#define ENABLE_SP
 #define ENABLE_DP
+//@#define ENABLE_DP
 
 #if CONFIG != 2
 #if defined(ENABLE_RVVM1NOFMA) || defined(ENABLE_RVVM2NOFMA)
 #error "RVV NOFMA only supported for CONFIG=2"
 #else
 #define ENABLE_FMA_SP
+//@#define ENABLE_FMA_SP
 #define ENABLE_FMA_DP
+//@#define ENABLE_FMA_DP
 #endif
 #endif
 
@@ -160,9 +164,13 @@ typedef vfloat64m1x4_t tdi_t;
 #if SLEEF_RVV_VLEN == 0
 #define VECTLENSP (__riscv_vsetvlmax_e32m1())
 #define VECTLENDP SLEEF_RVV_DP_RUNTIME_VL()
+//@#define VECTLENSP __riscv_vsetvlmax_e32m1()
+//@#define VECTLENDP  __riscv_vsetvlmax_e64m1()
 #else
 #define VECTLENSP (SLEEF_RVV_SP_LMUL * SLEEF_RVV_VLEN / sizeof(float))
 #define VECTLENDP (SLEEF_RVV_DP_LMUL * SLEEF_RVV_VLEN / sizeof(double))
+//@#define VECTLENSP (SLEEF_RVV_SP_LMUL * SLEEF_RVV_VLEN / sizeof(float))
+//@#define VECTLENDP (SLEEF_RVV_DP_LMUL * SLEEF_RVV_VLEN / sizeof(double))
 #endif
 #define SLEEF_RVV_SP_VCAST_VF_F __riscv_vfmv_v_f_f32m1
 #define SLEEF_RVV_SP_VCAST_VI2_I __riscv_vmv_v_x_i32m1
@@ -261,9 +269,13 @@ typedef vfloat64m2x4_t tdi_t;
 #if SLEEF_RVV_VLEN == 0
 #define VECTLENSP (__riscv_vsetvlmax_e32m2())
 #define VECTLENDP SLEEF_RVV_DP_RUNTIME_VL()
+//@#define VECTLENSP __riscv_vsetvlmax_e32m2()
+//@#define VECTLENDP  __riscv_vsetvlmax_e64m2()
 #else
 #define VECTLENSP (SLEEF_RVV_SP_LMUL * SLEEF_RVV_VLEN / sizeof(float))
 #define VECTLENDP (SLEEF_RVV_DP_LMUL * SLEEF_RVV_VLEN / sizeof(double))
+//@#define VECTLENSP (SLEEF_RVV_SP_LMUL * SLEEF_RVV_VLEN / sizeof(float))
+//@#define VECTLENDP (SLEEF_RVV_DP_LMUL * SLEEF_RVV_VLEN / sizeof(double))
 #endif
 #define SLEEF_RVV_SP_VCAST_VF_F __riscv_vfmv_v_f_f32m2
 #define SLEEF_RVV_SP_VCAST_VI2_I __riscv_vmv_v_x_i32m2
@@ -1317,6 +1329,15 @@ static INLINE void vprefetch_v_p(const void *ptr) {}
 #define vxor_vo_vo_vo    rvv_sp_vxor_vo_vo_vo
 #endif  // ENABLE_RVV_SP
 
+//@#ifdef ENABLE_RVV_SP
+//@#define vopmask rvv_sp_vopmask
+//
+//@#define vand_vo_vo_vo    rvv_sp_vand_vo_vo_vo
+//@#define vandnot_vo_vo_vo rvv_sp_vandnot_vo_vo_vo
+//@#define vor_vo_vo_vo     rvv_sp_vor_vo_vo_vo
+//@#define vxor_vo_vo_vo    rvv_sp_vxor_vo_vo_vo
+//@#endif  // ENABLE_RVV_SP
+
 // Types and functions that conflict with ENABLE_RVV_SP
 #ifdef ENABLE_RVV_DP
 #define vopmask rvv_dp_vopmask
@@ -1327,4 +1348,13 @@ static INLINE void vprefetch_v_p(const void *ptr) {}
 #define vxor_vo_vo_vo    rvv_dp_vxor_vo_vo_vo
 #endif  // ENABLE_RVV_DP
 
+//@#ifdef ENABLE_RVV_DP
+//@#define vopmask rvv_dp_vopmask
+//
+//@#define vand_vo_vo_vo    rvv_dp_vand_vo_vo_vo
+//@#define vandnot_vo_vo_vo rvv_dp_vandnot_vo_vo_vo
+//@#define vor_vo_vo_vo     rvv_dp_vor_vo_vo_vo
+//@#define vxor_vo_vo_vo    rvv_dp_vxor_vo_vo_vo
+//@#endif  // ENABLE_RVV_DP
+
 #endif // HELPERRVV_H
diff --git a/src/common/keywords.txt b/src/common/keywords.txt
index e22867dc..659fa5e1 100644
--- a/src/common/keywords.txt
+++ b/src/common/keywords.txt
@@ -679,3 +679,5 @@ Sleef_rempitabdp
 Sleef_rempitabqp
 vcastu_vm_vi
 vcastu_vi_vm
+rvv_sp_vopmask
+rvv_dp_vopmask