From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <Pavan.Bhagavatula@cavium.com>
Received: from NAM03-DM3-obe.outbound.protection.outlook.com
(mail-dm3nam03on0043.outbound.protection.outlook.com [104.47.41.43])
by dpdk.org (Postfix) with ESMTP id EE73D4C70
for <dev@dpdk.org>; Sun, 18 Mar 2018 14:13:03 +0100 (CET)
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=VodFpMtLNS5uSBn8+cHCcbTvKYX4Gpr4RHQJeM6349A=;
b=kIIZ4YpxCR3CyTphn3kaN/+sEnPzHmpDarn62UW26kLfJRgpvM6I5Oa9aLCxz4+7z6lKyqYNZ5hMfrBx5TAdAwwddzTHRUvsS/i5KudGIV7FdtsO4cpeynJWTmb6cKCaNo983uTRptFSQkDHK7bH7wCd6LG6oRSiPDdDIqSWuzM=
Authentication-Results: spf=none (sender IP is )
smtp.mailfrom=Pavan.Bhagavatula@cavium.com;
Received: from localhost.localdomain (111.93.218.67) by
MWHPR07MB3469.namprd07.prod.outlook.com (2603:10b6:301:63::20) with Microsoft
SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Sun, 18
Mar 2018 13:12:59 +0000
From: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
To: jerin.jacob@caviumnetworks.com, santosh.shukla@caviumnetworks.com,
erik.g.carrillo@intel.com
Cc: dev@dpdk.org,
Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
Date: Sun, 18 Mar 2018 18:42:13 +0530
Message-Id: <20180318131216.11699-1-pbhagavatula@caviumnetworks.com>
X-Mailer: git-send-email 2.16.2
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [111.93.218.67]
X-ClientProxiedBy: SG2PR0401CA0016.apcprd04.prod.outlook.com
(2603:1096:3:1::26) To MWHPR07MB3469.namprd07.prod.outlook.com
(2603:10b6:301:63::20)
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 686444b8-de0d-445d-3b24-08d58cd1fa19
X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0;
RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603328)(7153060)(7193020);
SRVR:MWHPR07MB3469;
X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3469;
3:aeuaI3c9bv0dMvr3cQNy+ejhsP7zWzMp1qEze7pzOgske8HXPHCfp6k2aI+SBSpjTjF8tzyeGrPu/FWIGlMlzGKmIPcGLM3lCzwQGmLqzit92fX49qLg1TT880t4ESrz6n/E8cV/+wFztnIXePQ03ykMgViTTyIpmm89vVFvK4QR3cO7UwLVGqp8iINgkPXYJi56fe6DT1pIXVBsz/5zHjvCLWln45evsNGgBClGPKwROvRUTtVkgw2LVhmS0nio;
25:JH2vJz5vw1w57HgdrhmBu8fHqTOwzU5tt5r0vLlf9Kh8LYYgG8INHjelRzEg+S2NMWN9haxLEbsSGxhb7zwZmIddwNQr8S1iVrJw5QMAE3P4FEF318o1AiN4KT6QMXn/AuOrUJGLDd/rG7mnFNB/8i/cB6+2fmChDpvVkX7xJkzA0JD2/oNw8dNX05lEKQmZMiScE+8/dw0HaKfyknKGJQwELJ8APgND2xf+HT5UZuSZAq6Q0LW3f/GefYT3C4szPxtDV2cNg2Gd+56jeDaVSPAvDaXgKKSkzGHP12UjFZT05wj/Sd0Z2Aw8chs/6nZRxGjQZ7yjPndVOf63nPsq9w==;
31:J87y/T4Fz4RscTJeqPKTMCQj/hloNvuVZcKlPWrj2hDkgKbtCEaioHpd9veFa9LT1AxVnQPAJx4+I1S3QgdoX7ABtFOl6uzZLcHd99DjuwqJj+TfwTArNiCYVONbV5/wlLQs8+8mAZ4xaRBfFtlps+3tvWv0m3OCMnlE9sgXi5KDIbc0WayKWOutX8NgBs/tyS/k4WkqoshfknTLi96XVapg0G0FUqOE9J8Iw8IEoLI=
X-MS-TrafficTypeDiagnostic: MWHPR07MB3469:
X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3469;
20:yJx1HEiWFx1DTnzUnja1QsaOpzWaAza8r4mVn9tmMbdKP/v/bv5pVzO8UEnpP42tf8rD3tV5Z945M1JwUNKtU2Dvk9LbelbGhZlISdjcZJTIPj1k8WAwOARMRsPH5ava/iVTCdIo1PqsBBvaJsW+0nnK6QzusK/PueJoLdEPtXV/O3kW9GhEBK56um9z/v3GyIcYK0bWPq2I6b+wl2yqianG0cjUSqAYG5tvn3bwA15utF5jI35E63bVRWbTlPV2T48J3AK9lALQlyQcRkuOhLxgg+27HzHzwaIuYJ4caSheqRujnNDyiIjetd4qvCHxBqtU3+MCz+yieR49crqPCpAPjRbgp1d6JokLsJrc9k0b+ZXmuuVA0T+NZIqhYoKSHcHDILiQXruvY15rAgPFlb94lJdTsd+YpeBPhQDk2K3Iw+gsAgtjHSvXp0sIbQZejOUbjOEv2+dfA0nZmBVFpt23Z6DBnK5rRuu3W110eGh2O5KRoEVLNtPpIm+22jB7UQHhQAfbTEe3/OAw+Kjs05I5tSbf/Hl4hQO4lcZSfBzWXHx6orl94aTfQ+0Wi5g7F3+3fXaVklQy9BtICLlo97zEtwKLrPlm5sYUzSpn2S4=;
4:48dkFLiMPcujKBw19Tm3Y1cQJHg9239IyKSBrI0XivAVQxHeAQzjjdkfkT4RkXJRd5DwRcJdHAU6IGBKpAWnVlOtyGZmffcdkbus0GPg1d4Ku94yL8Ho4sbvDc/mop+88gIhzpQqHAJxwJeAzUW1wAIHogAPU/fMMETzkEFwqOIUi+WP80+qvgZM1VQAaXxAnu9sF4R5Y1dhlywlkKYdqjzpaGSbAyJLQvjhFRpldjZLUKkdYbG6uOGUu/Fvy4VKg0WJI4vsjHkgVMAtbkN8z2CoBAKuTUFCR2HuraQ2FDrDlscFsiRSIom0ZKgNB2Gs
X-Microsoft-Antispam-PRVS: <MWHPR07MB34693DCFCC2E49604702A90F80D50@MWHPR07MB3469.namprd07.prod.outlook.com>
X-Exchange-Antispam-Report-Test: UriScan:(131327999870524);
X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0;
RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(3002001)(3231221)(944501244)(52105095)(10201501046)(6041310)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(6072148)(201708071742011);
SRVR:MWHPR07MB3469; BCL:0; PCL:0; RULEID:; SRVR:MWHPR07MB3469;
X-Forefront-PRVS: 06157D541C
X-Forefront-Antispam-Report: SFV:NSPM;
SFS:(10009020)(6069001)(39850400004)(346002)(376002)(39380400002)(396003)(366004)(189003)(199004)(50466002)(81156014)(5660300001)(316002)(105586002)(6486002)(7736002)(305945005)(42882007)(6512007)(8676002)(50226002)(2906002)(68736007)(48376002)(6666003)(478600001)(16586007)(53936002)(5009440100003)(106356001)(72206003)(1857600001)(16526019)(66066001)(386003)(6506007)(59450400001)(47776003)(4326008)(52116002)(97736004)(36756003)(575784001)(107886003)(81166006)(8936002)(25786009)(26005)(51416003)(3846002)(6116002)(1076002)(42262002);
DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR07MB3469; H:localhost.localdomain; FPR:;
SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en;
Received-SPF: None (protection.outlook.com: cavium.com does not designate
permitted sender hosts)
X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR07MB3469;
23:9YG4tRgKTbrAZPtNlrIJokW/IGqLalbz/kTM/hw3i?=
=?us-ascii?Q?4/I6BVtIiUnsJNEObJhI/0wTg+l1zEG4cKGc5iTp6cGKCg+t1qsUCwVwBjPZ?=
=?us-ascii?Q?iiTk+7L/5274HFOjanugMbcFVwjU2zUxeYGMZhQfWcgmnKhj+r/JlqwLvpBu?=
=?us-ascii?Q?pxGII7fIGAU7T7vWWSC1Qcq29MxOqJflemgomOxY8IvEObndb3JarGbro/mz?=
=?us-ascii?Q?PeUEC1u0Jk4FdPdEN0fdeefKEOLnsB+RXwcFq/wzwaZmnIoB6FdMK5Rp0lgI?=
=?us-ascii?Q?REhIdriPcrI7VkWZ5gsSI/O2teF6Rb8IRy8y7s795y+SYRGZO5YZzT3T4wDz?=
=?us-ascii?Q?3XIG0fzMkwzEI8C3Ny+17bnZg2RWjPB3Sfhh0XpFcJsYK7hi3iYG1Bpa8Nut?=
=?us-ascii?Q?mYL5oogkLhrm42Q1oDdIEYkLOl/V1Cvq7i7QWY0xMRwgC55mgMUYd34v7/5h?=
=?us-ascii?Q?Cg4W2Hv6D6VmhHcb9B4hxmbOmybOZi7FjK7GLNhVJUCxDrmHc7xO78x/pkBI?=
=?us-ascii?Q?SgMf2uOHQhZR66f4AQt1OdA72YFpz9JjIh2VM6bIYJRrWiZoMdh4qUINV0xr?=
=?us-ascii?Q?3tVkn1daZQ9GqWvyzNyF6wh3hnl4Jpti0EmDOx83+xpURu1qIXAjdDuBtILQ?=
=?us-ascii?Q?J6mgDyOWuAFr8tw0rbPVAhs34fxNX1FGR0rKZLefeM8W2/H28DRRaVGZic4t?=
=?us-ascii?Q?RvkJwjtR01h25Bh5HbtY9JgSNNtd0aoxD9E2GLsPnqUn8Gps06vL86C7njO8?=
=?us-ascii?Q?Cba2EFSbmjCqvDF4FNPv34OAglK3H8PF6+LLpHXJTby9Q+/pbJ9XgfKa0A+0?=
=?us-ascii?Q?eJEVVM6vBCWaGFtALFbKs1gcWvUTd80wA5iRsnFxzbozA2tKvqYRmL/cDMx5?=
=?us-ascii?Q?BEtc+/rbf1j1+JDk3cSmSyR23rorQoVyWMIciRTWpD8PSkHqlma+YMDKy/Kh?=
=?us-ascii?Q?mB7kw1ZufKBbkimScrPivOPJU7Ht9vlHqfqg6d0EMvyV6xUiKZT8lx+7v2m7?=
=?us-ascii?Q?Vg6WND4GYPNWhdVgbGniTLDHA5RinmN6t3TFwO7HYZgxQ6APFo4gQZP/f0T4?=
=?us-ascii?Q?Vnd7StvOFzsa4eTi2Ws0KM6oxVBkOnJgaZVYGYhrcwS6B5awidj7gw5q7zjX?=
=?us-ascii?Q?ufSysIfaIeKJ8H/yK61ot2Xu+XC1WZ835Qa4SpcFHqB3cSCd0heoha51vCu0?=
=?us-ascii?Q?YYAfhGzBm3TNsJzf6HQc4lVcxjbbFB9fxiY0lLrXPR3nmkbVdv3xJC8iw=3D?=
=?us-ascii?Q?=3D?=
X-Microsoft-Antispam-Message-Info: eEBRablmOai5KzgX7hX03fHAy+bTr6g6q1VXFe79c5NdXyG+tsNSxv3e1KgUQeOewJIieDHtlESZXcOAUzYk205bXFwriYOc/+q3icXztsxrXSrOdM1n/psv0CEMIY8qKFuXlG7BzAl94TWeoKQ16U1oIUj6ryQmmbeo9L/pj+HNsPI2v5nl1EeRc6h5byLA
X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3469;
6:OfQfeuDgktujU5wlrUw9gM2DRA7CCMCBd+BDsgujiFFqll+GWULEUVGT/oshgp828wHL2uBzYX5loGnV8HCw845QRNFnJfJt29+FnuViBPR+w2/tYse8Zp9ttYGsqa7FGlo9srKQIBDWSUo0MwDA6pWvY8Lb37uPlZwa+9hFw8ZrRLyEldaq7QcelXsEDekXtH26gfOoKHM8aupPFk9rF6fRZoMD2SB78fVUxy966GEUN4Si5uHb3s1ej/zWHi7VP3B/UYdprqp3JB8tayJB929d8ci8KFF8jAkzpfaRRF+9P00LbZ5smN8kETgO4Rpr8vstgkNnOXaJXFERO6rhJAgnXPHpkM9ZgjJKj7W7cUA=;
5:pmaAZ+MGcSSGjTtg/DwrUa2MOcVr7yjWPGD/qNEXLV/HPfO2isvGN83do7chnBchsts8BRpxPcpS8QyK1dBpYZ/N8Z/kpJYKMhD7GCYSSmOt/6PiOfRpzl6BYpJiC1ksz1OPLLay0PR/Du1fOWyRzbO6uLyOVQx3vI0PQYkddGM=;
24:QhkPojRZtY3fcqFQlLDZt9i7OYjlNdsGAjLts8fR264RVN0yqWxXTOXWBRKpqA4VEEebfnEuBGY0UuY3EBJxyhYiH8rfvBvZ0u1ZyJXAVB4=;
7:OPT9DcM7WO0Agj2iz5UPbAYNbtkuGjUxFjo6WOm23xb2e1+gwITLmUw0R0suicOHbKHs8PCf7mB6Mvnv2vcpJmDMN5otFE3Ir0EFlLW7Yg1nux15X/g8Gl3mXaRhxkXa7PpptIAavXOHi5dDjYEcLCirzY82Bdfe+jAM5iP/cedgGjPqZutDNUzZ/jP98Q/1kpbv5yb6rFwH2cu4fld8PyLyl//qJlGrEYCHW3Bfe/LC4SAYa2cluL0qrn3SHBAw
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-OriginatorOrg: caviumnetworks.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Mar 2018 13:12:59.8866 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 686444b8-de0d-445d-3b24-08d58cd1fa19
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR07MB3469
Subject: [dpdk-dev] [PATCH 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 <dev.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Mar 2018 13:13:05 -0000
Add event timer adapter as producer option that can be selected by
passing --prod_type_timerdev.
Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
---
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 | 166 +++++++++++++++++++++++++++++++++--
app/test-eventdev/test_perf_common.h | 7 ++
app/test-eventdev/test_perf_queue.c | 7 +-
6 files changed, 217 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..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..6ae146d91 100644
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -72,6 +72,62 @@ 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;
+ 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,
+ .timeout_ticks = opt->optm_bkt_tck_nsec ?
+ (opt->nb_bkt_tcks * opt->bkt_tck_nsec) /
+ opt->optm_bkt_tck_nsec : opt->nb_bkt_tcks,
+ };
+
+ 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) < 0) {
+ 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 +136,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 +204,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 +246,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 +342,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 +444,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 +545,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 +580,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 +626,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 +683,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 +734,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 <rte_ethdev.h>
#include <rte_eventdev.h>
#include <rte_event_eth_rx_adapter.h>
+#include <rte_event_timer_adapter.h>
#include <rte_lcore.h>
#include <rte_malloc.h>
#include <rte_mempool.h>
@@ -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