From f9c86e3105d786cccc88ac5bdbfd2393dc75f8b5 Mon Sep 17 00:00:00 2001
From: Alex Coplan <alex.coplan@arm.com>
Date: Thu, 1 Oct 2020 12:30:09 +0100
Subject: [PATCH] arm: Fix ordering in arm-cpus.in

This moves the recent entry for Neoverse N2 down and adds a comment in
order to preserve the existing order/structure in arm-cpus.in.

gcc/ChangeLog:

	* config/arm/arm-cpus.in: Fix ordering, move Neoverse N2 down.
	* config/arm/arm-tables.opt: Regenerate.
	* config/arm/arm-tune.md: Regenerate.
---
 gcc/config/arm/arm-cpus.in    | 23 ++++++++++++-----------
 gcc/config/arm/arm-tables.opt |  6 +++---
 gcc/config/arm/arm-tune.md    |  4 ++--
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
index d47f9439ed1..9abb59a00ba 100644
--- a/gcc/config/arm/arm-cpus.in
+++ b/gcc/config/arm/arm-cpus.in
@@ -1492,17 +1492,6 @@ begin cpu neoverse-n1
  part d0c
 end cpu neoverse-n1
 
-begin cpu neoverse-n2
-  cname neoversen2
-  tune for cortex-a57
-  tune flags LDSCHED
-  architecture armv8.5-a+fp16+bf16+i8mm
-  option crypto add FP_ARMv8 CRYPTO
-  costs cortex_a57
-  vendor 41
-  part 0xd49
-end cpu neoverse-n2
-
 # ARMv8.2 A-profile ARM DynamIQ big.LITTLE implementations
 begin cpu cortex-a75.cortex-a55
  cname cortexa75cortexa55
@@ -1532,6 +1521,18 @@ begin cpu neoverse-v1
   costs cortex_a57
 end cpu neoverse-v1
 
+# Armv8.5 A-profile Architecture Processors
+begin cpu neoverse-n2
+  cname neoversen2
+  tune for cortex-a57
+  tune flags LDSCHED
+  architecture armv8.5-a+fp16+bf16+i8mm
+  option crypto add FP_ARMv8 CRYPTO
+  costs cortex_a57
+  vendor 41
+  part 0xd49
+end cpu neoverse-n2
+
 # V8 M-profile implementations.
 begin cpu cortex-m23
  cname cortexm23
diff --git a/gcc/config/arm/arm-tables.opt b/gcc/config/arm/arm-tables.opt
index 9f658244053..05f5c08400b 100644
--- a/gcc/config/arm/arm-tables.opt
+++ b/gcc/config/arm/arm-tables.opt
@@ -252,9 +252,6 @@ Enum(processor_type) String(cortex-x1) Value( TARGET_CPU_cortexx1)
 EnumValue
 Enum(processor_type) String(neoverse-n1) Value( TARGET_CPU_neoversen1)
 
-EnumValue
-Enum(processor_type) String(neoverse-n2) Value( TARGET_CPU_neoversen2)
-
 EnumValue
 Enum(processor_type) String(cortex-a75.cortex-a55) Value( TARGET_CPU_cortexa75cortexa55)
 
@@ -264,6 +261,9 @@ Enum(processor_type) String(cortex-a76.cortex-a55) Value( TARGET_CPU_cortexa76co
 EnumValue
 Enum(processor_type) String(neoverse-v1) Value( TARGET_CPU_neoversev1)
 
+EnumValue
+Enum(processor_type) String(neoverse-n2) Value( TARGET_CPU_neoversen2)
+
 EnumValue
 Enum(processor_type) String(cortex-m23) Value( TARGET_CPU_cortexm23)
 
diff --git a/gcc/config/arm/arm-tune.md b/gcc/config/arm/arm-tune.md
index 269e627626a..32657da48a5 100644
--- a/gcc/config/arm/arm-tune.md
+++ b/gcc/config/arm/arm-tune.md
@@ -46,8 +46,8 @@
 	cortexa73cortexa53,cortexa55,cortexa75,
 	cortexa76,cortexa76ae,cortexa77,
 	cortexa78,cortexa78ae,cortexx1,
-	neoversen1,neoversen2,cortexa75cortexa55,
-	cortexa76cortexa55,neoversev1,cortexm23,
+	neoversen1,cortexa75cortexa55,cortexa76cortexa55,
+	neoversev1,neoversen2,cortexm23,
 	cortexm33,cortexm35p,cortexm55,
 	cortexr52"
 	(const (symbol_ref "((enum attr_tune) arm_tune)")))
-- 
2.30.2