From patchwork Mon Jan 12 19:16:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ananyev, Konstantin" X-Patchwork-Id: 2252 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 969735AC5; Mon, 12 Jan 2015 20:16:46 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 8853C5A88 for ; Mon, 12 Jan 2015 20:16:38 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP; 12 Jan 2015 11:11:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="439584278" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by FMSMGA003.fm.intel.com with ESMTP; 12 Jan 2015 11:03:49 -0800 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t0CJGagp008644; Mon, 12 Jan 2015 19:16:36 GMT Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id t0CJGaLK017300; Mon, 12 Jan 2015 19:16:36 GMT Received: (from kananye1@localhost) by sivswdev02.ir.intel.com with id t0CJGa6o017296; Mon, 12 Jan 2015 19:16:36 GMT From: Konstantin Ananyev To: dev@dpdk.org Date: Mon, 12 Jan 2015 19:16:18 +0000 Message-Id: <1421090181-17150-15-git-send-email-konstantin.ananyev@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1421090181-17150-1-git-send-email-konstantin.ananyev@intel.com> References: <1421090181-17150-1-git-send-email-konstantin.ananyev@intel.com> Subject: [dpdk-dev] [PATCH v2 14/17] libter_acl: move lo/hi dwords shuffle out from calc_addr X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Reorganise SSE code-path a bit by moving lo/hi dwords shuffle out from calc_addr(). That allows to make calc_addr() for SSE and AVX2 practically identical and opens opportunity for further code deduplication. Signed-off-by: Konstantin Ananyev --- lib/librte_acl/acl_run_sse.h | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/lib/librte_acl/acl_run_sse.h b/lib/librte_acl/acl_run_sse.h index 1b7870e..4a174e9 100644 --- a/lib/librte_acl/acl_run_sse.h +++ b/lib/librte_acl/acl_run_sse.h @@ -172,9 +172,9 @@ acl_match_check_x4(int slot, const struct rte_acl_ctx *ctx, struct parms *parms, */ static inline __attribute__((always_inline)) xmm_t calc_addr_sse(xmm_t index_mask, xmm_t next_input, xmm_t shuffle_input, - xmm_t ones_16, xmm_t indices1, xmm_t indices2) + xmm_t ones_16, xmm_t tr_lo, xmm_t tr_hi) { - xmm_t addr, node_types, range, temp; + xmm_t addr, node_types; xmm_t dfa_msk, dfa_ofs, quad_ofs; xmm_t in, r, t; @@ -187,18 +187,14 @@ calc_addr_sse(xmm_t index_mask, xmm_t next_input, xmm_t shuffle_input, * it reaches a match. */ - /* Shuffle low 32 into temp and high 32 into indices2 */ - temp = (xmm_t)MM_SHUFFLEPS((__m128)indices1, (__m128)indices2, 0x88); - range = (xmm_t)MM_SHUFFLEPS((__m128)indices1, (__m128)indices2, 0xdd); - t = MM_XOR(index_mask, index_mask); /* shuffle input byte to all 4 positions of 32 bit value */ in = MM_SHUFFLE8(next_input, shuffle_input); /* Calc node type and node addr */ - node_types = MM_ANDNOT(index_mask, temp); - addr = MM_AND(index_mask, temp); + node_types = MM_ANDNOT(index_mask, tr_lo); + addr = MM_AND(index_mask, tr_lo); /* * Calc addr for DFAs - addr = dfa_index + input_byte @@ -211,7 +207,7 @@ calc_addr_sse(xmm_t index_mask, xmm_t next_input, xmm_t shuffle_input, r = _mm_add_epi8(r, range_base); t = _mm_srli_epi32(in, 24); - r = _mm_shuffle_epi8(range, r); + r = _mm_shuffle_epi8(tr_hi, r); dfa_ofs = _mm_sub_epi32(t, r); @@ -224,22 +220,22 @@ calc_addr_sse(xmm_t index_mask, xmm_t next_input, xmm_t shuffle_input, */ /* check ranges */ - temp = MM_CMPGT8(in, range); + t = MM_CMPGT8(in, tr_hi); /* convert -1 to 1 (bytes greater than input byte */ - temp = MM_SIGN8(temp, temp); + t = MM_SIGN8(t, t); /* horizontal add pairs of bytes into words */ - temp = MM_MADD8(temp, temp); + t = MM_MADD8(t, t); /* horizontal add pairs of words into dwords */ - quad_ofs = MM_MADD16(temp, ones_16); + quad_ofs = MM_MADD16(t, ones_16); - /* mask to range type nodes */ - temp = _mm_blendv_epi8(quad_ofs, dfa_ofs, dfa_msk); + /* blend DFA and QUAD/SINGLE. */ + t = _mm_blendv_epi8(quad_ofs, dfa_ofs, dfa_msk); /* add index into node position */ - return MM_ADD32(addr, temp); + return MM_ADD32(addr, t); } /* @@ -249,13 +245,19 @@ static inline __attribute__((always_inline)) xmm_t transition4(xmm_t next_input, const uint64_t *trans, xmm_t *indices1, xmm_t *indices2) { - xmm_t addr; + xmm_t addr, tr_lo, tr_hi; uint64_t trans0, trans2; + /* Shuffle low 32 into tr_lo and high 32 into tr_hi */ + tr_lo = (xmm_t)_mm_shuffle_ps((__m128)*indices1, (__m128)*indices2, + 0x88); + tr_hi = (xmm_t)_mm_shuffle_ps((__m128)*indices1, (__m128)*indices2, + 0xdd); + /* Calculate the address (array index) for all 4 transitions. */ addr = calc_addr_sse(xmm_index_mask.x, next_input, xmm_shuffle_input.x, - xmm_ones_16.x, *indices1, *indices2); + xmm_ones_16.x, tr_lo, tr_hi); /* Gather 64 bit transitions and pack back into 2 registers. */