From patchwork Wed Oct 18 15:03:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Dumitrescu X-Patchwork-Id: 30547 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 77A2E1B23D; Wed, 18 Oct 2017 17:05:00 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 2DE681B1A4 for ; Wed, 18 Oct 2017 17:04:20 +0200 (CEST) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Oct 2017 08:04:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,397,1503385200"; d="scan'208";a="139673126" Received: from silpixa00382658.ir.intel.com ([10.237.223.29]) by orsmga004.jf.intel.com with ESMTP; 18 Oct 2017 08:04:18 -0700 From: Cristian Dumitrescu To: dev@dpdk.org Cc: thomas@monjalon.net Date: Wed, 18 Oct 2017 16:03:37 +0100 Message-Id: <1508339034-171115-21-git-send-email-cristian.dumitrescu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508339034-171115-1-git-send-email-cristian.dumitrescu@intel.com> References: <1507634341-72277-2-git-send-email-cristian.dumitrescu@intel.com> <1508339034-171115-1-git-send-email-cristian.dumitrescu@intel.com> Subject: [dpdk-dev] [PATCH v3 01/18] test: removing calls to deprecated hash tables X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Removing calls to hash tables that are going to be removed later. The calls are removed from test/test, test/test-pipeline, examples/ip_pipeline. Signed-off-by: Cristian Dumitrescu --- .../pipeline/pipeline_flow_classification_be.c | 18 +++----------- test/test-pipeline/pipeline_hash.c | 12 +++++----- test/test/test_table_combined.c | 28 +++++++++++----------- test/test/test_table_tables.c | 8 +++---- 4 files changed, 27 insertions(+), 39 deletions(-) diff --git a/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.c b/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.c index 026f00c..5e993c3 100644 --- a/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.c +++ b/examples/ip_pipeline/pipeline/pipeline_flow_classification_be.c @@ -542,29 +542,17 @@ static void *pipeline_fc_init(struct pipeline_params *params, switch (p_fc->key_size) { case 8: - if (p_fc->hash_offset != 0) { - table_params.ops = - &rte_table_hash_key8_ext_ops; - } else { - table_params.ops = - &rte_table_hash_key8_ext_dosig_ops; - } + table_params.ops = &rte_table_hash_key8_ext_dosig_ops; table_params.arg_create = &table_hash_key8_params; break; case 16: - if (p_fc->hash_offset != 0) { - table_params.ops = - &rte_table_hash_key16_ext_ops; - } else { - table_params.ops = - &rte_table_hash_key16_ext_dosig_ops; - } + table_params.ops = &rte_table_hash_key16_ext_dosig_ops; table_params.arg_create = &table_hash_key16_params; break; default: - table_params.ops = &rte_table_hash_ext_ops; + table_params.ops = &rte_table_hash_ext_dosig_ops; table_params.arg_create = &table_hash_params; } diff --git a/test/test-pipeline/pipeline_hash.c b/test/test-pipeline/pipeline_hash.c index 991e381..6d27f33 100644 --- a/test/test-pipeline/pipeline_hash.c +++ b/test/test-pipeline/pipeline_hash.c @@ -187,7 +187,7 @@ app_main_loop_worker_pipeline_hash(void) { }; struct rte_pipeline_table_params table_params = { - .ops = &rte_table_hash_ext_ops, + .ops = &rte_table_hash_ext_dosig_ops, .arg_create = &table_hash_params, .f_action_hit = NULL, .f_action_miss = NULL, @@ -215,7 +215,7 @@ app_main_loop_worker_pipeline_hash(void) { }; struct rte_pipeline_table_params table_params = { - .ops = &rte_table_hash_lru_ops, + .ops = &rte_table_hash_lru_dosig_ops, .arg_create = &table_hash_params, .f_action_hit = NULL, .f_action_miss = NULL, @@ -241,7 +241,7 @@ app_main_loop_worker_pipeline_hash(void) { }; struct rte_pipeline_table_params table_params = { - .ops = &rte_table_hash_key8_ext_ops, + .ops = &rte_table_hash_key8_ext_dosig_ops, .arg_create = &table_hash_params, .f_action_hit = NULL, .f_action_miss = NULL, @@ -266,7 +266,7 @@ app_main_loop_worker_pipeline_hash(void) { }; struct rte_pipeline_table_params table_params = { - .ops = &rte_table_hash_key8_lru_ops, + .ops = &rte_table_hash_key8_lru_dosig_ops, .arg_create = &table_hash_params, .f_action_hit = NULL, .f_action_miss = NULL, @@ -292,7 +292,7 @@ app_main_loop_worker_pipeline_hash(void) { }; struct rte_pipeline_table_params table_params = { - .ops = &rte_table_hash_key16_ext_ops, + .ops = &rte_table_hash_key16_ext_dosig_ops, .arg_create = &table_hash_params, .f_action_hit = NULL, .f_action_miss = NULL, @@ -317,7 +317,7 @@ app_main_loop_worker_pipeline_hash(void) { }; struct rte_pipeline_table_params table_params = { - .ops = &rte_table_hash_key16_lru_ops, + .ops = &rte_table_hash_key16_lru_dosig_ops, .arg_create = &table_hash_params, .f_action_hit = NULL, .f_action_miss = NULL, diff --git a/test/test/test_table_combined.c b/test/test/test_table_combined.c index a2d19a1..a337a59 100644 --- a/test/test/test_table_combined.c +++ b/test/test/test_table_combined.c @@ -469,7 +469,7 @@ test_table_hash8lru(void) table_packets.n_hit_packets = 50; table_packets.n_miss_packets = 50; - status = test_table_type(&rte_table_hash_key8_lru_ops, + status = test_table_type(&rte_table_hash_key8_lru_dosig_ops, (void *)&key8lru_params, (void *)key8lru, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_OK); @@ -477,7 +477,7 @@ test_table_hash8lru(void) /* Invalid parameters */ key8lru_params.n_entries = 0; - status = test_table_type(&rte_table_hash_key8_lru_ops, + status = test_table_type(&rte_table_hash_key8_lru_dosig_ops, (void *)&key8lru_params, (void *)key8lru, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_TABLE_CONFIG); @@ -485,7 +485,7 @@ test_table_hash8lru(void) key8lru_params.n_entries = 1<<16; key8lru_params.f_hash = NULL; - status = test_table_type(&rte_table_hash_key8_lru_ops, + status = test_table_type(&rte_table_hash_key8_lru_dosig_ops, (void *)&key8lru_params, (void *)key8lru, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_TABLE_CONFIG); @@ -528,7 +528,7 @@ test_table_hash16lru(void) table_packets.n_hit_packets = 50; table_packets.n_miss_packets = 50; - status = test_table_type(&rte_table_hash_key16_lru_ops, + status = test_table_type(&rte_table_hash_key16_lru_dosig_ops, (void *)&key16lru_params, (void *)key16lru, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_OK); @@ -536,7 +536,7 @@ test_table_hash16lru(void) /* Invalid parameters */ key16lru_params.n_entries = 0; - status = test_table_type(&rte_table_hash_key16_lru_ops, + status = test_table_type(&rte_table_hash_key16_lru_dosig_ops, (void *)&key16lru_params, (void *)key16lru, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_TABLE_CONFIG); @@ -544,7 +544,7 @@ test_table_hash16lru(void) key16lru_params.n_entries = 1<<16; key16lru_params.f_hash = NULL; - status = test_table_type(&rte_table_hash_key16_lru_ops, + status = test_table_type(&rte_table_hash_key16_lru_dosig_ops, (void *)&key16lru_params, (void *)key16lru, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_TABLE_CONFIG); @@ -646,7 +646,7 @@ test_table_hash8ext(void) table_packets.n_hit_packets = 50; table_packets.n_miss_packets = 50; - status = test_table_type(&rte_table_hash_key8_ext_ops, + status = test_table_type(&rte_table_hash_key8_ext_dosig_ops, (void *)&key8ext_params, (void *)key8ext, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_OK); @@ -654,7 +654,7 @@ test_table_hash8ext(void) /* Invalid parameters */ key8ext_params.n_entries = 0; - status = test_table_type(&rte_table_hash_key8_ext_ops, + status = test_table_type(&rte_table_hash_key8_ext_dosig_ops, (void *)&key8ext_params, (void *)key8ext, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_TABLE_CONFIG); @@ -662,7 +662,7 @@ test_table_hash8ext(void) key8ext_params.n_entries = 1<<16; key8ext_params.f_hash = NULL; - status = test_table_type(&rte_table_hash_key8_ext_ops, + status = test_table_type(&rte_table_hash_key8_ext_dosig_ops, (void *)&key8ext_params, (void *)key8ext, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_TABLE_CONFIG); @@ -670,7 +670,7 @@ test_table_hash8ext(void) key8ext_params.f_hash = pipeline_test_hash; key8ext_params.n_entries_ext = 0; - status = test_table_type(&rte_table_hash_key8_ext_ops, + status = test_table_type(&rte_table_hash_key8_ext_dosig_ops, (void *)&key8ext_params, (void *)key8ext, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_TABLE_CONFIG); @@ -713,7 +713,7 @@ test_table_hash16ext(void) table_packets.n_hit_packets = 50; table_packets.n_miss_packets = 50; - status = test_table_type(&rte_table_hash_key16_ext_ops, + status = test_table_type(&rte_table_hash_key16_ext_dosig_ops, (void *)&key16ext_params, (void *)key16ext, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_OK); @@ -721,7 +721,7 @@ test_table_hash16ext(void) /* Invalid parameters */ key16ext_params.n_entries = 0; - status = test_table_type(&rte_table_hash_key16_ext_ops, + status = test_table_type(&rte_table_hash_key16_ext_dosig_ops, (void *)&key16ext_params, (void *)key16ext, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_TABLE_CONFIG); @@ -729,7 +729,7 @@ test_table_hash16ext(void) key16ext_params.n_entries = 1<<16; key16ext_params.f_hash = NULL; - status = test_table_type(&rte_table_hash_key16_ext_ops, + status = test_table_type(&rte_table_hash_key16_ext_dosig_ops, (void *)&key16ext_params, (void *)key16ext, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_TABLE_CONFIG); @@ -737,7 +737,7 @@ test_table_hash16ext(void) key16ext_params.f_hash = pipeline_test_hash; key16ext_params.n_entries_ext = 0; - status = test_table_type(&rte_table_hash_key16_ext_ops, + status = test_table_type(&rte_table_hash_key16_ext_dosig_ops, (void *)&key16ext_params, (void *)key16ext, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_TABLE_CONFIG); diff --git a/test/test/test_table_tables.c b/test/test/test_table_tables.c index d835eb9..90d2f02 100644 --- a/test/test/test_table_tables.c +++ b/test/test/test_table_tables.c @@ -895,7 +895,7 @@ test_table_hash_lru(void) { int status; - status = test_table_hash_lru_generic(&rte_table_hash_key8_lru_ops); + status = test_table_hash_lru_generic(&rte_table_hash_key8_lru_dosig_ops); if (status < 0) return status; @@ -904,7 +904,7 @@ test_table_hash_lru(void) if (status < 0) return status; - status = test_table_hash_lru_generic(&rte_table_hash_key16_lru_ops); + status = test_table_hash_lru_generic(&rte_table_hash_key16_lru_dosig_ops); if (status < 0) return status; @@ -924,7 +924,7 @@ test_table_hash_ext(void) { int status; - status = test_table_hash_ext_generic(&rte_table_hash_key8_ext_ops); + status = test_table_hash_ext_generic(&rte_table_hash_key8_ext_dosig_ops); if (status < 0) return status; @@ -933,7 +933,7 @@ test_table_hash_ext(void) if (status < 0) return status; - status = test_table_hash_ext_generic(&rte_table_hash_key16_ext_ops); + status = test_table_hash_ext_generic(&rte_table_hash_key16_ext_dosig_ops); if (status < 0) return status;