From patchwork Tue Apr 3 16:01:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavan Nikhilesh X-Patchwork-Id: 36972 X-Patchwork-Delegate: jerinj@marvell.com 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 E17761B7F4; Tue, 3 Apr 2018 18:01:58 +0200 (CEST) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0089.outbound.protection.outlook.com [104.47.34.89]) by dpdk.org (Postfix) with ESMTP id 62FFF1B7F4 for ; Tue, 3 Apr 2018 18:01:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=zs692TWILIXKqpj+PStYvzWrjwzwDtgtodVAdJHx0Cg=; b=BHqbpNNTCLYnpqzMU0Yp8V8k5gotvlxcJy55FeiFg+eOAX5jg7v7ymr43M68EYIs1mNF2nDuHXDzGB2nQyeIOU00fyN4V6x9+BFMgtQOgd/pA0RFOsy5Zwj/VCfIZ9pbDwzVV1RyyrHPt2u4wghc5/SUPTTc4Zmmdf1b1hnPyS8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavan.Bhagavatula@cavium.com; Received: from ltp-pvn.caveonetworks.com (111.93.218.67) by DM5PR07MB3465.namprd07.prod.outlook.com (2603:10b6:4:67::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.631.10; Tue, 3 Apr 2018 16:01:51 +0000 From: Pavan Nikhilesh To: jerin.jacob@caviumnetworks.com, santosh.shukla@caviumnetworks.com, erik.g.carrillo@intel.com Cc: dev@dpdk.org, Pavan Nikhilesh Date: Tue, 3 Apr 2018 21:31:31 +0530 Message-Id: <20180403160134.27355-1-pbhagavatula@caviumnetworks.com> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180318131216.11699-1-pbhagavatula@caviumnetworks.com> References: <20180318131216.11699-1-pbhagavatula@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: CO2PR04CA0090.namprd04.prod.outlook.com (2603:10b6:104:6::16) To DM5PR07MB3465.namprd07.prod.outlook.com (2603:10b6:4:67::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cdd4f41a-6139-437c-560d-08d5997c3807 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603328)(7153060)(7193020); SRVR:DM5PR07MB3465; X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3465; 3:ERqNTIK8h8I/jI+jEpKZcrbaZlmmIrrJ1EpPedcbe1pZltYoaEmGtj3XPLWBg4bCGuvsG6FOt2YEsAn9cbWZD+e4XM645L/4hCAgbKqszOBhw9LCVa9gP5MOZ9o/uC0o8+x61N9ukbMDerCFd5YR6mqMSDnWNAZYsjTKWZ4UmGZ1mb3y9x/fR5svXq8RkgEbrfQWr+esVKfsOfvq9xtTAU/6SxJiMCPMGmRvretjEgquEj24iX00xg5Q7i/k34xs; 25:ZBS7/odDTo3+lcggIqgq8G5m2nFtlKTdiukXbAXCDg2htdsu3C+EbltYA53bHADTMuvXvvtrp+gqo5BQ27ffkWoQoEuey+7OGYpWz8HsVg+OU+VyRdrtoXZ361OPk048LNWI8672lABIYl7fwX/4g425AaQQVS1LgFmEGYs25G5M4/g/bxeeTzDcOvAP9I/eNpQfBhkssKpj5xYuSbhEQnJGjUVuaEpLj/Q4Ij2lrgiwQmNOMz8m+Qy4wgJlmd6bos5mKPme2kcJRAJi5Q6xhvzfGYRh+ZZ5mXz+BSIVmzm6MjB2Itji1sF3bklpNe4l0D/CKs7kJfCMmcX+TlyeAw==; 31:0WSCgmMcZPq1yZ53oIo8+hjAqML2ZgnHhDY2vKNx6KRdVgRoswwzCxzxUQudVDVpBr0229Xy/NUq+wF3Ck2N1EiCnEh2uHDKpBPbfOkzcokvup14rhp3b99DE3ZjPU5hKhi7Pi9dVojWqAVwFo64p98M5bdYWjJXI1bxAWGfqGs/XUQke3NYo02QrPdvAD1KFB8c/fCmC91gR5MYxgBoB7Slk+JniAMGeq6QFGiuS9E= X-MS-TrafficTypeDiagnostic: DM5PR07MB3465: X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3465; 20:7WToOnoM2Y8da3XwwRE85UAmYPaI/UZ8+qe6f4u4y0DpfSX0Bf6Wa41FNey2BIMSgDpDtctwE2GrlwYloI9j9p3CwNbFq/zxGxJaAA0EgjgbsAaNkN+mmv52JI0Ij+XAmXqiIINDKzdsCU+YUWNVPsm4LlsKn7IS+2+LXKtaytAPgCDUu6kdtc/TDDqftUe6F8pwTgo4RiswF2jVwGOE543IqVFKMN29x6lATFaz8fP9GHxesW7xxLi47PBg0g8/uMbl+gU+2V4iuDeKyS++kKNnE8pQBgIo2IUCPnpxY96wagbfU1XIusTX92Ba+NYe8gJ3zOWgoPwZ+Pjc1EiFI0qHw6E0o/kYe2WNtUdeQzwKQBodj1x6rnD3z+MhFP/1+dLrYd1UirbwaRZKSdFtv5GAKRAttHv1YFvHl7yj9etbjZSmDMIb6Sz3J2n1542dcjKZsrm0mf92W8edMHvXo65x7xjZkBTgXjGn+8iG+2Ja2ZvRivoikUJYk/UUU/10KihrvURLD2zojo52pb5aMXDRQZDjDcfbblr4myiSAD93pqkBkvvwlwLCfPpZhjgJGg2TvfBpGYjCbjK9kMqANhwjzSNswuBjSKQs++QPpYw=; 4:xzWKjjaYl2KSSockqP+Oczckfub3NZc36vvA/GkEs2RZEXGW0ztus50tAbNDu+4jr1rDUvxVrSnT9IJJa6hB8sAC3v2YNnmXqK7xlEv7vRq674d04h+FlpwmjoZjtX8R2EOEB16lQ8iL7zQkQ3IUKxV/aMxzNOe3ImQaqpT4Gb1NNHKY6NtNHG2ajJiOmo+ocLtwMWHuHuYDiGqD5BJY19o205zLZ9BWzyE7ezQNVitZpPHC2wo7pFnFw9kvydfAgEMaDwy6o6CmHdp6USYPFUtjdU1sOkwcyK9T7KQlN58gjhilYuXygUlfnGO2pqvE X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(131327999870524); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(3002001)(10201501046)(3231221)(944501327)(52105095)(6041310)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR07MB3465; BCL:0; PCL:0; RULEID:; SRVR:DM5PR07MB3465; X-Forefront-PRVS: 0631F0BC3D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(376002)(39860400002)(39380400002)(366004)(396003)(346002)(189003)(199004)(52116002)(50466002)(386003)(6506007)(5009440100003)(1076002)(6666003)(42882007)(6486002)(48376002)(2906002)(16526019)(25786009)(69596002)(59450400001)(51416003)(76176011)(446003)(4326008)(81166006)(81156014)(11346002)(106356001)(105586002)(68736007)(7736002)(5660300001)(53936002)(478600001)(6512007)(316002)(66066001)(47776003)(36756003)(97736004)(305945005)(1857600001)(72206003)(476003)(956004)(2616005)(8676002)(486005)(6116002)(3846002)(486005)(8936002)(16586007)(26005)(575784001)(50226002)(53416004)(107886003)(42262002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR07MB3465; H:ltp-pvn.caveonetworks.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR07MB3465; 23:COi0b8wOpWO6aHgXI/CKluVbjo96P9ZZrADOdEUSK?= GKq9fiou3ad69nRNb/CYCUb33EQ7ZDw8Lt2y7gzyiizwBfjNnl9akaCpB2SuRi62yOrDo+FbCTolGf7hPGlYvj2KzOoIZwe08WMfDoXqyU0YZ1htI0ZtYpL4Gh4foWHyB/tNLEiuITcYNsFlzrxhLc5PMpAJYY3Wz9ec3MoWqML8rOVz41W86rFWAqfv5bOGe0cgM6hECanDeR7QTHVlD/BOSg1B4nL+v6sej/ZaN5KSSNLFvD84DntDZaZWHE3m/CCJlT4G9okWfZX7tm/gZ+8Vsz3d2kuTzBdZ8Zu184G8kaMO2KKGjvJV9x2Jpa1dbnPMqcv8SNFbaGbQIHZjsZY8lhJQE/MiL/cgvC13BQLoiUrKMMPOOcmocIDl76b/pkyuEnzrCHryUjN9W/3rM8a1ns4GE1tjwqaz6h2lBcVG1RU2BwdWxqfGem3aq2BPbtXxeb5U2zMTS0Ox57/jkUusQQt3aciHNFSpybVH6e0fGx9/Gy2bJOGctju10yxNloWiGIeDgl+hbmzEgfjTzdkmdJos3HqZuIZunUG4vMTdVxGhXvU511bSQFq9G37HXrKFcgimjRE1MRH1C7IjCNjZDSHlqKlx8DFmr+1NQgmd7IBnHuSqzJGn3AnYBd19uDtJRef/6dUIwkE8Q6INTB1dGcpT2zHuqBVYgXB1+wga9wJDrp5ruC2+PNnCMquHDm4ghvOlAXYzXX/Q2RVGLOpVGquY1H5SLLgu2nKZ2ML7+q3NPuF6erbh+0TDD3QRMTfN0UdbMYWEUQzMyHtjPuwTVVQctMr1ane9C/k+ODOR2JZVUwXldNtznt6Ueqgj1zFQEPqavS8Drc8N3iWK4NwfN3IgOAmxxbJpfmex5ag5G6HyMImKoYFd2+uYMPASQPqyQrhqvhc7DDHPugIygMvsfNufr/0OobTBD1vXCW22w8uUc7vgnA8jplBZYP96PEnWko6N7Nljm8RFO5dZQzLmND7ARbaL0wWAO53R+TaY3uyCMxq7+JZkfEBcY3en8HWSoSRvV6LinykWFKWl3q6nlqwcuKemNFfavaNLSe+5gk8nE+rBBumHboG7Iaj1wAkPTWzPrAqJ16kbENjvaf0eJWfOX4k/kyD1hhMN8cvyA5nZzJttgEcdYs2FBmbNR63WM+F0g37zNd2nME9xybikZfl7OClikgT44C0WxQTBKqLrZ+FDNC5PAVkYPbH0i+T5C735D4lyxmAtWiyKpyl5D+sHchp8wF1+QzidulO3/fIWi/Kd2ZVmpTzZ4OWlol6XWkeMh4w7hlqvCbDeDOd8BdHc/ioRJv4LDgiRT40UMsgT/lV33EeSgSJcwqiq9UEOt/6Y64CbFGj72jmEqFkoRM3jx3si2JHYD3Y1KnHCbDQbdA/LlNhHWsINAkhl95aGvfa3UydKmPQ+e5Q7PMQjTc9OufuXh/HGzhjOuqmzw== X-Microsoft-Antispam-Message-Info: aZwyYFo5jJpWbV4C4N1U9ncOOOleYHRRNnt32yO3x0cZ8O0qPGOLpTTiQhiUoArX3b+vbXJZxIYSpoWguk+eVgJ6ICfdCKIDxH+M3xkuEPVWV54/fdQdir1SW8aqXHiwDEoiIP9/Dt1ZeQG52T+BYVyaqE5UoXenjVI/o9yzxRSM3hbEQt1FtP+55nPlMqfK X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3465; 6:J4o/aNjIWMT6T5KphSYKp3nVII/PNy0n8KBIB2X+w7DaG1/Y/LOJpfsUpes3jUZ+jxKIXoHdMFjm+Yr71RdbKCd+xR7SeaYNbCalaU3hCdZF6Qg6t09/O0K3jjHrCwjwBd/jcp8F4tH+2N90a0t1fU48cocWS4W5mvKP34pJSJfJPpYyGAsuBKz3pGUP9XLtMaBwCKhM89JLDxNlfP+6CEinnSi0SMrKrkS6pAaCg+SrMzx8c/M5/NgT2L0M6XqGiypCevZqPhVn5OuKEj/l40IVj0v3cGiXsWhpttDWE1tbrh+ycvRdX/EQDcxgW7xzbdAdOWmDY9UjXGBUaxIOyNYIMmYqQdXps7KRFLDZfOTBHayaqkmb0J0oegD6ewCiE+kH9ix1MXe2reTwCvUfekTyv5PbRkTFnSpCC4cJ2jz9ZEoSt35dxrOs/f2ZPbLvl12uAh29zBIJTxSV6OrMbg==; 5:bEQ7wtrKa1Sk9x4I7G1F786ehfGTR/kCsuJJXkRw2afkE2VATqtcGVL8i2h/tf7/D/+a7tK25miHHhDGc3NR36AATIEApKhiWCSk8WBoQSFluhVzK1HvOfD5uwwhSjWmSuB/WYBrW0uX8O3mJYTD2aia6qCW3DBLq6okopEjkIY=; 24:wJZGiKhr9WfoHZuAEUdks5ghoxiXQ2BukjXnOgrtJlo4YyVaohF6o8AZ/WAt5wdvW8MgfxZ9exKcoFug3jYxKIUoUbLUDxpsJrhSJj3eJgo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3465; 7:rn0vxwVufE6WXEIGoeGKB0SzvgW4huYhAsoDcGj1VXhd7nRcXm+t7Q/WBD1NS7KAn1ps5WABmz6LkKS2Ce73WAIwz226FPJd7LTs8G9kVR+VUdn7e9Upz+NzArJ8k83GfTmpHwRNE6c4g4iBH1XtOVkr3KaU1fY7edEp8OKnvLX/n0mp+kssG0/tevdLksa1N/nRYb2TwWTJeayaH4gGHgjQPBxfDUKzYH8u7sezU0b/cxVQB/vsNmz4EwgxjCp0 X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2018 16:01:51.8111 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cdd4f41a-6139-437c-560d-08d5997c3807 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR07MB3465 Subject: [dpdk-dev] [PATCH v2 1/4] app/eventdev: add event timer adapter as a producer 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" Add event timer adapter as producer option that can be selected by passing --prod_type_timerdev. Signed-off-by: Pavan Nikhilesh Acked-by: Erik Gabriel Carrillo --- v2 Changes: - set timer to NOT_ARMED before trying to arm it. - prevent edge cases for timeout_ticks being set to 0. app/test-eventdev/evt_options.c | 54 +++++++---- app/test-eventdev/evt_options.h | 9 ++ app/test-eventdev/test_perf_atq.c | 10 +-- app/test-eventdev/test_perf_common.c | 170 +++++++++++++++++++++++++++++++++-- app/test-eventdev/test_perf_common.h | 7 ++ app/test-eventdev/test_perf_queue.c | 7 +- 6 files changed, 221 insertions(+), 36 deletions(-) -- 2.16.2 diff --git a/app/test-eventdev/evt_options.c b/app/test-eventdev/evt_options.c index 9683b2224..49cd9c419 100644 --- a/app/test-eventdev/evt_options.c +++ b/app/test-eventdev/evt_options.c @@ -27,6 +27,11 @@ evt_options_default(struct evt_options *opt) opt->pool_sz = 16 * 1024; opt->wkr_deq_dep = 16; opt->nb_pkts = (1ULL << 26); /* do ~64M packets */ + opt->nb_timers = 1E8; + opt->nb_timer_adptrs = 1; + opt->bkt_tck_nsec = 1E3; /* 1000ns ~ 1us */ + opt->max_tmo_nsec = 1E5; /* 100us */ + opt->nb_bkt_tcks = 10; /* 50us */ opt->prod_type = EVT_PROD_TYPE_SYNT; } @@ -86,6 +91,13 @@ evt_parse_eth_prod_type(struct evt_options *opt, const char *arg __rte_unused) return 0; } +static int +evt_parse_timer_prod_type(struct evt_options *opt, const char *arg __rte_unused) +{ + opt->prod_type = EVT_PROD_TYPE_EVENT_TIMER_ADPTR; + return 0; +} + static int evt_parse_test_name(struct evt_options *opt, const char *arg) { @@ -169,7 +181,10 @@ usage(char *program) "\t--worker_deq_depth : dequeue depth of the worker\n" "\t--fwd_latency : perform fwd_latency measurement\n" "\t--queue_priority : enable queue priority\n" - "\t--prod_type_ethdev : use ethernet device as producer\n." + "\t--prod_type_ethdev : use ethernet device as producer.\n" + "\t--prod_type_timerdev : use event timer device as producer.\n" + "\t x * bkt_tck_nsec would be the timeout\n" + "\t in ns.\n" ); printf("available tests:\n"); evt_test_dump_names(); @@ -217,22 +232,23 @@ evt_parse_sched_type_list(struct evt_options *opt, const char *arg) } static struct option lgopts[] = { - { EVT_NB_FLOWS, 1, 0, 0 }, - { EVT_DEVICE, 1, 0, 0 }, - { EVT_VERBOSE, 1, 0, 0 }, - { EVT_TEST, 1, 0, 0 }, - { EVT_PROD_LCORES, 1, 0, 0 }, - { EVT_WORK_LCORES, 1, 0, 0 }, - { EVT_SOCKET_ID, 1, 0, 0 }, - { EVT_POOL_SZ, 1, 0, 0 }, - { EVT_NB_PKTS, 1, 0, 0 }, - { EVT_WKR_DEQ_DEP, 1, 0, 0 }, - { EVT_SCHED_TYPE_LIST, 1, 0, 0 }, - { EVT_FWD_LATENCY, 0, 0, 0 }, - { EVT_QUEUE_PRIORITY, 0, 0, 0 }, - { EVT_PROD_ETHDEV, 0, 0, 0 }, - { EVT_HELP, 0, 0, 0 }, - { NULL, 0, 0, 0 } + { EVT_NB_FLOWS, 1, 0, 0 }, + { EVT_DEVICE, 1, 0, 0 }, + { EVT_VERBOSE, 1, 0, 0 }, + { EVT_TEST, 1, 0, 0 }, + { EVT_PROD_LCORES, 1, 0, 0 }, + { EVT_WORK_LCORES, 1, 0, 0 }, + { EVT_SOCKET_ID, 1, 0, 0 }, + { EVT_POOL_SZ, 1, 0, 0 }, + { EVT_NB_PKTS, 1, 0, 0 }, + { EVT_WKR_DEQ_DEP, 1, 0, 0 }, + { EVT_SCHED_TYPE_LIST, 1, 0, 0 }, + { EVT_FWD_LATENCY, 0, 0, 0 }, + { EVT_QUEUE_PRIORITY, 0, 0, 0 }, + { EVT_PROD_ETHDEV, 0, 0, 0 }, + { EVT_PROD_TIMERDEV, 0, 0, 0 }, + { EVT_HELP, 0, 0, 0 }, + { NULL, 0, 0, 0 } }; static int @@ -255,11 +271,12 @@ evt_opts_parse_long(int opt_idx, struct evt_options *opt) { EVT_FWD_LATENCY, evt_parse_fwd_latency}, { EVT_QUEUE_PRIORITY, evt_parse_queue_priority}, { EVT_PROD_ETHDEV, evt_parse_eth_prod_type}, + { EVT_PROD_TIMERDEV, evt_parse_timer_prod_type}, }; for (i = 0; i < RTE_DIM(parsermap); i++) { if (strncmp(lgopts[opt_idx].name, parsermap[i].lgopt_name, - strlen(parsermap[i].lgopt_name)) == 0) + strlen(lgopts[opt_idx].name)) == 0) return parsermap[i].parser_fn(opt, optarg); } @@ -305,6 +322,7 @@ evt_options_dump(struct evt_options *opt) evt_dump("pool_sz", "%d", opt->pool_sz); evt_dump("master lcore", "%d", rte_get_master_lcore()); evt_dump("nb_pkts", "%"PRIu64, opt->nb_pkts); + evt_dump("nb_timers", "%"PRIu64, opt->nb_timers); evt_dump_begin("available lcores"); RTE_LCORE_FOREACH(lcore_id) printf("%d ", lcore_id); diff --git a/app/test-eventdev/evt_options.h b/app/test-eventdev/evt_options.h index 46d122229..37debae84 100644 --- a/app/test-eventdev/evt_options.h +++ b/app/test-eventdev/evt_options.h @@ -31,12 +31,14 @@ #define EVT_FWD_LATENCY ("fwd_latency") #define EVT_QUEUE_PRIORITY ("queue_priority") #define EVT_PROD_ETHDEV ("prod_type_ethdev") +#define EVT_PROD_TIMERDEV ("prod_type_timerdev") #define EVT_HELP ("help") enum evt_prod_type { EVT_PROD_TYPE_NONE, EVT_PROD_TYPE_SYNT, /* Producer type Synthetic i.e. CPU. */ EVT_PROD_TYPE_ETH_RX_ADPTR, /* Producer type Eth Rx Adapter. */ + EVT_PROD_TYPE_EVENT_TIMER_ADPTR, /* Producer type Eth Rx Adapter. */ EVT_PROD_TYPE_MAX, }; @@ -52,11 +54,18 @@ struct evt_options { int nb_stages; int verbose_level; uint64_t nb_pkts; + uint8_t nb_timer_adptrs; + uint64_t nb_timers; + uint64_t bkt_tck_nsec; + uint64_t optm_bkt_tck_nsec; + uint64_t max_tmo_nsec; + uint64_t nb_bkt_tcks; uint16_t wkr_deq_dep; uint8_t dev_id; uint32_t fwd_latency:1; uint32_t q_priority:1; enum evt_prod_type prod_type; + uint8_t timdev_cnt; }; void evt_options_default(struct evt_options *opt); diff --git a/app/test-eventdev/test_perf_atq.c b/app/test-eventdev/test_perf_atq.c index b36b22a77..b3a312722 100644 --- a/app/test-eventdev/test_perf_atq.c +++ b/app/test-eventdev/test_perf_atq.c @@ -43,15 +43,12 @@ perf_atq_worker(void *arg, const int enable_fwd_latency) while (t->done == false) { uint16_t event = rte_event_dequeue_burst(dev, port, &ev, 1, 0); - if (enable_fwd_latency) - rte_prefetch0(ev.event_ptr); - if (!event) { rte_pause(); continue; } - if (enable_fwd_latency) + if (enable_fwd_latency && !prod_timer_type) /* first stage in pipeline, mark ts to compute fwd latency */ atq_mark_fwd_latency(&ev); @@ -90,7 +87,7 @@ perf_atq_worker_burst(void *arg, const int enable_fwd_latency) } for (i = 0; i < nb_rx; i++) { - if (enable_fwd_latency) { + if (enable_fwd_latency && !prod_timer_type) { rte_prefetch0(ev[i+1].event_ptr); /* first stage in pipeline. * mark time stamp to compute fwd latency @@ -163,7 +160,8 @@ perf_atq_eventdev_setup(struct evt_test *test, struct evt_options *opt) struct rte_event_dev_info dev_info; nb_ports = evt_nr_active_lcores(opt->wlcores); - nb_ports += opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR ? 0 : + nb_ports += (opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR || + opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR) ? 0 : evt_nr_active_lcores(opt->plcores); nb_queues = atq_nb_event_queues(opt); diff --git a/app/test-eventdev/test_perf_common.c b/app/test-eventdev/test_perf_common.c index 59fa0a49e..39072eb5d 100644 --- a/app/test-eventdev/test_perf_common.c +++ b/app/test-eventdev/test_perf_common.c @@ -72,6 +72,66 @@ perf_producer(void *arg) return 0; } +static inline int +perf_event_timer_producer(void *arg) +{ + struct prod_data *p = arg; + struct test_perf *t = p->t; + struct evt_options *opt = t->opt; + uint32_t flow_counter = 0; + uint64_t count = 0; + uint64_t arm_latency = 0; + const uint8_t nb_timer_adptrs = opt->nb_timer_adptrs; + const uint32_t nb_flows = t->nb_flows; + const uint64_t nb_timers = opt->nb_timers; + struct rte_mempool *pool = t->pool; + struct perf_elt *m = NULL; + struct rte_event_timer_adapter **adptr = t->timer_adptr; + uint64_t timeout_ticks = opt->optm_bkt_tck_nsec ? + (opt->nb_bkt_tcks * opt->bkt_tck_nsec) + / opt->optm_bkt_tck_nsec : opt->nb_bkt_tcks; + + timeout_ticks += timeout_ticks ? 0 : 1; + const struct rte_event_timer tim = { + .ev.op = RTE_EVENT_OP_NEW, + .ev.queue_id = p->queue_id, + .ev.sched_type = t->opt->sched_type_list[0], + .ev.priority = RTE_EVENT_DEV_PRIORITY_NORMAL, + .ev.event_type = RTE_EVENT_TYPE_TIMER, + .state = RTE_EVENT_TIMER_NOT_ARMED, + .timeout_ticks = timeout_ticks, + }; + + if (opt->verbose_level > 1) + printf("%s(): lcore %d\n", __func__, rte_lcore_id()); + + while (count < nb_timers && t->done == false) { + if (rte_mempool_get(pool, (void **)&m) < 0) + continue; + + m->tim = tim; + m->tim.ev.flow_id = flow_counter++ % nb_flows; + m->tim.ev.event_ptr = m; + m->timestamp = rte_get_timer_cycles(); + while (rte_event_timer_arm_burst( + adptr[flow_counter % nb_timer_adptrs], + (struct rte_event_timer **)&m, 1) != 1) { + if (t->done) + break; + rte_pause(); + m->timestamp = rte_get_timer_cycles(); + } + arm_latency += rte_get_timer_cycles() - m->timestamp; + count++; + } + fflush(stdout); + rte_delay_ms(1000); + printf("%s(): lcore %d Average event timer arm latency = %.3f us\n", + __func__, rte_lcore_id(), (float)(arm_latency / count) / + (rte_get_timer_hz() / 1000000)); + return 0; +} + static int perf_producer_wrapper(void *arg) { @@ -80,6 +140,8 @@ perf_producer_wrapper(void *arg) /* Launch the producer function only in case of synthetic producer. */ if (t->opt->prod_type == EVT_PROD_TYPE_SYNT) return perf_producer(arg); + else if (t->opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR) + return perf_event_timer_producer(arg); return 0; } @@ -146,8 +208,7 @@ perf_launch_lcores(struct evt_test *test, struct evt_options *opt, port_idx++; } - const uint64_t total_pkts = opt->nb_pkts * - evt_nr_active_lcores(opt->plcores); + const uint64_t total_pkts = t->outstand_pkts; uint64_t dead_lock_cycles = rte_get_timer_cycles(); int64_t dead_lock_remaining = total_pkts; @@ -189,7 +250,9 @@ perf_launch_lcores(struct evt_test *test, struct evt_options *opt, if (remaining <= 0) { t->result = EVT_TEST_SUCCESS; - if (opt->prod_type == EVT_PROD_TYPE_SYNT) { + if (opt->prod_type == EVT_PROD_TYPE_SYNT || + opt->prod_type == + EVT_PROD_TYPE_EVENT_TIMER_ADPTR) { t->done = true; rte_smp_wmb(); break; @@ -283,6 +346,65 @@ perf_event_rx_adapter_setup(struct evt_options *opt, uint8_t stride, return ret; } +static int +perf_event_timer_adapter_setup(struct test_perf *t) +{ + int i; + int ret; + struct rte_event_timer_adapter_info adapter_info; + struct rte_event_timer_adapter *wl; + uint8_t nb_producers = evt_nr_active_lcores(t->opt->plcores); + uint8_t flags = RTE_EVENT_TIMER_ADAPTER_F_ADJUST_RES; + + if (nb_producers == 1) + flags |= RTE_EVENT_TIMER_ADAPTER_F_SP_PUT; + + for (i = 0; i < t->opt->nb_timer_adptrs; i++) { + struct rte_event_timer_adapter_conf config = { + .event_dev_id = t->opt->dev_id, + .timer_adapter_id = i, + .timer_tick_ns = t->opt->bkt_tck_nsec, + .max_tmo_ns = t->opt->max_tmo_nsec, + .nb_timers = 2 * 1024 * 1024, + .flags = flags, + }; + + wl = rte_event_timer_adapter_create(&config); + if (wl == NULL) { + evt_err("failed to create event timer ring %d", i); + return rte_errno; + } + + memset(&adapter_info, 0, + sizeof(struct rte_event_timer_adapter_info)); + rte_event_timer_adapter_get_info(wl, &adapter_info); + t->opt->optm_bkt_tck_nsec = adapter_info.min_resolution_ns; + + if (!(adapter_info.caps & + RTE_EVENT_TIMER_ADAPTER_CAP_INTERNAL_PORT)) { + uint32_t service_id; + + rte_event_timer_adapter_service_id_get(wl, + &service_id); + ret = evt_service_setup(service_id); + if (ret) { + evt_err("Failed to setup service core" + " for timer adapter\n"); + return ret; + } + rte_service_runstate_set(service_id, 1); + } + + ret = rte_event_timer_adapter_start(wl); + if (ret) { + evt_err("failed to Start event timer adapter %d", i); + return ret; + } + t->timer_adptr[i] = wl; + } + return 0; +} + int perf_event_dev_port_setup(struct evt_test *test, struct evt_options *opt, uint8_t stride, uint8_t nb_queues, @@ -326,6 +448,18 @@ perf_event_dev_port_setup(struct evt_test *test, struct evt_options *opt, ret = perf_event_rx_adapter_setup(opt, stride, *port_conf); if (ret) return ret; + } else if (opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR) { + prod = 0; + for ( ; port < perf_nb_event_ports(opt); port++) { + struct prod_data *p = &t->prod[port]; + p->queue_id = prod * stride; + p->t = t; + prod++; + } + + ret = perf_event_timer_adapter_setup(t); + if (ret) + return ret; } else { prod = 0; for ( ; port < perf_nb_event_ports(opt); port++) { @@ -415,10 +549,13 @@ perf_opt_check(struct evt_options *opt, uint64_t nb_queues) } /* Fixups */ - if (opt->nb_stages == 1 && opt->fwd_latency) { + if ((opt->nb_stages == 1 && + opt->prod_type != EVT_PROD_TYPE_EVENT_TIMER_ADPTR) && + opt->fwd_latency) { evt_info("fwd_latency is valid when nb_stages > 1, disabling"); opt->fwd_latency = 0; } + if (opt->fwd_latency && !opt->q_priority) { evt_info("enabled queue priority for latency measurement"); opt->q_priority = 1; @@ -447,8 +584,13 @@ perf_opt_dump(struct evt_options *opt, uint8_t nb_queues) void perf_eventdev_destroy(struct evt_test *test, struct evt_options *opt) { - RTE_SET_USED(test); + int i; + struct test_perf *t = evt_test_priv(test); + if (opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR) { + for (i = 0; i < opt->nb_timer_adptrs; i++) + rte_event_timer_adapter_stop(t->timer_adptr[i]); + } rte_event_dev_stop(opt->dev_id); rte_event_dev_close(opt->dev_id); } @@ -488,7 +630,8 @@ perf_ethdev_setup(struct evt_test *test, struct evt_options *opt) }, }; - if (opt->prod_type == EVT_PROD_TYPE_SYNT) + if (opt->prod_type == EVT_PROD_TYPE_SYNT || + opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR) return 0; if (!rte_eth_dev_count()) { @@ -544,7 +687,8 @@ perf_mempool_setup(struct evt_test *test, struct evt_options *opt) { struct test_perf *t = evt_test_priv(test); - if (opt->prod_type == EVT_PROD_TYPE_SYNT) { + if (opt->prod_type == EVT_PROD_TYPE_SYNT || + opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR) { t->pool = rte_mempool_create(test->name, /* mempool name */ opt->pool_sz, /* number of elements*/ sizeof(struct perf_elt), /* element size*/ @@ -594,10 +738,18 @@ perf_test_setup(struct evt_test *test, struct evt_options *opt) struct test_perf *t = evt_test_priv(test); - t->outstand_pkts = opt->nb_pkts * evt_nr_active_lcores(opt->plcores); + if (opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR) { + t->outstand_pkts = opt->nb_timers * + evt_nr_active_lcores(opt->plcores); + t->nb_pkts = opt->nb_timers; + } else { + t->outstand_pkts = opt->nb_pkts * + evt_nr_active_lcores(opt->plcores); + t->nb_pkts = opt->nb_pkts; + } + t->nb_workers = evt_nr_active_lcores(opt->wlcores); t->done = false; - t->nb_pkts = opt->nb_pkts; t->nb_flows = opt->nb_flows; t->result = EVT_TEST_FAILED; t->opt = opt; diff --git a/app/test-eventdev/test_perf_common.h b/app/test-eventdev/test_perf_common.h index 9ad99733b..4e96f229c 100644 --- a/app/test-eventdev/test_perf_common.h +++ b/app/test-eventdev/test_perf_common.h @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -39,6 +40,7 @@ struct prod_data { struct test_perf *t; } __rte_cache_aligned; + struct test_perf { /* Don't change the offset of "done". Signal handler use this memory * to terminate all lcores work. @@ -54,9 +56,12 @@ struct test_perf { struct worker_data worker[EVT_MAX_PORTS]; struct evt_options *opt; uint8_t sched_type_list[EVT_MAX_STAGES] __rte_cache_aligned; + struct rte_event_timer_adapter *timer_adptr[ + RTE_EVENT_TIMER_ADAPTER_NUM_MAX] __rte_cache_aligned; } __rte_cache_aligned; struct perf_elt { + struct rte_event_timer tim; uint64_t timestamp; } __rte_cache_aligned; @@ -68,6 +73,8 @@ struct perf_elt { struct evt_options *opt = t->opt;\ const uint8_t dev = w->dev_id;\ const uint8_t port = w->port_id;\ + const uint8_t prod_timer_type = \ + opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR;\ uint8_t *const sched_type_list = &t->sched_type_list[0];\ struct rte_mempool *const pool = t->pool;\ const uint8_t nb_stages = t->opt->nb_stages;\ diff --git a/app/test-eventdev/test_perf_queue.c b/app/test-eventdev/test_perf_queue.c index db8f2f3e5..74469a5ee 100644 --- a/app/test-eventdev/test_perf_queue.c +++ b/app/test-eventdev/test_perf_queue.c @@ -49,7 +49,7 @@ perf_queue_worker(void *arg, const int enable_fwd_latency) rte_pause(); continue; } - if (enable_fwd_latency) + if (enable_fwd_latency && !prod_timer_type) /* first q in pipeline, mark timestamp to compute fwd latency */ mark_fwd_latency(&ev, nb_stages); @@ -88,7 +88,7 @@ perf_queue_worker_burst(void *arg, const int enable_fwd_latency) } for (i = 0; i < nb_rx; i++) { - if (enable_fwd_latency) { + if (enable_fwd_latency && !prod_timer_type) { rte_prefetch0(ev[i+1].event_ptr); /* first queue in pipeline. * mark time stamp to compute fwd latency @@ -161,7 +161,8 @@ perf_queue_eventdev_setup(struct evt_test *test, struct evt_options *opt) struct rte_event_dev_info dev_info; nb_ports = evt_nr_active_lcores(opt->wlcores); - nb_ports += opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR ? 0 : + nb_ports += opt->prod_type == EVT_PROD_TYPE_ETH_RX_ADPTR || + opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR ? 0 : evt_nr_active_lcores(opt->plcores); nb_queues = perf_queue_nb_event_queues(opt);