From patchwork Thu Aug 30 10:00:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 145534 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp615899ljw; Thu, 30 Aug 2018 03:01:35 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdb9JTjGqrfUe1KKGUfKTjCY31XRnSnbXcjotYEYQzdsXTcmucWpOWXWt1Td2qwONoGheqJS X-Received: by 2002:a0c:ae71:: with SMTP id z46-v6mr10592622qvc.108.1535623294911; Thu, 30 Aug 2018 03:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535623294; cv=none; d=google.com; s=arc-20160816; b=Xd/20pEF/7sKSGJ3sqoWjWQ3T+ntb13i2dhoPj3Jgk+O6eA2vq+jFGzxUavnd/SOo0 kMa42Ip+X1tA8ESCDo9IkLS2zOBRRuZVnyIEvVKtI7XLVlmZxxd2MpW6H+b1VxPpKpy9 mSy/yjzNOifhLgmEC1lV4cFSTpJN1vBnyNkLWcyeUWzIrUw/Fvvyb4RvGukpzjhw5exN cyAIkUIGrGsrTcmriALuj2JklUsNuRGtaf68n8Lziq9QvtySlwmX8goEW5GOLMnXpeG9 ZG/KHunxad8Mq5wcIDSwziWbcyZiGevCeDSll1Gt5FQsUTqpt2ck0cCRt0baOg9QlTQm hFpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=Iwe6Ej+UWEy5aJ8g2lfIZXPEr45a1M8pbBAYxVtiqhg=; b=Csw0ya96iWXkNrODmZnGdaNbTS50duWav9oJNOtK9gesgtLuSaGLN3MNOBVgkZLne9 jzKT+nCbrEcs87KqbalfMLQyPzNPbU7MdQf05JVXuLAVtuZmnn19LcNGnL99Xp9j4OI8 wvka3uItIdGxTHLFeBbFafczdx/1JCx8vrRSGJ3Gxo/yoK0eueCFw3wEFuRgHZLG/J/q eBFWndpBVHwMW6JH3o8fdpX+dejKPVTrSDlq3dCG3h2YNC1LXHOtCAsK8XkhocNldHz/ WQj8dufuOpq1FkMwIoARY5Lh2fZufFbo/5Gq7zaRRD3AhiNpvmBTE3sPIy9oRJQyVkW7 Eoaw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id z65-v6si3446167qtc.182.2018.08.30.03.01.34; Thu, 30 Aug 2018 03:01:34 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 800EC685C2; Thu, 30 Aug 2018 10:01:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_LOW autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 1A3AE616F4; Thu, 30 Aug 2018 10:00:29 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 60E8C61840; Thu, 30 Aug 2018 10:00:13 +0000 (UTC) Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [5.45.198.249]) by lists.linaro.org (Postfix) with ESMTPS id C89DB60F30 for ; Thu, 30 Aug 2018 10:00:11 +0000 (UTC) Received: from mxback17j.mail.yandex.net (mxback17j.mail.yandex.net [IPv6:2a02:6b8:0:1619::93]) by forward106j.mail.yandex.net (Yandex) with ESMTP id 20953180381A for ; Thu, 30 Aug 2018 13:00:10 +0300 (MSK) Received: from smtp2o.mail.yandex.net (smtp2o.mail.yandex.net [2a02:6b8:0:1a2d::26]) by mxback17j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 8aEDgWdIvH-0AcCAdlK; Thu, 30 Aug 2018 13:00:10 +0300 Received: by smtp2o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id KOCrzhFGB0-09n0UBhJ; Thu, 30 Aug 2018 13:00:09 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 30 Aug 2018 10:00:05 +0000 Message-Id: <1535623206-484-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535623206-484-1-git-send-email-odpbot@yandex.ru> References: <1535623206-484-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 687 Subject: [lng-odp] [PATCH v1 2/3] test: sched_perf: add event forward option X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Petri Savolainen Added -f option to enable event forwarding between queues. By default, an event is sent back to the queue it was received from. When forwaring is enabled, it's sent to the next queue. Signed-off-by: Petri Savolainen --- /** Email created from pull request 687 (psavol:master-test-sched-perf-options) ** https://github.com/Linaro/odp/pull/687 ** Patch: https://github.com/Linaro/odp/pull/687.patch ** Base sha: 97fc51b1e5b3fcea9db99ba63c10bda47f79341a ** Merge commit sha: b10a9d3318c78101ad4c590deb3d4be6ad7b3cc1 **/ test/performance/odp_sched_perf.c | 36 ++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/test/performance/odp_sched_perf.c b/test/performance/odp_sched_perf.c index d5fceede9..ba16623c9 100644 --- a/test/performance/odp_sched_perf.c +++ b/test/performance/odp_sched_perf.c @@ -24,6 +24,7 @@ typedef struct test_options_t { uint32_t num_round; uint32_t max_burst; int queue_type; + int forward; uint32_t tot_queue; uint32_t tot_event; @@ -66,6 +67,7 @@ static void print_usage(void) " -r, --num_round Number of rounds\n" " -b, --burst Maximum number of events per operation. Default: 100.\n" " -t, --type Queue type. 0: parallel, 1: atomic, 2: ordered. Default: 0.\n" + " -f, --forward 0: Keep event in the original queue, 1: Forward event to the next queue. Default: 0.\n" " -h, --help This help\n" "\n"); } @@ -84,11 +86,12 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) {"num_round", required_argument, NULL, 'r'}, {"burst", required_argument, NULL, 'b'}, {"type", required_argument, NULL, 't'}, + {"forward", required_argument, NULL, 'f'}, {"help", no_argument, NULL, 'h'}, {NULL, 0, NULL, 0} }; - static const char *shortopts = "+c:q:d:e:r:b:t:h"; + static const char *shortopts = "+c:q:d:e:r:b:t:f:h"; test_options->num_cpu = 1; test_options->num_queue = 1; @@ -97,6 +100,7 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) test_options->num_round = 100000; test_options->max_burst = 100; test_options->queue_type = 0; + test_options->forward = 0; while (1) { opt = getopt_long(argc, argv, shortopts, longopts, &long_index); @@ -126,6 +130,9 @@ static int parse_options(int argc, char *argv[], test_options_t *test_options) case 't': test_options->queue_type = atoi(optarg); break; + case 'f': + test_options->forward = atoi(optarg); + break; case 'h': /* fall through */ default: @@ -194,6 +201,7 @@ static int create_pool(test_global_t *global) uint32_t max_burst = test_options->max_burst; uint32_t tot_queue = test_options->tot_queue; uint32_t tot_event = test_options->tot_event; + int forward = test_options->forward; printf("\nScheduler performance test\n"); printf(" num cpu %u\n", num_cpu); @@ -204,6 +212,7 @@ static int create_pool(test_global_t *global) printf(" max burst size %u\n", max_burst); printf(" total events %u\n", tot_event); printf(" num rounds %u\n", num_round); + printf(" forward events %i\n", forward ? 1 : 0); if (odp_pool_capability(&pool_capa)) { printf("Error: Pool capa failed.\n"); @@ -298,6 +307,19 @@ static int create_queues(test_global_t *global) for (i = 0; i < num_queue; i++) { queue = global->queue[i]; + if (test_options->forward) { + uint32_t next = i + 1; + + if (next == num_queue) + next = 0; + + if (odp_queue_context_set(queue, &global->queue[next], + sizeof(odp_queue_t))) { + printf("Error: Context set failed %u\n", i); + return -1; + } + } + for (j = 0; j < num_event; j++) { buf = odp_buffer_alloc(pool); @@ -349,10 +371,12 @@ static int test_sched(void *arg) uint64_t events, enqueues; odp_time_t t1, t2; odp_queue_t queue; + odp_queue_t *next; test_global_t *global = arg; test_options_t *test_options = &global->test_options; uint32_t num_round = test_options->num_round; uint32_t max_burst = test_options->max_burst; + int forward = test_options->forward; odp_event_t ev[max_burst]; thr = odp_thread_id(); @@ -378,6 +402,11 @@ static int test_sched(void *arg) events += num; i = 0; + if (odp_unlikely(forward)) { + next = odp_queue_context(queue); + queue = *next; + } + while (num) { num_enq = odp_queue_enq_multi(queue, &ev[i], num); @@ -430,6 +459,11 @@ static int test_sched(void *arg) if (ev[0] == ODP_EVENT_INVALID) break; + if (odp_unlikely(forward)) { + next = odp_queue_context(queue); + queue = *next; + } + odp_queue_enq(queue, ev[0]); }