[v3] build: add emag(arm64) platform and default config

Message ID 1570589086-25430-1-git-send-email-gavin.hu@arm.com
State Superseded
Headers show
Series
  • [v3] build: add emag(arm64) platform and default config
Related show

Checks

Context Check Description
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-compilation success Compile Testing PASS
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Gavin Hu (Arm Technology China) Oct. 9, 2019, 2:44 a.m.
From: Jerry Hao OS <jerryhao@os.amperecomputing.com>

config: add emag configuration
mk/machine: add emag machine configurations

eMAG is Ampere Computing 64-bit ARM processor
with 32 Arm v8 64-bit CPU cores.
For more information, refer to:
https://amperecomputing.com/product/

Signed-off-by: Jerry Hao OS <jerryhao@os.amperecomputing.com>
Signed-off-by: Gavin Hu <gavin.hu@arm.com>
---
V3:
- add "mtune=emag" to generate optimized code for emag
V2:
- add meson build support

 config/arm/arm64_emag_linux_gcc          | 15 +++++++++++++++
 config/arm/meson.build                   | 11 ++++++++++-
 config/defconfig_arm64-emag-linux-gcc    |  1 +
 config/defconfig_arm64-emag-linuxapp-gcc | 11 +++++++++++
 mk/machine/emag/rte.vars.mk              | 32 ++++++++++++++++++++++++++++++++
 5 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 config/arm/arm64_emag_linux_gcc
 create mode 120000 config/defconfig_arm64-emag-linux-gcc
 create mode 100644 config/defconfig_arm64-emag-linuxapp-gcc
 create mode 100644 mk/machine/emag/rte.vars.mk

Comments

Jerin Jacob Oct. 11, 2019, 11:45 a.m. | #1
On Wed, Oct 9, 2019 at 8:15 AM Gavin Hu <gavin.hu@arm.com> wrote:
>
> From: Jerry Hao OS <jerryhao@os.amperecomputing.com>
>

I think the subject can be changed to
"build: add emag target "



> config: add emag configuration
> mk/machine: add emag machine configurations

The above lines are not a sentence. Please make it as a sentence in
the git commit.

>
> eMAG is Ampere Computing 64-bit ARM processor
> with 32 Arm v8 64-bit CPU cores.
> For more information, refer to:
> https://amperecomputing.com/product/
>
> Signed-off-by: Jerry Hao OS <jerryhao@os.amperecomputing.com>
> Signed-off-by: Gavin Hu <gavin.hu@arm.com>

With the above changes:

Acked-by: Jerin Jacob <jerinj@marvell.com>


