From 091df64952e4922ad4160cd7ea0e76684b3ad0ee Mon Sep 17 00:00:00 2001 From: Richard Earnshaw Date: Thu, 15 Dec 2016 15:59:20 +0000 Subject: [PATCH] [arm] Use arm_active_target for most FP feature tests Now that the isa feature bits are all available in arm_active_target we can use that for most of the feature tests that are needed. * arm.h (TARGET_VFPD32): Use arm_active_target. (TARGET_VFP3): Likewise. (TARGET_VFP5): Likewise. (TARGET_VFP_SINGLE): Likewise. (TARGET_VFP_DOUBLE): Likewise. (TARGET_NEON_FP16): Likewise. (TARGET_FP16): Likewise. (TARGET_FMA): Likewise. (TARGET_FPU_ARMV8): Likewise. (TARGET_CRYPTO): Likewise. (TARGET_NEON): Likewise. (TARGET_FPU_FEATURES): Delete. * arm.c (arm_option_check_internal): Check for iwmmxt conflict with Neon using arm_active_target. From-SVN: r243712 --- gcc/ChangeLog | 17 +++++++++++++++++ gcc/config/arm/arm.c | 3 +-- gcc/config/arm/arm.h | 33 ++++++++++++++------------------- 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4ccd46e3b45..cd6be7d578c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,20 @@ +2016-12-15 Richard Earnshaw + + * arm.h (TARGET_VFPD32): Use arm_active_target. + (TARGET_VFP3): Likewise. + (TARGET_VFP5): Likewise. + (TARGET_VFP_SINGLE): Likewise. + (TARGET_VFP_DOUBLE): Likewise. + (TARGET_NEON_FP16): Likewise. + (TARGET_FP16): Likewise. + (TARGET_FMA): Likewise. + (TARGET_FPU_ARMV8): Likewise. + (TARGET_CRYPTO): Likewise. + (TARGET_NEON): Likewise. + (TARGET_FPU_FEATURES): Delete. + * arm.c (arm_option_check_internal): Check for iwmmxt conflict with + Neon using arm_active_target. + 2016-12-15 Richard Earnshaw * arm.h (TARGET_FPU_NAME): Delete. diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index df7a3eac98f..676c78bbb54 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -2815,11 +2815,10 @@ static void arm_option_check_internal (struct gcc_options *opts) { int flags = opts->x_target_flags; - const struct arm_fpu_desc *fpu_desc = &all_fpus[opts->x_arm_fpu_index]; /* iWMMXt and NEON are incompatible. */ if (TARGET_IWMMXT - && ARM_FPU_FSET_HAS (fpu_desc->features, FPU_FL_NEON)) + && bitmap_bit_p (arm_active_target.isa, isa_bit_neon)) error ("iWMMXt and NEON are incompatible"); /* Make sure that the processor choice does not conflict with any of the diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h index 980bb743de4..17f030b797a 100644 --- a/gcc/config/arm/arm.h +++ b/gcc/config/arm/arm.h @@ -161,28 +161,27 @@ extern tree arm_fp16_type_node; to be more careful with TARGET_NEON as noted below. */ /* FPU is has the full VFPv3/NEON register file of 32 D registers. */ -#define TARGET_VFPD32 (TARGET_FPU_FEATURES & FPU_FL_D32) +#define TARGET_VFPD32 (bitmap_bit_p (arm_active_target.isa, isa_bit_fp_d32)) /* FPU supports VFPv3 instructions. */ -#define TARGET_VFP3 (TARGET_FPU_FEATURES & FPU_FL_VFPv3) +#define TARGET_VFP3 (bitmap_bit_p (arm_active_target.isa, isa_bit_VFPv3)) /* FPU supports FPv5 instructions. */ -#define TARGET_VFP5 (TARGET_FPU_FEATURES & FPU_FL_VFPv5) +#define TARGET_VFP5 (bitmap_bit_p (arm_active_target.isa, isa_bit_FPv5)) /* FPU only supports VFP single-precision instructions. */ -#define TARGET_VFP_SINGLE ((TARGET_FPU_FEATURES & FPU_FL_DBL) == 0) +#define TARGET_VFP_SINGLE (!TARGET_VFP_DOUBLE) /* FPU supports VFP double-precision instructions. */ -#define TARGET_VFP_DOUBLE (TARGET_FPU_FEATURES & FPU_FL_DBL) +#define TARGET_VFP_DOUBLE (bitmap_bit_p (arm_active_target.isa, isa_bit_fp_dbl)) /* FPU supports half-precision floating-point with NEON element load/store. */ #define TARGET_NEON_FP16 \ - (ARM_FPU_FSET_HAS (TARGET_FPU_FEATURES, FPU_FL_NEON) \ - && ARM_FPU_FSET_HAS (TARGET_FPU_FEATURES, FPU_FL_FP16)) + (bitmap_bit_p (arm_active_target.isa, isa_bit_neon) \ + && bitmap_bit_p (arm_active_target.isa, isa_bit_fp16conv)) -/* FPU supports VFP half-precision floating-point. */ -#define TARGET_FP16 \ - (ARM_FPU_FSET_HAS (TARGET_FPU_FEATURES, FPU_FL_FP16)) +/* FPU supports VFP half-precision floating-point conversions. */ +#define TARGET_FP16 (bitmap_bit_p (arm_active_target.isa, isa_bit_fp16conv)) /* FPU supports converting between HFmode and DFmode in a single hardware step. */ @@ -190,14 +189,14 @@ extern tree arm_fp16_type_node; (TARGET_HARD_FLOAT && (TARGET_FP16 && TARGET_VFP5)) /* FPU supports fused-multiply-add operations. */ -#define TARGET_FMA (TARGET_FPU_FEATURES & FPU_FL_VFPv4) +#define TARGET_FMA (bitmap_bit_p (arm_active_target.isa, isa_bit_VFPv4)) /* FPU is ARMv8 compatible. */ -#define TARGET_FPU_ARMV8 (TARGET_FPU_FEATURES & FPU_FL_ARMv8) +#define TARGET_FPU_ARMV8 \ + (bitmap_bit_p (arm_active_target.isa, isa_bit_FP_ARMv8)) /* FPU supports Crypto extensions. */ -#define TARGET_CRYPTO \ - (ARM_FPU_FSET_HAS (TARGET_FPU_FEATURES, FPU_FL_CRYPTO)) +#define TARGET_CRYPTO (bitmap_bit_p (arm_active_target.isa, isa_bit_crypto)) /* FPU supports Neon instructions. The setting of this macro gets revealed via __ARM_NEON__ so we add extra guards upon TARGET_32BIT @@ -205,7 +204,7 @@ extern tree arm_fp16_type_node; available. */ #define TARGET_NEON \ (TARGET_32BIT && TARGET_HARD_FLOAT \ - && ARM_FPU_FSET_HAS (TARGET_FPU_FEATURES, FPU_FL_NEON)) + && bitmap_bit_p (arm_active_target.isa, isa_bit_neon)) /* FPU supports ARMv8.1 Adv.SIMD extensions. */ #define TARGET_NEON_RDMA (TARGET_NEON && arm_arch8_1) @@ -367,10 +366,6 @@ extern const struct arm_fpu_desc arm_fpu_feature_set features; } all_fpus[]; -/* Accessors. */ - -#define TARGET_FPU_FEATURES (all_fpus[arm_fpu_index].features) - /* Which floating point hardware to schedule for. */ extern int arm_fpu_attr;