app/test-pipeline: add cuckoo hash

This patch inclides cuckoo hash table into test-pipeline
This allows to benchmark the performance of the cuckoo hash table
The following key sizes are supported for cuckoo hash table
8, 16, 32, 48, 64, 80, 96, 112 and 128.

The test-pipeline can be run using the following command
say for key size 8
./app/testpipeline -c 0xe -n 4 -- -p 0xf --hash-cuckoo-8

Signed-off-by: Sankar Chokkalingam <sankarx.chokkalingam@intel.com>
Signed-off-by: Guruprasad Rao <guruprasadx.rao@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>

diff --git a/app/test-pipeline/config.c b/app/test-pipeline/config.c
index c7bc937fc0c341483a80b97457a1a658637aa0fa..dd80ed6991b7b76d5008a726735b25c50a7bad64 100644 (file)
--- a/app/test-pipeline/config.c
+++ b/app/test-pipeline/config.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -139,6 +139,15 @@ struct {
        {"acl", e_APP_PIPELINE_ACL},
        {"lpm", e_APP_PIPELINE_LPM},
        {"lpm-ipv6", e_APP_PIPELINE_LPM_IPV6},
+       {"hash-cuckoo-8", e_APP_PIPELINE_HASH_CUCKOO_KEY8},
+       {"hash-cuckoo-16", e_APP_PIPELINE_HASH_CUCKOO_KEY16},
+       {"hash-cuckoo-32", e_APP_PIPELINE_HASH_CUCKOO_KEY32},
+       {"hash-cuckoo-48", e_APP_PIPELINE_HASH_CUCKOO_KEY48},
+       {"hash-cuckoo-64", e_APP_PIPELINE_HASH_CUCKOO_KEY64},
+       {"hash-cuckoo-80", e_APP_PIPELINE_HASH_CUCKOO_KEY80},
+       {"hash-cuckoo-96", e_APP_PIPELINE_HASH_CUCKOO_KEY96},
+       {"hash-cuckoo-112", e_APP_PIPELINE_HASH_CUCKOO_KEY112},
+       {"hash-cuckoo-128", e_APP_PIPELINE_HASH_CUCKOO_KEY128},
 };
 
 int
@@ -166,6 +175,15 @@ app_parse_args(int argc, char **argv)
                {"acl", 0, 0, 0},
                {"lpm", 0, 0, 0},
                {"lpm-ipv6", 0, 0, 0},
+               {"hash-cuckoo-8", 0, 0, 0},
+               {"hash-cuckoo-16", 0, 0, 0},
+               {"hash-cuckoo-32", 0, 0, 0},
+               {"hash-cuckoo-48", 0, 0, 0},
+               {"hash-cuckoo-64", 0, 0, 0},
+               {"hash-cuckoo-80", 0, 0, 0},
+               {"hash-cuckoo-96", 0, 0, 0},
+               {"hash-cuckoo-112", 0, 0, 0},
+               {"hash-cuckoo-128", 0, 0, 0},
                {NULL, 0, 0, 0}
        };
        uint32_t lcores[3], n_lcores, lcore_id, pipeline_type_provided;

diff --git a/app/test-pipeline/main.c b/app/test-pipeline/main.c
index c57e4dd41eda5f618ee735738fbf125e485b4328..71ab6ad98580faadf3cf2acbee40287b495af0c9 100644 (file)
--- a/app/test-pipeline/main.c
+++ b/app/test-pipeline/main.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -143,6 +143,16 @@ app_lcore_main_loop(__attribute__((unused)) void *arg)
                case e_APP_PIPELINE_HASH_SPEC_KEY16_LRU:
                case e_APP_PIPELINE_HASH_SPEC_KEY32_EXT:
                case e_APP_PIPELINE_HASH_SPEC_KEY32_LRU:
+               /* cases for cuckoo hash table types */
+               case e_APP_PIPELINE_HASH_CUCKOO_KEY8:
+               case e_APP_PIPELINE_HASH_CUCKOO_KEY16:
+               case e_APP_PIPELINE_HASH_CUCKOO_KEY32:
+               case e_APP_PIPELINE_HASH_CUCKOO_KEY48:
+               case e_APP_PIPELINE_HASH_CUCKOO_KEY64:
+               case e_APP_PIPELINE_HASH_CUCKOO_KEY80:
+               case e_APP_PIPELINE_HASH_CUCKOO_KEY96:
+               case e_APP_PIPELINE_HASH_CUCKOO_KEY112:
+               case e_APP_PIPELINE_HASH_CUCKOO_KEY128:
                        app_main_loop_worker_pipeline_hash();
                        return 0;
 

