From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 010AAA0524 for ; Fri, 5 Feb 2021 12:33:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E532B40682; Fri, 5 Feb 2021 12:33:53 +0100 (CET) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mails.dpdk.org (Postfix) with ESMTP id A3380188A13 for ; Fri, 5 Feb 2021 12:33:52 +0100 (CET) Received: by mail-wr1-f52.google.com with SMTP id 7so7378916wrz.0 for ; Fri, 05 Feb 2021 03:33:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mjbwvPc3SFt4BYxfdcgpNx4YTXcJELkthOQUDet+e/w=; b=K0d2lgmZcT+sA9BXLUQRwhA6PTLkfK24xb6ourhnjphBQlZk4m25infJhLXIC7vQd5 6Dy/AnhR7DOIolvkvsZsed1Fz/l99zN9yIK//VmpkMVJup0rV8dRP1LyaJYZWyWfr7VE d+bBehQnL0J9BkaMlX033M8Lv7vWXz2oOzNeFUc9Ttn8sRENhWKtHwae9iOkCHtf5EEP qaZCZJt8OM4rBAleIQkFej+SLr+1sJiCxhTpxDbjSq40V07QJE6myILHnBVXt/gDj5QU CnIwtVmWGpfw/YgqEjpBlJxcHPBqbNpiwemaJJU226MWbmoNsOS9sdHLZzgOoaSAvdZD Ft6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mjbwvPc3SFt4BYxfdcgpNx4YTXcJELkthOQUDet+e/w=; b=NUv19igA+jSi5crpxeuRQWTHue/Hk+Hl24otKXaMmHA0p6YiaIdXdn9Fo2CwENAtv9 kHcl1WSfbGzJwi140f/mGSrkTM9CEbPAYcR7OFiuZXuluqeLdy2CUAbInktVj3Sug034 aYIsLf94c65uW4a+9+RzFzGKswlE8FZvZEBMTiCPZRvkTWdWlpcSgDCpt127es3xEVn/ D9OlSfHbWU3tizCIHkxynYYbyDZ/Xctd2nrKB9B8myfOr2QXNz2vqVZPjUTxLRIrEBTG 5Pcqd077Fv6Vb6gUb/bxtxTSe6yMkYlQ4fZNvIWDYapzNXT2c9Auhbghk9F9jRlqekK5 zqIw== X-Gm-Message-State: AOAM532Cwe1fl+JEUQv4/vk8SqEh5MH4M9h1fohF0CaRFCRd1XPb3Q5S 0RfI1IbrS9raVmR212OwbA6Lk0pDPmFamm9r X-Google-Smtp-Source: ABdhPJzgqMqhprj8OAdqehBUuN4UPBmczly86v7ez28AXUn9rI6uqig8J26REJBvWIDNcwI1dnb6xA== X-Received: by 2002:a5d:47a8:: with SMTP id 8mr4445764wrb.180.1612524832409; Fri, 05 Feb 2021 03:33:52 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 35sm13268007wrn.42.2021.02.05.03.33.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:33:51 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: Ruifeng Wang , dpdk stable Date: Fri, 5 Feb 2021 11:17:31 +0000 Message-Id: <20210205111920.1272063-165-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hinic: restore vectorised code' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/7759c40b06911920218c72c75102b5264fc9db36 Thanks. Luca Boccassi --- >From 7759c40b06911920218c72c75102b5264fc9db36 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 15 Jan 2021 14:40:19 +0100 Subject: [PATCH] net/hinic: restore vectorised code [ upstream commit 36f98ed2e33f08d93e570cfed958b666f23bd87a ] Following make support removal, the vectorised code is not built anymore, fix the build flag check. Fixes: 3cc6ecfdfe85 ("build: remove makefiles") Signed-off-by: David Marchand Reviewed-by: Ruifeng Wang --- drivers/net/hinic/hinic_pmd_rx.c | 6 +++--- drivers/net/hinic/hinic_pmd_tx.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/hinic/hinic_pmd_rx.c b/drivers/net/hinic/hinic_pmd_rx.c index a49769a863..842399cc4c 100644 --- a/drivers/net/hinic/hinic_pmd_rx.c +++ b/drivers/net/hinic/hinic_pmd_rx.c @@ -4,7 +4,7 @@ #include #include -#ifdef __ARM64_NEON__ +#ifdef RTE_ARCH_ARM64 #include #endif @@ -762,7 +762,7 @@ void hinic_free_all_rx_mbufs(struct hinic_rxq *rxq) static inline void hinic_rq_cqe_be_to_cpu32(void *dst_le32, volatile void *src_be32) { -#if defined(__X86_64_SSE__) +#if defined(RTE_ARCH_X86_64) volatile __m128i *wqe_be = (volatile __m128i *)src_be32; __m128i *wqe_le = (__m128i *)dst_le32; __m128i shuf_mask = _mm_set_epi8(12, 13, 14, 15, 8, 9, 10, @@ -770,7 +770,7 @@ static inline void hinic_rq_cqe_be_to_cpu32(void *dst_le32, /* l2nic just use first 128 bits */ wqe_le[0] = _mm_shuffle_epi8(wqe_be[0], shuf_mask); -#elif defined(__ARM64_NEON__) +#elif defined(RTE_ARCH_ARM64) volatile uint8x16_t *wqe_be = (volatile uint8x16_t *)src_be32; uint8x16_t *wqe_le = (uint8x16_t *)dst_le32; const uint8x16_t shuf_mask = {3, 2, 1, 0, 7, 6, 5, 4, 11, 10, diff --git a/drivers/net/hinic/hinic_pmd_tx.c b/drivers/net/hinic/hinic_pmd_tx.c index 9d0264e67a..669f82389c 100644 --- a/drivers/net/hinic/hinic_pmd_tx.c +++ b/drivers/net/hinic/hinic_pmd_tx.c @@ -7,7 +7,7 @@ #include #include #include -#ifdef __ARM64_NEON__ +#ifdef RTE_ARCH_ARM64 #include #endif @@ -203,7 +203,7 @@ static inline void hinic_sq_wqe_cpu_to_be32(void *data, int nr_wqebb) { -#if defined(__X86_64_SSE__) +#if defined(RTE_ARCH_X86_64) int i; __m128i *wqe_line = (__m128i *)data; __m128i shuf_mask = _mm_set_epi8(12, 13, 14, 15, 8, 9, 10, @@ -217,7 +217,7 @@ static inline void hinic_sq_wqe_cpu_to_be32(void *data, int nr_wqebb) wqe_line[3] = _mm_shuffle_epi8(wqe_line[3], shuf_mask); wqe_line += 4; } -#elif defined(__ARM64_NEON__) +#elif defined(RTE_ARCH_ARM64) int i; uint8x16_t *wqe_line = (uint8x16_t *)data; const uint8x16_t shuf_mask = {3, 2, 1, 0, 7, 6, 5, 4, 11, 10, @@ -237,7 +237,7 @@ static inline void hinic_sq_wqe_cpu_to_be32(void *data, int nr_wqebb) static inline void hinic_sge_cpu_to_be32(void *data, int nr_sge) { -#if defined(__X86_64_SSE__) +#if defined(RTE_ARCH_X86_64) int i; __m128i *sge_line = (__m128i *)data; __m128i shuf_mask = _mm_set_epi8(12, 13, 14, 15, 8, 9, 10, @@ -248,7 +248,7 @@ static inline void hinic_sge_cpu_to_be32(void *data, int nr_sge) *sge_line = _mm_shuffle_epi8(*sge_line, shuf_mask); sge_line++; } -#elif defined(__ARM64_NEON__) +#elif defined(RTE_ARCH_ARM64) int i; uint8x16_t *sge_line = (uint8x16_t *)data; const uint8x16_t shuf_mask = {3, 2, 1, 0, 7, 6, 5, 4, 11, 10, -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:36.666387477 +0000 +++ 0165-net-hinic-restore-vectorised-code.patch 2021-02-05 11:18:29.114696976 +0000 @@ -1 +1 @@ -From 36f98ed2e33f08d93e570cfed958b666f23bd87a Mon Sep 17 00:00:00 2001 +From 7759c40b06911920218c72c75102b5264fc9db36 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 36f98ed2e33f08d93e570cfed958b666f23bd87a ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org