From patchwork Mon Jan 12 19:16:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ananyev, Konstantin" X-Patchwork-Id: 2263 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 CE2A25B05; Mon, 12 Jan 2015 20:17:09 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 809CC5AA2 for ; Mon, 12 Jan 2015 20:16:40 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP; 12 Jan 2015 11:16:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,745,1413270000"; d="scan'208";a="668605505" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga002.jf.intel.com with ESMTP; 12 Jan 2015 11:16:37 -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 t0CJGakR008657; 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 t0CJGavN017323; Mon, 12 Jan 2015 19:16:36 GMT Received: (from kananye1@localhost) by sivswdev02.ir.intel.com with id t0CJGaho017318; Mon, 12 Jan 2015 19:16:36 GMT From: Konstantin Ananyev To: dev@dpdk.org Date: Mon, 12 Jan 2015 19:16:21 +0000 Message-Id: <1421090181-17150-18-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 17/17] libte_acl: remove unused macros. 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" Signed-off-by: Konstantin Ananyev --- lib/librte_acl/acl.h | 39 ++++++++++++++++++++++++++++++++++++++- lib/librte_acl/acl_run.h | 1 - 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/lib/librte_acl/acl.h b/lib/librte_acl/acl.h index 61b849a..e65e079 100644 --- a/lib/librte_acl/acl.h +++ b/lib/librte_acl/acl.h @@ -62,13 +62,50 @@ struct rte_acl_bitset { #define RTE_ACL_NODE_DFA (0 << RTE_ACL_TYPE_SHIFT) #define RTE_ACL_NODE_SINGLE (1U << RTE_ACL_TYPE_SHIFT) -#define RTE_ACL_NODE_QEXACT (2U << RTE_ACL_TYPE_SHIFT) #define RTE_ACL_NODE_QRANGE (3U << RTE_ACL_TYPE_SHIFT) #define RTE_ACL_NODE_MATCH (4U << RTE_ACL_TYPE_SHIFT) #define RTE_ACL_NODE_TYPE (7U << RTE_ACL_TYPE_SHIFT) #define RTE_ACL_NODE_UNDEFINED UINT32_MAX /* + * ACL RT structure is a set of multibit tries (with stride == 8) + * represented by an array of transitions. The next position is calculated + * based on the current position and the input byte. + * Each transition is 64 bit value with the following format: + * | node_type_specific : 32 | node_type : 3 | node_addr : 29 | + * For all node types except RTE_ACL_NODE_MATCH, node_addr is an index + * to the start of the node in the transtions array. + * Few different node types are used: + * RTE_ACL_NODE_MATCH: + * node_addr value is and index into an array that contains the return value + * and its priority for each category. + * Upper 32 bits of the transtion value are not used for that node type. + * RTE_ACL_NODE_QRANGE: + * that node consist of up to 5 transitions. + * Upper 32 bits are interpreted as 4 signed character values which + * are ordered from smallest(INT8_MIN) to largest (INT8_MAX). + * These values define 5 ranges: + * INT8_MIN <= range[0] <= ((int8_t *)&transition)[4] + * ((int8_t *)&transition)[4] < range[1] <= ((int8_t *)&transition)[5] + * ((int8_t *)&transition)[5] < range[2] <= ((int8_t *)&transition)[6] + * ((int8_t *)&transition)[6] < range[3] <= ((int8_t *)&transition)[7] + * ((int8_t *)&transition)[7] < range[4] <= INT8_MAX + * So for input byte value within range[i] i-th transition within that node + * will be used. + * RTE_ACL_NODE_SINGLE: + * always transitions to the same node regardless of the input value. + * RTE_ACL_NODE_DFA: + * that node consits of up to 256 transitions. + * In attempt to conserve space all transitions are divided into 4 consecutive + * groups, by 64 transitions per group: + * group64[i] contains transitions[i * 64, .. i * 64 + 63]. + * Upper 32 bits are interpreted as 4 unsigned character values one per group, + * which contain index to the start of the given group within the node. + * So to calculate transition index within the node for given input byte value: + * input_byte - ((uint8_t *)&transition)[4 + input_byte / 64]. + */ + +/* * Structure of a node is a set of ptrs and each ptr has a bit map * of values associated with this transition. */ diff --git a/lib/librte_acl/acl_run.h b/lib/librte_acl/acl_run.h index 850bc81..b2fc42c 100644 --- a/lib/librte_acl/acl_run.h +++ b/lib/librte_acl/acl_run.h @@ -40,7 +40,6 @@ #define MAX_SEARCHES_AVX16 16 #define MAX_SEARCHES_SSE8 8 #define MAX_SEARCHES_SSE4 4 -#define MAX_SEARCHES_SSE2 2 #define MAX_SEARCHES_SCALAR 2 #define GET_NEXT_4BYTES(prm, idx) \