diff --git a/app/test-pipeline/main.h b/app/test-pipeline/main.h
index 8dcd4592ab792b0dbfc136617f57668996f04309..3685849278ec72597539a088594e8e50511d9631 100644 (file)
--- a/app/test-pipeline/main.h
+++ b/app/test-pipeline/main.h
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -116,6 +116,16 @@ enum {
        e_APP_PIPELINE_ACL,
        e_APP_PIPELINE_LPM,
        e_APP_PIPELINE_LPM_IPV6,
+
+       e_APP_PIPELINE_HASH_CUCKOO_KEY8,
+       e_APP_PIPELINE_HASH_CUCKOO_KEY16,
+       e_APP_PIPELINE_HASH_CUCKOO_KEY32,
+       e_APP_PIPELINE_HASH_CUCKOO_KEY48,
+       e_APP_PIPELINE_HASH_CUCKOO_KEY64,
+       e_APP_PIPELINE_HASH_CUCKOO_KEY80,
+       e_APP_PIPELINE_HASH_CUCKOO_KEY96,
+       e_APP_PIPELINE_HASH_CUCKOO_KEY112,
+       e_APP_PIPELINE_HASH_CUCKOO_KEY128,
        e_APP_PIPELINES
 };
 

diff --git a/app/test-pipeline/pipeline_hash.c b/app/test-pipeline/pipeline_hash.c
index 0e369a2327e1cbe0253365084a1741ee5c34cfef..10d28695ef73cb22b04e774370cc7c6d487d1742 100644 (file)
--- a/app/test-pipeline/pipeline_hash.c
+++ b/app/test-pipeline/pipeline_hash.c
@@ -43,6 +43,7 @@
 
 #include <rte_port_ring.h>
 #include <rte_table_hash.h>
+#include <rte_hash.h>
 #include <rte_pipeline.h>
 
 #include "main.h"
@@ -77,6 +78,25 @@ translate_options(uint32_t *special, uint32_t *ext, uint32_t *key_size)
        case e_APP_PIPELINE_HASH_SPEC_KEY32_LRU:
                *special = 1; *ext = 0; *key_size = 32; return;
 
+       case e_APP_PIPELINE_HASH_CUCKOO_KEY8:
+               *special = 0; *ext = 0; *key_size = 8; return;
+       case e_APP_PIPELINE_HASH_CUCKOO_KEY16:
+               *special = 0; *ext = 0; *key_size = 16; return;
+       case e_APP_PIPELINE_HASH_CUCKOO_KEY32:
+               *special = 0; *ext = 0; *key_size = 32; return;
+       case e_APP_PIPELINE_HASH_CUCKOO_KEY48:
+               *special = 0; *ext = 0; *key_size = 48; return;
+       case e_APP_PIPELINE_HASH_CUCKOO_KEY64:
+               *special = 0; *ext = 0; *key_size = 64; return;
+       case e_APP_PIPELINE_HASH_CUCKOO_KEY80:
+               *special = 0; *ext = 0; *key_size = 80; return;
+       case e_APP_PIPELINE_HASH_CUCKOO_KEY96:
+               *special = 0; *ext = 0; *key_size = 96; return;
+       case e_APP_PIPELINE_HASH_CUCKOO_KEY112:
+               *special = 0; *ext = 0; *key_size = 112; return;
+       case e_APP_PIPELINE_HASH_CUCKOO_KEY128:
+               *special = 0; *ext = 0; *key_size = 128; return;
+
        default:
                rte_panic("Invalid hash table type or key size\n");
        }
@@ -360,6 +380,45 @@ app_main_loop_worker_pipeline_hash(void) {
        }
        break;
 
+       case e_APP_PIPELINE_HASH_CUCKOO_KEY8:
+       case e_APP_PIPELINE_HASH_CUCKOO_KEY16:
+       case e_APP_PIPELINE_HASH_CUCKOO_KEY32:
+       case e_APP_PIPELINE_HASH_CUCKOO_KEY48:
+       case e_APP_PIPELINE_HASH_CUCKOO_KEY64:
+       case e_APP_PIPELINE_HASH_CUCKOO_KEY80:
+       case e_APP_PIPELINE_HASH_CUCKOO_KEY96:
+       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_dosig_ops,
+                       .arg_create = &table_hash_params,
+                       .f_action_hit = NULL,
+                       .f_action_miss = NULL,
+                       .arg_ah = NULL,
+                       .action_data_size = 0,
+               };
+
+               if (rte_pipeline_table_create(p, &table_params, &table_id))
+                       rte_panic("Unable to configure the hash table\n");
+       }
+       break;
+
        default:
                rte_panic("Invalid hash table type or key size\n");
        }