This patch removes RTE_CPUFLAG_NUMFLAGS to allow new CPU
features without breaking ABI each time.
I'm not sure I understand the reason for removing the last element canary. It's quite useful in the coffee that you're refactoring.
Isn't it so that you want to essentially remove the test (other commit in this series)?
Because that I can understand as a forward compatibility measure.
Signed-off-by: Sivaprasad Tummala <sivaprasad.tummala@amd.com>
---
lib/eal/arm/include/rte_cpuflags_32.h | 1 -
lib/eal/arm/include/rte_cpuflags_64.h | 1 -
lib/eal/arm/rte_cpuflags.c | 7 +++++--
lib/eal/loongarch/include/rte_cpuflags.h | 1 -
lib/eal/loongarch/rte_cpuflags.c | 7 +++++--
lib/eal/ppc/include/rte_cpuflags.h | 1 -
lib/eal/ppc/rte_cpuflags.c | 7 +++++--
lib/eal/riscv/include/rte_cpuflags.h | 1 -
lib/eal/riscv/rte_cpuflags.c | 7 +++++--
lib/eal/x86/include/rte_cpuflags.h | 1 -
lib/eal/x86/rte_cpuflags.c | 7 +++++--
11 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/lib/eal/arm/include/rte_cpuflags_32.h b/lib/eal/arm/include/rte_cpuflags_32.h
index 4e254428a2..41ab0d5f21 100644
--- a/lib/eal/arm/include/rte_cpuflags_32.h
+++ b/lib/eal/arm/include/rte_cpuflags_32.h
@@ -43,7 +43,6 @@ enum rte_cpu_flag_t {
RTE_CPUFLAG_V7L,
RTE_CPUFLAG_V8L,
/* The last item */
- RTE_CPUFLAG_NUMFLAGS,/**< This should always be the last! */
};
#include "generic/rte_cpuflags.h"
diff --git a/lib/eal/arm/include/rte_cpuflags_64.h b/lib/eal/arm/include/rte_cpuflags_64.h
index aa7a56d491..ea5193e510 100644
--- a/lib/eal/arm/include/rte_cpuflags_64.h
+++ b/lib/eal/arm/include/rte_cpuflags_64.h
@@ -37,7 +37,6 @@ enum rte_cpu_flag_t {
RTE_CPUFLAG_SVEBF16,
RTE_CPUFLAG_AARCH64,
/* The last item */
- RTE_CPUFLAG_NUMFLAGS,/**< This should always be the last! */
};
#include "generic/rte_cpuflags.h"
diff --git a/lib/eal/arm/rte_cpuflags.c b/lib/eal/arm/rte_cpuflags.c
index 56e7b2e689..447a8d9f9f 100644
--- a/lib/eal/arm/rte_cpuflags.c
+++ b/lib/eal/arm/rte_cpuflags.c
@@ -139,8 +139,9 @@ rte_cpu_get_flag_enabled(enum rte_cpu_flag_t feature)
{
const struct feature_entry *feat;
hwcap_registers_t regs = {0};
+ unsigned int num_flags = RTE_DIM(rte_cpu_feature_table);
- if (feature >= RTE_CPUFLAG_NUMFLAGS)
+ if (feature >= num_flags)
return -ENOENT;
feat = &rte_cpu_feature_table[feature];
@@ -154,7 +155,9 @@ rte_cpu_get_flag_enabled(enum rte_cpu_flag_t feature)
const char *
rte_cpu_get_flag_name(enum rte_cpu_flag_t feature)
{
- if (feature >= RTE_CPUFLAG_NUMFLAGS)
+ unsigned int num_flags = RTE_DIM(rte_cpu_feature_table);
+
+ if (feature >= num_flags)
return NULL;
return rte_cpu_feature_table[feature].name;
}
diff --git a/lib/eal/loongarch/include/rte_cpuflags.h b/lib/eal/loongarch/include/rte_cpuflags.h
index 1c80779262..9ff8baaa3c 100644
--- a/lib/eal/loongarch/include/rte_cpuflags.h
+++ b/lib/eal/loongarch/include/rte_cpuflags.h
@@ -27,7 +27,6 @@ enum rte_cpu_flag_t {
RTE_CPUFLAG_LBT_ARM,
RTE_CPUFLAG_LBT_MIPS,
/* The last item */
- RTE_CPUFLAG_NUMFLAGS /**< This should always be the last! */
};
#include "generic/rte_cpuflags.h"
diff --git a/lib/eal/loongarch/rte_cpuflags.c b/lib/eal/loongarch/rte_cpuflags.c
index 0a75ca58d4..642eb42509 100644
--- a/lib/eal/loongarch/rte_cpuflags.c
+++ b/lib/eal/loongarch/rte_cpuflags.c
@@ -66,8 +66,9 @@ rte_cpu_get_flag_enabled(enum rte_cpu_flag_t feature)
{
const struct feature_entry *feat;
hwcap_registers_t regs = {0};
+ unsigned int num_flags = RTE_DIM(rte_cpu_feature_table);
- if (feature >= RTE_CPUFLAG_NUMFLAGS)
+ if (feature >= num_flags)
return -ENOENT;
feat = &rte_cpu_feature_table[feature];
@@ -81,7 +82,9 @@ rte_cpu_get_flag_enabled(enum rte_cpu_flag_t feature)
const char *
rte_cpu_get_flag_name(enum rte_cpu_flag_t feature)
{
- if (feature >= RTE_CPUFLAG_NUMFLAGS)
+ unsigned int num_flags = RTE_DIM(rte_cpu_feature_table);
+
+ if (feature >= num_flags)
return NULL;
return rte_cpu_feature_table[feature].name;
}
diff --git a/lib/eal/ppc/include/rte_cpuflags.h b/lib/eal/ppc/include/rte_cpuflags.h
index a88355d170..b74e7a73ee 100644
--- a/lib/eal/ppc/include/rte_cpuflags.h
+++ b/lib/eal/ppc/include/rte_cpuflags.h
@@ -49,7 +49,6 @@ enum rte_cpu_flag_t {
RTE_CPUFLAG_HTM,
RTE_CPUFLAG_ARCH_2_07,
/* The last item */
- RTE_CPUFLAG_NUMFLAGS,/**< This should always be the last! */
};
#include "generic/rte_cpuflags.h"
diff --git a/lib/eal/ppc/rte_cpuflags.c b/lib/eal/ppc/rte_cpuflags.c
index 61db5c216d..3a639ef45a 100644
--- a/lib/eal/ppc/rte_cpuflags.c
+++ b/lib/eal/ppc/rte_cpuflags.c
@@ -90,8 +90,9 @@ rte_cpu_get_flag_enabled(enum rte_cpu_flag_t feature)
{
const struct feature_entry *feat;
hwcap_registers_t regs = {0};
+ unsigned int num_flags = RTE_DIM(rte_cpu_feature_table);
- if (feature >= RTE_CPUFLAG_NUMFLAGS)
+ if (feature >= num_flags)
return -ENOENT;
feat = &rte_cpu_feature_table[feature];
@@ -105,7 +106,9 @@ rte_cpu_get_flag_enabled(enum rte_cpu_flag_t feature)
const char *
rte_cpu_get_flag_name(enum rte_cpu_flag_t feature)
{
- if (feature >= RTE_CPUFLAG_NUMFLAGS)
+ unsigned int num_flags = RTE_DIM(rte_cpu_feature_table);
+
+ if (feature >= num_flags)
return NULL;
return rte_cpu_feature_table[feature].name;
}
diff --git a/lib/eal/riscv/include/rte_cpuflags.h b/lib/eal/riscv/include/rte_cpuflags.h
index 66e787f898..803c3655ae 100644
--- a/lib/eal/riscv/include/rte_cpuflags.h
+++ b/lib/eal/riscv/include/rte_cpuflags.h
@@ -43,7 +43,6 @@ enum rte_cpu_flag_t {
RTE_CPUFLAG_RISCV_ISA_Y, /* Reserved */
RTE_CPUFLAG_RISCV_ISA_Z, /* Reserved */
/* The last item */
- RTE_CPUFLAG_NUMFLAGS,/**< This should always be the last! */
};
#include "generic/rte_cpuflags.h"
diff --git a/lib/eal/riscv/rte_cpuflags.c b/lib/eal/riscv/rte_cpuflags.c
index 4f6d29b947..a452261188 100644
--- a/lib/eal/riscv/rte_cpuflags.c
+++ b/lib/eal/riscv/rte_cpuflags.c
@@ -95,8 +95,9 @@ rte_cpu_get_flag_enabled(enum rte_cpu_flag_t feature)
{
const struct feature_entry *feat;
hwcap_registers_t regs = {0};
+ unsigned int num_flags = RTE_DIM(rte_cpu_feature_table);
- if (feature >= RTE_CPUFLAG_NUMFLAGS)
+ if (feature >= num_flags)
return -ENOENT;
feat = &rte_cpu_feature_table[feature];
@@ -110,7 +111,9 @@ rte_cpu_get_flag_enabled(enum rte_cpu_flag_t feature)
const char *
rte_cpu_get_flag_name(enum rte_cpu_flag_t feature)
{
- if (feature >= RTE_CPUFLAG_NUMFLAGS)
+ unsigned int num_flags = RTE_DIM(rte_cpu_feature_table);
+
+ if (feature >= num_flags)
return NULL;
return rte_cpu_feature_table[feature].name;
}
diff --git a/lib/eal/x86/include/rte_cpuflags.h b/lib/eal/x86/include/rte_cpuflags.h
index 92e90fb6e0..7fc6117243 100644
--- a/lib/eal/x86/include/rte_cpuflags.h
+++ b/lib/eal/x86/include/rte_cpuflags.h
@@ -135,7 +135,6 @@ enum rte_cpu_flag_t {
RTE_CPUFLAG_WAITPKG, /**< UMONITOR/UMWAIT/TPAUSE */
/* The last item */
- RTE_CPUFLAG_NUMFLAGS, /**< This should always be the last! */
};
#include "generic/rte_cpuflags.h"
diff --git a/lib/eal/x86/rte_cpuflags.c b/lib/eal/x86/rte_cpuflags.c
index d6b518251b..00d17c7515 100644
--- a/lib/eal/x86/rte_cpuflags.c
+++ b/lib/eal/x86/rte_cpuflags.c
@@ -149,8 +149,9 @@ rte_cpu_get_flag_enabled(enum rte_cpu_flag_t feature)
const struct feature_entry *feat;
cpuid_registers_t regs;
unsigned int maxleaf;
+ unsigned int num_flags = RTE_DIM(rte_cpu_feature_table);
- if (feature >= RTE_CPUFLAG_NUMFLAGS)
+ if (feature >= num_flags)
/* Flag does not match anything in the feature tables */
return -ENOENT;
@@ -176,7 +177,9 @@ rte_cpu_get_flag_enabled(enum rte_cpu_flag_t feature)
const char *
rte_cpu_get_flag_name(enum rte_cpu_flag_t feature)
{
- if (feature >= RTE_CPUFLAG_NUMFLAGS)
+ unsigned int num_flags = RTE_DIM(rte_cpu_feature_table);
+
+ if (feature >= num_flags)
return NULL;
return rte_cpu_feature_table[feature].name;
}
--
2.34.1