From patchwork Thu Nov 20 05:17:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yerden Zhumabekov X-Patchwork-Id: 1360 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 BAA777F78; Thu, 20 Nov 2014 06:07:30 +0100 (CET) Received: from mgw.gov.kz (mgw.gov.kz [89.218.88.242]) by dpdk.org (Postfix) with ESMTP id 9C3F87F65 for ; Thu, 20 Nov 2014 06:07:24 +0100 (CET) Received: from mgw.gov.kz (mx.ctsat.kz [178.89.4.95]) by mgw.gov.kz with ESMTP id sAK5HF9d000557-sAK5HF9h000557 (version=TLSv1.0 cipher=AES128-SHA bits=128 verify=NO); Thu, 20 Nov 2014 11:17:45 +0600 Received: from EXCASHUB2.rgp.local (192.168.40.53) by EdgeForefront.rgp.local (192.168.40.59) with Microsoft SMTP Server (TLS) id 14.2.247.3; Thu, 20 Nov 2014 11:17:21 +0600 Received: from r220.rgp.local (192.168.59.10) by excashub2.rgp.local (192.168.40.48) with Microsoft SMTP Server (TLS) id 14.2.247.3; Thu, 20 Nov 2014 11:17:33 +0600 From: Yerden Zhumabekov To: Date: Thu, 20 Nov 2014 11:17:16 +0600 Message-ID: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: <1409724351-23786-1-git-send-email-e_zhumabekov@sts.kz> MIME-Version: 1.0 X-Originating-IP: [192.168.59.10] X-FEAS-SYSTEM-WL: e_zhumabekov@sts.kz Subject: [dpdk-dev] [PATCH v5 7/7] test: remove redundant compile checks 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" Since rte_hash_crc() can now be run regardless of SSE4.2 support, we can safely remove compile checks for RTE_MACHINE_CPUFLAG_SSE4_2 in test utilities. Signed-off-by: Yerden Zhumabekov --- app/test/test_hash.c | 7 ------- app/test/test_hash_perf.c | 11 ----------- 2 files changed, 18 deletions(-) diff --git a/app/test/test_hash.c b/app/test/test_hash.c index 178ec3f..76b1b8f 100644 --- a/app/test/test_hash.c +++ b/app/test/test_hash.c @@ -55,10 +55,7 @@ #include #include #include - -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2 #include -#endif /******************************************************************************* * Hash function performance test configuration section. Each performance test @@ -67,11 +64,7 @@ * The five arrays below control what tests are performed. Every combination * from the array entries is tested. */ -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2 static rte_hash_function hashtest_funcs[] = {rte_jhash, rte_hash_crc}; -#else -static rte_hash_function hashtest_funcs[] = {rte_jhash}; -#endif static uint32_t hashtest_initvals[] = {0}; static uint32_t hashtest_key_lens[] = {0, 2, 4, 5, 6, 7, 8, 10, 11, 15, 16, 21, 31, 32, 33, 63, 64}; /******************************************************************************/ diff --git a/app/test/test_hash_perf.c b/app/test/test_hash_perf.c index be34957..05a88ec 100644 --- a/app/test/test_hash_perf.c +++ b/app/test/test_hash_perf.c @@ -56,10 +56,7 @@ #include #include #include - -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2 #include -#endif /* Types of hash table performance test that can be performed */ enum hash_test_t { @@ -97,11 +94,7 @@ struct tbl_perf_test_params { */ #define HASHTEST_ITERATIONS 1000000 -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2 static rte_hash_function hashtest_funcs[] = {rte_jhash, rte_hash_crc}; -#else -static rte_hash_function hashtest_funcs[] = {rte_jhash}; -#endif static uint32_t hashtest_initvals[] = {0}; static uint32_t hashtest_key_lens[] = {2, 4, 5, 6, 7, 8, 10, 11, 15, 16, 21, 31, 32, 33, 63, 64}; /******************************************************************************/ @@ -243,7 +236,6 @@ struct tbl_perf_test_params tbl_perf_params[] = { LOOKUP, ITERATIONS, 1048576, 4, 64, rte_jhash, 0}, { LOOKUP, ITERATIONS, 1048576, 8, 64, rte_jhash, 0}, { LOOKUP, ITERATIONS, 1048576, 16, 64, rte_jhash, 0}, -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2 /* Small table, add */ /* Test type | Iterations | Entries | BucketSize | KeyLen | HashFunc | InitVal */ { ADD_ON_EMPTY, 1024, 1024, 1, 16, rte_hash_crc, 0}, @@ -376,7 +368,6 @@ struct tbl_perf_test_params tbl_perf_params[] = { LOOKUP, ITERATIONS, 1048576, 4, 64, rte_hash_crc, 0}, { LOOKUP, ITERATIONS, 1048576, 8, 64, rte_hash_crc, 0}, { LOOKUP, ITERATIONS, 1048576, 16, 64, rte_hash_crc, 0}, -#endif }; /******************************************************************************/ @@ -423,10 +414,8 @@ static const char *get_hash_name(rte_hash_function f) if (f == rte_jhash) return "jhash"; -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2 if (f == rte_hash_crc) return "rte_hash_crc"; -#endif return "UnknownHash"; }