* [dpdk-dev] [PATCH 0/2] clean-up arch config
@ 2016-02-05 22:00 Thomas Monjalon
2016-02-05 22:00 ` [dpdk-dev] [PATCH 1/2] config: remove obsolete machine descriptions Thomas Monjalon
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Thomas Monjalon @ 2016-02-05 22:00 UTC (permalink / raw)
To: konstantin.ananyev, bruce.richardson; +Cc: dev
Thomas Monjalon (2):
config: remove obsolete machine descriptions
config: add a common x86 flag
config/common_bsdapp | 20 +++++---------------
config/common_linuxapp | 20 +++++---------------
config/defconfig_i686-native-linuxapp-gcc | 1 +
config/defconfig_i686-native-linuxapp-icc | 1 +
config/defconfig_x86_64-native-bsdapp-clang | 1 +
config/defconfig_x86_64-native-bsdapp-gcc | 1 +
config/defconfig_x86_64-native-linuxapp-clang | 1 +
config/defconfig_x86_64-native-linuxapp-gcc | 1 +
config/defconfig_x86_64-native-linuxapp-icc | 1 +
config/defconfig_x86_x32-native-linuxapp-gcc | 1 +
mk/target/generic/rte.vars.mk | 8 --------
11 files changed, 18 insertions(+), 38 deletions(-)
--
2.7.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [dpdk-dev] [PATCH 1/2] config: remove obsolete machine descriptions
2016-02-05 22:00 [dpdk-dev] [PATCH 0/2] clean-up arch config Thomas Monjalon
@ 2016-02-05 22:00 ` Thomas Monjalon
2016-02-05 22:00 ` [dpdk-dev] [PATCH 2/2] config: add a common x86 flag Thomas Monjalon
2016-02-11 11:34 ` [dpdk-dev] [PATCH 0/2] clean-up arch config Ananyev, Konstantin
2 siblings, 0 replies; 5+ messages in thread
From: Thomas Monjalon @ 2016-02-05 22:00 UTC (permalink / raw)
To: konstantin.ananyev, bruce.richardson; +Cc: dev
More and more machines and architectures are added without keeping
the lists up-to-date.
Replace the lists with a pointer to the reference directory.
The same kind of pointer is used for the supported compilers and environments.
Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
config/common_bsdapp | 19 ++++---------------
config/common_linuxapp | 19 ++++---------------
mk/target/generic/rte.vars.mk | 8 --------
3 files changed, 8 insertions(+), 38 deletions(-)
diff --git a/config/common_bsdapp b/config/common_bsdapp
index ed7c31c..50b9829 100644
--- a/config/common_bsdapp
+++ b/config/common_bsdapp
@@ -32,38 +32,27 @@
#
# define executive environment
-#
-# CONFIG_RTE_EXEC_ENV can be linuxapp, bsdapp
+# RTE_EXEC_ENV values are the directories in mk/exec-env/
#
CONFIG_RTE_EXEC_ENV="bsdapp"
CONFIG_RTE_EXEC_ENV_BSDAPP=y
##
## machine can define specific variables or action for a specific board
-## RTE_MACHINE can be:
-## default nothing specific
-## native current machine
-## atm Intel® Atom™ microarchitecture
-## nhm Intel® microarchitecture code name Nehalem
-## wsm Intel® microarchitecture code name Westmere
-## snb Intel® microarchitecture code name Sandy Bridge
-## ivb Intel® microarchitecture code name Ivy Bridge
-##
-## Note: if your compiler does not support the relevant -march options,
-## it will be compiled with whatever latest processor the compiler supports!
+## RTE_MACHINE values are the directories in mk/machine/
##
#CONFIG_RTE_MACHINE="native"
#
##
## define the architecture we compile for.
-## CONFIG_RTE_ARCH can be i686, x86_64, x86_64_32
+## RTE_ARCH values are the directories in mk/arch/
##
#CONFIG_RTE_ARCH="x86_64"
#CONFIG_RTE_ARCH_X86_64=y
#
##
## The compiler we use.
-## Can be gcc, icc or clang.
+## RTE_TOOLCHAIN values are the directories in mk/toolchain/
##
#CONFIG_RTE_TOOLCHAIN="gcc"
#CONFIG_RTE_TOOLCHAIN_GCC=y
diff --git a/config/common_linuxapp b/config/common_linuxapp
index 74bc515..4866b96 100644
--- a/config/common_linuxapp
+++ b/config/common_linuxapp
@@ -32,38 +32,27 @@
#
# define executive environment
-#
-# CONFIG_RTE_EXEC_ENV can be linuxapp, bsdapp
+# RTE_EXEC_ENV values are the directories in mk/exec-env/
#
CONFIG_RTE_EXEC_ENV="linuxapp"
CONFIG_RTE_EXEC_ENV_LINUXAPP=y
##
## machine can define specific variables or action for a specific board
-## RTE_MACHINE can be:
-## default nothing specific
-## native current machine
-## atm Intel® Atom™ microarchitecture
-## nhm Intel® microarchitecture code name Nehalem
-## wsm Intel® microarchitecture code name Westmere
-## snb Intel® microarchitecture code name Sandy Bridge
-## ivb Intel® microarchitecture code name Ivy Bridge
-##
-## Note: if your compiler does not support the relevant -march options,
-## it will be compiled with whatever latest processor the compiler supports!
+## RTE_MACHINE values are the directories in mk/machine/
##
#CONFIG_RTE_MACHINE="native"
#
##
## define the architecture we compile for.
-## CONFIG_RTE_ARCH can be i686, x86_64, x86_64_32
+## RTE_ARCH values are the directories in mk/arch/
##
#CONFIG_RTE_ARCH="x86_64"
#CONFIG_RTE_ARCH_X86_64=y
#
##
## The compiler we use.
-## Can be gcc, icc or clang.
+## RTE_TOOLCHAIN values are the directories in mk/toolchain/
##
#CONFIG_RTE_TOOLCHAIN="gcc"
#CONFIG_RTE_TOOLCHAIN_GCC=y
diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk
index 53650c3..75a616a 100644
--- a/mk/target/generic/rte.vars.mk
+++ b/mk/target/generic/rte.vars.mk
@@ -50,8 +50,6 @@
# - can define CPU_ASFLAGS variable (overriden by cmdline value) that
# overrides the one defined in arch.
#
-# examples for RTE_MACHINE: default, pc, bensley, tylesburg, ...
-#
include $(RTE_SDK)/mk/machine/$(RTE_MACHINE)/rte.vars.mk
#
@@ -69,8 +67,6 @@ include $(RTE_SDK)/mk/machine/$(RTE_MACHINE)/rte.vars.mk
# define in machine .mk)
# - may override any previously defined variable
#
-# examples for RTE_ARCH: i686, x86_64
-#
include $(RTE_SDK)/mk/arch/$(RTE_ARCH)/rte.vars.mk
#
@@ -82,8 +78,6 @@ include $(RTE_SDK)/mk/arch/$(RTE_ARCH)/rte.vars.mk
# - define TOOLCHAIN_ASFLAGS variable (overriden by cmdline value)
# - may override any previously defined variable
#
-# examples for RTE_TOOLCHAIN: gcc, icc
-#
include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.vars.mk
#
@@ -94,8 +88,6 @@ include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.vars.mk
# - define EXECENV_ASFLAGS variable (overriden by cmdline)
# - may override any previously defined variable
#
-# examples for RTE_EXEC_ENV: linuxapp, bsdapp
-#
include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.vars.mk
# Don't set CFLAGS/LDFLAGS flags for kernel module, all flags are
--
2.7.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [dpdk-dev] [PATCH 2/2] config: add a common x86 flag
2016-02-05 22:00 [dpdk-dev] [PATCH 0/2] clean-up arch config Thomas Monjalon
2016-02-05 22:00 ` [dpdk-dev] [PATCH 1/2] config: remove obsolete machine descriptions Thomas Monjalon
@ 2016-02-05 22:00 ` Thomas Monjalon
2016-02-11 11:34 ` [dpdk-dev] [PATCH 0/2] clean-up arch config Ananyev, Konstantin
2 siblings, 0 replies; 5+ messages in thread
From: Thomas Monjalon @ 2016-02-05 22:00 UTC (permalink / raw)
To: konstantin.ananyev, bruce.richardson; +Cc: dev
Intel Architecture (IA), also called x86, is declined in
- i686
- x86_x32
- x86_64
The code common to all of these architectures can now be guarded
by a single flag RTE_ARCH_X86.
Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
config/common_bsdapp | 1 +
config/common_linuxapp | 1 +
config/defconfig_i686-native-linuxapp-gcc | 1 +
config/defconfig_i686-native-linuxapp-icc | 1 +
config/defconfig_x86_64-native-bsdapp-clang | 1 +
config/defconfig_x86_64-native-bsdapp-gcc | 1 +
config/defconfig_x86_64-native-linuxapp-clang | 1 +
config/defconfig_x86_64-native-linuxapp-gcc | 1 +
config/defconfig_x86_64-native-linuxapp-icc | 1 +
config/defconfig_x86_x32-native-linuxapp-gcc | 1 +
10 files changed, 10 insertions(+)
diff --git a/config/common_bsdapp b/config/common_bsdapp
index 50b9829..be09b48 100644
--- a/config/common_bsdapp
+++ b/config/common_bsdapp
@@ -49,6 +49,7 @@ CONFIG_RTE_EXEC_ENV_BSDAPP=y
##
#CONFIG_RTE_ARCH="x86_64"
#CONFIG_RTE_ARCH_X86_64=y
+#CONFIG_RTE_ARCH_X86=y
#
##
## The compiler we use.
diff --git a/config/common_linuxapp b/config/common_linuxapp
index 4866b96..bf1bb6e 100644
--- a/config/common_linuxapp
+++ b/config/common_linuxapp
@@ -49,6 +49,7 @@ CONFIG_RTE_EXEC_ENV_LINUXAPP=y
##
#CONFIG_RTE_ARCH="x86_64"
#CONFIG_RTE_ARCH_X86_64=y
+#CONFIG_RTE_ARCH_X86=y
#
##
## The compiler we use.
diff --git a/config/defconfig_i686-native-linuxapp-gcc b/config/defconfig_i686-native-linuxapp-gcc
index a90de9b..290183a 100644
--- a/config/defconfig_i686-native-linuxapp-gcc
+++ b/config/defconfig_i686-native-linuxapp-gcc
@@ -36,6 +36,7 @@ CONFIG_RTE_MACHINE="native"
CONFIG_RTE_ARCH="i686"
CONFIG_RTE_ARCH_I686=y
+CONFIG_RTE_ARCH_X86=y
CONFIG_RTE_TOOLCHAIN="gcc"
CONFIG_RTE_TOOLCHAIN_GCC=y
diff --git a/config/defconfig_i686-native-linuxapp-icc b/config/defconfig_i686-native-linuxapp-icc
index c021321..96725f3 100644
--- a/config/defconfig_i686-native-linuxapp-icc
+++ b/config/defconfig_i686-native-linuxapp-icc
@@ -36,6 +36,7 @@ CONFIG_RTE_MACHINE="native"
CONFIG_RTE_ARCH="i686"
CONFIG_RTE_ARCH_I686=y
+CONFIG_RTE_ARCH_X86=y
CONFIG_RTE_TOOLCHAIN="icc"
CONFIG_RTE_TOOLCHAIN_ICC=y
diff --git a/config/defconfig_x86_64-native-bsdapp-clang b/config/defconfig_x86_64-native-bsdapp-clang
index 3305cbd..d2baf2c 100644
--- a/config/defconfig_x86_64-native-bsdapp-clang
+++ b/config/defconfig_x86_64-native-bsdapp-clang
@@ -36,6 +36,7 @@ CONFIG_RTE_MACHINE="native"
CONFIG_RTE_ARCH="x86_64"
CONFIG_RTE_ARCH_X86_64=y
+CONFIG_RTE_ARCH_X86=y
CONFIG_RTE_TOOLCHAIN="clang"
CONFIG_RTE_TOOLCHAIN_CLANG=y
diff --git a/config/defconfig_x86_64-native-bsdapp-gcc b/config/defconfig_x86_64-native-bsdapp-gcc
index aad7add..5a6a4e8 100644
--- a/config/defconfig_x86_64-native-bsdapp-gcc
+++ b/config/defconfig_x86_64-native-bsdapp-gcc
@@ -36,6 +36,7 @@ CONFIG_RTE_MACHINE="native"
CONFIG_RTE_ARCH="x86_64"
CONFIG_RTE_ARCH_X86_64=y
+CONFIG_RTE_ARCH_X86=y
CONFIG_RTE_TOOLCHAIN="gcc"
CONFIG_RTE_TOOLCHAIN_GCC=y
diff --git a/config/defconfig_x86_64-native-linuxapp-clang b/config/defconfig_x86_64-native-linuxapp-clang
index 5f3074e..7b1102f 100644
--- a/config/defconfig_x86_64-native-linuxapp-clang
+++ b/config/defconfig_x86_64-native-linuxapp-clang
@@ -36,6 +36,7 @@ CONFIG_RTE_MACHINE="native"
CONFIG_RTE_ARCH="x86_64"
CONFIG_RTE_ARCH_X86_64=y
+CONFIG_RTE_ARCH_X86=y
CONFIG_RTE_ARCH_64=y
CONFIG_RTE_TOOLCHAIN="clang"
diff --git a/config/defconfig_x86_64-native-linuxapp-gcc b/config/defconfig_x86_64-native-linuxapp-gcc
index 60baf5b..e69a37e 100644
--- a/config/defconfig_x86_64-native-linuxapp-gcc
+++ b/config/defconfig_x86_64-native-linuxapp-gcc
@@ -36,6 +36,7 @@ CONFIG_RTE_MACHINE="native"
CONFIG_RTE_ARCH="x86_64"
CONFIG_RTE_ARCH_X86_64=y
+CONFIG_RTE_ARCH_X86=y
CONFIG_RTE_ARCH_64=y
CONFIG_RTE_TOOLCHAIN="gcc"
diff --git a/config/defconfig_x86_64-native-linuxapp-icc b/config/defconfig_x86_64-native-linuxapp-icc
index 71d1e28..bfa8a3d 100644
--- a/config/defconfig_x86_64-native-linuxapp-icc
+++ b/config/defconfig_x86_64-native-linuxapp-icc
@@ -36,6 +36,7 @@ CONFIG_RTE_MACHINE="native"
CONFIG_RTE_ARCH="x86_64"
CONFIG_RTE_ARCH_X86_64=y
+CONFIG_RTE_ARCH_X86=y
CONFIG_RTE_ARCH_64=y
CONFIG_RTE_TOOLCHAIN="icc"
diff --git a/config/defconfig_x86_x32-native-linuxapp-gcc b/config/defconfig_x86_x32-native-linuxapp-gcc
index fb0afc4..0c26857 100644
--- a/config/defconfig_x86_x32-native-linuxapp-gcc
+++ b/config/defconfig_x86_x32-native-linuxapp-gcc
@@ -36,6 +36,7 @@ CONFIG_RTE_MACHINE="native"
CONFIG_RTE_ARCH="x86_x32"
CONFIG_RTE_ARCH_X86_X32=y
+CONFIG_RTE_ARCH_X86=y
CONFIG_RTE_TOOLCHAIN="gcc"
CONFIG_RTE_TOOLCHAIN_GCC=y
--
2.7.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [dpdk-dev] [PATCH 0/2] clean-up arch config
2016-02-05 22:00 [dpdk-dev] [PATCH 0/2] clean-up arch config Thomas Monjalon
2016-02-05 22:00 ` [dpdk-dev] [PATCH 1/2] config: remove obsolete machine descriptions Thomas Monjalon
2016-02-05 22:00 ` [dpdk-dev] [PATCH 2/2] config: add a common x86 flag Thomas Monjalon
@ 2016-02-11 11:34 ` Ananyev, Konstantin
2016-02-11 11:49 ` Thomas Monjalon
2 siblings, 1 reply; 5+ messages in thread
From: Ananyev, Konstantin @ 2016-02-11 11:34 UTC (permalink / raw)
To: Thomas Monjalon, Richardson, Bruce; +Cc: dev
> -----Original Message-----
> From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
> Sent: Friday, February 05, 2016 10:01 PM
> To: Ananyev, Konstantin; Richardson, Bruce
> Cc: dev@dpdk.org
> Subject: [PATCH 0/2] clean-up arch config
>
> Thomas Monjalon (2):
> config: remove obsolete machine descriptions
> config: add a common x86 flag
>
> config/common_bsdapp | 20 +++++---------------
> config/common_linuxapp | 20 +++++---------------
> config/defconfig_i686-native-linuxapp-gcc | 1 +
> config/defconfig_i686-native-linuxapp-icc | 1 +
> config/defconfig_x86_64-native-bsdapp-clang | 1 +
> config/defconfig_x86_64-native-bsdapp-gcc | 1 +
> config/defconfig_x86_64-native-linuxapp-clang | 1 +
> config/defconfig_x86_64-native-linuxapp-gcc | 1 +
> config/defconfig_x86_64-native-linuxapp-icc | 1 +
> config/defconfig_x86_x32-native-linuxapp-gcc | 1 +
> mk/target/generic/rte.vars.mk | 8 --------
> 11 files changed, 18 insertions(+), 38 deletions(-)
>
> --
> 2.7.0
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [dpdk-dev] [PATCH 0/2] clean-up arch config
2016-02-11 11:34 ` [dpdk-dev] [PATCH 0/2] clean-up arch config Ananyev, Konstantin
@ 2016-02-11 11:49 ` Thomas Monjalon
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Monjalon @ 2016-02-11 11:49 UTC (permalink / raw)
To: Ananyev, Konstantin; +Cc: dev
> > Thomas Monjalon (2):
> > config: remove obsolete machine descriptions
> > config: add a common x86 flag
>
> Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Applied
A lot of conditions may now be replaced with RTE_ARCH_X86.
It will fix some issues with X32, often forgotten.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-02-11 11:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-05 22:00 [dpdk-dev] [PATCH 0/2] clean-up arch config Thomas Monjalon
2016-02-05 22:00 ` [dpdk-dev] [PATCH 1/2] config: remove obsolete machine descriptions Thomas Monjalon
2016-02-05 22:00 ` [dpdk-dev] [PATCH 2/2] config: add a common x86 flag Thomas Monjalon
2016-02-11 11:34 ` [dpdk-dev] [PATCH 0/2] clean-up arch config Ananyev, Konstantin
2016-02-11 11:49 ` Thomas Monjalon
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 NNTP newsgroup(s).