> ---
> V3:
> - add "mtune=emag" to generate optimized code for emag
> V2:
> - add meson build support
>
>  config/arm/arm64_emag_linux_gcc          | 15 +++++++++++++++
>  config/arm/meson.build                   | 11 ++++++++++-
>  config/defconfig_arm64-emag-linux-gcc    |  1 +
>  config/defconfig_arm64-emag-linuxapp-gcc | 11 +++++++++++
>  mk/machine/emag/rte.vars.mk              | 32 ++++++++++++++++++++++++++++++++
>  5 files changed, 69 insertions(+), 1 deletion(-)
>  create mode 100644 config/arm/arm64_emag_linux_gcc
>  create mode 120000 config/defconfig_arm64-emag-linux-gcc
>  create mode 100644 config/defconfig_arm64-emag-linuxapp-gcc
>  create mode 100644 mk/machine/emag/rte.vars.mk
>
> diff --git a/config/arm/arm64_emag_linux_gcc b/config/arm/arm64_emag_linux_gcc
> new file mode 100644
> index 0000000..bcb147a
> --- /dev/null
> +++ b/config/arm/arm64_emag_linux_gcc
> @@ -0,0 +1,15 @@
> +[binaries]
> +c = 'aarch64-linux-gnu-gcc'
> +cpp = 'aarch64-linux-gnu-cpp'
> +ar = 'aarch64-linux-gnu-gcc-ar'
> +strip = 'aarch64-linux-gnu-strip'
> +pcap-config = ''
> +
> +[host_machine]
> +system = 'linux'
> +cpu_family = 'aarch64'
> +cpu = 'armv8-a'
> +endian = 'little'
> +
> +[properties]
> +implementor_id = '0x50'
> diff --git a/config/arm/meson.build b/config/arm/meson.build
> index 979018e..aa73e1d 100644
> --- a/config/arm/meson.build
> +++ b/config/arm/meson.build
> @@ -61,6 +61,11 @@ flags_armada = [
>         ['RTE_CACHE_LINE_SIZE', 64],
>         ['RTE_MAX_NUMA_NODES', 1],
>         ['RTE_MAX_LCORE', 16]]
> +flags_emag = [
> +       ['RTE_MACHINE', '"emag"'],
> +       ['RTE_CACHE_LINE_SIZE', 64],
> +       ['RTE_MAX_NUMA_NODES', 1],
> +       ['RTE_MAX_LCORE', 32]]
>
>  flags_default_extra = []
>  flags_thunderx_extra = [
> @@ -98,6 +103,10 @@ machine_args_cavium = [
>         ['0xaf', ['-march=armv8.1-a+crc+crypto','-mcpu=thunderx2t99'], flags_thunderx2_extra],
>         ['0xb2', ['-mcpu=octeontx2'], flags_octeontx2_extra]]
>
> +machine_args_emag = [
> +       ['default', ['-march=armv8-a+crc+crypto', '-mtune=emag']],
> +       ['native', ['-march=native']]]
> +
>  ## Arm implementer ID (ARM DDI 0487C.a, Section G7.2.106, Page G7-5321)
>  impl_generic = ['Generic armv8', flags_generic, machine_args_generic]
>  impl_0x41 = ['Arm', flags_arm, machine_args_generic]
> @@ -107,7 +116,7 @@ impl_0x44 = ['DEC', flags_generic, machine_args_generic]
>  impl_0x49 = ['Infineon', flags_generic, machine_args_generic]
>  impl_0x4d = ['Motorola', flags_generic, machine_args_generic]
>  impl_0x4e = ['NVIDIA', flags_generic, machine_args_generic]
> -impl_0x50 = ['AppliedMicro', flags_generic, machine_args_generic]
> +impl_0x50 = ['Ampere Computing', flags_emag, machine_args_emag]
>  impl_0x51 = ['Qualcomm', flags_generic, machine_args_generic]
>  impl_0x53 = ['Samsung', flags_generic, machine_args_generic]
>  impl_0x56 = ['Marvell ARMADA', flags_armada, machine_args_generic]
> diff --git a/config/defconfig_arm64-emag-linux-gcc b/config/defconfig_arm64-emag-linux-gcc
> new file mode 120000
> index 0000000..21894a3
> --- /dev/null
> +++ b/config/defconfig_arm64-emag-linux-gcc
> @@ -0,0 +1 @@
> +defconfig_arm64-emag-linuxapp-gcc
> \ No newline at end of file
> diff --git a/config/defconfig_arm64-emag-linuxapp-gcc b/config/defconfig_arm64-emag-linuxapp-gcc
> new file mode 100644
> index 0000000..1db654c
> --- /dev/null
> +++ b/config/defconfig_arm64-emag-linuxapp-gcc
> @@ -0,0 +1,11 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +# Copyright(c) 2019 Ampere Computing
> +#
> +
> +#include "defconfig_arm64-armv8a-linux-gcc"
> +
> +CONFIG_RTE_MACHINE="emag"
> +
> +CONFIG_RTE_CACHE_LINE_SIZE=64
> +CONFIG_RTE_MAX_NUMA_NODES=1
> +CONFIG_RTE_MAX_LCORE=32
> diff --git a/mk/machine/emag/rte.vars.mk b/mk/machine/emag/rte.vars.mk
> new file mode 100644
> index 0000000..50342df
> --- /dev/null
> +++ b/mk/machine/emag/rte.vars.mk
> @@ -0,0 +1,32 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +# Copyright(c) 2019 Ampere Computing
> +#
> +
> +#
> +# machine:
> +#
> +#   - can define ARCH variable (overridden by cmdline value)
> +#   - can define CROSS variable (overridden by cmdline value)
> +#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
> +#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
> +#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
> +#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
> +#     overrides the one defined in arch.
> +#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
> +#     overrides the one defined in arch.
> +#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
> +#     overrides the one defined in arch.
> +#   - may override any previously defined variable
> +#
> +
> +# ARCH =
> +# CROSS =
> +# MACHINE_CFLAGS =
> +# MACHINE_LDFLAGS =
> +# MACHINE_ASFLAGS =
> +# CPU_CFLAGS =
> +# CPU_LDFLAGS =
> +# CPU_ASFLAGS =
> +
> +MACHINE_CFLAGS += -march=armv8-a+crc+crypto
> +MACHINE_CFLAGS += $(call rte_cc_has_argument, -mtune=emag)
> --
> 2.7.4
>

Patch

diff --git a/config/arm/arm64_emag_linux_gcc b/config/arm/arm64_emag_linux_gcc
new file mode 100644
index 0000000..bcb147a
--- /dev/null
+++ b/config/arm/arm64_emag_linux_gcc
@@ -0,0 +1,15 @@ 
+[binaries]
+c = 'aarch64-linux-gnu-gcc'
+cpp = 'aarch64-linux-gnu-cpp'
+ar = 'aarch64-linux-gnu-gcc-ar'
+strip = 'aarch64-linux-gnu-strip'
+pcap-config = ''
+
+[host_machine]
+system = 'linux'
+cpu_family = 'aarch64'
+cpu = 'armv8-a'
+endian = 'little'
+
+[properties]
+implementor_id = '0x50'
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 979018e..aa73e1d 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -61,6 +61,11 @@  flags_armada = [
 	['RTE_CACHE_LINE_SIZE', 64],
 	['RTE_MAX_NUMA_NODES', 1],
 	['RTE_MAX_LCORE', 16]]
+flags_emag = [
+	['RTE_MACHINE', '"emag"'],
+	['RTE_CACHE_LINE_SIZE', 64],
+	['RTE_MAX_NUMA_NODES', 1],
+	['RTE_MAX_LCORE', 32]]
 
 flags_default_extra = []
 flags_thunderx_extra = [
@@ -98,6 +103,10 @@  machine_args_cavium = [
 	['0xaf', ['-march=armv8.1-a+crc+crypto','-mcpu=thunderx2t99'], flags_thunderx2_extra],
 	['0xb2', ['-mcpu=octeontx2'], flags_octeontx2_extra]]
 
+machine_args_emag = [
+	['default', ['-march=armv8-a+crc+crypto', '-mtune=emag']],
+	['native', ['-march=native']]]
+
 ## Arm implementer ID (ARM DDI 0487C.a, Section G7.2.106, Page G7-5321)
 impl_generic = ['Generic armv8', flags_generic, machine_args_generic]
 impl_0x41 = ['Arm', flags_arm, machine_args_generic]
@@ -107,7 +116,7 @@  impl_0x44 = ['DEC', flags_generic, machine_args_generic]
 impl_0x49 = ['Infineon', flags_generic, machine_args_generic]
 impl_0x4d = ['Motorola', flags_generic, machine_args_generic]
 impl_0x4e = ['NVIDIA', flags_generic, machine_args_generic]
-impl_0x50 = ['AppliedMicro', flags_generic, machine_args_generic]
+impl_0x50 = ['Ampere Computing', flags_emag, machine_args_emag]
 impl_0x51 = ['Qualcomm', flags_generic, machine_args_generic]
 impl_0x53 = ['Samsung', flags_generic, machine_args_generic]
 impl_0x56 = ['Marvell ARMADA', flags_armada, machine_args_generic]
diff --git a/config/defconfig_arm64-emag-linux-gcc b/config/defconfig_arm64-emag-linux-gcc
new file mode 120000
index 0000000..21894a3
--- /dev/null
+++ b/config/defconfig_arm64-emag-linux-gcc
@@ -0,0 +1 @@ 
+defconfig_arm64-emag-linuxapp-gcc
\ No newline at end of file
diff --git a/config/defconfig_arm64-emag-linuxapp-gcc b/config/defconfig_arm64-emag-linuxapp-gcc
new file mode 100644
index 0000000..1db654c
--- /dev/null
+++ b/config/defconfig_arm64-emag-linuxapp-gcc
@@ -0,0 +1,11 @@ 
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2019 Ampere Computing
+#
+
+#include "defconfig_arm64-armv8a-linux-gcc"
+
+CONFIG_RTE_MACHINE="emag"
+
+CONFIG_RTE_CACHE_LINE_SIZE=64
+CONFIG_RTE_MAX_NUMA_NODES=1
+CONFIG_RTE_MAX_LCORE=32
diff --git a/mk/machine/emag/rte.vars.mk b/mk/machine/emag/rte.vars.mk
new file mode 100644
index 0000000..50342df
--- /dev/null
+++ b/mk/machine/emag/rte.vars.mk
@@ -0,0 +1,32 @@ 
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2019 Ampere Computing
+#
+
+#
+# machine:
+#
+#   - can define ARCH variable (overridden by cmdline value)
+#   - can define CROSS variable (overridden by cmdline value)
+#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
+#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
+#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
+#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
+#     overrides the one defined in arch.
+#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
+#     overrides the one defined in arch.
+#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
+#     overrides the one defined in arch.
+#   - may override any previously defined variable
+#
+
+# ARCH =
+# CROSS =
+# MACHINE_CFLAGS =
+# MACHINE_LDFLAGS =
+# MACHINE_ASFLAGS =
+# CPU_CFLAGS =
+# CPU_LDFLAGS =
+# CPU_ASFLAGS =
+
+MACHINE_CFLAGS += -march=armv8-a+crc+crypto
+MACHINE_CFLAGS += $(call rte_cc_has_argument, -mtune=emag)