test/kni: fix dependency for BSD meson build
[dpdk.git] / test / test-pipeline / pipeline_hash.c
index 3c48640..11e2402 100644 (file)
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2016 Intel Corporation
  */
 
 #include <stdio.h>
@@ -169,23 +140,23 @@ app_main_loop_worker_pipeline_hash(void) {
                                "ring %d\n", i);
        }
 
+       struct rte_table_hash_params table_hash_params = {
+               .name = "TABLE",
+               .key_size = key_size,
+               .key_offset = APP_METADATA_OFFSET(32),
+               .key_mask = NULL,
+               .n_keys = 1 << 24,
+               .n_buckets = 1 << 22,
+               .f_hash = test_hash,
+               .seed = 0,
+       };
+
        /* Table configuration */
        switch (app.pipeline_type) {
        case e_APP_PIPELINE_HASH_KEY8_EXT:
        case e_APP_PIPELINE_HASH_KEY16_EXT:
        case e_APP_PIPELINE_HASH_KEY32_EXT:
        {
-               struct rte_table_hash_params table_hash_params = {
-                       .name = "TABLE",
-                       .key_size = key_size,
-                       .key_offset = APP_METADATA_OFFSET(32),
-                       .key_mask = NULL,
-                       .n_keys = 1 << 24,
-                       .n_buckets = 1 << 22,
-                       .f_hash = (rte_table_hash_op_hash)test_hash,
-                       .seed = 0,
-               };
-
                struct rte_pipeline_table_params table_params = {
                        .ops = &rte_table_hash_ext_ops,
                        .arg_create = &table_hash_params,
@@ -204,17 +175,6 @@ app_main_loop_worker_pipeline_hash(void) {
        case e_APP_PIPELINE_HASH_KEY16_LRU:
        case e_APP_PIPELINE_HASH_KEY32_LRU:
        {
-               struct rte_table_hash_params table_hash_params = {
-                       .name = "TABLE",
-                       .key_size = key_size,
-                       .key_offset = APP_METADATA_OFFSET(32),
-                       .key_mask = NULL,
-                       .n_keys = 1 << 24,
-                       .n_buckets = 1 << 22,
-                       .f_hash = (rte_table_hash_op_hash)test_hash,
-                       .seed = 0,
-               };
-
                struct rte_pipeline_table_params table_params = {
                        .ops = &rte_table_hash_lru_ops,
                        .arg_create = &table_hash_params,
@@ -231,16 +191,6 @@ app_main_loop_worker_pipeline_hash(void) {
 
        case e_APP_PIPELINE_HASH_SPEC_KEY8_EXT:
        {
-               struct rte_table_hash_key8_ext_params table_hash_params = {
-                       .n_entries = 1 << 24,
-                       .n_entries_ext = 1 << 23,
-                       .signature_offset = APP_METADATA_OFFSET(0),
-                       .key_offset = APP_METADATA_OFFSET(32),
-                       .key_mask = NULL,
-                       .f_hash = test_hash,
-                       .seed = 0,
-               };
-
                struct rte_pipeline_table_params table_params = {
                        .ops = &rte_table_hash_key8_ext_ops,
                        .arg_create = &table_hash_params,
@@ -257,15 +207,6 @@ app_main_loop_worker_pipeline_hash(void) {
 
        case e_APP_PIPELINE_HASH_SPEC_KEY8_LRU:
        {
-               struct rte_table_hash_key8_lru_params table_hash_params = {
-                       .n_entries = 1 << 24,
-                       .signature_offset = APP_METADATA_OFFSET(0),
-                       .key_offset = APP_METADATA_OFFSET(32),
-                       .key_mask = NULL,
-                       .f_hash = test_hash,
-                       .seed = 0,
-               };
-
                struct rte_pipeline_table_params table_params = {
                        .ops = &rte_table_hash_key8_lru_ops,
                        .arg_create = &table_hash_params,
@@ -282,16 +223,6 @@ app_main_loop_worker_pipeline_hash(void) {
 
        case e_APP_PIPELINE_HASH_SPEC_KEY16_EXT:
        {
-               struct rte_table_hash_key16_ext_params table_hash_params = {
-                       .n_entries = 1 << 24,
-                       .n_entries_ext = 1 << 23,
-                       .signature_offset = APP_METADATA_OFFSET(0),
-                       .key_offset = APP_METADATA_OFFSET(32),
-                       .f_hash = test_hash,
-                       .seed = 0,
-                       .key_mask = NULL,
-               };
-
                struct rte_pipeline_table_params table_params = {
                        .ops = &rte_table_hash_key16_ext_ops,
                        .arg_create = &table_hash_params,
@@ -308,15 +239,6 @@ app_main_loop_worker_pipeline_hash(void) {
 
        case e_APP_PIPELINE_HASH_SPEC_KEY16_LRU:
        {
-               struct rte_table_hash_key16_lru_params table_hash_params = {
-                       .n_entries = 1 << 24,
-                       .signature_offset = APP_METADATA_OFFSET(0),
-                       .key_offset = APP_METADATA_OFFSET(32),
-                       .f_hash = test_hash,
-                       .seed = 0,
-                       .key_mask = NULL,
-               };
-
                struct rte_pipeline_table_params table_params = {
                        .ops = &rte_table_hash_key16_lru_ops,
                        .arg_create = &table_hash_params,
@@ -333,15 +255,6 @@ app_main_loop_worker_pipeline_hash(void) {
 
        case e_APP_PIPELINE_HASH_SPEC_KEY32_EXT:
        {
-               struct rte_table_hash_key32_ext_params table_hash_params = {
-                       .n_entries = 1 << 24,
-                       .n_entries_ext = 1 << 23,
-                       .signature_offset = APP_METADATA_OFFSET(0),
-                       .key_offset = APP_METADATA_OFFSET(32),
-                       .f_hash = test_hash,
-                       .seed = 0,
-               };
-
                struct rte_pipeline_table_params table_params = {
                        .ops = &rte_table_hash_key32_ext_ops,
                        .arg_create = &table_hash_params,
@@ -359,14 +272,6 @@ app_main_loop_worker_pipeline_hash(void) {
 
        case e_APP_PIPELINE_HASH_SPEC_KEY32_LRU:
        {
-               struct rte_table_hash_key32_lru_params table_hash_params = {
-                       .n_entries = 1 << 24,
-                       .signature_offset = APP_METADATA_OFFSET(0),
-                       .key_offset = APP_METADATA_OFFSET(32),
-                       .f_hash = test_hash,
-                       .seed = 0,
-               };
-
                struct rte_pipeline_table_params table_params = {
                        .ops = &rte_table_hash_key32_lru_ops,
                        .arg_create = &table_hash_params,
@@ -391,21 +296,6 @@ app_main_loop_worker_pipeline_hash(void) {
        case e_APP_PIPELINE_HASH_CUCKOO_KEY112:
        case e_APP_PIPELINE_HASH_CUCKOO_KEY128:
        {
-               char hash_name[RTE_HASH_NAMESIZE];
-
-               snprintf(hash_name, sizeof(hash_name), "RTE_TH_CUCKOO_%d",
-                       app.pipeline_type);
-
-               struct rte_table_hash_cuckoo_params table_hash_params = {
-                       .key_size = key_size,
-                       .n_keys = (1 << 24) + 1,
-                       .f_hash = test_hash,
-                       .seed = 0,
-                       .signature_offset = APP_METADATA_OFFSET(0),
-                       .key_offset = APP_METADATA_OFFSET(32),
-                       .name = hash_name,
-               };
-
                struct rte_pipeline_table_params table_params = {
                        .ops = &rte_table_hash_cuckoo_ops,
                        .arg_create = &table_hash_params,
@@ -478,6 +368,7 @@ app_main_loop_worker_pipeline_hash(void) {
 
 uint64_t test_hash(
        void *key,
+       __attribute__((unused)) void *key_mask,
        __attribute__((unused)) uint32_t key_size,
        __attribute__((unused)) uint64_t seed)
 {
@@ -540,7 +431,7 @@ app_main_loop_rx_metadata(void) {
                        } else
                                continue;
 
-                       *signature = test_hash(key, 0, 0);
+                       *signature = test_hash(key, NULL, 0, 0);
                }
 
                do {