From patchwork Fri May 20 10:12:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 111535 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 13337A0503; Fri, 20 May 2022 12:12:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9590142BAB; Fri, 20 May 2022 12:12:13 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 7C072427F3 for ; Fri, 20 May 2022 12:12:09 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 8132F20F9C12; Fri, 20 May 2022 03:12:08 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 8132F20F9C12 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1653041528; bh=wDY0tYiJXqNlBO5CDa3Y9YriY6PctA2FXYUCUdNUpsk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WJac8H+sqfbtF915tnpvG916fdv4bYIMh1NEdaMYSzezMkk9BwLY0jaCcm2dNcwkb wIdxNwYeq1PwY0QwlAV4b8F/z2j6OS+S9iXrrbyf2zXCOTE8Rx7q4pm/O1uFfylQn6 9mqjjgX4XxfHzERZrYv7bsT9/DrB0L2nC3wox1kc= From: Tyler Retzlaff To: dev@dpdk.org Cc: thomas@monjalon.net, dmitry.kozliuk@gmail.com, gakhil@marvell.com, roy.fan.zhang@intel.com, Tyler Retzlaff Subject: [PATCH v2 1/2] test/crypto: remove Windows conditional compilation Date: Fri, 20 May 2022 03:12:05 -0700 Message-Id: <1653041526-5872-2-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1653041526-5872-1-git-send-email-roretzla@linux.microsoft.com> References: <1648544551-21324-1-git-send-email-roretzla@linux.microsoft.com> <1653041526-5872-1-git-send-email-roretzla@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org build the test/crypto harnesses on windows to allow them to be listed as tests to run. Signed-off-by: Tyler Retzlaff --- app/test/test_cryptodev.c | 3 --- app/test/test_cryptodev_asym.c | 3 --- app/test/test_cryptodev_blockcipher.c | 3 --- app/test/test_cryptodev_security_ipsec.c | 7 ++++--- app/test/test_cryptodev_security_pdcp.c | 3 --- 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index f444144..55ae536 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -3,8 +3,6 @@ * Copyright 2020 NXP */ -#ifndef RTE_EXEC_ENV_WINDOWS - #include #include @@ -16637,4 +16635,3 @@ struct test_crypto_vector { REGISTER_TEST_COMMAND(cryptodev_cn9k_autotest, test_cryptodev_cn9k); REGISTER_TEST_COMMAND(cryptodev_cn10k_autotest, test_cryptodev_cn10k); -#endif /* !RTE_EXEC_ENV_WINDOWS */ diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c index 573af2a..0d81405 100644 --- a/app/test/test_cryptodev_asym.c +++ b/app/test/test_cryptodev_asym.c @@ -3,8 +3,6 @@ * Copyright (c) 2019 Intel Corporation */ -#ifndef RTE_EXEC_ENV_WINDOWS - #include #include #include @@ -2266,4 +2264,3 @@ static inline void print_asym_capa( REGISTER_TEST_COMMAND(cryptodev_cn9k_asym_autotest, test_cryptodev_cn9k_asym); REGISTER_TEST_COMMAND(cryptodev_cn10k_asym_autotest, test_cryptodev_cn10k_asym); -#endif /* !RTE_EXEC_ENV_WINDOWS */ diff --git a/app/test/test_cryptodev_blockcipher.c b/app/test/test_cryptodev_blockcipher.c index 4944591..31c2d9f 100644 --- a/app/test/test_cryptodev_blockcipher.c +++ b/app/test/test_cryptodev_blockcipher.c @@ -2,8 +2,6 @@ * Copyright(c) 2015-2017 Intel Corporation */ -#ifndef RTE_EXEC_ENV_WINDOWS - #include #include #include @@ -1220,4 +1218,3 @@ struct unit_test_suite * free(ts); } -#endif /* !RTE_EXEC_ENV_WINDOWS */ diff --git a/app/test/test_cryptodev_security_ipsec.c b/app/test/test_cryptodev_security_ipsec.c index 14c6ba6..ca60deb 100644 --- a/app/test/test_cryptodev_security_ipsec.c +++ b/app/test/test_cryptodev_security_ipsec.c @@ -2,8 +2,6 @@ * Copyright(C) 2021 Marvell. */ -#ifndef RTE_EXEC_ENV_WINDOWS - #include #include #include @@ -17,6 +15,10 @@ #define IV_LEN_MAX 16 +#ifndef IPVERSION +#define IPVERSION 4 +#endif + struct crypto_param_comb alg_list[RTE_DIM(aead_list) + (RTE_DIM(cipher_list) * RTE_DIM(auth_list))]; @@ -1199,4 +1201,3 @@ struct crypto_param_comb alg_list[RTE_DIM(aead_list) + return 0; } -#endif /* !RTE_EXEC_ENV_WINDOWS */ diff --git a/app/test/test_cryptodev_security_pdcp.c b/app/test/test_cryptodev_security_pdcp.c index 30d86fb..b8016a0 100644 --- a/app/test/test_cryptodev_security_pdcp.c +++ b/app/test/test_cryptodev_security_pdcp.c @@ -4,8 +4,6 @@ * Copyright 2018-2019 NXP */ -#ifndef RTE_EXEC_ENV_WINDOWS - #include #include @@ -590,4 +588,3 @@ static int uplane_encap_no_integrity(uint32_t sn_size, uint8_t dir, return n - i; }; -#endif /* !RTE_EXEC_ENV_WINDOWS */ From patchwork Fri May 20 10:12:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 111534 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 74260A0503; Fri, 20 May 2022 12:12:15 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AB20242BA4; Fri, 20 May 2022 12:12:12 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 610E1427ED for ; Fri, 20 May 2022 12:12:09 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 8D80820F9C13; Fri, 20 May 2022 03:12:08 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 8D80820F9C13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1653041528; bh=KtMbYsiBVL1jzAQd8zHB+r50VLwbJvnrs/4tm9yFyo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gfIel5esd7AvJLuJUr9CbDvpNWj9QTOyUc06lv8CfK4YUahbgPW9wkU+cuQCyq0xx 8mxrKBxMImODisY9Gx1tSXIqUa5que0A26tmc+DvBLi9fh95P7/4QzbxfuaHLXvuYY dkDLR6OYkoRnFXEjFOtIDFO2lPbeciJKDABn4rOA= From: Tyler Retzlaff To: dev@dpdk.org Cc: thomas@monjalon.net, dmitry.kozliuk@gmail.com, gakhil@marvell.com, roy.fan.zhang@intel.com, Tyler Retzlaff Subject: [PATCH v2 2/2] test: enable most driver tests on Windows Date: Fri, 20 May 2022 03:12:06 -0700 Message-Id: <1653041526-5872-3-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1653041526-5872-1-git-send-email-roretzla@linux.microsoft.com> References: <1648544551-21324-1-git-send-email-roretzla@linux.microsoft.com> <1653041526-5872-1-git-send-email-roretzla@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org enable most of the driver tests to run on windows, most tests will be skipped since the drivers themselves are not available on windows. tests not removed from conditional run: cryptodev_openssl_asym_autotest test fails because it does not bother checking to see if required driver is available ias the other cryptodev tests do. the test should be updated to fix the issue. eventdev_selftest_octeontx, eventdev_selftest_sw because it has a dependency on eventdev library which doesn't build on windows. these should be resolved by including/running the tests dependent on if dpdk_conf.has('RTE_LIB_EVENT') dump_xxx tests are still to be evaluated, no attempt has been made to move these out of conditional run for windows. Signed-off-by: Tyler Retzlaff --- app/test/meson.build | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 15591ce..6f422c1 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -293,31 +293,32 @@ perf_test_names = [ 'thash_perf_autotest', ] -driver_test_names = [] +driver_test_names = [ + 'cryptodev_aesni_gcm_autotest', + 'cryptodev_aesni_mb_autotest', + 'cryptodev_cn10k_autotest', + 'cryptodev_cn9k_autotest', + 'cryptodev_dpaa2_sec_autotest', + 'cryptodev_dpaa_sec_autotest', + 'cryptodev_null_autotest', + 'cryptodev_openssl_autotest', + 'cryptodev_qat_autotest', + 'cryptodev_sw_armv8_autotest', + 'cryptodev_sw_kasumi_autotest', + 'cryptodev_sw_mvsam_autotest', + 'cryptodev_sw_snow3g_autotest', + 'cryptodev_sw_zuc_autotest', + 'dmadev_autotest', + 'rawdev_autotest', +] dump_test_names = [] if not is_windows driver_test_names += [ - 'cryptodev_aesni_mb_autotest', - 'cryptodev_aesni_gcm_autotest', - 'cryptodev_cn9k_autotest', - 'cryptodev_cn10k_autotest', - 'cryptodev_dpaa_sec_autotest', - 'cryptodev_dpaa2_sec_autotest', - 'cryptodev_null_autotest', - 'cryptodev_openssl_autotest', 'cryptodev_openssl_asym_autotest', - 'cryptodev_qat_autotest', - 'cryptodev_sw_armv8_autotest', - 'cryptodev_sw_kasumi_autotest', - 'cryptodev_sw_mvsam_autotest', - 'cryptodev_sw_snow3g_autotest', - 'cryptodev_sw_zuc_autotest', - 'dmadev_autotest', 'eventdev_selftest_octeontx', 'eventdev_selftest_sw', - 'rawdev_autotest', ] dump_test_names += [