* [PATCH 2/4] [ARM] Add attribute/pragma target fpu=
@ 2015-09-14 11:21 Christian Bruel
2015-09-14 20:11 ` Bernhard Reutner-Fischer
2015-10-05 10:54 ` Kyrill Tkachov
0 siblings, 2 replies; 3+ messages in thread
From: Christian Bruel @ 2015-09-14 11:21 UTC (permalink / raw)
To: kyrylo.tkachov, Ramana.Radhakrishnan; +Cc: gcc-patches
[-- Attachment #1: Type: text/plain, Size: 153 bytes --]
This patch defines and uses accessors for the current fpu type fields,
based on switchable arm_fpu_index rather than defuncted arm_fpu_desc.
Christian
[-- Attachment #2: p2.patch --]
[-- Type: text/x-patch, Size: 6745 bytes --]
2015-09-14 Christian Bruel <christian.bruel@st.com>
* config/arm/arm.c (arm_fpu_desc): Remove.
(all_fpus): Make global.
(arm_option_override): Use FPU TARGET accessors.
(arm_declare_function_name): Likewise.
* config/arm/arm.h (TARGET_VFP, TARGET_VFPD32, TARGET_VFP5)
(TARGET_VFP_SINGLE, TARGET_VFP_DOUBLE, TARGET_NEON_FP16)
(TARGET_FP16, TARGET_FMA, TARGET_FPU_ARMV8, TARGET_CRYPTO)
(TARGET_NEON): Likewise.
(all_fpus): Declare extern.
(TARGET_FPU_NAME, TARGET_FPU_MODEL, TARGET_FPU_REV)
(TARGET_FPU_REGS, TARGET_FPU_FEATURES): Define.
diff -ruN gnu_trunk.p1/gcc/gcc/config/arm/arm.c gnu_trunk.p2/gcc/gcc/config/arm/arm.c
--- gnu_trunk.p1/gcc/gcc/config/arm/arm.c 2015-09-11 15:44:56.347432374 +0200
+++ gnu_trunk.p2/gcc/gcc/config/arm/arm.c 2015-09-11 15:28:59.937357745 +0200
@@ -763,9 +763,6 @@
/* Which floating point hardware to schedule for. */
int arm_fpu_attr;
-/* Which floating popint hardware to use. */
-const struct arm_fpu_desc *arm_fpu_desc;
-
/* Used for Thumb call_via trampolines. */
rtx thumb_call_via_label[14];
static int thumb_call_reg_needed;
@@ -2233,7 +2230,7 @@
/* Available values for -mfpu=. */
-static const struct arm_fpu_desc all_fpus[] =
+const struct arm_fpu_desc all_fpus[] =
{
#define ARM_FPU(NAME, MODEL, REV, VFP_REGS, FEATURES) \
{ NAME, MODEL, REV, VFP_REGS, FEATURES },
@@ -3130,17 +3126,13 @@
gcc_assert (ok);
}
- arm_fpu_desc = &all_fpus[arm_fpu_index];
-
- switch (arm_fpu_desc->model)
- {
- case ARM_FP_MODEL_VFP:
- arm_fpu_attr = FPU_VFP;
- break;
-
- default:
- gcc_unreachable();
- }
+ /* If soft-float is specified then don't use FPU. */
+ if (TARGET_SOFT_FLOAT)
+ arm_fpu_attr = FPU_NONE;
+ else if (TARGET_FPU_MODEL == ARM_FP_MODEL_VFP)
+ arm_fpu_attr = FPU_VFP;
+ else
+ gcc_unreachable();
if (TARGET_AAPCS_BASED)
{
@@ -3155,10 +3147,6 @@
if (!arm_arch4 && arm_fp16_format != ARM_FP16_FORMAT_NONE)
sorry ("__fp16 and no ldrh");
- /* If soft-float is specified then don't use FPU. */
- if (TARGET_SOFT_FLOAT)
- arm_fpu_attr = FPU_NONE;
-
if (TARGET_AAPCS_BASED)
{
if (arm_abi == ARM_ABI_IWMMXT)
@@ -25679,7 +25667,7 @@
if (print_tune_info)
arm_print_tune_info ();
- if (! TARGET_SOFT_FLOAT && arm_fpu_desc->model == ARM_FP_MODEL_VFP)
+ if (! TARGET_SOFT_FLOAT && TARGET_FPU_MODEL == ARM_FP_MODEL_VFP)
{
if (TARGET_HARD_FLOAT && TARGET_VFP_SINGLE)
arm_emit_eabi_attribute ("Tag_ABI_HardFP_use", 27, 1);
@@ -29686,8 +29674,8 @@
else
fprintf (stream, "\t.arm\n");
- asm_fprintf (asm_out_file, "\t.fpu %s\n", TARGET_SOFT_FLOAT
- ? "softvfp" : arm_fpu_desc->name);
+ asm_fprintf (asm_out_file, "\t.fpu %s\n",
+ TARGET_SOFT_FLOAT ? "softvfp" : TARGET_FPU_NAME);
if (TARGET_POKE_FUNCTION_NAME)
arm_poke_function_name (stream, (const char *) name);
diff -ruN gnu_trunk.p1/gcc/gcc/config/arm/arm.h gnu_trunk.p2/gcc/gcc/config/arm/arm.h
--- gnu_trunk.p1/gcc/gcc/config/arm/arm.h 2015-09-11 14:47:02.567903689 +0200
+++ gnu_trunk.p2/gcc/gcc/config/arm/arm.h 2015-09-11 15:34:08.982028883 +0200
@@ -138,7 +138,7 @@
#define TARGET_HARD_FLOAT (arm_float_abi != ARM_FLOAT_ABI_SOFT)
/* Use hardware floating point calling convention. */
#define TARGET_HARD_FLOAT_ABI (arm_float_abi == ARM_FLOAT_ABI_HARD)
-#define TARGET_VFP (arm_fpu_desc->model == ARM_FP_MODEL_VFP)
+#define TARGET_VFP (TARGET_FPU_MODEL == ARM_FP_MODEL_VFP)
#define TARGET_IWMMXT (arm_arch_iwmmxt)
#define TARGET_IWMMXT2 (arm_arch_iwmmxt2)
#define TARGET_REALLY_IWMMXT (TARGET_IWMMXT && TARGET_32BIT)
@@ -176,39 +176,38 @@
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_VFP && arm_fpu_desc->regs == VFP_REG_D32)
+#define TARGET_VFPD32 (TARGET_VFP && TARGET_FPU_REGS == VFP_REG_D32)
/* FPU supports VFPv3 instructions. */
-#define TARGET_VFP3 (TARGET_VFP && arm_fpu_desc->rev >= 3)
+#define TARGET_VFP3 (TARGET_VFP && TARGET_FPU_REV >= 3)
/* FPU supports FPv5 instructions. */
-#define TARGET_VFP5 (TARGET_VFP && arm_fpu_desc->rev >= 5)
+#define TARGET_VFP5 (TARGET_VFP && TARGET_FPU_REV >= 5)
/* FPU only supports VFP single-precision instructions. */
-#define TARGET_VFP_SINGLE (TARGET_VFP && arm_fpu_desc->regs == VFP_REG_SINGLE)
+#define TARGET_VFP_SINGLE (TARGET_VFP && TARGET_FPU_REGS == VFP_REG_SINGLE)
/* FPU supports VFP double-precision instructions. */
-#define TARGET_VFP_DOUBLE (TARGET_VFP && arm_fpu_desc->regs != VFP_REG_SINGLE)
+#define TARGET_VFP_DOUBLE (TARGET_VFP && TARGET_FPU_REGS != VFP_REG_SINGLE)
/* FPU supports half-precision floating-point with NEON element load/store. */
#define TARGET_NEON_FP16 \
(TARGET_VFP \
- && ARM_FPU_FSET_HAS (arm_fpu_desc->features, FPU_FL_NEON | FPU_FL_FP16))
+ && ARM_FPU_FSET_HAS (TARGET_FPU_FEATURES, FPU_FL_NEON | FPU_FL_FP16))
/* FPU supports VFP half-precision floating-point. */
#define TARGET_FP16 \
- (TARGET_VFP && ARM_FPU_FSET_HAS (arm_fpu_desc->features, FPU_FL_FP16))
+ (TARGET_VFP && ARM_FPU_FSET_HAS (TARGET_FPU_FEATURES, FPU_FL_FP16))
/* FPU supports fused-multiply-add operations. */
-#define TARGET_FMA (TARGET_VFP && arm_fpu_desc->rev >= 4)
+#define TARGET_FMA (TARGET_VFP && TARGET_FPU_REV >= 4)
/* FPU is ARMv8 compatible. */
-#define TARGET_FPU_ARMV8 (TARGET_VFP && arm_fpu_desc->rev >= 8)
+#define TARGET_FPU_ARMV8 (TARGET_VFP && TARGET_FPU_REV >= 8)
/* FPU supports Crypto extensions. */
#define TARGET_CRYPTO \
- (TARGET_VFP && ARM_FPU_FSET_HAS (arm_fpu_desc->features, FPU_FL_CRYPTO))
-
+ (TARGET_VFP && ARM_FPU_FSET_HAS (TARGET_FPU_FEATURES, FPU_FL_CRYPTO))
/* FPU supports Neon instructions. The setting of this macro gets
revealed via __ARM_NEON__ so we add extra guards upon TARGET_32BIT
@@ -216,8 +215,7 @@
available. */
#define TARGET_NEON \
(TARGET_32BIT && TARGET_HARD_FLOAT && TARGET_VFP \
- && ARM_FPU_FSET_HAS (arm_fpu_desc->features, FPU_FL_NEON))
-
+ && ARM_FPU_FSET_HAS (TARGET_FPU_FEATURES, FPU_FL_NEON))
/* Q-bit is present. */
#define TARGET_ARM_QBIT \
@@ -345,7 +343,15 @@
int rev;
enum vfp_reg_type regs;
arm_fpu_feature_set features;
-} *arm_fpu_desc;
+} all_fpus[];
+
+/* Accessors. */
+
+#define TARGET_FPU_NAME (all_fpus[arm_fpu_index].name)
+#define TARGET_FPU_MODEL (all_fpus[arm_fpu_index].model)
+#define TARGET_FPU_REV (all_fpus[arm_fpu_index].rev)
+#define TARGET_FPU_REGS (all_fpus[arm_fpu_index].regs)
+#define TARGET_FPU_FEATURES (all_fpus[arm_fpu_index].features)
/* Which floating point hardware to schedule for. */
extern int arm_fpu_attr;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/4] [ARM] Add attribute/pragma target fpu=
2015-09-14 11:21 [PATCH 2/4] [ARM] Add attribute/pragma target fpu= Christian Bruel
@ 2015-09-14 20:11 ` Bernhard Reutner-Fischer
2015-10-05 10:54 ` Kyrill Tkachov
1 sibling, 0 replies; 3+ messages in thread
From: Bernhard Reutner-Fischer @ 2015-09-14 20:11 UTC (permalink / raw)
To: Christian Bruel, kyrylo.tkachov, Ramana.Radhakrishnan; +Cc: gcc-patches
On September 14, 2015 12:47:23 PM GMT+02:00, Christian Bruel <christian.bruel@st.com> wrote:
>This patch defines and uses accessors for the current fpu type fields,
>based on switchable arm_fpu_index rather than defuncted arm_fpu_desc.
* config/arm/arm.c (arm_fpu_desc): Remove.
(all_fpus): Make global.
I suppose there will be no "mixed" targets nor multiple targets in one binary anytime soon, still I'd have stuck some arm indicator into the "all_fpus" global while exporting it..
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/4] [ARM] Add attribute/pragma target fpu=
2015-09-14 11:21 [PATCH 2/4] [ARM] Add attribute/pragma target fpu= Christian Bruel
2015-09-14 20:11 ` Bernhard Reutner-Fischer
@ 2015-10-05 10:54 ` Kyrill Tkachov
1 sibling, 0 replies; 3+ messages in thread
From: Kyrill Tkachov @ 2015-10-05 10:54 UTC (permalink / raw)
To: Christian Bruel, Ramana Radhakrishnan; +Cc: gcc-patches
Hi Christian,
Sorry for the delay.
On 14/09/15 11:47, Christian Bruel wrote:
> This patch defines and uses accessors for the current fpu type fields,
> based on switchable arm_fpu_index rather than defuncted arm_fpu_desc.
>
> Christian
+ if (TARGET_SOFT_FLOAT)
+ arm_fpu_attr = FPU_NONE;
+ else if (TARGET_FPU_MODEL == ARM_FP_MODEL_VFP)
+ arm_fpu_attr = FPU_VFP;
+ else
+ gcc_unreachable();
Instead of "TARGET_FPU_MODEL == ARM_FP_MODEL_VFP" you can just use the new TARGET_VFP definition, right?
@@ -25679,7 +25667,7 @@
if (print_tune_info)
arm_print_tune_info ();
- if (! TARGET_SOFT_FLOAT && arm_fpu_desc->model == ARM_FP_MODEL_VFP)
+ if (! TARGET_SOFT_FLOAT && TARGET_FPU_MODEL == ARM_FP_MODEL_VFP)
{
if (TARGET_HARD_FLOAT && TARGET_VFP_SINGLE)
arm_emit_eabi_attribute ("Tag_ABI_HardFP_use", 27, 1);
Likewise.
This is ok with those changes, but please wait until all patches in the series have been approved before
committing.
Thanks,
Kyrill
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-05 10:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-14 11:21 [PATCH 2/4] [ARM] Add attribute/pragma target fpu= Christian Bruel
2015-09-14 20:11 ` Bernhard Reutner-Fischer
2015-10-05 10:54 ` Kyrill Tkachov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).