Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/76323/?format=api
{ "id": 76323, "url": "http://patches.dpdk.org/api/patches/76323/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200902104343.31774-3-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-3-radu.nicolau@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200902104343.31774-3-radu.nicolau@intel.com", "date": "2020-09-02T10:43:41", "name": "[v1,2/4] arm: change cpuflag macros to compiler macros", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "6a8cb243e6983642cc242c5dc3a54ca8f2c2ce80", "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-3-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/76323/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/76323/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 97838A04B8;\n\tWed, 2 Sep 2020 12:44:15 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 2C7C81C0B6;\n\tWed, 2 Sep 2020 12:43:59 +0200 (CEST)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n by dpdk.org (Postfix) with ESMTP id B2C8B1C067\n for <dev@dpdk.org>; Wed, 2 Sep 2020 12:43:56 +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:56 -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:53 -0700" ], "IronPort-SDR": [ "\n H1DZFv6DOcIKzOC4T7gqK0Nd37lNt68uXN0dj/3VEtjNccbWaf40phuHD4XIJtGDSA6zXLDJ+o\n TBnH+NBVWDzQ==", "\n HPyKddnHtZJhwG5hWLImzcEGFw9pnVjSz1PXtSbLSIpu7f8/s4o7ws6x4gGNmDxRwLM7iYkpOv\n kY4BVJJ8lpbA==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9731\"; a=\"242185020\"", "E=Sophos;i=\"5.76,381,1592895600\"; d=\"scan'208\";a=\"242185020\"", "E=Sophos;i=\"5.76,381,1592895600\"; d=\"scan'208\";a=\"477591981\"" ], "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:41 +0000", "Message-Id": "<20200902104343.31774-3-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 2/4] arm: 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-pmd/macswap.c | 2 +-\n config/arm/meson.build | 6 ------\n drivers/net/ixgbe/ixgbe_ethdev.c | 2 +-\n examples/l3fwd/l3fwd.h | 2 +-\n examples/l3fwd/l3fwd_em.c | 12 ++++++------\n examples/l3fwd/l3fwd_em_hlm.h | 2 +-\n examples/l3fwd/l3fwd_em_sequential.h | 2 +-\n examples/l3fwd/l3fwd_lpm.c | 6 +++---\n lib/librte_eal/arm/include/rte_memcpy_32.h | 2 +-\n lib/librte_hash/Makefile | 2 +-\n lib/librte_hash/rte_cuckoo_hash.c | 2 +-\n lib/librte_hash/rte_hash_crc.h | 2 +-\n lib/librte_hash/rte_thash.h | 4 ++--\n lib/librte_member/rte_member.h | 2 +-\n lib/librte_net/rte_net_crc.c | 2 +-\n lib/librte_node/ip4_lookup.c | 2 +-\n lib/librte_sched/rte_sched.c | 2 +-\n lib/librte_table/rte_lru_arm64.h | 2 +-\n lib/librte_table/rte_table_hash_func.h | 2 +-\n 19 files changed, 26 insertions(+), 32 deletions(-)", "diff": "diff --git a/app/test-pmd/macswap.c b/app/test-pmd/macswap.c\nindex fbe8cb39e..c84e65000 100644\n--- a/app/test-pmd/macswap.c\n+++ b/app/test-pmd/macswap.c\n@@ -39,7 +39,7 @@\n #include \"testpmd.h\"\n #if defined(RTE_ARCH_X86)\n #include \"macswap_sse.h\"\n-#elif defined(RTE_MACHINE_CPUFLAG_NEON)\n+#elif defined(__ARM__NEON)\n #include \"macswap_neon.h\"\n #else\n #include \"macswap.h\"\ndiff --git a/config/arm/meson.build b/config/arm/meson.build\nindex 8728051d5..42c0c34a5 100644\n--- a/config/arm/meson.build\n+++ b/config/arm/meson.build\n@@ -208,20 +208,14 @@ message(machine_args)\n \n if (cc.get_define('__ARM_NEON', args: machine_args) != '' or\n cc.get_define('__aarch64__', args: machine_args) != '')\n-\tdpdk_conf.set('RTE_MACHINE_CPUFLAG_NEON', 1)\n \tcompile_time_cpuflags += ['RTE_CPUFLAG_NEON']\n endif\n \n if cc.get_define('__ARM_FEATURE_CRC32', args: machine_args) != ''\n-\tdpdk_conf.set('RTE_MACHINE_CPUFLAG_CRC32', 1)\n \tcompile_time_cpuflags += ['RTE_CPUFLAG_CRC32']\n endif\n \n if cc.get_define('__ARM_FEATURE_CRYPTO', args: machine_args) != ''\n-\tdpdk_conf.set('RTE_MACHINE_CPUFLAG_AES', 1)\n-\tdpdk_conf.set('RTE_MACHINE_CPUFLAG_PMULL', 1)\n-\tdpdk_conf.set('RTE_MACHINE_CPUFLAG_SHA1', 1)\n-\tdpdk_conf.set('RTE_MACHINE_CPUFLAG_SHA2', 1)\n \tcompile_time_cpuflags += ['RTE_CPUFLAG_AES', 'RTE_CPUFLAG_PMULL',\n \t'RTE_CPUFLAG_SHA1', 'RTE_CPUFLAG_SHA2']\n endif\ndiff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c\nindex fd0cb9b0e..f70012684 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.c\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.c\n@@ -3960,7 +3960,7 @@ ixgbe_dev_supported_ptypes_get(struct rte_eth_dev *dev)\n \t dev->rx_pkt_burst == ixgbe_recv_pkts_bulk_alloc)\n \t\treturn ptypes;\n \n-#if defined(RTE_ARCH_X86) || defined(RTE_MACHINE_CPUFLAG_NEON)\n+#if defined(RTE_ARCH_X86) || defined(__ARM_NEON)\n \tif (dev->rx_pkt_burst == ixgbe_recv_pkts_vec ||\n \t dev->rx_pkt_burst == ixgbe_recv_scattered_pkts_vec)\n \t\treturn ptypes;\ndiff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h\nindex 67055431f..2cf06099e 100644\n--- a/examples/l3fwd/l3fwd.h\n+++ b/examples/l3fwd/l3fwd.h\n@@ -12,7 +12,7 @@\n \n #define RTE_LOGTYPE_L3FWD RTE_LOGTYPE_USER1\n \n-#if !defined(NO_HASH_MULTI_LOOKUP) && defined(RTE_MACHINE_CPUFLAG_NEON)\n+#if !defined(NO_HASH_MULTI_LOOKUP) && defined(__ARM_NEON)\n #define NO_HASH_MULTI_LOOKUP 1\n #endif\n \ndiff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c\nindex 78181a640..c529dcd3e 100644\n--- a/examples/l3fwd/l3fwd_em.c\n+++ b/examples/l3fwd/l3fwd_em.c\n@@ -28,7 +28,7 @@\n #include \"l3fwd.h\"\n #include \"l3fwd_event.h\"\n \n-#if defined(RTE_ARCH_X86) || defined(RTE_MACHINE_CPUFLAG_CRC32)\n+#if defined(RTE_ARCH_X86) || defined(__ARM_FEATURE_CRC32)\n #define EM_HASH_CRC 1\n #endif\n \n@@ -223,7 +223,7 @@ em_mask_key(void *key, xmm_t mask)\n \n \treturn _mm_and_si128(data, mask);\n }\n-#elif defined(RTE_MACHINE_CPUFLAG_NEON)\n+#elif defined(__ARM_NEON)\n static inline xmm_t\n em_mask_key(void *key, xmm_t mask)\n {\n@@ -303,7 +303,7 @@ em_get_ipv6_dst_port(void *ipv6_hdr, uint16_t portid, void *lookup_struct)\n \treturn (ret < 0) ? portid : ipv6_l3fwd_out_if[ret];\n }\n \n-#if defined RTE_ARCH_X86 || defined RTE_MACHINE_CPUFLAG_NEON\n+#if defined RTE_ARCH_X86 || defined __ARM_NEON\n #if defined(NO_HASH_MULTI_LOOKUP)\n #include \"l3fwd_em_sequential.h\"\n #else\n@@ -685,7 +685,7 @@ em_main_loop(__rte_unused void *dummy)\n \t\t\tif (nb_rx == 0)\n \t\t\t\tcontinue;\n \n-#if defined RTE_ARCH_X86 || defined RTE_MACHINE_CPUFLAG_NEON\n+#if defined RTE_ARCH_X86 || defined __ARM_NEON\n \t\t\tl3fwd_em_send_packets(nb_rx, pkts_burst,\n \t\t\t\t\t\t\tportid, qconf);\n #else\n@@ -723,7 +723,7 @@ em_event_loop_single(struct l3fwd_event_resources *evt_rsrc,\n \n \t\tstruct rte_mbuf *mbuf = ev.mbuf;\n \n-#if defined RTE_ARCH_X86 || defined RTE_MACHINE_CPUFLAG_NEON\n+#if defined RTE_ARCH_X86 || defined __ARM_NEON\n \t\tmbuf->port = em_get_dst_port(lconf, mbuf, mbuf->port);\n \t\tprocess_packet(mbuf, &mbuf->port);\n #else\n@@ -784,7 +784,7 @@ em_event_loop_burst(struct l3fwd_event_resources *evt_rsrc,\n \t\t\tcontinue;\n \t\t}\n \n-#if defined RTE_ARCH_X86 || defined RTE_MACHINE_CPUFLAG_NEON\n+#if defined RTE_ARCH_X86 || defined __ARM_NEON\n \t\tl3fwd_em_process_events(nb_deq, (struct rte_event **)&events,\n \t\t\t\t\tlconf);\n #else\ndiff --git a/examples/l3fwd/l3fwd_em_hlm.h b/examples/l3fwd/l3fwd_em_hlm.h\nindex 79812716c..278707c18 100644\n--- a/examples/l3fwd/l3fwd_em_hlm.h\n+++ b/examples/l3fwd/l3fwd_em_hlm.h\n@@ -9,7 +9,7 @@\n #if defined RTE_ARCH_X86\n #include \"l3fwd_sse.h\"\n #include \"l3fwd_em_hlm_sse.h\"\n-#elif defined RTE_MACHINE_CPUFLAG_NEON\n+#elif defined __ARM_NEON\n #include \"l3fwd_neon.h\"\n #include \"l3fwd_em_hlm_neon.h\"\n #endif\ndiff --git a/examples/l3fwd/l3fwd_em_sequential.h b/examples/l3fwd/l3fwd_em_sequential.h\nindex b231b9994..6170052cf 100644\n--- a/examples/l3fwd/l3fwd_em_sequential.h\n+++ b/examples/l3fwd/l3fwd_em_sequential.h\n@@ -16,7 +16,7 @@\n \n #if defined RTE_ARCH_X86\n #include \"l3fwd_sse.h\"\n-#elif defined RTE_MACHINE_CPUFLAG_NEON\n+#elif defined __ARM_NEON\n #include \"l3fwd_neon.h\"\n #endif\n \ndiff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c\nindex 91eb74272..3dcf1fef1 100644\n--- a/examples/l3fwd/l3fwd_lpm.c\n+++ b/examples/l3fwd/l3fwd_lpm.c\n@@ -163,7 +163,7 @@ lpm_get_dst_port_with_ipv4(const struct lcore_conf *qconf, struct rte_mbuf *pkt,\n \n #if defined(RTE_ARCH_X86)\n #include \"l3fwd_lpm_sse.h\"\n-#elif defined RTE_MACHINE_CPUFLAG_NEON\n+#elif defined __ARM_NEON\n #include \"l3fwd_lpm_neon.h\"\n #elif defined(RTE_ARCH_PPC_64)\n #include \"l3fwd_lpm_altivec.h\"\n@@ -240,7 +240,7 @@ lpm_main_loop(__rte_unused void *dummy)\n \t\t\tif (nb_rx == 0)\n \t\t\t\tcontinue;\n \n-#if defined RTE_ARCH_X86 || defined RTE_MACHINE_CPUFLAG_NEON \\\n+#if defined RTE_ARCH_X86 || defined __ARM_NEON \\\n \t\t\t || defined RTE_ARCH_PPC_64\n \t\t\tl3fwd_lpm_send_packets(nb_rx, pkts_burst,\n \t\t\t\t\t\tportid, qconf);\n@@ -259,7 +259,7 @@ lpm_process_event_pkt(const struct lcore_conf *lconf, struct rte_mbuf *mbuf)\n {\n \tmbuf->port = lpm_get_dst_port(lconf, mbuf, mbuf->port);\n \n-#if defined RTE_ARCH_X86 || defined RTE_MACHINE_CPUFLAG_NEON \\\n+#if defined RTE_ARCH_X86 || defined __ARM_NEON \\\n \t|| defined RTE_ARCH_PPC_64\n \tprocess_packet(mbuf, &mbuf->port);\n #else\ndiff --git a/lib/librte_eal/arm/include/rte_memcpy_32.h b/lib/librte_eal/arm/include/rte_memcpy_32.h\nindex eb02c3b41..fb3245b59 100644\n--- a/lib/librte_eal/arm/include/rte_memcpy_32.h\n+++ b/lib/librte_eal/arm/include/rte_memcpy_32.h\n@@ -16,7 +16,7 @@ extern \"C\" {\n \n #ifdef RTE_ARCH_ARM_NEON_MEMCPY\n \n-#ifndef RTE_MACHINE_CPUFLAG_NEON\n+#ifndef __ARM_NEON\n #error \"Cannot optimize memcpy by NEON as the CPU seems to not support this\"\n #endif\n \ndiff --git a/lib/librte_hash/Makefile b/lib/librte_hash/Makefile\nindex ec9f86499..b84a40d55 100644\n--- a/lib/librte_hash/Makefile\n+++ b/lib/librte_hash/Makefile\n@@ -20,7 +20,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_HASH) += rte_fbk_hash.c\n SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include := rte_hash.h\n SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_hash_crc.h\n ifeq ($(CONFIG_RTE_ARCH_ARM64),y)\n-ifneq ($(findstring RTE_MACHINE_CPUFLAG_CRC32,$(CFLAGS)),)\n+ifneq ($(filter $(AUTO_CPUFLAGS),__ARM_FEATURE_CRC32),)\n SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_crc_arm64.h\n endif\n endif\ndiff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c\nindex 7c7ab84af..aad0c965b 100644\n--- a/lib/librte_hash/rte_cuckoo_hash.c\n+++ b/lib/librte_hash/rte_cuckoo_hash.c\n@@ -1704,7 +1704,7 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches,\n \t\t\t\t\t(__m128i const *)sec_bkt->sig_current),\n \t\t\t\t_mm_set1_epi16(sig)));\n \t\tbreak;\n-#elif defined(RTE_MACHINE_CPUFLAG_NEON)\n+#elif defined(__ARM_NEON)\n \tcase RTE_HASH_COMPARE_NEON: {\n \t\tuint16x8_t vmat, vsig, x;\n \t\tint16x8_t shift = {-15, -13, -11, -9, -7, -5, -3, -1};\ndiff --git a/lib/librte_hash/rte_hash_crc.h b/lib/librte_hash/rte_hash_crc.h\nindex cf28031b3..3e131aa6b 100644\n--- a/lib/librte_hash/rte_hash_crc.h\n+++ b/lib/librte_hash/rte_hash_crc.h\n@@ -424,7 +424,7 @@ crc32c_sse42_u64(uint64_t data, uint64_t init_val)\n \n static uint8_t crc32_alg = CRC32_SW;\n \n-#if defined(RTE_ARCH_ARM64) && defined(RTE_MACHINE_CPUFLAG_CRC32)\n+#if defined(RTE_ARCH_ARM64) && defined(__ARM_FEATURE_CRC32)\n #include \"rte_crc_arm64.h\"\n #else\n \ndiff --git a/lib/librte_hash/rte_thash.h b/lib/librte_hash/rte_thash.h\nindex 51b512946..061efa2ae 100644\n--- a/lib/librte_hash/rte_thash.h\n+++ b/lib/librte_hash/rte_thash.h\n@@ -28,7 +28,7 @@ extern \"C\" {\n #include <rte_ip.h>\n #include <rte_common.h>\n \n-#if defined(RTE_ARCH_X86) || defined(RTE_MACHINE_CPUFLAG_NEON)\n+#if defined(RTE_ARCH_X86) || defined(__ARM_NEON)\n #include <rte_vect.h>\n #endif\n \n@@ -149,7 +149,7 @@ rte_thash_load_v6_addrs(const struct rte_ipv6_hdr *orig,\n \tipv6 = _mm_loadu_si128((const __m128i *)orig->dst_addr);\n \t*(__m128i *)targ->v6.dst_addr =\n \t\t\t_mm_shuffle_epi8(ipv6, rte_thash_ipv6_bswap_mask);\n-#elif defined(RTE_MACHINE_CPUFLAG_NEON)\n+#elif defined(__ARM_NEON)\n \tuint8x16_t ipv6 = vld1q_u8((uint8_t const *)orig->src_addr);\n \tvst1q_u8((uint8_t *)targ->v6.src_addr, vrev32q_u8(ipv6));\n \tipv6 = vld1q_u8((uint8_t const *)orig->dst_addr);\ndiff --git a/lib/librte_member/rte_member.h b/lib/librte_member/rte_member.h\nindex ab2b23217..c0689e233 100644\n--- a/lib/librte_member/rte_member.h\n+++ b/lib/librte_member/rte_member.h\n@@ -68,7 +68,7 @@ typedef uint16_t member_set_t;\n #define RTE_MEMBER_NAMESIZE 32\n \n /** @internal Hash function used by membership library. */\n-#if defined(RTE_ARCH_X86) || defined(RTE_MACHINE_CPUFLAG_CRC32)\n+#if defined(RTE_ARCH_X86) || defined(__ARM_FEATURE_CRC32)\n #include <rte_hash_crc.h>\n #define MEMBER_HASH_FUNC rte_hash_crc\n #else\ndiff --git a/lib/librte_net/rte_net_crc.c b/lib/librte_net/rte_net_crc.c\nindex 56a0ed129..4f5b9e828 100644\n--- a/lib/librte_net/rte_net_crc.c\n+++ b/lib/librte_net/rte_net_crc.c\n@@ -12,7 +12,7 @@\n \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+#elif defined(RTE_ARCH_ARM64) && defined(__ARM_FEATURE_CRYPTO)\n #define ARM64_NEON_PMULL 1\n #endif\n \ndiff --git a/lib/librte_node/ip4_lookup.c b/lib/librte_node/ip4_lookup.c\nindex 8e6379457..293c77f39 100644\n--- a/lib/librte_node/ip4_lookup.c\n+++ b/lib/librte_node/ip4_lookup.c\n@@ -30,7 +30,7 @@ struct ip4_lookup_node_main {\n \n static struct ip4_lookup_node_main ip4_lookup_nm;\n \n-#if defined(RTE_MACHINE_CPUFLAG_NEON)\n+#if defined(__ARM_NEON)\n #include \"ip4_lookup_neon.h\"\n #elif defined(RTE_ARCH_X86)\n #include \"ip4_lookup_sse.h\"\ndiff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c\nindex 0fa074166..75be8b6bd 100644\n--- a/lib/librte_sched/rte_sched.c\n+++ b/lib/librte_sched/rte_sched.c\n@@ -29,7 +29,7 @@\n \n #ifdef RTE_ARCH_X86\n #define SCHED_VECTOR_SSE4\n-#elif defined(RTE_MACHINE_CPUFLAG_NEON)\n+#elif defined(__ARM_NEON)\n #define SCHED_VECTOR_NEON\n #endif\n \ndiff --git a/lib/librte_table/rte_lru_arm64.h b/lib/librte_table/rte_lru_arm64.h\nindex b45e9d03c..add889a57 100644\n--- a/lib/librte_table/rte_lru_arm64.h\n+++ b/lib/librte_table/rte_lru_arm64.h\n@@ -13,7 +13,7 @@ extern \"C\" {\n #include <rte_vect.h>\n \n #ifndef RTE_TABLE_HASH_LRU_STRATEGY\n-#ifdef RTE_MACHINE_CPUFLAG_NEON\n+#ifdef __ARM_NEON\n #define RTE_TABLE_HASH_LRU_STRATEGY 3\n #else /* if no NEON, use simple scalar version */\n #define RTE_TABLE_HASH_LRU_STRATEGY 1\ndiff --git a/lib/librte_table/rte_table_hash_func.h b/lib/librte_table/rte_table_hash_func.h\nindex 350c79564..c4c35cc06 100644\n--- a/lib/librte_table/rte_table_hash_func.h\n+++ b/lib/librte_table/rte_table_hash_func.h\n@@ -41,7 +41,7 @@ rte_crc32_u64(uint64_t crc, uint64_t v)\n \treturn _mm_crc32_u64(crc, v);\n }\n \n-#elif defined(RTE_ARCH_ARM64) && defined(RTE_MACHINE_CPUFLAG_CRC32)\n+#elif defined(RTE_ARCH_ARM64) && defined(__ARM_FEATURE_CRC32)\n #include \"rte_table_hash_func_arm64.h\"\n #else\n \n", "prefixes": [ "v1", "2/4" ] }