From 6e757e69425a5e74b72be50a8ecc230c1d51b569 Mon Sep 17 00:00:00 2001 From: Jerin Jacob Date: Mon, 7 Dec 2015 19:52:50 +0530 Subject: [PATCH] config: clean cache line size selection scheme by default, all the targets will be configured with the 64-byte cache line size, targets which have different cache line size can be overridden through target specific config file. Selected ThunderX and power8 as CONFIG_RTE_CACHE_LINE_SIZE=128 targets based on existing configuration. Signed-off-by: Jerin Jacob Acked-by: Thomas Monjalon --- config/common_bsdapp | 5 +++++ config/common_linuxapp | 6 +++++- config/defconfig_arm64-armv8a-linuxapp-gcc | 2 -- config/defconfig_ppc_64-power8-linuxapp-gcc | 2 ++ lib/librte_eal/common/include/rte_memory.h | 3 --- .../linuxapp/eal/include/exec-env/rte_kni_common.h | 4 ---- mk/arch/arm/rte.vars.mk | 2 +- mk/arch/ppc_64/rte.vars.mk | 2 +- mk/machine/armv8a/rte.vars.mk | 2 +- mk/machine/thunderx/rte.vars.mk | 2 +- mk/machine/xgene1/rte.vars.mk | 2 +- 11 files changed, 17 insertions(+), 15 deletions(-) diff --git a/config/common_bsdapp b/config/common_bsdapp index be09b48794..696382ce2b 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -83,6 +83,11 @@ CONFIG_RTE_BUILD_COMBINE_LIBS=n # CONFIG_RTE_NEXT_ABI=y +# +# Machine's cache line size +# +CONFIG_RTE_CACHE_LINE_SIZE=64 + # # Compile Environment Abstraction Layer # diff --git a/config/common_linuxapp b/config/common_linuxapp index bf1bb6e8bf..f1638dbbd0 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -83,6 +83,11 @@ CONFIG_RTE_BUILD_COMBINE_LIBS=n # CONFIG_RTE_NEXT_ABI=y +# +# Machine's cache line size +# +CONFIG_RTE_CACHE_LINE_SIZE=64 + # # Compile Environment Abstraction Layer # @@ -100,7 +105,6 @@ CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=n CONFIG_RTE_EAL_IGB_UIO=y CONFIG_RTE_EAL_VFIO=y CONFIG_RTE_MALLOC_DEBUG=n - # Default driver path (or "" to disable) CONFIG_RTE_EAL_PMD_PATH="" diff --git a/config/defconfig_arm64-armv8a-linuxapp-gcc b/config/defconfig_arm64-armv8a-linuxapp-gcc index 504f3edff1..eacd01c14e 100644 --- a/config/defconfig_arm64-armv8a-linuxapp-gcc +++ b/config/defconfig_arm64-armv8a-linuxapp-gcc @@ -43,8 +43,6 @@ CONFIG_RTE_FORCE_INTRINSICS=y CONFIG_RTE_TOOLCHAIN="gcc" CONFIG_RTE_TOOLCHAIN_GCC=y -CONFIG_RTE_CACHE_LINE_SIZE=64 - CONFIG_RTE_IXGBE_INC_VECTOR=n CONFIG_RTE_LIBRTE_VIRTIO_PMD=n CONFIG_RTE_LIBRTE_IVSHMEM=n diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc index 03760c493f..a80a19e2c0 100644 --- a/config/defconfig_ppc_64-power8-linuxapp-gcc +++ b/config/defconfig_ppc_64-power8-linuxapp-gcc @@ -36,6 +36,8 @@ CONFIG_RTE_ARCH="ppc_64" CONFIG_RTE_ARCH_PPC_64=y CONFIG_RTE_ARCH_64=y +CONFIG_RTE_CACHE_LINE_SIZE=128 + CONFIG_RTE_TOOLCHAIN="gcc" CONFIG_RTE_TOOLCHAIN_GCC=y diff --git a/lib/librte_eal/common/include/rte_memory.h b/lib/librte_eal/common/include/rte_memory.h index 587a25dfa7..2200d58c2f 100644 --- a/lib/librte_eal/common/include/rte_memory.h +++ b/lib/librte_eal/common/include/rte_memory.h @@ -68,9 +68,6 @@ enum rte_page_sizes { }; #define SOCKET_ID_ANY -1 /**< Any NUMA socket. */ -#ifndef RTE_CACHE_LINE_SIZE -#define RTE_CACHE_LINE_SIZE 64 /**< Cache line size. */ -#endif #define RTE_CACHE_LINE_MASK (RTE_CACHE_LINE_SIZE-1) /**< Cache line mask. */ #define RTE_CACHE_LINE_ROUNDUP(size) \ diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h index bd1cc094ea..815abd6740 100644 --- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h +++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h @@ -68,10 +68,6 @@ */ #define RTE_KNI_NAMESIZE 32 -#ifndef RTE_CACHE_LINE_SIZE -#define RTE_CACHE_LINE_SIZE 64 /**< Cache line size. */ -#endif - /* * Request id. */ diff --git a/mk/arch/arm/rte.vars.mk b/mk/arch/arm/rte.vars.mk index df0c043676..bd85140e08 100644 --- a/mk/arch/arm/rte.vars.mk +++ b/mk/arch/arm/rte.vars.mk @@ -32,7 +32,7 @@ ARCH ?= arm CROSS ?= -CPU_CFLAGS ?= -marm -DRTE_CACHE_LINE_SIZE=64 -munaligned-access +CPU_CFLAGS ?= -marm -munaligned-access CPU_LDFLAGS ?= CPU_ASFLAGS ?= -felf diff --git a/mk/arch/ppc_64/rte.vars.mk b/mk/arch/ppc_64/rte.vars.mk index fdba019883..363fcd14b9 100644 --- a/mk/arch/ppc_64/rte.vars.mk +++ b/mk/arch/ppc_64/rte.vars.mk @@ -32,7 +32,7 @@ ARCH ?= powerpc CROSS ?= -CPU_CFLAGS ?= -m64 -DRTE_CACHE_LINE_SIZE=128 +CPU_CFLAGS ?= -m64 CPU_LDFLAGS ?= CPU_ASFLAGS ?= -felf64 diff --git a/mk/machine/armv8a/rte.vars.mk b/mk/machine/armv8a/rte.vars.mk index 8c018a4405..d5049e1f13 100644 --- a/mk/machine/armv8a/rte.vars.mk +++ b/mk/machine/armv8a/rte.vars.mk @@ -55,4 +55,4 @@ # CPU_LDFLAGS = # CPU_ASFLAGS = -MACHINE_CFLAGS += -march=armv8-a+crc -DRTE_CACHE_LINE_SIZE=64 +MACHINE_CFLAGS += -march=armv8-a+crc diff --git a/mk/machine/thunderx/rte.vars.mk b/mk/machine/thunderx/rte.vars.mk index 0bb6b3d009..81da1b4cc7 100644 --- a/mk/machine/thunderx/rte.vars.mk +++ b/mk/machine/thunderx/rte.vars.mk @@ -55,4 +55,4 @@ CROSS ?= aarch64-thunderx-linux-gnu- # CPU_LDFLAGS = # CPU_ASFLAGS = -MACHINE_CFLAGS += -march=armv8-a+crc -mcpu=thunderx -DRTE_CACHE_LINE_SIZE=128 +MACHINE_CFLAGS += -march=armv8-a+crc -mcpu=thunderx diff --git a/mk/machine/xgene1/rte.vars.mk b/mk/machine/xgene1/rte.vars.mk index bdf8c6b16b..419c234381 100644 --- a/mk/machine/xgene1/rte.vars.mk +++ b/mk/machine/xgene1/rte.vars.mk @@ -55,4 +55,4 @@ # CPU_LDFLAGS = # CPU_ASFLAGS = -MACHINE_CFLAGS += -march=armv8-a -DRTE_CACHE_LINE_SIZE=64 +MACHINE_CFLAGS += -march=armv8-a