From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0075.outbound.protection.outlook.com [104.47.37.75]) by dpdk.org (Postfix) with ESMTP id 1ED891CB51 for ; Thu, 5 Apr 2018 13:54:01 +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=yMr9y0dfhfxNIJlF8em/d9QxPhTSFDu0V10QCFPLJi8=; b=C0lhvgRV1G6+VzHeuJbqKZ3IjViiLnlIjajjvkhG5RpQ1Gcb8bBJT7EPY9YWx7dHmoPPphp5QdHXx6MhepQrtJ43+FKV5k5VMC3Y0qc1Ysm0y/rWJJLaJaYO/koXQbBT/uvq+XKG1QBWrld/ozV/WJmB8rCLRC2wTKjhF5XAeA4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavan.Bhagavatula@cavium.com; Received: from ltp-pvn.caveonetworks.com (111.93.218.67) by BN6PR07MB3458.namprd07.prod.outlook.com (2603:10b6:405:64::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.653.12; Thu, 5 Apr 2018 11:53:57 +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: Thu, 5 Apr 2018 17:23:26 +0530 Message-Id: <20180405115329.22372-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 Content-Type: text/plain X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: PN1PR0101CA0053.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c00:d::15) To BN6PR07MB3458.namprd07.prod.outlook.com (2603:10b6:405:64::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8b2f1ee9-a58c-4bee-f20f-08d59aebea95 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603328)(7153060)(7193020); SRVR:BN6PR07MB3458; X-Microsoft-Exchange-Diagnostics: 1; BN6PR07MB3458; 3:SBOBkzpzinizcEIpixzuiHwbSWEUluSISEhb1jO6XnySd/DgNWd75M8xim4XsYdn034+RgCg0T1vGag3kHdC/fo5FmsI5EXGeupDUILMW2HWKUsd/ePhy16J47Xqa1ruXlfjS2FGf7603ySuwtoPBQ8mkNbq2gPxVEncxDWYE+OpzYNlW1jNdVb6C7Cbxk0K3Sa+KNDXxaelqJDngtknf8bR/jSlQuMRGCO28Dweyunq7+Cc56t+HC2yNKdaofzR; 25:+74s/tvQmSYkJQ4YEW3odik5f99ELuA6Z7eh6URI3W6OJVIpN89I9BUtRYYj3jyMfOu8HhRxnW973Mxm9X0QfLDMzHJAuydHIGeC+ebY+I16RQ3SZKn0m2wK0HD97iC6w0G5EKwDU2HiK1RUn5YRLVDGVSruq/YBJvN7bBF7cc6KZuAyl5WWVAFfIaZAzhSKxHSanNQJJEHy/SmnoMRr1cNcgNokZQY56qjlUzY9N5NcI6zWkrn87dIiHo+sq+XYVlaK9vgNm7jgIcOObJXURamIhfHp3oEDC+52SwBLG33s2lFVVmJIKBwF0gp+vOiFzJEauPW7MqYZtYO/zRw+gQ==; 31:pldLo7JJ0GyjFs8+I0jq+oG1j61ODh5xRh2qoYG22BRIY5gCBIxGCi3pI1O323T+GEEVF0mThytdspml809vEei24f1UDe0IkBaJawEyOM2tTWTlGQx9E5FKp2oPkjQXN4mmM9/zjRn5vQcOZ3WoXnvmHky4yHd9ROxFRNIMLGJFU8i3aLL1xXRwjPsiyIIoq59esE59kMbU+j6AFJIpKst4dlD0jv9ds5c2j0uLjtM= X-MS-TrafficTypeDiagnostic: BN6PR07MB3458: X-Microsoft-Exchange-Diagnostics: 1; BN6PR07MB3458; 20:AJjHaCjRrQD174o7iQf1j+nwUmEDO2jC6Rjp4Wr5exYfcj1yiF7xbSfaVOX4CN6otgnOAejhSvOGchEPSEjtp5AbeHD9QP/Q+9tfRMf7V4pAtO1HBcuziO62VZpI0CtQBAN1+ssN01d5IB6D5PlKMXWqwmiJccm/GGp36sDCbmcOU1by1BVPEORbs2QEYQOUFAwpyUG+GW7cJgE3SHff6bhrIYvvQhaO40I2+9xJBnnIloxl4DVHlvW3vH4n/4qzcbKTaxP9fJc7PmtdS+A1DPhGhTU3BnDm85tiaJ4dD6xEonD6Tts6OCK62bpTdEVwlFhLnixNAcYTNWGCrA47toIcT1F4NrHtlvimbQjN9+xkDRm5J5AQeBRyOokWCSOudTZC2TGx7lY/lYneV0V92Ea6rNie0E/CvTB+DwQmJ/Gs29rBIrbaOfbNf1/t85rv1vgE6Pf+ER1qKeG/nqH0xmXw4+2oU/YCFzgf/B3zKkLa21EwoovnTewW3BvtNVdDpNrw8CChrQmC3HgHQHRv4UatfgJSrD92GlxsL2c4QRsgv3tquBuV83y8ETZdGlc66w4tLNpV1slYCztRqYGqMB0YSipRB8Yi2d1rbXtTlzw=; 4:1eH5/MrlfZkkN+rZVTzRjGraEvifl9fUiPWlS01ySu6B1F5u28KOmiFpJXnor90x6NJzhaJp7mqs5XKRWyRayBF9akrNeZVqdOM0uyGUiSNHju5LE22x3J+W9lnkmkaB1lJ5Nvtdw1G+bPql4AUguzizDrCJAiFQJguqgspz4YLNx/5dkh4D6fiAouzXADPTEjbE/bYDwvYFbl1R/2kxwTZ5EXwiQupnITIBcVbY4PIonm7NiqJsiPurB5Az+ZFjKHFJaUaI9VL+4i3oHNlI7TExGaNo7NdR+Lv+KJYomMQeN3JhAi6c2+BoHFoVOqp2 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)(10201501046)(3002001)(3231221)(944501327)(52105095)(6041310)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:BN6PR07MB3458; BCL:0; PCL:0; RULEID:; SRVR:BN6PR07MB3458; X-Forefront-PRVS: 06339BAE63 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(366004)(39380400002)(376002)(396003)(39860400002)(189003)(199004)(956004)(72206003)(42882007)(575784001)(476003)(53936002)(2616005)(50226002)(2906002)(486006)(68736007)(4326008)(52116002)(6486002)(76176011)(107886003)(11346002)(25786009)(6512007)(51416003)(6506007)(81166006)(81156014)(446003)(69596002)(8676002)(386003)(8936002)(59450400001)(316002)(3846002)(16586007)(1857600001)(7736002)(106356001)(1076002)(26005)(6116002)(97736004)(50466002)(48376002)(36756003)(5660300001)(66066001)(6666003)(105586002)(53416004)(47776003)(5009440100003)(305945005)(478600001)(16526019)(42262002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR07MB3458; 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; BN6PR07MB3458; 23:HN48i2hzd3bqBs0M9zrIUhJ4RSqaCJnmyUOpmoIfV?= =?us-ascii?Q?Fu0B7tGvg9pUlkjL/ljPKRbOUI3LLUZMNwOsP2yS9N/0+gupX/dTyRVz5Vrd?= =?us-ascii?Q?E2bHJC7T6MJoOnTzCO5dDjLFrlMnY5106NngWCTJCb1w7WWkC0KFujKM+sqo?= =?us-ascii?Q?8TFquupnJWIduYHPsyD1cT5I4+xewxD7hzuoXuK1M6CoQAJMSd3AfI74mJMP?= =?us-ascii?Q?1lagG4f6lj5EJDmVCHt/t/nSmrtMtucfSy6c+pTqv4V60yxvTk0NKrgJGNfS?= =?us-ascii?Q?5Drsf+JrCEsDZAsuNG9WsCItsWTwn443JPoJbZM8uZaMoWQErN9IcjUA5KYZ?= =?us-ascii?Q?nm41hHiCvpqOdbjg04oEEzl4bnjVDZU49FekEI9znzt4DAV6nghr9xWOwQUi?= =?us-ascii?Q?3vBp8dPirn9aOncn6IRKsdkpF99Y55MEy9+bTdd7zN/fKg3/4P9fJlgrr/MQ?= =?us-ascii?Q?ta9F8otdRaIU1Nh7P6p9TJwiXA4uDaJ8WKdLAkSRld8rrk7ddEIBrdVnY3pV?= =?us-ascii?Q?WR2LRUBpJEoSHynjZjIx+bVOIzmqv7EBTziHIXod7q2BumazM+ojyJ7Xp4aT?= =?us-ascii?Q?uPWUfl3s6pe1zoOmL0b5h/U36O3RDrqIBjZh0d+yxfZZZagrPBJWUEFfmBLb?= =?us-ascii?Q?GN5QUbKlEJIicvrosLAh9SdkKzVbgQ2twN/gcNeouUeso0wHJe9DDWxai/oa?= =?us-ascii?Q?EjL5FD8u+ENKAUnyogEwZMhWUpeHFRlH0bE/lBp80T7agCRApU/8dJQ4/29T?= =?us-ascii?Q?yU3L2v8ID0lFu2ioVzcZCTQ7HKtNIZq4dHsxSeuTE3TmAhBVs0IASGoeQjwE?= =?us-ascii?Q?0umOXYXCCcpO4+VSpsovWcQHxHskcaRNhx/YDo8qJG+V2RREt7nDNBC2XDmm?= =?us-ascii?Q?XPqTTjQ0qPESKH/AZ2XsKwJbKvRaiEDZjZWyfxkwF5Plw6V8+Zt7B1rgkPkA?= =?us-ascii?Q?u6Hq3Z7Npzxh0ZRNs7OTJqYJVFt54L3/iuDj1X9y280tHrqBoxwhKASTcBVp?= =?us-ascii?Q?s+C0PIdk6f9wyP3hMalV6irN/W01EKk3VRHYsxKmwqzm99IqDOYpq9dSvRsz?= =?us-ascii?Q?JcPutxwvHccrlnAbJc3eVcYqzp75fJqUnDLuxVeYqrB3vWRyHXKVMl+Gcmtn?= =?us-ascii?Q?/cdsNQGLInVMghBaP9vLECEB/Ady3GeWGoRrvMMSudb//2ul4YLJS5fCvZmV?= =?us-ascii?Q?ChM412vh+5lT7OwFgMaC2ApTyWF6rDjeuhOsQ3dU8jvQpk2b8q7vGzYLk161?= =?us-ascii?Q?uXf7OzGBeAK+rObKRfWriP7hzkLJRZ2UfJcdJY3mUFzNYt+sWQKNtOsqLiHB?= =?us-ascii?Q?kw15hZJ09JdQdhcgGvbq+qKDvKrY4jq5MNk3wP6TVivdW+wmv5LILsvbfuXs?= =?us-ascii?Q?2MOj5j+H+Rw7UvSn4Cxoz4irn8=3D?= X-Microsoft-Antispam-Message-Info: YOKr013SZjZ6Wn3/v29/fCM8JkFi26kmacSj5NPeaPybSpStDTAB4BoiG2rCK2efLbiZEVH+RgQwJslZ9PBYcsfbZyuua0FYCmoWgpmNW50nuiYYHClUv12j/Q0LDRFwst0BtdSsD2cJNRAwrJ0zIFeqnen4oqTqjuXfR1++JxChFpmQTbKpzn6ut8y18J8L X-Microsoft-Exchange-Diagnostics: 1; BN6PR07MB3458; 6:RQYCr783DULl4HlAXwoCyEvixIggWNKH5Q0mGH0feqUHs6SNsgOk7CAHxKmEpqJalgQJu37OVRRdJShYcJdmZ7msfyMBqzuUqkG2fL1NO9t+ryAFbDbiVf23qKm8NJVbKJO6LeVUO87IenXPGa+NOimxNLLk8Cb/sYNidPune77HOElqzvzs77kHQVpAb0m0OTqKrVNtAeIV4+WMCSgpjmFQns0IdYqpvGwIX23xGGEHL7LbGZdwZRYybosi8XLLm+kQxF7wwiCLAvrSVYSxXgKSWj4CJ9H7EwkxGNekl9DHbT2/94CqbvTcmlloDdXd8XWCOsT/DDjTCbl041gTseRw+PolToalAdxpe3yTA+70KL4epZ0nlR2txDQj8PwvILt4Z6e5bgdPmjj490n8sBVZmWwinhJ5SFMq/dwYaOgyHGC9+8RFuajBujA08CIgNAdVgkOJdfjLaFp++Xoo1w==; 5:QwqYc5K9b+3vot/smWXiPUImbO2kgPCbNwTFwxeV/OtlQMZHVpx81HHJmaOyH/WnbQ/ZFkF2M+HTFCWVgdswNYS1BOBTAW+zxPC5R6L0Jo/O2Ed405Z0eLC6lP2TnqW5I4CNYc7YnmT/iKtx++JDKlCmkNsmWYwuRnuDfDTyQLU=; 24:M5q2POKPhSJdM4lrQaYLe+dRLBjbTNXEVOuH4IT4qIj2e57WtZMLArCy1K66l1T96/4K9wyqnyn7Vboa2DLVulmDc9IdAsjf2KLH/FEZ2h0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR07MB3458; 7:/+jV5olt8chEDq9VkFebIXg8eCTPwPrZuIHvSuHhKxshwyZfv3ohsdGzglbaOx+/3gU2dkpZeB3dS27gDAgUsPILRzvg3SP24mYhawcL+yJwmgu/cM1OyBW9Ff74oRSor38zkRy4ugHUumLWrxslnYyd8OJusS5bRBuVTGskan6s1eic2qM7n0E0ivUxyQd7tvHTW+WI1VfOkUxqNKe/Zg0jwaSy2uE9u2/KJEHFszXCZi+nXs6IFIXE9P/9Q/d7 X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2018 11:53:57.0589 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8b2f1ee9-a58c-4bee-f20f-08d59aebea95 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR07MB3458 Subject: [dpdk-dev] [PATCH v3 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: , X-List-Received-Date: Thu, 05 Apr 2018 11:54:01 -0000 Add event timer adapter as producer option that can be selected by passing --prod_type_timerdev. Signed-off-by: Pavan Nikhilesh --- v3 Changes: - Add detailed options dump. - Fix few typos. 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 | 24 +++++ 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, 236 insertions(+), 36 deletions(-) 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..1fb340ac9 100644 --- a/app/test-eventdev/evt_options.h +++ b/app/test-eventdev/evt_options.h @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -31,12 +32,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 Timer Adapter. */ EVT_PROD_TYPE_MAX, }; @@ -52,11 +55,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); @@ -262,6 +272,20 @@ evt_dump_producer_type(struct evt_options *opt) case EVT_PROD_TYPE_ETH_RX_ADPTR: snprintf(name, EVT_PROD_MAX_NAME_LEN, "Ethdev Rx Adapter producers"); + evt_dump("nb_ethdev", "%d", rte_eth_dev_count()); + break; + case EVT_PROD_TYPE_EVENT_TIMER_ADPTR: + snprintf(name, EVT_PROD_MAX_NAME_LEN, + "Event timer adapter producer"); + evt_dump("nb_timer_adapters", "%d", opt->nb_timer_adptrs); + evt_dump("max_tmo_nsec", "%"PRIu64"", opt->max_tmo_nsec); + evt_dump("nb_bkt_tcks", "%"PRIu64"", opt->nb_bkt_tcks); + if (opt->optm_bkt_tck_nsec) + evt_dump("bkt_tck_nsec", "%"PRIu64"", + opt->optm_bkt_tck_nsec); + else + evt_dump("bkt_tck_nsec", "%"PRIu64"", + opt->bkt_tck_nsec); break; } evt_dump("prod_type", "%s", name); 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); -- 2.16.2