Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 115688,
    "url": "http://patches.dpdk.org/api/patches/115688/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220831064639.4163765-3-leyi.rong@intel.com/",
    "project": {
        "id": 1,
        "url": "http://patches.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<20220831064639.4163765-3-leyi.rong@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20220831064639.4163765-3-leyi.rong@intel.com",
    "date": "2022-08-31T06:46:39",
    "name": "[v2,2/2] test/member: add functional and perf tests for sketch",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "fddf9e91bbcdc8251990ca51e0db7ddb5408d52b",
    "submitter": {
        "id": 1204,
        "url": "http://patches.dpdk.org/api/people/1204/?format=api",
        "name": "Leyi Rong",
        "email": "leyi.rong@intel.com"
    },
    "delegate": {
        "id": 1,
        "url": "http://patches.dpdk.org/api/users/1/?format=api",
        "username": "tmonjalo",
        "first_name": "Thomas",
        "last_name": "Monjalon",
        "email": "thomas@monjalon.net"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220831064639.4163765-3-leyi.rong@intel.com/mbox/",
    "series": [
        {
            "id": 24474,
            "url": "http://patches.dpdk.org/api/series/24474/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=24474",
            "date": "2022-08-31T06:46:37",
            "name": "introduce NitroSketch Mode into membership library",
            "version": 2,
            "mbox": "http://patches.dpdk.org/series/24474/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/115688/comments/",
    "check": "fail",
    "checks": "http://patches.dpdk.org/api/patches/115688/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@inbox.dpdk.org",
        "Delivered-To": "patchwork@inbox.dpdk.org",
        "Received": [
            "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id E4BDAA00C5;\n\tWed, 31 Aug 2022 08:47:23 +0200 (CEST)",
            "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 533294281B;\n\tWed, 31 Aug 2022 08:47:18 +0200 (CEST)",
            "from mga06.intel.com (mga06b.intel.com [134.134.136.31])\n by mails.dpdk.org (Postfix) with ESMTP id 96C96400D6\n for <dev@dpdk.org>; Wed, 31 Aug 2022 08:47:15 +0200 (CEST)",
            "from orsmga005.jf.intel.com ([10.7.209.41])\n by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 30 Aug 2022 23:46:53 -0700",
            "from dpdk-lrong-icx-01.sh.intel.com ([10.67.119.18])\n by orsmga005.jf.intel.com with ESMTP; 30 Aug 2022 23:46:50 -0700"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1661928435; x=1693464435;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=Sp8zTI5NjyeuMRKcjdPK4lYENyBA2xuz/8jmLK59CAg=;\n b=OSEIc936UY/f5sZFnXjsWAh6npEpkdqc6CoFuSHT+43oLIbzhgeZ69OO\n SN5vDvC8MA9Ye+OW7ADoKgxlSb0V3KKpbZ123pEYrUPiwvcWmj5uBBmBZ\n f10bham+LNKjHvvH92aGMAHIvEnn8iheyVUWytba7NruLuNj86LAAI7rU\n kXKuf2kBCC8FIpND+o/djZWDR/r6WvKHeOqMNdPzdzznCxlySsUPiFQr7\n tG0PBxcTkmK+2C8TMHWgPaNK9A//sOM3JaQi4BegUU7+c559gXNaus68b\n r0BrEyNg3BDzGvMBZkeC8lObcb+P8X7WioSHCaNTJciDWeocxOQWAQUpM w==;",
        "X-IronPort-AV": [
            "E=McAfee;i=\"6500,9779,10455\"; a=\"357102914\"",
            "E=Sophos;i=\"5.93,277,1654585200\"; d=\"scan'208\";a=\"357102914\"",
            "E=Sophos;i=\"5.93,277,1654585200\"; d=\"scan'208\";a=\"787774781\""
        ],
        "X-ExtLoop1": "1",
        "From": "Leyi Rong <leyi.rong@intel.com>",
        "To": "ferruh.yigit@xilinx.com, suanmingm@nvidia.com, yipeng1.wang@intel.com,\n zaoxingliu@gmail.com, sameh.gobriel@intel.com",
        "Cc": "dev@dpdk.org,\n\tLeyi Rong <leyi.rong@intel.com>",
        "Subject": "[PATCH v2 2/2] test/member: add functional and perf tests for sketch",
        "Date": "Wed, 31 Aug 2022 14:46:39 +0800",
        "Message-Id": "<20220831064639.4163765-3-leyi.rong@intel.com>",
        "X-Mailer": "git-send-email 2.25.1",
        "In-Reply-To": "<20220831064639.4163765-1-leyi.rong@intel.com>",
        "References": "<20220810074518.1695013-1-leyi.rong@intel.com>\n <20220831064639.4163765-1-leyi.rong@intel.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.29",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org"
    },
    "content": "This patch adds functional and performance tests for sketch mode of\nmembership library.\n\nSigned-off-by: Yipeng Wang <yipeng1.wang@intel.com>\nSigned-off-by: Leyi Rong <leyi.rong@intel.com>\n---\n app/test/test_member.c      | 272 ++++++++++++++++++++++++++++++++++++\n app/test/test_member_perf.c | 153 +++++++++++++++++++-\n 2 files changed, 421 insertions(+), 4 deletions(-)",
    "diff": "diff --git a/app/test/test_member.c b/app/test/test_member.c\nindex 26a712439f..8266e6437b 100644\n--- a/app/test/test_member.c\n+++ b/app/test/test_member.c\n@@ -4,6 +4,7 @@\n \n /* This test is for membership library's simple feature test */\n \n+#include <math.h>\n #include \"test.h\"\n \n #include <rte_memcpy.h>\n@@ -28,6 +29,7 @@ test_member(void)\n struct rte_member_setsum *setsum_ht;\n struct rte_member_setsum *setsum_cache;\n struct rte_member_setsum *setsum_vbf;\n+struct rte_member_setsum *setsum_sketch;\n \n /* 5-tuple key type */\n struct flow_key {\n@@ -108,6 +110,21 @@ static struct rte_member_parameters params = {\n \t\t.socket_id = 0\t\t\t/* NUMA Socket ID for memory. */\n };\n \n+/* for sketch definitions */\n+#define TOP_K 10\n+#define HH_PKT_SIZE 16\n+#define SKETCH_ERROR_RATE 0.05\n+#define SKETCH_SAMPLE_RATE 0.001\n+#define PRINT_OUT_COUNT 20\n+\n+#define SKETCH_LARGEST_KEY_SIZE 1000000\n+#define SKETCH_TOTAL_KEY 500\n+#define NUM_OF_KEY(key) {\\\n+\t(unsigned int)ceil(SKETCH_LARGEST_KEY_SIZE / (key + 1)) \\\n+}\n+\n+void *heavy_hitters[TOP_K];\n+\n /*\n  * Sequence of operations for find existing setsummary\n  *\n@@ -684,6 +701,257 @@ perform_free(void)\n \trte_member_free(setsum_vbf);\n }\n \n+static void\n+print_out_sketch_results(uint64_t *count_result, member_set_t *heavy_set,\n+\t\t\t uint32_t print_num, bool count_byte)\n+{\n+\tuint32_t i;\n+\n+\tfor (i = 0; i < print_num; i++) {\n+\t\tif (count_byte)\n+\t\t\tprintf(\"key %2u, count %8\"PRIu64\", real count %8u, \"\n+\t\t\t\t\"heavy_set %u, deviation rate [%.04f]\\n\",\n+\t\t\t\ti, count_result[i],\n+\t\t\t\t(unsigned int)ceil(SKETCH_LARGEST_KEY_SIZE / (i + 1)) *\n+\t\t\t\tHH_PKT_SIZE,\n+\t\t\t\theavy_set[i],\n+\t\t\t\tfabs((float)count_result[i] - (float)NUM_OF_KEY(i) * HH_PKT_SIZE) /\n+\t\t\t\t((float)NUM_OF_KEY(i) * HH_PKT_SIZE));\n+\t\telse\n+\t\t\tprintf(\"key %2u, count %8\"PRIu64\", real count %8u, \"\n+\t\t\t\t\"heavy_set %u, deviation rate [%.04f]\\n\",\n+\t\t\t\ti, count_result[i],\n+\t\t\t\t(unsigned int)ceil(SKETCH_LARGEST_KEY_SIZE / (i + 1)),\n+\t\t\t\theavy_set[i],\n+\t\t\t\tfabs((float)count_result[i] - (float)NUM_OF_KEY(i)) /\n+\t\t\t\t(float)NUM_OF_KEY(i));\n+\t}\n+}\n+\n+static int\n+sketch_test(uint32_t *keys, uint32_t total_pkt, int count_byte, int reset_test)\n+{\n+\tuint32_t i;\n+\tuint64_t result_count[SKETCH_TOTAL_KEY];\n+\tmember_set_t heavy_set[SKETCH_TOTAL_KEY];\n+\tuint64_t count[TOP_K];\n+\tint ret;\n+\tint hh_cnt;\n+\n+\tsetsum_sketch = rte_member_create(&params);\n+\tif (setsum_sketch == NULL) {\n+\t\tprintf(\"Creation of setsums fail\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\tfor (i = 0; i < total_pkt; i++) {\n+\t\tif (count_byte)\n+\t\t\tret = rte_member_add_byte_count(setsum_sketch, &keys[i], HH_PKT_SIZE);\n+\t\telse\n+\t\t\tret = rte_member_add(setsum_sketch, &keys[i], 1);\n+\n+\t\tif (ret < 0) {\n+\t\t\tprintf(\"rte_member_add Failed! Error [%d]\\n\", ret);\n+\t\t\trte_member_free(setsum_sketch);\n+\n+\t\t\treturn -1;\n+\t\t}\n+\t}\n+\n+\tfor (i = 0; i < SKETCH_TOTAL_KEY; i++) {\n+\t\tuint32_t tmp_key = i;\n+\n+\t\trte_member_query_count(setsum_sketch, (void *)&tmp_key, &result_count[i]);\n+\t\trte_member_lookup(setsum_sketch, (void *)&tmp_key, &heavy_set[i]);\n+\t}\n+\n+\tprint_out_sketch_results(result_count, heavy_set, PRINT_OUT_COUNT, count_byte);\n+\n+\thh_cnt = rte_member_report_heavyhitter(setsum_sketch, heavy_hitters, count);\n+\tif (hh_cnt < 0) {\n+\t\tprintf(\"sketch report heavy hitter error!\");\n+\t\trte_member_free(setsum_sketch);\n+\n+\t\treturn -1;\n+\t}\n+\n+\tprintf(\"Report heavy hitters:\");\n+\tfor (i = 0; i < (unsigned int)hh_cnt; i++) {\n+\t\tprintf(\"%u: %\"PRIu64\"\\t\",\n+\t\t\t*((uint32_t *)heavy_hitters[i]), count[i]);\n+\t}\n+\tprintf(\"\\n\");\n+\n+\tif (reset_test) {\n+\t\tprintf(\"\\nEntering Sketch Reset Test Process!\\n\");\n+\t\trte_member_reset(setsum_sketch);\n+\n+\t\t/* after reset, check some key's count */\n+\t\tfor (i = 0; i < SKETCH_TOTAL_KEY; i++) {\n+\t\t\tuint32_t tmp_key = i;\n+\n+\t\t\trte_member_query_count(setsum_sketch, (void *)&tmp_key, &result_count[i]);\n+\t\t\trte_member_lookup(setsum_sketch, (void *)&tmp_key, &heavy_set[i]);\n+\t\t}\n+\n+\t\tprint_out_sketch_results(result_count, heavy_set, PRINT_OUT_COUNT, count_byte);\n+\n+\t\tprintf(\"\\nReinsert keys after Sketch Reset!\\n\");\n+\t\tfor (i = 0; i < total_pkt; i++) {\n+\t\t\tif (count_byte)\n+\t\t\t\tret = rte_member_add_byte_count\n+\t\t\t\t\t(setsum_sketch, &keys[i], HH_PKT_SIZE);\n+\t\t\telse\n+\t\t\t\tret = rte_member_add(setsum_sketch, &keys[i], 1);\n+\n+\t\t\tif (ret < 0) {\n+\t\t\t\tprintf(\"rte_member_add Failed! Error [%d]\\n\", ret);\n+\t\t\t\trte_member_free(setsum_sketch);\n+\n+\t\t\t\treturn -1;\n+\t\t\t}\n+\t\t}\n+\n+\t\tfor (i = 0; i < SKETCH_TOTAL_KEY; i++) {\n+\t\t\tuint32_t tmp_key = i;\n+\n+\t\t\trte_member_query_count(setsum_sketch, (void *)&tmp_key, &result_count[i]);\n+\t\t\trte_member_lookup(setsum_sketch, (void *)&tmp_key, &heavy_set[i]);\n+\t\t}\n+\n+\t\tprint_out_sketch_results(result_count, heavy_set, PRINT_OUT_COUNT, count_byte);\n+\n+\t\thh_cnt = rte_member_report_heavyhitter(setsum_sketch, heavy_hitters, count);\n+\t\tif (hh_cnt < 0) {\n+\t\t\tprintf(\"sketch report heavy hitter error!\");\n+\t\t\trte_member_free(setsum_sketch);\n+\n+\t\t\treturn -1;\n+\t\t}\n+\t\tprintf(\"Report heavy hitters:\");\n+\t\tfor (i = 0; i < (unsigned int)hh_cnt; i++) {\n+\t\t\tprintf(\"%u: %\"PRIu64\"\\t\",\n+\t\t\t\t*((uint32_t *)heavy_hitters[i]), count[i]);\n+\t\t}\n+\t\tprintf(\"\\n\");\n+\n+\t\tprintf(\"\\nDelete some keys!\\n\");\n+\t\tuint32_t tmp_key = 0;\n+\n+\t\trte_member_delete(setsum_sketch, (void *)&tmp_key, 0);\n+\t\ttmp_key = 1;\n+\t\trte_member_delete(setsum_sketch, (void *)&tmp_key, 0);\n+\n+\t\tfor (i = 0; i < SKETCH_TOTAL_KEY; i++) {\n+\t\t\tuint32_t tmp_key = i;\n+\n+\t\t\trte_member_query_count(setsum_sketch, (void *)&tmp_key, &result_count[i]);\n+\t\t\trte_member_lookup(setsum_sketch, (void *)&tmp_key, &heavy_set[i]);\n+\t\t}\n+\n+\t\tprint_out_sketch_results(result_count, heavy_set, PRINT_OUT_COUNT, count_byte);\n+\n+\t\thh_cnt = rte_member_report_heavyhitter(setsum_sketch, heavy_hitters, count);\n+\t\tif (hh_cnt < 0) {\n+\t\t\tprintf(\"sketch report heavy hitter error!\");\n+\t\t\trte_member_free(setsum_sketch);\n+\n+\t\t\treturn -1;\n+\t\t}\n+\t\tprintf(\"Report heavy hitters:\");\n+\t\tfor (i = 0; i < (unsigned int)hh_cnt; i++) {\n+\t\t\tprintf(\"%u: %\"PRIu64\"\\t\",\n+\t\t\t\t*((uint32_t *)heavy_hitters[i]), count[i]);\n+\t\t}\n+\t\tprintf(\"\\n\");\n+\t}\n+\n+\trte_member_free(setsum_sketch);\n+\treturn 0;\n+}\n+\n+static int\n+test_member_sketch(void)\n+{\n+\tunsigned int i, j, index;\n+\tuint32_t total_pkt = 0;\n+\tuint32_t *keys;\n+\tint count_byte = 0;\n+\n+\tfor (i = 0; i < SKETCH_TOTAL_KEY; i++)\n+\t\ttotal_pkt += ceil(SKETCH_LARGEST_KEY_SIZE / (i + 1));\n+\n+\tprintf(\"\\nTotal key count [%u] in Sketch Autotest\\n\", total_pkt);\n+\n+\tkeys = rte_zmalloc(NULL, sizeof(uint32_t) * total_pkt, 0);\n+\n+\tif (keys == NULL) {\n+\t\tprintf(\"RTE_ZMALLOC failed\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\tindex = 0;\n+\tfor (i = 0; i < SKETCH_TOTAL_KEY; i++) {\n+\t\tfor (j = 0; j < ceil(SKETCH_LARGEST_KEY_SIZE / (i + 1)); j++)\n+\t\t\tkeys[index++] = i;\n+\t}\n+\n+\t/* shuffle the keys */\n+\tfor (i = index - 1; i > 0; i--) {\n+\t\tuint32_t swap_idx = rte_rand() % i;\n+\t\tuint32_t tmp_key = keys[i];\n+\n+\t\tkeys[i] = keys[swap_idx];\n+\t\tkeys[swap_idx] = tmp_key;\n+\t}\n+\n+\tparams.key_len = 4;\n+\tparams.name = \"test_member_sketch\";\n+\tparams.type = RTE_MEMBER_TYPE_SKETCH;\n+\tparams.error_rate = SKETCH_ERROR_RATE;\n+\tparams.sample_rate = SKETCH_SAMPLE_RATE;\n+\tparams.extra_flag = 0;\n+\tparams.top_k = TOP_K;\n+\tparams.prim_hash_seed = rte_rdtsc();\n+\tint reset_test = 0;\n+\n+\tprintf(\"Default sketching params: Error Rate: [%f]\\tSample Rate: [%f]\\tTopK: [%d]\\n\",\n+\t\t\tSKETCH_ERROR_RATE, SKETCH_SAMPLE_RATE, TOP_K);\n+\n+\tprintf(\"\\n[Sketch with Fixed Sampling Rate Mode]\\n\");\n+\tif (sketch_test(keys, total_pkt, count_byte, reset_test) < 0) {\n+\t\trte_free(keys);\n+\t\treturn -1;\n+\t}\n+\n+\tparams.extra_flag |= RTE_MEMBER_SKETCH_ALWAYS_BOUNDED;\n+\tprintf(\"\\n[Sketch with Always Bounded Mode]\\n\");\n+\tif (sketch_test(keys, total_pkt, count_byte, reset_test) < 0) {\n+\t\trte_free(keys);\n+\t\treturn -1;\n+\t}\n+\n+\tcount_byte = 1;\n+\tparams.extra_flag |= RTE_MEMBER_SKETCH_COUNT_BYTE;\n+\tprintf(\"\\n[Sketch with Packet Size Mode]\\n\");\n+\tif (sketch_test(keys, total_pkt, count_byte, reset_test) < 0) {\n+\t\trte_free(keys);\n+\t\treturn -1;\n+\t}\n+\n+\tcount_byte = 0;\n+\tparams.extra_flag = 0;\n+\treset_test = 1;\n+\tprintf(\"\\nreset sketch test\\n\");\n+\tif (sketch_test(keys, total_pkt, count_byte, reset_test) < 0) {\n+\t\trte_free(keys);\n+\t\treturn -1;\n+\t}\n+\n+\trte_free(keys);\n+\treturn 0;\n+}\n+\n static int\n test_member(void)\n {\n@@ -719,6 +987,10 @@ test_member(void)\n \t\treturn -1;\n \t}\n \n+\tif (test_member_sketch() < 0) {\n+\t\tperform_free();\n+\t\treturn -1;\n+\t}\n \tperform_free();\n \treturn 0;\n }\ndiff --git a/app/test/test_member_perf.c b/app/test/test_member_perf.c\nindex 978db0020a..b7eb3e4c66 100644\n--- a/app/test/test_member_perf.c\n+++ b/app/test/test_member_perf.c\n@@ -13,6 +13,7 @@\n #include <rte_random.h>\n #include <rte_memcpy.h>\n #include <rte_thash.h>\n+#include <math.h>\n \n #ifdef RTE_EXEC_ENV_WINDOWS\n static int\n@@ -26,7 +27,7 @@ test_member_perf(void)\n \n #include <rte_member.h>\n \n-#define NUM_KEYSIZES 10\n+#define NUM_KEYSIZES RTE_DIM(hashtest_key_lens)\n #define NUM_SHUFFLES 10\n #define MAX_KEYSIZE 64\n #define MAX_ENTRIES (1 << 19)\n@@ -36,12 +37,23 @@ test_member_perf(void)\n #define BURST_SIZE 64\n #define VBF_FALSE_RATE 0.03\n \n+/* for the heavy hitter detection */\n+#define SKETCH_LARGEST_KEY_SIZE (1<<15)\n+#define SKETCH_PKT_SIZE 16\n+#define TOP_K 100\n+#define SKETCH_ERROR_RATE 0.05\n+#define SKETCH_SAMPLE_RATE 0.001\n+#define NUM_ADDS (KEYS_TO_ADD * 20)\n+\n static unsigned int test_socket_id;\n \n enum sstype {\n \tHT = 0,\n \tCACHE,\n \tVBF,\n+\tSKETCH,\n+\tSKETCH_BOUNDED,\n+\tSKETCH_BYTE,\n \tNUM_TYPE\n };\n \n@@ -88,6 +100,7 @@ static member_set_t data[NUM_TYPE][/* Array to store the data */KEYS_TO_ADD];\n \n /* Array to store all input keys */\n static uint8_t keys[KEYS_TO_ADD][MAX_KEYSIZE];\n+static uint8_t hh_keys[KEYS_TO_ADD][MAX_KEYSIZE];\n \n /* Shuffle the keys that have been added, so lookups will be totally random */\n static void\n@@ -136,6 +149,10 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle,\n {\n \tunsigned int i, j;\n \tint num_duplicates;\n+\tint distinct_key = 0;\n+\tint count_down = SKETCH_LARGEST_KEY_SIZE;\n+\tuint32_t swap_idx;\n+\tuint8_t temp_key[MAX_KEYSIZE];\n \n \tparams->key_size = hashtest_key_lens[cycle];\n \tparams->cycle = cycle;\n@@ -176,6 +193,22 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle,\n \t/* Shuffle the random values again */\n \tshuffle_input_keys(params);\n \n+\tfor (i = 0; i < KEYS_TO_ADD; i++) {\n+\t\tif (count_down == 0) {\n+\t\t\tdistinct_key++;\n+\t\t\tcount_down = ceil(SKETCH_LARGEST_KEY_SIZE / (distinct_key + 1));\n+\t\t}\n+\t\tmemcpy(hh_keys[i], keys[distinct_key], params->key_size);\n+\t\tcount_down--;\n+\t}\n+\n+\tfor (i = KEYS_TO_ADD - 1; i > 0; i--) {\n+\t\tswap_idx = rte_rand() % i;\n+\t\tmemcpy(temp_key, hh_keys[i], params->key_size);\n+\t\tmemcpy(hh_keys[i], hh_keys[swap_idx], params->key_size);\n+\t\tmemcpy(hh_keys[swap_idx], temp_key, params->key_size);\n+\t}\n+\n \t/* For testing miss lookup, we insert half and lookup the other half */\n \tunsigned int entry_cnt, bf_key_cnt;\n \tif (!miss) {\n@@ -208,6 +241,44 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle,\n \tparams->setsum[VBF] = rte_member_create(&member_params);\n \tif (params->setsum[VBF] == NULL)\n \t\tfprintf(stderr, \"VBF create fail\\n\");\n+\n+\tmember_params.name = \"test_member_sketch\";\n+\tmember_params.key_len = params->key_size;\n+\tmember_params.type = RTE_MEMBER_TYPE_SKETCH;\n+\tmember_params.error_rate = SKETCH_ERROR_RATE;\n+\tmember_params.sample_rate = SKETCH_SAMPLE_RATE;\n+\tmember_params.extra_flag = 0;\n+\tmember_params.top_k = TOP_K;\n+\tmember_params.prim_hash_seed = rte_rdtsc();\n+\tparams->setsum[SKETCH] = rte_member_create(&member_params);\n+\tif (params->setsum[SKETCH] == NULL)\n+\t\tfprintf(stderr, \"sketch create fail\\n\");\n+\n+\tmember_params.name = \"test_member_sketch_bounded\";\n+\tmember_params.key_len = params->key_size;\n+\tmember_params.type = RTE_MEMBER_TYPE_SKETCH;\n+\tmember_params.error_rate = SKETCH_ERROR_RATE;\n+\tmember_params.sample_rate = SKETCH_SAMPLE_RATE;\n+\tmember_params.extra_flag |= RTE_MEMBER_SKETCH_ALWAYS_BOUNDED;\n+\tmember_params.top_k = TOP_K;\n+\tmember_params.prim_hash_seed = rte_rdtsc();\n+\tparams->setsum[SKETCH_BOUNDED] = rte_member_create(&member_params);\n+\tif (params->setsum[SKETCH_BOUNDED] == NULL)\n+\t\tfprintf(stderr, \"sketch create fail\\n\");\n+\n+\tmember_params.name = \"test_member_sketch_byte\";\n+\tmember_params.key_len = params->key_size;\n+\tmember_params.type = RTE_MEMBER_TYPE_SKETCH;\n+\tmember_params.error_rate = SKETCH_ERROR_RATE;\n+\tmember_params.sample_rate = SKETCH_SAMPLE_RATE;\n+\tmember_params.extra_flag |= RTE_MEMBER_SKETCH_COUNT_BYTE;\n+\tmember_params.top_k = TOP_K;\n+\tmember_params.prim_hash_seed = rte_rdtsc();\n+\tparams->setsum[SKETCH_BYTE] = rte_member_create(&member_params);\n+\tif (params->setsum[SKETCH_BYTE] == NULL)\n+\t\tfprintf(stderr, \"sketch create fail\\n\");\n+\n+\n \tfor (i = 0; i < NUM_TYPE; i++) {\n \t\tif (params->setsum[i] == NULL)\n \t\t\treturn -1;\n@@ -243,6 +314,39 @@ timed_adds(struct member_perf_params *params, int type)\n \treturn 0;\n }\n \n+static int\n+timed_adds_sketch(struct member_perf_params *params, int type)\n+{\n+\tconst uint64_t start_tsc = rte_rdtsc();\n+\tunsigned int i, j, a;\n+\tint32_t ret;\n+\n+\tfor (i = 0; i < NUM_ADDS / KEYS_TO_ADD; i++) {\n+\t\tfor (j = 0; j < KEYS_TO_ADD; j++) {\n+\t\t\tif (type == SKETCH_BYTE)\n+\t\t\t\tret = rte_member_add_byte_count(params->setsum[type],\n+\t\t\t\t\t\t&hh_keys[j], SKETCH_PKT_SIZE);\n+\t\t\telse\n+\t\t\t\tret = rte_member_add(params->setsum[type], &hh_keys[j], 1);\n+\t\t\tif (ret < 0) {\n+\t\t\t\tprintf(\"Error %d in rte_member_add - key=0x\", ret);\n+\t\t\t\tfor (a = 0; a < params->key_size; a++)\n+\t\t\t\t\tprintf(\"%02x\", hh_keys[j][a]);\n+\t\t\t\tprintf(\"type: %d\\n\", type);\n+\n+\t\t\t\treturn -1;\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\tconst uint64_t end_tsc = rte_rdtsc();\n+\tconst uint64_t time_taken = end_tsc - start_tsc;\n+\n+\tcycles[type][params->cycle][ADD] = time_taken / NUM_ADDS;\n+\n+\treturn 0;\n+}\n+\n static int\n timed_lookups(struct member_perf_params *params, int type)\n {\n@@ -279,6 +383,36 @@ timed_lookups(struct member_perf_params *params, int type)\n \treturn 0;\n }\n \n+static int\n+timed_lookups_sketch(struct member_perf_params *params, int type)\n+{\n+\tunsigned int i, j;\n+\n+\tfalse_data[type][params->cycle] = 0;\n+\n+\tconst uint64_t start_tsc = rte_rdtsc();\n+\tmember_set_t result;\n+\tint ret;\n+\n+\tfor (i = 0; i < NUM_LOOKUPS / KEYS_TO_ADD; i++) {\n+\t\tfor (j = 0; j < KEYS_TO_ADD; j++) {\n+\t\t\tret = rte_member_lookup(params->setsum[type], &hh_keys[j],\n+\t\t\t\t\t\t&result);\n+\t\t\tif (ret < 0) {\n+\t\t\t\tprintf(\"lookup wrong internally\");\n+\t\t\t\treturn -1;\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\tconst uint64_t end_tsc = rte_rdtsc();\n+\tconst uint64_t time_taken = end_tsc - start_tsc;\n+\n+\tcycles[type][params->cycle][LOOKUP] = time_taken / NUM_LOOKUPS;\n+\n+\treturn 0;\n+}\n+\n static int\n timed_lookups_bulk(struct member_perf_params *params, int type)\n {\n@@ -531,7 +665,7 @@ run_all_tbl_perf_tests(void)\n \t\t\tprintf(\"Could not create keys/data/table\\n\");\n \t\t\treturn -1;\n \t\t}\n-\t\tfor (j = 0; j < NUM_TYPE; j++) {\n+\t\tfor (j = 0; j < SKETCH; j++) {\n \n \t\t\tif (timed_adds(&params, j) < 0)\n \t\t\t\treturn exit_with_fail(\"timed_adds\", &params,\n@@ -562,6 +696,17 @@ run_all_tbl_perf_tests(void)\n \n \t\t\t/* Print a dot to show progress on operations */\n \t\t}\n+\n+\t\tfor (j = SKETCH; j < NUM_TYPE; j++) {\n+\t\t\tif (timed_adds_sketch(&params, j) < 0)\n+\t\t\t\treturn exit_with_fail\n+\t\t\t\t\t(\"timed_adds_sketch\", &params, i, j);\n+\n+\t\t\tif (timed_lookups_sketch(&params, j) < 0)\n+\t\t\t\treturn exit_with_fail\n+\t\t\t\t\t(\"timed_lookups_sketch\", &params, i, j);\n+\t\t}\n+\n \t\tprintf(\".\");\n \t\tfflush(stdout);\n \n@@ -574,7 +719,7 @@ run_all_tbl_perf_tests(void)\n \t\t\tprintf(\"Could not create keys/data/table\\n\");\n \t\t\treturn -1;\n \t\t\t}\n-\t\tfor (j = 0; j < NUM_TYPE; j++) {\n+\t\tfor (j = 0; j < SKETCH; j++) {\n \t\t\tif (timed_miss_lookup(&params, j) < 0)\n \t\t\t\treturn exit_with_fail(\"timed_miss_lookup\",\n \t\t\t\t\t\t&params, i, j);\n@@ -605,7 +750,7 @@ run_all_tbl_perf_tests(void)\n \t\t\t\"fr_multi_bulk\", \"false_positive_rate\");\n \t/* Key size not influence False rate so just print out one key size */\n \tfor (i = 0; i < 1; i++) {\n-\t\tfor (j = 0; j < NUM_TYPE; j++) {\n+\t\tfor (j = 0; j < SKETCH; j++) {\n \t\t\tprintf(\"%-18d\", hashtest_key_lens[i]);\n \t\t\tprintf(\"%-18d\", j);\n \t\t\tprintf(\"%-18f\", (float)false_data[j][i] / NUM_LOOKUPS);\n",
    "prefixes": [
        "v2",
        "2/2"
    ]
}