Skip to content

R
riscv-gcc-1
Commit dbb2d725 by Kyrylo Tkachov Committed by Kyrylo Tkachov
Options

[ARM] Make issue rate part of per-core tuning structs 

	* config/arm/arm-protos.h (struct tune_params): Add issue_rate field.
	* config/arm/arm.c (arm_slowmul_tune, arm_fastmul_tune,
	arm_strongarm_tune, arm_xscale_tune, arm_9e_tune, arm_v6t2_tune,
	arm_cortex_tune, arm_cortex_a8_tune, arm_cortex_a7_tune,
	arm_cortex_a15_tune, arm_cortex_a53_tune, arm_cortex_a57_tune,
	arm_cortex_a9_tune, arm_cortex_a12_tune, arm_v7m_tune, arm_v6m_tune,
	arm_fa726te_tune arm_cortex_a5_tune, arm_xgene1_tune):
	Specify issue_rate value.
	(arm_issue_rate): Look up issue rate from tuning structs. Remove
	large switch statement.
	(arm_marvell_pj4_tune): New struct.
	* config/arm/arm-cores.def (marvell-pj4): Use arm_marvell_pj4_tune
	struct.

From-SVN: r222356
parent 2e8ab70c
Showing with 85 additions and 52 deletions
gcc/ChangeLog
2015-04-23 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
* config/arm/arm-protos.h (struct tune_params): Add issue_rate field.
* config/arm/arm.c (arm_slowmul_tune, arm_fastmul_tune,
arm_strongarm_tune, arm_xscale_tune, arm_9e_tune, arm_v6t2_tune,
arm_cortex_tune, arm_cortex_a8_tune, arm_cortex_a7_tune,
arm_cortex_a15_tune, arm_cortex_a53_tune, arm_cortex_a57_tune,
arm_cortex_a9_tune, arm_cortex_a12_tune, arm_v7m_tune, arm_v6m_tune,
arm_fa726te_tune arm_cortex_a5_tune, arm_xgene1_tune):
Specify issue_rate value.
(arm_issue_rate): Look up issue rate from tuning structs. Remove
large switch statement.
(arm_marvell_pj4_tune): New struct.
* config/arm/arm-cores.def (marvell-pj4): Use arm_marvell_pj4_tune
struct.
2015-04-23 Richard Biener <rguenther@suse.de> 2015-04-23 Richard Biener <rguenther@suse.de>
* tree-vect-slp.c (vect_find_first_load_in_slp_instance): Remove. * tree-vect-slp.c (vect_find_first_load_in_slp_instance): Remove.
......
gcc/config/arm/arm-cores.def
...@@ -158,7 +158,7 @@ ARM_CORE("cortex-r7", cortexr7, cortexr7, 7R, FL_LDSCHED | FL_ARM_DIV, cortex ...@@ -158,7 +158,7 @@ ARM_CORE("cortex-r7", cortexr7, cortexr7, 7R, FL_LDSCHED | FL_ARM_DIV, cortex
ARM_CORE("cortex-m7", cortexm7, cortexm7, 7EM, FL_LDSCHED | FL_NO_VOLATILE_CE, cortex_m7) ARM_CORE("cortex-m7", cortexm7, cortexm7, 7EM, FL_LDSCHED | FL_NO_VOLATILE_CE, cortex_m7)
ARM_CORE("cortex-m4", cortexm4, cortexm4, 7EM, FL_LDSCHED, v7m) ARM_CORE("cortex-m4", cortexm4, cortexm4, 7EM, FL_LDSCHED, v7m)
ARM_CORE("cortex-m3", cortexm3, cortexm3, 7M, FL_LDSCHED, v7m) ARM_CORE("cortex-m3", cortexm3, cortexm3, 7M, FL_LDSCHED, v7m)
ARM_CORE("marvell-pj4", marvell_pj4, marvell_pj4, 7A, FL_LDSCHED, 9e) ARM_CORE("marvell-pj4", marvell_pj4, marvell_pj4, 7A, FL_LDSCHED, marvell_pj4)
/* V7 big.LITTLE implementations */ /* V7 big.LITTLE implementations */
ARM_CORE("cortex-a15.cortex-a7", cortexa15cortexa7, cortexa7, 7A, FL_LDSCHED | FL_THUMB_DIV | FL_ARM_DIV, cortex_a15) ARM_CORE("cortex-a15.cortex-a7", cortexa15cortexa7, cortexa7, 7A, FL_LDSCHED | FL_THUMB_DIV | FL_ARM_DIV, cortex_a15)
......
gcc/config/arm/arm-protos.h
...@@ -303,6 +303,8 @@ struct tune_params ...@@ -303,6 +303,8 @@ struct tune_params
unsigned int fuseable_ops; unsigned int fuseable_ops;
/* Depth of scheduling queue to check for L2 autoprefetcher. */ /* Depth of scheduling queue to check for L2 autoprefetcher. */
enum arm_sched_autopref sched_autopref; enum arm_sched_autopref sched_autopref;
/* Issue rate of the processor. */
unsigned int issue_rate;
}; };
extern const struct tune_params *current_tune; extern const struct tune_params *current_tune;
......
gcc/config/arm/arm.c
...@@ -1699,7 +1699,8 @@ const struct tune_params arm_slowmul_tune = ...@@ -1699,7 +1699,8 @@ const struct tune_params arm_slowmul_tune =
false, /* Prefer Neon for stringops. */ false, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */ ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
1 /* Issue rate. */
}; };
const struct tune_params arm_fastmul_tune = const struct tune_params arm_fastmul_tune =
...@@ -1720,7 +1721,8 @@ const struct tune_params arm_fastmul_tune = ...@@ -1720,7 +1721,8 @@ const struct tune_params arm_fastmul_tune =
false, /* Prefer Neon for stringops. */ false, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */ ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
1 /* Issue rate. */
}; };
/* StrongARM has early execution of branches, so a sequence that is worth /* StrongARM has early execution of branches, so a sequence that is worth
...@@ -1744,7 +1746,8 @@ const struct tune_params arm_strongarm_tune = ...@@ -1744,7 +1746,8 @@ const struct tune_params arm_strongarm_tune =
false, /* Prefer Neon for stringops. */ false, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */ ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
1 /* Issue rate. */
}; };
const struct tune_params arm_xscale_tune = const struct tune_params arm_xscale_tune =
...@@ -1765,7 +1768,8 @@ const struct tune_params arm_xscale_tune = ...@@ -1765,7 +1768,8 @@ const struct tune_params arm_xscale_tune =
false, /* Prefer Neon for stringops. */ false, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */ ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
1 /* Issue rate. */
}; };
const struct tune_params arm_9e_tune = const struct tune_params arm_9e_tune =
...@@ -1786,7 +1790,30 @@ const struct tune_params arm_9e_tune = ...@@ -1786,7 +1790,30 @@ const struct tune_params arm_9e_tune =
false, /* Prefer Neon for stringops. */ false, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */ ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
1 /* Issue rate. */
};
const struct tune_params arm_marvell_pj4_tune =
{
arm_9e_rtx_costs,
NULL,
NULL, /* Sched adj cost. */
1, /* Constant limit. */
5, /* Max cond insns. */
ARM_PREFETCH_NOT_BENEFICIAL,
true, /* Prefer constant pool. */
arm_default_branch_cost,
false, /* Prefer LDRD/STRD. */
{true, true}, /* Prefer non short circuit. */
&arm_default_vec_cost, /* Vectorizer costs. */
false, /* Prefer Neon for 64-bits bitops. */
false, false, /* Prefer 32-bit encodings. */
false, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
2 /* Issue rate. */
}; };
const struct tune_params arm_v6t2_tune = const struct tune_params arm_v6t2_tune =
...@@ -1807,9 +1834,11 @@ const struct tune_params arm_v6t2_tune = ...@@ -1807,9 +1834,11 @@ const struct tune_params arm_v6t2_tune =
false, /* Prefer Neon for stringops. */ false, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */ ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
1 /* Issue rate. */
}; };
/* Generic Cortex tuning. Use more specific tunings if appropriate. */ /* Generic Cortex tuning. Use more specific tunings if appropriate. */
const struct tune_params arm_cortex_tune = const struct tune_params arm_cortex_tune =
{ {
...@@ -1829,7 +1858,8 @@ const struct tune_params arm_cortex_tune = ...@@ -1829,7 +1858,8 @@ const struct tune_params arm_cortex_tune =
false, /* Prefer Neon for stringops. */ false, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */ ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
2 /* Issue rate. */
}; };
const struct tune_params arm_cortex_a8_tune = const struct tune_params arm_cortex_a8_tune =
...@@ -1850,7 +1880,8 @@ const struct tune_params arm_cortex_a8_tune = ...@@ -1850,7 +1880,8 @@ const struct tune_params arm_cortex_a8_tune =
true, /* Prefer Neon for stringops. */ true, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */ ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
2 /* Issue rate. */
}; };
const struct tune_params arm_cortex_a7_tune = const struct tune_params arm_cortex_a7_tune =
...@@ -1871,7 +1902,8 @@ const struct tune_params arm_cortex_a7_tune = ...@@ -1871,7 +1902,8 @@ const struct tune_params arm_cortex_a7_tune =
true, /* Prefer Neon for stringops. */ true, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */ ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
2 /* Issue rate. */
}; };
const struct tune_params arm_cortex_a15_tune = const struct tune_params arm_cortex_a15_tune =
...@@ -1892,7 +1924,8 @@ const struct tune_params arm_cortex_a15_tune = ...@@ -1892,7 +1924,8 @@ const struct tune_params arm_cortex_a15_tune =
true, /* Prefer Neon for stringops. */ true, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */ ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_FULL /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_FULL, /* Sched L2 autopref. */
3 /* Issue rate. */
}; };
const struct tune_params arm_cortex_a53_tune = const struct tune_params arm_cortex_a53_tune =
...@@ -1913,7 +1946,8 @@ const struct tune_params arm_cortex_a53_tune = ...@@ -1913,7 +1946,8 @@ const struct tune_params arm_cortex_a53_tune =
true, /* Prefer Neon for stringops. */ true, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_MOVW_MOVT, /* Fuseable pairs of instructions. */ ARM_FUSE_MOVW_MOVT, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
2 /* Issue rate. */
}; };
const struct tune_params arm_cortex_a57_tune = const struct tune_params arm_cortex_a57_tune =
...@@ -1934,7 +1968,8 @@ const struct tune_params arm_cortex_a57_tune = ...@@ -1934,7 +1968,8 @@ const struct tune_params arm_cortex_a57_tune =
true, /* Prefer Neon for stringops. */ true, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_MOVW_MOVT, /* Fuseable pairs of instructions. */ ARM_FUSE_MOVW_MOVT, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_FULL /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_FULL, /* Sched L2 autopref. */
3 /* Issue rate. */
}; };
const struct tune_params arm_xgene1_tune = const struct tune_params arm_xgene1_tune =
...@@ -1955,7 +1990,8 @@ const struct tune_params arm_xgene1_tune = ...@@ -1955,7 +1990,8 @@ const struct tune_params arm_xgene1_tune =
false, /* Prefer Neon for stringops. */ false, /* Prefer Neon for stringops. */
32, /* Maximum insns to inline memset. */ 32, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */ ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
4 /* Issue rate. */
}; };
/* Branches can be dual-issued on Cortex-A5, so conditional execution is /* Branches can be dual-issued on Cortex-A5, so conditional execution is
...@@ -1979,7 +2015,8 @@ const struct tune_params arm_cortex_a5_tune = ...@@ -1979,7 +2015,8 @@ const struct tune_params arm_cortex_a5_tune =
true, /* Prefer Neon for stringops. */ true, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */ ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
2 /* Issue rate. */
}; };
const struct tune_params arm_cortex_a9_tune = const struct tune_params arm_cortex_a9_tune =
...@@ -2000,7 +2037,8 @@ const struct tune_params arm_cortex_a9_tune = ...@@ -2000,7 +2037,8 @@ const struct tune_params arm_cortex_a9_tune =
false, /* Prefer Neon for stringops. */ false, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */ ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
2 /* Issue rate. */
}; };
const struct tune_params arm_cortex_a12_tune = const struct tune_params arm_cortex_a12_tune =
...@@ -2021,7 +2059,8 @@ const struct tune_params arm_cortex_a12_tune = ...@@ -2021,7 +2059,8 @@ const struct tune_params arm_cortex_a12_tune =
true, /* Prefer Neon for stringops. */ true, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_MOVW_MOVT, /* Fuseable pairs of instructions. */ ARM_FUSE_MOVW_MOVT, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
2 /* Issue rate. */
}; };
/* armv7m tuning. On Cortex-M4 cores for example, MOVW/MOVT take a single /* armv7m tuning. On Cortex-M4 cores for example, MOVW/MOVT take a single
...@@ -2049,7 +2088,8 @@ const struct tune_params arm_v7m_tune = ...@@ -2049,7 +2088,8 @@ const struct tune_params arm_v7m_tune =
false, /* Prefer Neon for stringops. */ false, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */ ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
1 /* Issue rate. */
}; };
/* Cortex-M7 tuning. */ /* Cortex-M7 tuning. */
...@@ -2072,7 +2112,8 @@ const struct tune_params arm_cortex_m7_tune = ...@@ -2072,7 +2112,8 @@ const struct tune_params arm_cortex_m7_tune =
false, /* Prefer Neon for stringops. */ false, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */ ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
2 /* Issue rate. */
}; };
/* The arm_v6m_tune is duplicated from arm_cortex_tune, rather than /* The arm_v6m_tune is duplicated from arm_cortex_tune, rather than
...@@ -2095,7 +2136,8 @@ const struct tune_params arm_v6m_tune = ...@@ -2095,7 +2136,8 @@ const struct tune_params arm_v6m_tune =
false, /* Prefer Neon for stringops. */ false, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */ ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
1 /* Issue rate. */
}; };
const struct tune_params arm_fa726te_tune = const struct tune_params arm_fa726te_tune =
...@@ -2116,7 +2158,8 @@ const struct tune_params arm_fa726te_tune = ...@@ -2116,7 +2158,8 @@ const struct tune_params arm_fa726te_tune =
false, /* Prefer Neon for stringops. */ false, /* Prefer Neon for stringops. */
8, /* Maximum insns to inline memset. */ 8, /* Maximum insns to inline memset. */
ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */ ARM_FUSE_NOTHING, /* Fuseable pairs of instructions. */
ARM_SCHED_AUTOPREF_OFF /* Sched L2 autopref. */ ARM_SCHED_AUTOPREF_OFF, /* Sched L2 autopref. */
2 /* Issue rate. */
}; };
...@@ -27191,40 +27234,12 @@ thumb2_output_casesi (rtx *operands) ...@@ -27191,40 +27234,12 @@ thumb2_output_casesi (rtx *operands)
} }
} }
/* Most ARM cores are single issue, but some newer ones can dual issue. /* Implement TARGET_SCHED_ISSUE_RATE. Lookup the issue rate in the
The scheduler descriptions rely on this being correct. */ per-core tuning structs. */
static int static int
arm_issue_rate (void) arm_issue_rate (void)
{ {
switch (arm_tune) return current_tune->issue_rate;
{
case xgene1:
return 4;
case cortexa15:
case cortexa57:
case exynosm1:
return 3;
case cortexm7:
case cortexr4:
case cortexr4f:
case cortexr5:
case genericv7a:
case cortexa5:
case cortexa7:
case cortexa8:
case cortexa9:
case cortexa12:
case cortexa17:
case cortexa53:
case fa726te:
case marvell_pj4:
return 2;
default:
return 1;
}
} }
/* Return how many instructions should scheduler lookahead to choose the /* Return how many instructions should scheduler lookahead to choose the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment