Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/76322/?format=api
{ "id": 76322, "url": "http://patches.dpdk.org/api/patches/76322/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200902104343.31774-2-radu.nicolau@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20200902104343.31774-2-radu.nicolau@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200902104343.31774-2-radu.nicolau@intel.com", "date": "2020-09-02T10:43:40", "name": "[v1,1/4] x86: change cpuflag macros to compiler macros", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "e3999e809da9908cf6178c87a7c13603737a8155", "submitter": { "id": 743, "url": "http://patches.dpdk.org/api/people/743/?format=api", "name": "Radu Nicolau", "email": "radu.nicolau@intel.com" }, "delegate": { "id": 24651, "url": "http://patches.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200902104343.31774-2-radu.nicolau@intel.com/mbox/", "series": [ { "id": 11903, "url": "http://patches.dpdk.org/api/series/11903/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=11903", "date": "2020-09-02T10:43:39", "name": "Remove RTE_MACHINE_CPUFLAG_ macros", "version": 1, "mbox": "http://patches.dpdk.org/series/11903/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/76322/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/76322/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 65236A04B8;\n\tWed, 2 Sep 2020 12:44:04 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 5F5591C07E;\n\tWed, 2 Sep 2020 12:43:57 +0200 (CEST)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n by dpdk.org (Postfix) with ESMTP id ACCB6255\n for <dev@dpdk.org>; Wed, 2 Sep 2020 12:43:54 +0200 (CEST)", "from orsmga005.jf.intel.com ([10.7.209.41])\n by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 02 Sep 2020 03:43:53 -0700", "from unknown (HELO silpixa00399477.ir.intel.com) ([10.237.214.225])\n by orsmga005.jf.intel.com with ESMTP; 02 Sep 2020 03:43:51 -0700" ], "IronPort-SDR": [ "\n NbHX2xrbu9snVLwJDnKQqE+8lBd7FFUWXaVtTIZkSLVvj8AJ/GOBr9Tk8eNBFWRQ2aS6Z1x84r\n g8aHImqUompA==", "\n 9VkAIB6w0nirlYzEMsondLzhUcdwXKQI6TCnqn1bCliMEQzO1pBjaNNwzlrUJdlOJPT6XFCgMF\n we6KJqOHKR5w==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9731\"; a=\"242185016\"", "E=Sophos;i=\"5.76,381,1592895600\"; d=\"scan'208\";a=\"242185016\"", "E=Sophos;i=\"5.76,381,1592895600\"; d=\"scan'208\";a=\"477591955\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Radu Nicolau <radu.nicolau@intel.com>", "To": "dev@dpdk.org", "Cc": "thomas@monjalon.net, david.marchand@redhat.com, viktorin@rehivetech.com,\n ruifeng.wang@arm.com, jerinj@marvell.com, drc@linux.vnet.ibm.com,\n bruce.richardson@intel.com, konstantin.ananyev@intel.com,\n Radu Nicolau <radu.nicolau@intel.com>,\n Sean Morrissey <sean.morrissey@intel.com>", "Date": "Wed, 2 Sep 2020 10:43:40 +0000", "Message-Id": "<20200902104343.31774-2-radu.nicolau@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200902104343.31774-1-radu.nicolau@intel.com>", "References": "<20200902104343.31774-1-radu.nicolau@intel.com>", "Subject": "[dpdk-dev] [PATCH v1 1/4] x86: change cpuflag macros to compiler\n\tmacros", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Replace use of RTE_MACHINE_CPUFLAG macros with regular compiler\nmacros.\n\nSigned-off-by: Sean Morrissey <sean.morrissey@intel.com>\nSigned-off-by: Radu Nicolau <radu.nicolau@intel.com>\n---\n app/test/test_memcpy_perf.c | 8 ++++----\n config/x86/meson.build | 2 --\n drivers/net/enic/Makefile | 2 +-\n drivers/net/enic/meson.build | 2 +-\n drivers/net/i40e/Makefile | 2 +-\n drivers/net/i40e/meson.build | 2 +-\n drivers/net/iavf/Makefile | 2 +-\n drivers/net/iavf/meson.build | 2 +-\n drivers/net/ice/Makefile | 2 +-\n drivers/net/ice/meson.build | 2 +-\n examples/l3fwd/l3fwd_em.c | 4 ++--\n lib/librte_acl/Makefile | 2 +-\n lib/librte_acl/meson.build | 2 +-\n lib/librte_eal/common/rte_random.c | 4 ++--\n lib/librte_eal/x86/include/rte_memcpy.h | 8 ++++----\n lib/librte_efd/rte_efd_x86.h | 2 +-\n lib/librte_hash/rte_cuckoo_hash.c | 2 +-\n lib/librte_member/rte_member_ht.c | 10 +++++-----\n lib/librte_member/rte_member_x86.h | 2 +-\n lib/librte_net/rte_net_crc.c | 2 +-\n mk/rte.cpuflags.mk | 1 -\n 21 files changed, 31 insertions(+), 34 deletions(-)", "diff": "diff --git a/app/test/test_memcpy_perf.c b/app/test/test_memcpy_perf.c\nindex 00a2092b4..c711e36ba 100644\n--- a/app/test/test_memcpy_perf.c\n+++ b/app/test/test_memcpy_perf.c\n@@ -51,13 +51,13 @@ static size_t buf_sizes[TEST_VALUE_RANGE];\n #define TEST_BATCH_SIZE 100\n \n /* Data is aligned on this many bytes (power of 2) */\n-#ifdef RTE_MACHINE_CPUFLAG_AVX512F\n+#ifdef __AVX512F__\n #define ALIGNMENT_UNIT 64\n-#elif defined RTE_MACHINE_CPUFLAG_AVX2\n+#elif defined __AVX2__\n #define ALIGNMENT_UNIT 32\n-#else /* RTE_MACHINE_CPUFLAG */\n+#else\n #define ALIGNMENT_UNIT 16\n-#endif /* RTE_MACHINE_CPUFLAG */\n+#endif\n \n /*\n * Pointers used in performance tests. The two large buffers are for uncached\ndiff --git a/config/x86/meson.build b/config/x86/meson.build\nindex 6ec020ef6..fea4d5403 100644\n--- a/config/x86/meson.build\n+++ b/config/x86/meson.build\n@@ -18,7 +18,6 @@ endif\n \n base_flags = ['SSE', 'SSE2', 'SSE3','SSSE3', 'SSE4_1', 'SSE4_2']\n foreach f:base_flags\n-\tdpdk_conf.set('RTE_MACHINE_CPUFLAG_' + f, 1)\n \tcompile_time_cpuflags += ['RTE_CPUFLAG_' + f]\n endforeach\n \n@@ -32,7 +31,6 @@ foreach f:optional_flags\n \t\telif f == 'RDRND'\n \t\t\tf = 'RDRAND'\n \t\tendif\n-\t\tdpdk_conf.set('RTE_MACHINE_CPUFLAG_' + f, 1)\n \t\tcompile_time_cpuflags += ['RTE_CPUFLAG_' + f]\n \tendif\n endforeach\ndiff --git a/drivers/net/enic/Makefile b/drivers/net/enic/Makefile\nindex d098a474a..a6055983c 100644\n--- a/drivers/net/enic/Makefile\n+++ b/drivers/net/enic/Makefile\n@@ -45,7 +45,7 @@ ifeq ($(CONFIG_RTE_ARCH_X86_64),y)\n # 'default' machine (corei7 which has no avx2) and run the binary on\n # newer CPUs that have avx2.\n # This part is verbatim from i40e makefile.\n-ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2)\n+ifneq ($(filter $(AUTO_CPUFLAGS),__AVX2__),)\n \tCC_AVX2_SUPPORT=1\n else\n \tCC_AVX2_SUPPORT=\\\ndiff --git a/drivers/net/enic/meson.build b/drivers/net/enic/meson.build\nindex 1bd7cc7e1..896b224e4 100644\n--- a/drivers/net/enic/meson.build\n+++ b/drivers/net/enic/meson.build\n@@ -19,7 +19,7 @@ deps += ['hash']\n includes += include_directories('base')\n \n # The current implementation assumes 64-bit pointers\n-if dpdk_conf.has('RTE_MACHINE_CPUFLAG_AVX2') and dpdk_conf.get('RTE_ARCH_64')\n+if cc.get_define('__AVX2__', args: machine_args) != '' and dpdk_conf.get('RTE_ARCH_64')\n \tsources += files('enic_rxtx_vec_avx2.c')\n # Build the avx2 handler if the compiler supports it, even though 'machine'\n # does not. This is to support users who build for the min supported machine\ndiff --git a/drivers/net/i40e/Makefile b/drivers/net/i40e/Makefile\nindex 43f10941b..bb486b83c 100644\n--- a/drivers/net/i40e/Makefile\n+++ b/drivers/net/i40e/Makefile\n@@ -85,7 +85,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_tm.c\n SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_vf_representor.c\n \n ifeq ($(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR),y)\n-ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2)\n+ifneq ($(filter $(AUTO_CPUFLAGS),__AVX2__),)\n \tCC_AVX2_SUPPORT=1\n else\n \tCC_AVX2_SUPPORT=\\\ndiff --git a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build\nindex 211d45d88..68f9895cd 100644\n--- a/drivers/net/i40e/meson.build\n+++ b/drivers/net/i40e/meson.build\n@@ -31,7 +31,7 @@ if arch_subdir == 'x86'\n \t# compile AVX2 version if either:\n \t# a. we have AVX supported in minimum instruction set baseline\n \t# b. it's not minimum instruction set, but supported by compiler\n-\tif dpdk_conf.has('RTE_MACHINE_CPUFLAG_AVX2')\n+\tif cc.get_define('__AVX2__', args: machine_args) != ''\n \t\tcflags += ['-DCC_AVX2_SUPPORT']\n \t\tsources += files('i40e_rxtx_vec_avx2.c')\n \telif cc.has_argument('-mavx2')\ndiff --git a/drivers/net/iavf/Makefile b/drivers/net/iavf/Makefile\nindex 792cbb7f7..61eca6271 100644\n--- a/drivers/net/iavf/Makefile\n+++ b/drivers/net/iavf/Makefile\n@@ -31,7 +31,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx_vec_sse.c\n endif\n \n ifeq ($(CONFIG_RTE_LIBRTE_IAVF_PMD), y)\n-\tifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2)\n+\tifneq ($(filter $(AUTO_CPUFLAGS),__AVX2__),)\n \t\tCC_AVX2_SUPPORT=1\n \telse\n \t\tCC_AVX2_SUPPORT=\\\ndiff --git a/drivers/net/iavf/meson.build b/drivers/net/iavf/meson.build\nindex a3fad363d..33407c503 100644\n--- a/drivers/net/iavf/meson.build\n+++ b/drivers/net/iavf/meson.build\n@@ -21,7 +21,7 @@ if arch_subdir == 'x86'\n \t# compile AVX2 version if either:\n \t# a. we have AVX supported in minimum instruction set baseline\n \t# b. it's not minimum instruction set, but supported by compiler\n-\tif dpdk_conf.has('RTE_MACHINE_CPUFLAG_AVX2')\n+\tif cc.get_define('__AVX2__', args: machine_args) != ''\n \t\tcflags += ['-DCC_AVX2_SUPPORT']\n \t\tsources += files('iavf_rxtx_vec_avx2.c')\n \telif cc.has_argument('-mavx2')\ndiff --git a/drivers/net/ice/Makefile b/drivers/net/ice/Makefile\nindex 34cd4024b..6beb7ba40 100644\n--- a/drivers/net/ice/Makefile\n+++ b/drivers/net/ice/Makefile\n@@ -66,7 +66,7 @@ endif\n SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_switch_filter.c\n SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_fdir_filter.c\n SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_hash.c\n-ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2)\n+ifneq ($(filter $(AUTO_CPUFLAGS),__AVX2__),)\n \tCC_AVX2_SUPPORT=1\n else\n \tCC_AVX2_SUPPORT=\\\ndiff --git a/drivers/net/ice/meson.build b/drivers/net/ice/meson.build\nindex e6fe74487..99e1b773a 100644\n--- a/drivers/net/ice/meson.build\n+++ b/drivers/net/ice/meson.build\n@@ -22,7 +22,7 @@ if arch_subdir == 'x86'\n \t# compile AVX2 version if either:\n \t# a. we have AVX supported in minimum instruction set baseline\n \t# b. it's not minimum instruction set, but supported by compiler\n-\tif dpdk_conf.has('RTE_MACHINE_CPUFLAG_AVX2')\n+\tif cc.get_define('__AVX2__', args: machine_args) != ''\n \t\tsources += files('ice_rxtx_vec_avx2.c')\n \telif cc.has_argument('-mavx2')\n \t\tice_avx2_lib = static_library('ice_avx2_lib',\ndiff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c\nindex fdbee70b4..78181a640 100644\n--- a/examples/l3fwd/l3fwd_em.c\n+++ b/examples/l3fwd/l3fwd_em.c\n@@ -215,7 +215,7 @@ static rte_xmm_t mask0;\n static rte_xmm_t mask1;\n static rte_xmm_t mask2;\n \n-#if defined(RTE_MACHINE_CPUFLAG_SSE2)\n+#if defined(__SSE2__)\n static inline xmm_t\n em_mask_key(void *key, xmm_t mask)\n {\n@@ -231,7 +231,7 @@ em_mask_key(void *key, xmm_t mask)\n \n \treturn vandq_s32(data, mask);\n }\n-#elif defined(RTE_MACHINE_CPUFLAG_ALTIVEC)\n+#elif defined(__ALTIVEC__)\n static inline xmm_t\n em_mask_key(void *key, xmm_t mask)\n {\ndiff --git a/lib/librte_acl/Makefile b/lib/librte_acl/Makefile\nindex f4332b044..3b591c2ed 100644\n--- a/lib/librte_acl/Makefile\n+++ b/lib/librte_acl/Makefile\n@@ -38,7 +38,7 @@ endif\n #\n \n #check if flag for AVX2 is already on, if not set it up manually\n-ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2)\n+ifneq ($(filter $(AUTO_CPUFLAGS),__AVX2__),)\n \tCC_AVX2_SUPPORT=1\n else\n \tCC_AVX2_SUPPORT=\\\ndiff --git a/lib/librte_acl/meson.build b/lib/librte_acl/meson.build\nindex d1e2c184c..b31a3f798 100644\n--- a/lib/librte_acl/meson.build\n+++ b/lib/librte_acl/meson.build\n@@ -15,7 +15,7 @@ if dpdk_conf.has('RTE_ARCH_X86')\n \t# in former case, just add avx2 C file to files list\n \t# in latter case, compile c file to static lib, using correct compiler\n \t# flags, and then have the .o file from static lib linked into main lib.\n-\tif dpdk_conf.has('RTE_MACHINE_CPUFLAG_AVX2')\n+\tif cc.get_define('__AVX2__', args: machine_args) != ''\n \t\tsources += files('acl_run_avx2.c')\n \t\tcflags += '-DCC_AVX2_SUPPORT'\n \telif cc.has_argument('-mavx2')\ndiff --git a/lib/librte_eal/common/rte_random.c b/lib/librte_eal/common/rte_random.c\nindex b7a089ac4..b2c5416b3 100644\n--- a/lib/librte_eal/common/rte_random.c\n+++ b/lib/librte_eal/common/rte_random.c\n@@ -2,7 +2,7 @@\n * Copyright(c) 2019 Ericsson AB\n */\n \n-#ifdef RTE_MACHINE_CPUFLAG_RDSEED\n+#ifdef __RDSEED__\n #include <x86intrin.h>\n #endif\n #include <stdlib.h>\n@@ -188,7 +188,7 @@ __rte_random_initial_seed(void)\n \tif (ge_rc == 0)\n \t\treturn ge_seed;\n #endif\n-#ifdef RTE_MACHINE_CPUFLAG_RDSEED\n+#ifdef __RDSEED__\n \tunsigned int rdseed_low;\n \tunsigned int rdseed_high;\n \ndiff --git a/lib/librte_eal/x86/include/rte_memcpy.h b/lib/librte_eal/x86/include/rte_memcpy.h\nindex 9c67232df..008a3de67 100644\n--- a/lib/librte_eal/x86/include/rte_memcpy.h\n+++ b/lib/librte_eal/x86/include/rte_memcpy.h\n@@ -45,7 +45,7 @@ extern \"C\" {\n static __rte_always_inline void *\n rte_memcpy(void *dst, const void *src, size_t n);\n \n-#ifdef RTE_MACHINE_CPUFLAG_AVX512F\n+#ifdef __AVX512F__\n \n #define ALIGNMENT_MASK 0x3F\n \n@@ -286,7 +286,7 @@ rte_memcpy_generic(void *dst, const void *src, size_t n)\n \tgoto COPY_BLOCK_128_BACK63;\n }\n \n-#elif defined RTE_MACHINE_CPUFLAG_AVX2\n+#elif defined __AVX2__\n \n #define ALIGNMENT_MASK 0x1F\n \n@@ -479,7 +479,7 @@ rte_memcpy_generic(void *dst, const void *src, size_t n)\n \tgoto COPY_BLOCK_128_BACK31;\n }\n \n-#else /* RTE_MACHINE_CPUFLAG */\n+#else /* __AVX512F__ */\n \n #define ALIGNMENT_MASK 0x0F\n \n@@ -803,7 +803,7 @@ rte_memcpy_generic(void *dst, const void *src, size_t n)\n \tgoto COPY_BLOCK_64_BACK15;\n }\n \n-#endif /* RTE_MACHINE_CPUFLAG */\n+#endif /* __AVX512F__ */\n \n static __rte_always_inline void *\n rte_memcpy_aligned(void *dst, const void *src, size_t n)\ndiff --git a/lib/librte_efd/rte_efd_x86.h b/lib/librte_efd/rte_efd_x86.h\nindex 6c207e87d..e2f9dcca8 100644\n--- a/lib/librte_efd/rte_efd_x86.h\n+++ b/lib/librte_efd/rte_efd_x86.h\n@@ -19,7 +19,7 @@ efd_lookup_internal_avx2(const efd_hashfunc_t *group_hash_idx,\n \t\tconst efd_lookuptbl_t *group_lookup_table,\n \t\tconst uint32_t hash_val_a, const uint32_t hash_val_b)\n {\n-#ifdef RTE_MACHINE_CPUFLAG_AVX2\n+#ifdef __AVX2__\n \tefd_value_t value = 0;\n \tuint32_t i = 0;\n \t__m256i vhash_val_a = _mm256_set1_epi32(hash_val_a);\ndiff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c\nindex 0a6d47471..7c7ab84af 100644\n--- a/lib/librte_hash/rte_cuckoo_hash.c\n+++ b/lib/librte_hash/rte_cuckoo_hash.c\n@@ -1691,7 +1691,7 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches,\n \n \t/* For match mask the first bit of every two bits indicates the match */\n \tswitch (sig_cmp_fn) {\n-#if defined(RTE_MACHINE_CPUFLAG_SSE2)\n+#if defined(__SSE2__)\n \tcase RTE_HASH_COMPARE_SSE:\n \t\t/* Compare all signatures in the bucket */\n \t\t*prim_hash_matches = _mm_movemask_epi8(_mm_cmpeq_epi16(\ndiff --git a/lib/librte_member/rte_member_ht.c b/lib/librte_member/rte_member_ht.c\nindex cbcd0d440..3ea293a09 100644\n--- a/lib/librte_member/rte_member_ht.c\n+++ b/lib/librte_member/rte_member_ht.c\n@@ -176,7 +176,7 @@ rte_member_lookup_ht(const struct rte_member_setsum *ss,\n \tget_buckets_index(ss, key, &prim_bucket, &sec_bucket, &tmp_sig);\n \n \tswitch (ss->sig_cmp_fn) {\n-#if defined(RTE_ARCH_X86) && defined(RTE_MACHINE_CPUFLAG_AVX2)\n+#if defined(RTE_ARCH_X86) && defined(__AVX2__)\n \tcase RTE_MEMBER_COMPARE_AVX2:\n \t\tif (search_bucket_single_avx(prim_bucket, tmp_sig, buckets,\n \t\t\t\tset_id) ||\n@@ -216,7 +216,7 @@ rte_member_lookup_bulk_ht(const struct rte_member_setsum *ss,\n \n \tfor (i = 0; i < num_keys; i++) {\n \t\tswitch (ss->sig_cmp_fn) {\n-#if defined(RTE_ARCH_X86) && defined(RTE_MACHINE_CPUFLAG_AVX2)\n+#if defined(RTE_ARCH_X86) && defined(__AVX2__)\n \t\tcase RTE_MEMBER_COMPARE_AVX2:\n \t\t\tif (search_bucket_single_avx(prim_buckets[i],\n \t\t\t\t\ttmp_sig[i], buckets, &set_id[i]) ||\n@@ -253,7 +253,7 @@ rte_member_lookup_multi_ht(const struct rte_member_setsum *ss,\n \tget_buckets_index(ss, key, &prim_bucket, &sec_bucket, &tmp_sig);\n \n \tswitch (ss->sig_cmp_fn) {\n-#if defined(RTE_ARCH_X86) && defined(RTE_MACHINE_CPUFLAG_AVX2)\n+#if defined(RTE_ARCH_X86) && defined(__AVX2__)\n \tcase RTE_MEMBER_COMPARE_AVX2:\n \t\tsearch_bucket_multi_avx(prim_bucket, tmp_sig, buckets,\n \t\t\t&num_matches, match_per_key, set_id);\n@@ -296,7 +296,7 @@ rte_member_lookup_multi_bulk_ht(const struct rte_member_setsum *ss,\n \t\tmatch_cnt_tmp = 0;\n \n \t\tswitch (ss->sig_cmp_fn) {\n-#if defined(RTE_ARCH_X86) && defined(RTE_MACHINE_CPUFLAG_AVX2)\n+#if defined(RTE_ARCH_X86) && defined(__AVX2__)\n \t\tcase RTE_MEMBER_COMPARE_AVX2:\n \t\t\tsearch_bucket_multi_avx(prim_buckets[i], tmp_sig[i],\n \t\t\t\tbuckets, &match_cnt_tmp, match_per_key,\n@@ -357,7 +357,7 @@ try_update(struct member_ht_bucket *buckets, uint32_t prim, uint32_t sec,\n \t\tenum rte_member_sig_compare_function cmp_fn)\n {\n \tswitch (cmp_fn) {\n-#if defined(RTE_ARCH_X86) && defined(RTE_MACHINE_CPUFLAG_AVX2)\n+#if defined(RTE_ARCH_X86) && defined(__AVX2__)\n \tcase RTE_MEMBER_COMPARE_AVX2:\n \t\tif (update_entry_search_avx(prim, sig, buckets, set_id) ||\n \t\t\t\tupdate_entry_search_avx(sec, sig, buckets,\ndiff --git a/lib/librte_member/rte_member_x86.h b/lib/librte_member/rte_member_x86.h\nindex 21a498ef0..74c8e3885 100644\n--- a/lib/librte_member/rte_member_x86.h\n+++ b/lib/librte_member/rte_member_x86.h\n@@ -11,7 +11,7 @@ extern \"C\" {\n \n #include <x86intrin.h>\n \n-#if defined(RTE_MACHINE_CPUFLAG_AVX2)\n+#if defined(__AVX2__)\n \n static inline int\n update_entry_search_avx(uint32_t bucket_id, member_sig_t tmp_sig,\ndiff --git a/lib/librte_net/rte_net_crc.c b/lib/librte_net/rte_net_crc.c\nindex 9fd4794a9..56a0ed129 100644\n--- a/lib/librte_net/rte_net_crc.c\n+++ b/lib/librte_net/rte_net_crc.c\n@@ -10,7 +10,7 @@\n #include <rte_common.h>\n #include <rte_net_crc.h>\n \n-#if defined(RTE_ARCH_X86_64) && defined(RTE_MACHINE_CPUFLAG_PCLMULQDQ)\n+#if defined(RTE_ARCH_X86_64) && defined(__PCLMUL__)\n #define X86_64_SSE42_PCLMULQDQ 1\n #elif defined(RTE_ARCH_ARM64) && defined(RTE_MACHINE_CPUFLAG_PMULL)\n #define ARM64_NEON_PMULL 1\ndiff --git a/mk/rte.cpuflags.mk b/mk/rte.cpuflags.mk\nindex fa8753531..e517524b6 100644\n--- a/mk/rte.cpuflags.mk\n+++ b/mk/rte.cpuflags.mk\n@@ -113,7 +113,6 @@ CPUFLAGS += SHA1\n CPUFLAGS += SHA2\n endif\n \n-MACHINE_CFLAGS += $(addprefix -DRTE_MACHINE_CPUFLAG_,$(CPUFLAGS))\n \n # To strip whitespace\n comma:= ,\n", "prefixes": [ "v1", "1/4" ] }