From patchwork Thu Feb 1 14: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: 126542 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1741544ljc; Thu, 1 Feb 2018 06:06:02 -0800 (PST) X-Google-Smtp-Source: AH8x227L2gFp7QN/eyjOhQ416UhLcvoUpe/SQtDGXSBM4IBEPOlCzJSa6Zm1VyOLFCx9WrhxJo+3 X-Received: by 10.129.209.11 with SMTP id w11mr24488282ywi.475.1517493962334; Thu, 01 Feb 2018 06:06:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517493962; cv=none; d=google.com; s=arc-20160816; b=n0FcdmPJiglXElgfEdo8ZiW/Ph6ZAwfQwnG6+n7EubxPXbEgLEE1etbjqwY5tRjqAY ixIxeTMp6WWDaGyh84axbO9WN3BkWVNzlmd8FEw7bxstEpJ/+0ZtdVWTzRJobCMefEMv 3+ETA96VDSqcw9ipIk1LOmNF9a+AYDpSBTKULD+hzzvAMLqKXF1a5NYfapq8LtEe18Mo 04aXqs8pf1VKnCWQ3lbbx5clLb5bUoDeeuP8tOvSyQ+8aHLYyRhaXDIJb4zRXpCRHMjr wncn2Q1Lirtw60kuQkri1p11z6sImr3LNTE3j2RD3MlkAj2kqVHbvgPQRXyamtPKVjJk u7uw== 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=/zxS1580Zw8azbzyz62jdkyOxUKliAMqyE7teWNSJkk=; b=X9TUB+kyMczE5BRqKjNol+2tiNmbYiU6ZngSMUL9euPJ+9NRtvwdOv98BGbAVPV1uS 9S+xndBHsZQxX0J2t6xpGz7mhte/gDjxmQz6ogyob+z+gI+iYVtbZ8gNHXOBQTV//VU6 uSe4BnefIRcz2ruGFL2UhFWVvx7FRh00uFYwCPJqA8DKWOYXLkN35qsX7X4OltA3+zFN Ieh4aCx6MMHDubwls0BlcRhtIRBUtLOJGizwfD4oOAW6fQEm1y4ryrvLo+PEPUZlkunz qihi96LPMC7yEdw8fydY/rIYSfg86/jrJ0zHx1KLRa1qnrjtuv6rerxYSy7FKLhlIcNH M45g== 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 u9si8184734qte.140.2018.02.01.06.06.01; Thu, 01 Feb 2018 06:06:02 -0800 (PST) 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 C84D061794; Thu, 1 Feb 2018 14:06:01 +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=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 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 9BF9961785; Thu, 1 Feb 2018 14:00:54 +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 5B52C6174B; Thu, 1 Feb 2018 14:00:26 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 627D661768 for ; Thu, 1 Feb 2018 14:00:15 +0000 (UTC) Received: from mxback15j.mail.yandex.net (mxback15j.mail.yandex.net [IPv6:2a02:6b8:0:1619::91]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 78DE91830F1 for ; Thu, 1 Feb 2018 17:00:12 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback15j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id x484KKlRpk-0CfODTDo; Thu, 01 Feb 2018 17:00:12 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 84IFXYC70u-0BniTFtD; Thu, 01 Feb 2018 17:00:11 +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, 1 Feb 2018 17:00:05 +0300 Message-Id: <1517493607-30535-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517493607-30535-1-git-send-email-odpbot@yandex.ru> References: <1517493607-30535-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 443 Subject: [lng-odp] [PATCH v1 5/7] example: instrum: configure instrumented API set 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: Bogdan Pricope Add configure time option to trim API set to be instrumented. Signed-off-by: Bogdan Pricope --- /** Email created from pull request 443 (bogdanPricope:master_benchmark_pr) ** https://github.com/Linaro/odp/pull/443 ** Patch: https://github.com/Linaro/odp/pull/443.patch ** Base sha: b95ccd3db6eeb7358a877541747e06354429acdd ** Merge commit sha: a7eb054a87f5e31ccdca856470dd8e2ce0dcdd1b **/ example/instrum/Makefile.am | 16 +++++++++++++--- example/instrum/instrum.c | 4 ++++ example/instrum/pktio_direct.h | 3 +++ example/instrum/sched.h | 3 +++ example/m4/configure.m4 | 8 ++++++++ 5 files changed, 31 insertions(+), 3 deletions(-) diff --git a/example/instrum/Makefile.am b/example/instrum/Makefile.am index 42c8161bf..fc4f5dcff 100644 --- a/example/instrum/Makefile.am +++ b/example/instrum/Makefile.am @@ -16,13 +16,11 @@ AM_LDFLAGS = -L$(PAPI_PATH)/lib -lpapi lib_LTLIBRARIES = $(LIB)/libinstrum.la -__LIB__libinstrum_la_SOURCES = \ +INSTRUM_SRC = \ instrum.c \ store.c \ papi_cnt.c \ init.c \ - pktio_direct.c\ - sched.c \ instrum_common.h \ sample.h \ store.h \ @@ -30,3 +28,15 @@ __LIB__libinstrum_la_SOURCES = \ init.h \ pktio_direct.h \ sched.h + +if CODE_INSTRUM_SCHED +AM_CFLAGS += -DCODE_INSTRUM_SCHED +INSTRUM_SRC += sched.c +endif + +if CODE_INSTRUM_PKTIO_DIRECT +AM_CFLAGS += -DCODE_INSTRUM_PKTIO_DIRECT +INSTRUM_SRC += pktio_direct.c +endif + +__LIB__libinstrum_la_SOURCES = $(INSTRUM_SRC) diff --git a/example/instrum/instrum.c b/example/instrum/instrum.c index 605675154..aba07e0c2 100644 --- a/example/instrum/instrum.c +++ b/example/instrum/instrum.c @@ -21,11 +21,15 @@ static __attribute__((constructor)) void setup_wrappers(void) if (instr_odpinit_init()) return; +#ifdef CODE_INSTRUM_SCHED if (instr_odpsched_init()) return; +#endif /* CODE_INSTRUM_SCHED */ +#ifdef CODE_INSTRUM_PKTIO_DIRECT if (instr_odppktio_direct_init()) return; +#endif /* CODE_INSTRUM_PKTIO_DIRECT */ } static __attribute__((destructor)) void teardown_wrappers(void) diff --git a/example/instrum/pktio_direct.h b/example/instrum/pktio_direct.h index 1bc544dd2..6f2fc6ce7 100644 --- a/example/instrum/pktio_direct.h +++ b/example/instrum/pktio_direct.h @@ -7,6 +7,8 @@ #ifndef __INSTRUM_PKTIO_DIRECT_H__ #define __INSTRUM_PKTIO_DIRECT_H__ +#ifdef CODE_INSTRUM_PKTIO_DIRECT + #ifdef __cplusplus extern "C" { #endif @@ -16,4 +18,5 @@ int instr_odppktio_direct_init(void); #ifdef __cplusplus } #endif +#endif /* CODE_INSTRUM_PKTIO_DIRECT */ #endif /* __INSTRUM_PKTIO_DIRECT_H__ */ diff --git a/example/instrum/sched.h b/example/instrum/sched.h index 2a092b0ed..6cfc40bdc 100644 --- a/example/instrum/sched.h +++ b/example/instrum/sched.h @@ -7,6 +7,8 @@ #ifndef __INSTRUM_SCHED_H__ #define __INSTRUM_SCHED_H__ +#ifdef CODE_INSTRUM_SCHED + #ifdef __cplusplus extern "C" { #endif @@ -16,4 +18,5 @@ int instr_odpsched_init(void); #ifdef __cplusplus } #endif +#endif /* CODE_INSTRUM_SCHED */ #endif /* __INSTRUM_SCHED_H__ */ diff --git a/example/m4/configure.m4 b/example/m4/configure.m4 index 45549b728..e2d5ed5a0 100644 --- a/example/m4/configure.m4 +++ b/example/m4/configure.m4 @@ -23,6 +23,14 @@ AS_HELP_STRING([--with-papi-path=DIR path to papi install directory]), AC_SUBST([PAPI_PATH]) AM_CONDITIONAL([CODE_INSTRUM], [test x$code_instrumentation = xyes ]) +AC_ARG_WITH([code-instrum-profile], +AS_HELP_STRING([--with-code-instrum-profile=all|scheduler|pktio_direct set code instrumentation profile]), + [code_instrum_profile="$withval"], + [code_instrum_profile="all"]) + +AM_CONDITIONAL([CODE_INSTRUM_SCHED],[test $code_instrum_profile = "all" || test $code_instrum_profile = "scheduler"]) +AM_CONDITIONAL([CODE_INSTRUM_PKTIO_DIRECT],[test $code_instrum_profile = "all" || test $code_instrum_profile = "pktio_direct"]) + AC_CONFIG_FILES([example/classifier/Makefile example/generator/Makefile example/hello/Makefile