From d81cc5f5cd9b1c5ea4f4cee8e6d9b051380fc8c8 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 15 Jun 2018 14:10:13 -0400 Subject: [PATCH] target/arm: Implement SVE Floating Point Arithmetic - Unpredicated Group Backports commit 29b80469dc51ae4064e9ef9223967882d2610523 from qemu --- qemu/aarch64.h | 18 +++++++++ qemu/aarch64eb.h | 18 +++++++++ qemu/arm.h | 12 ++++++ qemu/armeb.h | 12 ++++++ qemu/header_gen.py | 18 +++++++++ qemu/m68k.h | 12 ++++++ qemu/mips.h | 12 ++++++ qemu/mips64.h | 12 ++++++ qemu/mips64el.h | 12 ++++++ qemu/mipsel.h | 12 ++++++ qemu/powerpc.h | 12 ++++++ qemu/sparc.h | 12 ++++++ qemu/sparc64.h | 12 ++++++ qemu/target/arm/helper-sve.h | 14 +++++++ qemu/target/arm/helper.h | 19 +++++++++ qemu/target/arm/sve.decode | 10 +++++ qemu/target/arm/translate-sve.c | 43 ++++++++++++++++++++ qemu/target/arm/vec_helper.c | 69 +++++++++++++++++++++++++++++++++ qemu/x86_64.h | 12 ++++++ 19 files changed, 341 insertions(+) diff --git a/qemu/aarch64.h b/qemu/aarch64.h index a35a3d50..d030bd56 100644 --- a/qemu/aarch64.h +++ b/qemu/aarch64.h @@ -1112,6 +1112,9 @@ #define helper_gvec_eq16 helper_gvec_eq16_aarch64 #define helper_gvec_eq32 helper_gvec_eq32_aarch64 #define helper_gvec_eq64 helper_gvec_eq64_aarch64 +#define helper_gvec_fadd_d helper_gvec_fadd_d_aarch64 +#define helper_gvec_fadd_h helper_gvec_fadd_h_aarch64 +#define helper_gvec_fadd_s helper_gvec_fadd_s_aarch64 #define helper_gvec_fcaddh helper_gvec_fcaddh_aarch64 #define helper_gvec_fcadds helper_gvec_fcadds_aarch64 #define helper_gvec_fcaddd helper_gvec_fcaddd_aarch64 @@ -1120,6 +1123,15 @@ #define helper_gvec_fcmlah_idx helper_gvec_fcmlah_idx_aarch64 #define helper_gvec_fcmlas helper_gvec_fcmlas_aarch64 #define helper_gvec_fcmlas_idx helper_gvec_fcmlas_idx_aarch64 +#define helper_gvec_fmul_d helper_gvec_fmul_d_aarch64 +#define helper_gvec_fmul_h helper_gvec_fmul_h_aarch64 +#define helper_gvec_fmul_s helper_gvec_fmul_s_aarch64 +#define helper_gvec_fsub_d helper_gvec_fsub_d_aarch64 +#define helper_gvec_fsub_h helper_gvec_fsub_h_aarch64 +#define helper_gvec_fsub_s helper_gvec_fsub_s_aarch64 +#define helper_gvec_ftsmul_d helper_gvec_ftsmul_d_aarch64 +#define helper_gvec_ftsmul_h helper_gvec_ftsmul_h_aarch64 +#define helper_gvec_ftsmul_s helper_gvec_ftsmul_s_aarch64 #define helper_gvec_le8 helper_gvec_le8_aarch64 #define helper_gvec_le16 helper_gvec_le16_aarch64 #define helper_gvec_le32 helper_gvec_le32_aarch64 @@ -3255,6 +3267,12 @@ #define helper_frecpx_f16 helper_frecpx_f16_aarch64 #define helper_frecpx_f32 helper_frecpx_f32_aarch64 #define helper_frecpx_f64 helper_frecpx_f64_aarch64 +#define helper_gvec_recps_d helper_gvec_recps_d_aarch64 +#define helper_gvec_recps_h helper_gvec_recps_h_aarch64 +#define helper_gvec_recps_s helper_gvec_recps_s_aarch64 +#define helper_gvec_rsqrts_d helper_gvec_rsqrts_d_aarch64 +#define helper_gvec_rsqrts_h helper_gvec_rsqrts_h_aarch64 +#define helper_gvec_rsqrts_s helper_gvec_rsqrts_s_aarch64 #define helper_neon_addlp_s16 helper_neon_addlp_s16_aarch64 #define helper_neon_addlp_s8 helper_neon_addlp_s8_aarch64 #define helper_neon_addlp_u16 helper_neon_addlp_u16_aarch64 diff --git a/qemu/aarch64eb.h b/qemu/aarch64eb.h index 6107a56a..9b2174a2 100644 --- a/qemu/aarch64eb.h +++ b/qemu/aarch64eb.h @@ -1112,6 +1112,9 @@ #define helper_gvec_eq16 helper_gvec_eq16_aarch64eb #define helper_gvec_eq32 helper_gvec_eq32_aarch64eb #define helper_gvec_eq64 helper_gvec_eq64_aarch64eb +#define helper_gvec_fadd_d helper_gvec_fadd_d_aarch64eb +#define helper_gvec_fadd_h helper_gvec_fadd_h_aarch64eb +#define helper_gvec_fadd_s helper_gvec_fadd_s_aarch64eb #define helper_gvec_fcaddh helper_gvec_fcaddh_aarch64eb #define helper_gvec_fcadds helper_gvec_fcadds_aarch64eb #define helper_gvec_fcaddd helper_gvec_fcaddd_aarch64eb @@ -1120,6 +1123,15 @@ #define helper_gvec_fcmlah_idx helper_gvec_fcmlah_idx_aarch64eb #define helper_gvec_fcmlas helper_gvec_fcmlas_aarch64eb #define helper_gvec_fcmlas_idx helper_gvec_fcmlas_idx_aarch64eb +#define helper_gvec_fmul_d helper_gvec_fmul_d_aarch64eb +#define helper_gvec_fmul_h helper_gvec_fmul_h_aarch64eb +#define helper_gvec_fmul_s helper_gvec_fmul_s_aarch64eb +#define helper_gvec_fsub_d helper_gvec_fsub_d_aarch64eb +#define helper_gvec_fsub_h helper_gvec_fsub_h_aarch64eb +#define helper_gvec_fsub_s helper_gvec_fsub_s_aarch64eb +#define helper_gvec_ftsmul_d helper_gvec_ftsmul_d_aarch64eb +#define helper_gvec_ftsmul_h helper_gvec_ftsmul_h_aarch64eb +#define helper_gvec_ftsmul_s helper_gvec_ftsmul_s_aarch64eb #define helper_gvec_le8 helper_gvec_le8_aarch64eb #define helper_gvec_le16 helper_gvec_le16_aarch64eb #define helper_gvec_le32 helper_gvec_le32_aarch64eb @@ -3255,6 +3267,12 @@ #define helper_frecpx_f16 helper_frecpx_f16_aarch64eb #define helper_frecpx_f32 helper_frecpx_f32_aarch64eb #define helper_frecpx_f64 helper_frecpx_f64_aarch64eb +#define helper_gvec_recps_d helper_gvec_recps_d_aarch64eb +#define helper_gvec_recps_h helper_gvec_recps_h_aarch64eb +#define helper_gvec_recps_s helper_gvec_recps_s_aarch64eb +#define helper_gvec_rsqrts_d helper_gvec_rsqrts_d_aarch64eb +#define helper_gvec_rsqrts_h helper_gvec_rsqrts_h_aarch64eb +#define helper_gvec_rsqrts_s helper_gvec_rsqrts_s_aarch64eb #define helper_neon_addlp_s16 helper_neon_addlp_s16_aarch64eb #define helper_neon_addlp_s8 helper_neon_addlp_s8_aarch64eb #define helper_neon_addlp_u16 helper_neon_addlp_u16_aarch64eb diff --git a/qemu/arm.h b/qemu/arm.h index 8ea5f518..e65af29b 100644 --- a/qemu/arm.h +++ b/qemu/arm.h @@ -1112,6 +1112,9 @@ #define helper_gvec_eq16 helper_gvec_eq16_arm #define helper_gvec_eq32 helper_gvec_eq32_arm #define helper_gvec_eq64 helper_gvec_eq64_arm +#define helper_gvec_fadd_d helper_gvec_fadd_d_arm +#define helper_gvec_fadd_h helper_gvec_fadd_h_arm +#define helper_gvec_fadd_s helper_gvec_fadd_s_arm #define helper_gvec_fcaddh helper_gvec_fcaddh_arm #define helper_gvec_fcadds helper_gvec_fcadds_arm #define helper_gvec_fcaddd helper_gvec_fcaddd_arm @@ -1120,6 +1123,15 @@ #define helper_gvec_fcmlah_idx helper_gvec_fcmlah_idx_arm #define helper_gvec_fcmlas helper_gvec_fcmlas_arm #define helper_gvec_fcmlas_idx helper_gvec_fcmlas_idx_arm +#define helper_gvec_fmul_d helper_gvec_fmul_d_arm +#define helper_gvec_fmul_h helper_gvec_fmul_h_arm +#define helper_gvec_fmul_s helper_gvec_fmul_s_arm +#define helper_gvec_fsub_d helper_gvec_fsub_d_arm +#define helper_gvec_fsub_h helper_gvec_fsub_h_arm +#define helper_gvec_fsub_s helper_gvec_fsub_s_arm +#define helper_gvec_ftsmul_d helper_gvec_ftsmul_d_arm +#define helper_gvec_ftsmul_h helper_gvec_ftsmul_h_arm +#define helper_gvec_ftsmul_s helper_gvec_ftsmul_s_arm #define helper_gvec_le8 helper_gvec_le8_arm #define helper_gvec_le16 helper_gvec_le16_arm #define helper_gvec_le32 helper_gvec_le32_arm diff --git a/qemu/armeb.h b/qemu/armeb.h index 0081494e..460e8002 100644 --- a/qemu/armeb.h +++ b/qemu/armeb.h @@ -1112,6 +1112,9 @@ #define helper_gvec_eq16 helper_gvec_eq16_armeb #define helper_gvec_eq32 helper_gvec_eq32_armeb #define helper_gvec_eq64 helper_gvec_eq64_armeb +#define helper_gvec_fadd_d helper_gvec_fadd_d_armeb +#define helper_gvec_fadd_h helper_gvec_fadd_h_armeb +#define helper_gvec_fadd_s helper_gvec_fadd_s_armeb #define helper_gvec_fcaddh helper_gvec_fcaddh_armeb #define helper_gvec_fcadds helper_gvec_fcadds_armeb #define helper_gvec_fcaddd helper_gvec_fcaddd_armeb @@ -1120,6 +1123,15 @@ #define helper_gvec_fcmlah_idx helper_gvec_fcmlah_idx_armeb #define helper_gvec_fcmlas helper_gvec_fcmlas_armeb #define helper_gvec_fcmlas_idx helper_gvec_fcmlas_idx_armeb +#define helper_gvec_fmul_d helper_gvec_fmul_d_armeb +#define helper_gvec_fmul_h helper_gvec_fmul_h_armeb +#define helper_gvec_fmul_s helper_gvec_fmul_s_armeb +#define helper_gvec_fsub_d helper_gvec_fsub_d_armeb +#define helper_gvec_fsub_h helper_gvec_fsub_h_armeb +#define helper_gvec_fsub_s helper_gvec_fsub_s_armeb +#define helper_gvec_ftsmul_d helper_gvec_ftsmul_d_armeb +#define helper_gvec_ftsmul_h helper_gvec_ftsmul_h_armeb +#define helper_gvec_ftsmul_s helper_gvec_ftsmul_s_armeb #define helper_gvec_le8 helper_gvec_le8_armeb #define helper_gvec_le16 helper_gvec_le16_armeb #define helper_gvec_le32 helper_gvec_le32_armeb diff --git a/qemu/header_gen.py b/qemu/header_gen.py index 0210ab54..88de9ab1 100644 --- a/qemu/header_gen.py +++ b/qemu/header_gen.py @@ -1118,6 +1118,9 @@ symbols = ( 'helper_gvec_eq16', 'helper_gvec_eq32', 'helper_gvec_eq64', + 'helper_gvec_fadd_d', + 'helper_gvec_fadd_h', + 'helper_gvec_fadd_s', 'helper_gvec_fcaddh', 'helper_gvec_fcadds', 'helper_gvec_fcaddd', @@ -1126,6 +1129,15 @@ symbols = ( 'helper_gvec_fcmlah_idx', 'helper_gvec_fcmlas', 'helper_gvec_fcmlas_idx', + 'helper_gvec_fmul_d', + 'helper_gvec_fmul_h', + 'helper_gvec_fmul_s', + 'helper_gvec_fsub_d', + 'helper_gvec_fsub_h', + 'helper_gvec_fsub_s', + 'helper_gvec_ftsmul_d', + 'helper_gvec_ftsmul_h', + 'helper_gvec_ftsmul_s', 'helper_gvec_le8', 'helper_gvec_le16', 'helper_gvec_le32', @@ -3276,6 +3288,12 @@ aarch64_symbols = ( 'helper_frecpx_f16', 'helper_frecpx_f32', 'helper_frecpx_f64', + 'helper_gvec_recps_d', + 'helper_gvec_recps_h', + 'helper_gvec_recps_s', + 'helper_gvec_rsqrts_d', + 'helper_gvec_rsqrts_h', + 'helper_gvec_rsqrts_s', 'helper_neon_addlp_s16', 'helper_neon_addlp_s8', 'helper_neon_addlp_u16', diff --git a/qemu/m68k.h b/qemu/m68k.h index d3982938..34df3361 100644 --- a/qemu/m68k.h +++ b/qemu/m68k.h @@ -1112,6 +1112,9 @@ #define helper_gvec_eq16 helper_gvec_eq16_m68k #define helper_gvec_eq32 helper_gvec_eq32_m68k #define helper_gvec_eq64 helper_gvec_eq64_m68k +#define helper_gvec_fadd_d helper_gvec_fadd_d_m68k +#define helper_gvec_fadd_h helper_gvec_fadd_h_m68k +#define helper_gvec_fadd_s helper_gvec_fadd_s_m68k #define helper_gvec_fcaddh helper_gvec_fcaddh_m68k #define helper_gvec_fcadds helper_gvec_fcadds_m68k #define helper_gvec_fcaddd helper_gvec_fcaddd_m68k @@ -1120,6 +1123,15 @@ #define helper_gvec_fcmlah_idx helper_gvec_fcmlah_idx_m68k #define helper_gvec_fcmlas helper_gvec_fcmlas_m68k #define helper_gvec_fcmlas_idx helper_gvec_fcmlas_idx_m68k +#define helper_gvec_fmul_d helper_gvec_fmul_d_m68k +#define helper_gvec_fmul_h helper_gvec_fmul_h_m68k +#define helper_gvec_fmul_s helper_gvec_fmul_s_m68k +#define helper_gvec_fsub_d helper_gvec_fsub_d_m68k +#define helper_gvec_fsub_h helper_gvec_fsub_h_m68k +#define helper_gvec_fsub_s helper_gvec_fsub_s_m68k +#define helper_gvec_ftsmul_d helper_gvec_ftsmul_d_m68k +#define helper_gvec_ftsmul_h helper_gvec_ftsmul_h_m68k +#define helper_gvec_ftsmul_s helper_gvec_ftsmul_s_m68k #define helper_gvec_le8 helper_gvec_le8_m68k #define helper_gvec_le16 helper_gvec_le16_m68k #define helper_gvec_le32 helper_gvec_le32_m68k diff --git a/qemu/mips.h b/qemu/mips.h index 361a39b3..cae9c966 100644 --- a/qemu/mips.h +++ b/qemu/mips.h @@ -1112,6 +1112,9 @@ #define helper_gvec_eq16 helper_gvec_eq16_mips #define helper_gvec_eq32 helper_gvec_eq32_mips #define helper_gvec_eq64 helper_gvec_eq64_mips +#define helper_gvec_fadd_d helper_gvec_fadd_d_mips +#define helper_gvec_fadd_h helper_gvec_fadd_h_mips +#define helper_gvec_fadd_s helper_gvec_fadd_s_mips #define helper_gvec_fcaddh helper_gvec_fcaddh_mips #define helper_gvec_fcadds helper_gvec_fcadds_mips #define helper_gvec_fcaddd helper_gvec_fcaddd_mips @@ -1120,6 +1123,15 @@ #define helper_gvec_fcmlah_idx helper_gvec_fcmlah_idx_mips #define helper_gvec_fcmlas helper_gvec_fcmlas_mips #define helper_gvec_fcmlas_idx helper_gvec_fcmlas_idx_mips +#define helper_gvec_fmul_d helper_gvec_fmul_d_mips +#define helper_gvec_fmul_h helper_gvec_fmul_h_mips +#define helper_gvec_fmul_s helper_gvec_fmul_s_mips +#define helper_gvec_fsub_d helper_gvec_fsub_d_mips +#define helper_gvec_fsub_h helper_gvec_fsub_h_mips +#define helper_gvec_fsub_s helper_gvec_fsub_s_mips +#define helper_gvec_ftsmul_d helper_gvec_ftsmul_d_mips +#define helper_gvec_ftsmul_h helper_gvec_ftsmul_h_mips +#define helper_gvec_ftsmul_s helper_gvec_ftsmul_s_mips #define helper_gvec_le8 helper_gvec_le8_mips #define helper_gvec_le16 helper_gvec_le16_mips #define helper_gvec_le32 helper_gvec_le32_mips diff --git a/qemu/mips64.h b/qemu/mips64.h index 0cd52748..5157dd0d 100644 --- a/qemu/mips64.h +++ b/qemu/mips64.h @@ -1112,6 +1112,9 @@ #define helper_gvec_eq16 helper_gvec_eq16_mips64 #define helper_gvec_eq32 helper_gvec_eq32_mips64 #define helper_gvec_eq64 helper_gvec_eq64_mips64 +#define helper_gvec_fadd_d helper_gvec_fadd_d_mips64 +#define helper_gvec_fadd_h helper_gvec_fadd_h_mips64 +#define helper_gvec_fadd_s helper_gvec_fadd_s_mips64 #define helper_gvec_fcaddh helper_gvec_fcaddh_mips64 #define helper_gvec_fcadds helper_gvec_fcadds_mips64 #define helper_gvec_fcaddd helper_gvec_fcaddd_mips64 @@ -1120,6 +1123,15 @@ #define helper_gvec_fcmlah_idx helper_gvec_fcmlah_idx_mips64 #define helper_gvec_fcmlas helper_gvec_fcmlas_mips64 #define helper_gvec_fcmlas_idx helper_gvec_fcmlas_idx_mips64 +#define helper_gvec_fmul_d helper_gvec_fmul_d_mips64 +#define helper_gvec_fmul_h helper_gvec_fmul_h_mips64 +#define helper_gvec_fmul_s helper_gvec_fmul_s_mips64 +#define helper_gvec_fsub_d helper_gvec_fsub_d_mips64 +#define helper_gvec_fsub_h helper_gvec_fsub_h_mips64 +#define helper_gvec_fsub_s helper_gvec_fsub_s_mips64 +#define helper_gvec_ftsmul_d helper_gvec_ftsmul_d_mips64 +#define helper_gvec_ftsmul_h helper_gvec_ftsmul_h_mips64 +#define helper_gvec_ftsmul_s helper_gvec_ftsmul_s_mips64 #define helper_gvec_le8 helper_gvec_le8_mips64 #define helper_gvec_le16 helper_gvec_le16_mips64 #define helper_gvec_le32 helper_gvec_le32_mips64 diff --git a/qemu/mips64el.h b/qemu/mips64el.h index f7ac40e2..66da5e91 100644 --- a/qemu/mips64el.h +++ b/qemu/mips64el.h @@ -1112,6 +1112,9 @@ #define helper_gvec_eq16 helper_gvec_eq16_mips64el #define helper_gvec_eq32 helper_gvec_eq32_mips64el #define helper_gvec_eq64 helper_gvec_eq64_mips64el +#define helper_gvec_fadd_d helper_gvec_fadd_d_mips64el +#define helper_gvec_fadd_h helper_gvec_fadd_h_mips64el +#define helper_gvec_fadd_s helper_gvec_fadd_s_mips64el #define helper_gvec_fcaddh helper_gvec_fcaddh_mips64el #define helper_gvec_fcadds helper_gvec_fcadds_mips64el #define helper_gvec_fcaddd helper_gvec_fcaddd_mips64el @@ -1120,6 +1123,15 @@ #define helper_gvec_fcmlah_idx helper_gvec_fcmlah_idx_mips64el #define helper_gvec_fcmlas helper_gvec_fcmlas_mips64el #define helper_gvec_fcmlas_idx helper_gvec_fcmlas_idx_mips64el +#define helper_gvec_fmul_d helper_gvec_fmul_d_mips64el +#define helper_gvec_fmul_h helper_gvec_fmul_h_mips64el +#define helper_gvec_fmul_s helper_gvec_fmul_s_mips64el +#define helper_gvec_fsub_d helper_gvec_fsub_d_mips64el +#define helper_gvec_fsub_h helper_gvec_fsub_h_mips64el +#define helper_gvec_fsub_s helper_gvec_fsub_s_mips64el +#define helper_gvec_ftsmul_d helper_gvec_ftsmul_d_mips64el +#define helper_gvec_ftsmul_h helper_gvec_ftsmul_h_mips64el +#define helper_gvec_ftsmul_s helper_gvec_ftsmul_s_mips64el #define helper_gvec_le8 helper_gvec_le8_mips64el #define helper_gvec_le16 helper_gvec_le16_mips64el #define helper_gvec_le32 helper_gvec_le32_mips64el diff --git a/qemu/mipsel.h b/qemu/mipsel.h index a7185043..d65f6a5a 100644 --- a/qemu/mipsel.h +++ b/qemu/mipsel.h @@ -1112,6 +1112,9 @@ #define helper_gvec_eq16 helper_gvec_eq16_mipsel #define helper_gvec_eq32 helper_gvec_eq32_mipsel #define helper_gvec_eq64 helper_gvec_eq64_mipsel +#define helper_gvec_fadd_d helper_gvec_fadd_d_mipsel +#define helper_gvec_fadd_h helper_gvec_fadd_h_mipsel +#define helper_gvec_fadd_s helper_gvec_fadd_s_mipsel #define helper_gvec_fcaddh helper_gvec_fcaddh_mipsel #define helper_gvec_fcadds helper_gvec_fcadds_mipsel #define helper_gvec_fcaddd helper_gvec_fcaddd_mipsel @@ -1120,6 +1123,15 @@ #define helper_gvec_fcmlah_idx helper_gvec_fcmlah_idx_mipsel #define helper_gvec_fcmlas helper_gvec_fcmlas_mipsel #define helper_gvec_fcmlas_idx helper_gvec_fcmlas_idx_mipsel +#define helper_gvec_fmul_d helper_gvec_fmul_d_mipsel +#define helper_gvec_fmul_h helper_gvec_fmul_h_mipsel +#define helper_gvec_fmul_s helper_gvec_fmul_s_mipsel +#define helper_gvec_fsub_d helper_gvec_fsub_d_mipsel +#define helper_gvec_fsub_h helper_gvec_fsub_h_mipsel +#define helper_gvec_fsub_s helper_gvec_fsub_s_mipsel +#define helper_gvec_ftsmul_d helper_gvec_ftsmul_d_mipsel +#define helper_gvec_ftsmul_h helper_gvec_ftsmul_h_mipsel +#define helper_gvec_ftsmul_s helper_gvec_ftsmul_s_mipsel #define helper_gvec_le8 helper_gvec_le8_mipsel #define helper_gvec_le16 helper_gvec_le16_mipsel #define helper_gvec_le32 helper_gvec_le32_mipsel diff --git a/qemu/powerpc.h b/qemu/powerpc.h index a324b87b..64f0c223 100644 --- a/qemu/powerpc.h +++ b/qemu/powerpc.h @@ -1112,6 +1112,9 @@ #define helper_gvec_eq16 helper_gvec_eq16_powerpc #define helper_gvec_eq32 helper_gvec_eq32_powerpc #define helper_gvec_eq64 helper_gvec_eq64_powerpc +#define helper_gvec_fadd_d helper_gvec_fadd_d_powerpc +#define helper_gvec_fadd_h helper_gvec_fadd_h_powerpc +#define helper_gvec_fadd_s helper_gvec_fadd_s_powerpc #define helper_gvec_fcaddh helper_gvec_fcaddh_powerpc #define helper_gvec_fcadds helper_gvec_fcadds_powerpc #define helper_gvec_fcaddd helper_gvec_fcaddd_powerpc @@ -1120,6 +1123,15 @@ #define helper_gvec_fcmlah_idx helper_gvec_fcmlah_idx_powerpc #define helper_gvec_fcmlas helper_gvec_fcmlas_powerpc #define helper_gvec_fcmlas_idx helper_gvec_fcmlas_idx_powerpc +#define helper_gvec_fmul_d helper_gvec_fmul_d_powerpc +#define helper_gvec_fmul_h helper_gvec_fmul_h_powerpc +#define helper_gvec_fmul_s helper_gvec_fmul_s_powerpc +#define helper_gvec_fsub_d helper_gvec_fsub_d_powerpc +#define helper_gvec_fsub_h helper_gvec_fsub_h_powerpc +#define helper_gvec_fsub_s helper_gvec_fsub_s_powerpc +#define helper_gvec_ftsmul_d helper_gvec_ftsmul_d_powerpc +#define helper_gvec_ftsmul_h helper_gvec_ftsmul_h_powerpc +#define helper_gvec_ftsmul_s helper_gvec_ftsmul_s_powerpc #define helper_gvec_le8 helper_gvec_le8_powerpc #define helper_gvec_le16 helper_gvec_le16_powerpc #define helper_gvec_le32 helper_gvec_le32_powerpc diff --git a/qemu/sparc.h b/qemu/sparc.h index 9a627ccb..4b2bc93c 100644 --- a/qemu/sparc.h +++ b/qemu/sparc.h @@ -1112,6 +1112,9 @@ #define helper_gvec_eq16 helper_gvec_eq16_sparc #define helper_gvec_eq32 helper_gvec_eq32_sparc #define helper_gvec_eq64 helper_gvec_eq64_sparc +#define helper_gvec_fadd_d helper_gvec_fadd_d_sparc +#define helper_gvec_fadd_h helper_gvec_fadd_h_sparc +#define helper_gvec_fadd_s helper_gvec_fadd_s_sparc #define helper_gvec_fcaddh helper_gvec_fcaddh_sparc #define helper_gvec_fcadds helper_gvec_fcadds_sparc #define helper_gvec_fcaddd helper_gvec_fcaddd_sparc @@ -1120,6 +1123,15 @@ #define helper_gvec_fcmlah_idx helper_gvec_fcmlah_idx_sparc #define helper_gvec_fcmlas helper_gvec_fcmlas_sparc #define helper_gvec_fcmlas_idx helper_gvec_fcmlas_idx_sparc +#define helper_gvec_fmul_d helper_gvec_fmul_d_sparc +#define helper_gvec_fmul_h helper_gvec_fmul_h_sparc +#define helper_gvec_fmul_s helper_gvec_fmul_s_sparc +#define helper_gvec_fsub_d helper_gvec_fsub_d_sparc +#define helper_gvec_fsub_h helper_gvec_fsub_h_sparc +#define helper_gvec_fsub_s helper_gvec_fsub_s_sparc +#define helper_gvec_ftsmul_d helper_gvec_ftsmul_d_sparc +#define helper_gvec_ftsmul_h helper_gvec_ftsmul_h_sparc +#define helper_gvec_ftsmul_s helper_gvec_ftsmul_s_sparc #define helper_gvec_le8 helper_gvec_le8_sparc #define helper_gvec_le16 helper_gvec_le16_sparc #define helper_gvec_le32 helper_gvec_le32_sparc diff --git a/qemu/sparc64.h b/qemu/sparc64.h index 1bd36eee..fa837930 100644 --- a/qemu/sparc64.h +++ b/qemu/sparc64.h @@ -1112,6 +1112,9 @@ #define helper_gvec_eq16 helper_gvec_eq16_sparc64 #define helper_gvec_eq32 helper_gvec_eq32_sparc64 #define helper_gvec_eq64 helper_gvec_eq64_sparc64 +#define helper_gvec_fadd_d helper_gvec_fadd_d_sparc64 +#define helper_gvec_fadd_h helper_gvec_fadd_h_sparc64 +#define helper_gvec_fadd_s helper_gvec_fadd_s_sparc64 #define helper_gvec_fcaddh helper_gvec_fcaddh_sparc64 #define helper_gvec_fcadds helper_gvec_fcadds_sparc64 #define helper_gvec_fcaddd helper_gvec_fcaddd_sparc64 @@ -1120,6 +1123,15 @@ #define helper_gvec_fcmlah_idx helper_gvec_fcmlah_idx_sparc64 #define helper_gvec_fcmlas helper_gvec_fcmlas_sparc64 #define helper_gvec_fcmlas_idx helper_gvec_fcmlas_idx_sparc64 +#define helper_gvec_fmul_d helper_gvec_fmul_d_sparc64 +#define helper_gvec_fmul_h helper_gvec_fmul_h_sparc64 +#define helper_gvec_fmul_s helper_gvec_fmul_s_sparc64 +#define helper_gvec_fsub_d helper_gvec_fsub_d_sparc64 +#define helper_gvec_fsub_h helper_gvec_fsub_h_sparc64 +#define helper_gvec_fsub_s helper_gvec_fsub_s_sparc64 +#define helper_gvec_ftsmul_d helper_gvec_ftsmul_d_sparc64 +#define helper_gvec_ftsmul_h helper_gvec_ftsmul_h_sparc64 +#define helper_gvec_ftsmul_s helper_gvec_ftsmul_s_sparc64 #define helper_gvec_le8 helper_gvec_le8_sparc64 #define helper_gvec_le16 helper_gvec_le16_sparc64 #define helper_gvec_le32 helper_gvec_le32_sparc64 diff --git a/qemu/target/arm/helper-sve.h b/qemu/target/arm/helper-sve.h index 97bfe0f4..2e760849 100644 --- a/qemu/target/arm/helper-sve.h +++ b/qemu/target/arm/helper-sve.h @@ -705,3 +705,17 @@ DEF_HELPER_FLAGS_4(sve_umini_b, TCG_CALL_NO_RWG, void, ptr, ptr, i64, i32) DEF_HELPER_FLAGS_4(sve_umini_h, TCG_CALL_NO_RWG, void, ptr, ptr, i64, i32) DEF_HELPER_FLAGS_4(sve_umini_s, TCG_CALL_NO_RWG, void, ptr, ptr, i64, i32) DEF_HELPER_FLAGS_4(sve_umini_d, TCG_CALL_NO_RWG, void, ptr, ptr, i64, i32) + +DEF_HELPER_FLAGS_5(gvec_recps_h, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(gvec_recps_s, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(gvec_recps_d, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, i32) + +DEF_HELPER_FLAGS_5(gvec_rsqrts_h, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(gvec_rsqrts_s, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(gvec_rsqrts_d, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, i32) diff --git a/qemu/target/arm/helper.h b/qemu/target/arm/helper.h index 0971a0aa..e9c08952 100644 --- a/qemu/target/arm/helper.h +++ b/qemu/target/arm/helper.h @@ -603,6 +603,25 @@ DEF_HELPER_FLAGS_5(gvec_fcmlas_idx, TCG_CALL_NO_RWG, DEF_HELPER_FLAGS_5(gvec_fcmlad, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(gvec_fadd_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(gvec_fadd_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(gvec_fadd_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) + +DEF_HELPER_FLAGS_5(gvec_fsub_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(gvec_fsub_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(gvec_fsub_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) + +DEF_HELPER_FLAGS_5(gvec_fmul_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(gvec_fmul_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(gvec_fmul_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) + +DEF_HELPER_FLAGS_5(gvec_ftsmul_h, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(gvec_ftsmul_s, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(gvec_ftsmul_d, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, i32) + #ifdef TARGET_ARM #define helper_clz helper_clz_arm #define gen_helper_clz gen_helper_clz_arm diff --git a/qemu/target/arm/sve.decode b/qemu/target/arm/sve.decode index 18c40294..b72e74b7 100644 --- a/qemu/target/arm/sve.decode +++ b/qemu/target/arm/sve.decode @@ -648,6 +648,16 @@ UMIN_zzi 00100101 .. 101 011 110 ........ ..... @rdn_i8u # SVE integer multiply immediate (unpredicated) MUL_zzi 00100101 .. 110 000 110 ........ ..... @rdn_i8s +### SVE Floating Point Arithmetic - Unpredicated Group + +# SVE floating-point arithmetic (unpredicated) +FADD_zzz 01100101 .. 0 ..... 000 000 ..... ..... @rd_rn_rm +FSUB_zzz 01100101 .. 0 ..... 000 001 ..... ..... @rd_rn_rm +FMUL_zzz 01100101 .. 0 ..... 000 010 ..... ..... @rd_rn_rm +FTSMUL 01100101 .. 0 ..... 000 011 ..... ..... @rd_rn_rm +FRECPS 01100101 .. 0 ..... 000 110 ..... ..... @rd_rn_rm +FRSQRTS 01100101 .. 0 ..... 000 111 ..... ..... @rd_rn_rm + ### SVE Memory - 32-bit Gather and Unsized Contiguous Group # SVE load predicate register diff --git a/qemu/target/arm/translate-sve.c b/qemu/target/arm/translate-sve.c index 794e1b47..8e35b4a5 100644 --- a/qemu/target/arm/translate-sve.c +++ b/qemu/target/arm/translate-sve.c @@ -3513,6 +3513,49 @@ DO_ZZI(UMIN, umin) #undef DO_ZZI +/* + *** SVE Floating Point Arithmetic - Unpredicated Group + */ + +static bool do_zzz_fp(DisasContext *s, arg_rrr_esz *a, + gen_helper_gvec_3_ptr *fn) +{ + if (fn == NULL) { + return false; + } + if (sve_access_check(s)) { + TCGContext *tcg_ctx = s->uc->tcg_ctx; + unsigned vsz = vec_full_reg_size(s); + TCGv_ptr status = get_fpstatus_ptr(tcg_ctx, a->esz == MO_16); + tcg_gen_gvec_3_ptr(tcg_ctx, vec_full_reg_offset(s, a->rd), + vec_full_reg_offset(s, a->rn), + vec_full_reg_offset(s, a->rm), + status, vsz, vsz, 0, fn); + tcg_temp_free_ptr(tcg_ctx, status); + } + return true; +} + + +#define DO_FP3(NAME, name) \ +static bool trans_##NAME(DisasContext *s, arg_rrr_esz *a, uint32_t insn) \ +{ \ + static gen_helper_gvec_3_ptr * const fns[4] = { \ + NULL, gen_helper_gvec_##name##_h, \ + gen_helper_gvec_##name##_s, gen_helper_gvec_##name##_d \ + }; \ + return do_zzz_fp(s, a, fns[a->esz]); \ +} + +DO_FP3(FADD_zzz, fadd) +DO_FP3(FSUB_zzz, fsub) +DO_FP3(FMUL_zzz, fmul) +DO_FP3(FTSMUL, ftsmul) +DO_FP3(FRECPS, recps) +DO_FP3(FRSQRTS, rsqrts) + +#undef DO_FP3 + /* *** SVE Memory - 32-bit Gather and Unsized Contiguous Group */ diff --git a/qemu/target/arm/vec_helper.c b/qemu/target/arm/vec_helper.c index ec705cfc..4b5ec946 100644 --- a/qemu/target/arm/vec_helper.c +++ b/qemu/target/arm/vec_helper.c @@ -427,3 +427,72 @@ void HELPER(gvec_fcmlad)(void *vd, void *vn, void *vm, } clear_tail(d, opr_sz, simd_maxsz(desc)); } + +/* Floating-point trigonometric starting value. + * See the ARM ARM pseudocode function FPTrigSMul. + */ +static float16 float16_ftsmul(float16 op1, uint16_t op2, float_status *stat) +{ + float16 result = float16_mul(op1, op1, stat); + if (!float16_is_any_nan(result)) { + result = float16_set_sign(result, op2 & 1); + } + return result; +} + +static float32 float32_ftsmul(float32 op1, uint32_t op2, float_status *stat) +{ + float32 result = float32_mul(op1, op1, stat); + if (!float32_is_any_nan(result)) { + result = float32_set_sign(result, op2 & 1); + } + return result; +} + +static float64 float64_ftsmul(float64 op1, uint64_t op2, float_status *stat) +{ + float64 result = float64_mul(op1, op1, stat); + if (!float64_is_any_nan(result)) { + result = float64_set_sign(result, op2 & 1); + } + return result; +} + +#define DO_3OP(NAME, FUNC, TYPE) \ +void HELPER(NAME)(void *vd, void *vn, void *vm, void *stat, uint32_t desc) \ +{ \ + intptr_t i, oprsz = simd_oprsz(desc); \ + TYPE *d = vd, *n = vn, *m = vm; \ + for (i = 0; i < oprsz / sizeof(TYPE); i++) { \ + d[i] = FUNC(n[i], m[i], stat); \ + } \ +} + +DO_3OP(gvec_fadd_h, float16_add, float16) +DO_3OP(gvec_fadd_s, float32_add, float32) +DO_3OP(gvec_fadd_d, float64_add, float64) + +DO_3OP(gvec_fsub_h, float16_sub, float16) +DO_3OP(gvec_fsub_s, float32_sub, float32) +DO_3OP(gvec_fsub_d, float64_sub, float64) + +DO_3OP(gvec_fmul_h, float16_mul, float16) +DO_3OP(gvec_fmul_s, float32_mul, float32) +DO_3OP(gvec_fmul_d, float64_mul, float64) + +DO_3OP(gvec_ftsmul_h, float16_ftsmul, float16) +DO_3OP(gvec_ftsmul_s, float32_ftsmul, float32) +DO_3OP(gvec_ftsmul_d, float64_ftsmul, float64) + +#ifdef TARGET_AARCH64 + +DO_3OP(gvec_recps_h, helper_recpsf_f16, float16) +DO_3OP(gvec_recps_s, helper_recpsf_f32, float32) +DO_3OP(gvec_recps_d, helper_recpsf_f64, float64) + +DO_3OP(gvec_rsqrts_h, helper_rsqrtsf_f16, float16) +DO_3OP(gvec_rsqrts_s, helper_rsqrtsf_f32, float32) +DO_3OP(gvec_rsqrts_d, helper_rsqrtsf_f64, float64) + +#endif +#undef DO_3OP diff --git a/qemu/x86_64.h b/qemu/x86_64.h index e0a9a5f1..be52e2fa 100644 --- a/qemu/x86_64.h +++ b/qemu/x86_64.h @@ -1112,6 +1112,9 @@ #define helper_gvec_eq16 helper_gvec_eq16_x86_64 #define helper_gvec_eq32 helper_gvec_eq32_x86_64 #define helper_gvec_eq64 helper_gvec_eq64_x86_64 +#define helper_gvec_fadd_d helper_gvec_fadd_d_x86_64 +#define helper_gvec_fadd_h helper_gvec_fadd_h_x86_64 +#define helper_gvec_fadd_s helper_gvec_fadd_s_x86_64 #define helper_gvec_fcaddh helper_gvec_fcaddh_x86_64 #define helper_gvec_fcadds helper_gvec_fcadds_x86_64 #define helper_gvec_fcaddd helper_gvec_fcaddd_x86_64 @@ -1120,6 +1123,15 @@ #define helper_gvec_fcmlah_idx helper_gvec_fcmlah_idx_x86_64 #define helper_gvec_fcmlas helper_gvec_fcmlas_x86_64 #define helper_gvec_fcmlas_idx helper_gvec_fcmlas_idx_x86_64 +#define helper_gvec_fmul_d helper_gvec_fmul_d_x86_64 +#define helper_gvec_fmul_h helper_gvec_fmul_h_x86_64 +#define helper_gvec_fmul_s helper_gvec_fmul_s_x86_64 +#define helper_gvec_fsub_d helper_gvec_fsub_d_x86_64 +#define helper_gvec_fsub_h helper_gvec_fsub_h_x86_64 +#define helper_gvec_fsub_s helper_gvec_fsub_s_x86_64 +#define helper_gvec_ftsmul_d helper_gvec_ftsmul_d_x86_64 +#define helper_gvec_ftsmul_h helper_gvec_ftsmul_h_x86_64 +#define helper_gvec_ftsmul_s helper_gvec_ftsmul_s_x86_64 #define helper_gvec_le8 helper_gvec_le8_x86_64 #define helper_gvec_le16 helper_gvec_le16_x86_64 #define helper_gvec_le32 helper_gvec_le32_x86_64