From patchwork Thu Jan 18 14:01:16 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: 124969 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp141326lja; Thu, 18 Jan 2018 06:09:11 -0800 (PST) X-Google-Smtp-Source: ACJfBovvGh9eHNk8jLeiD1tdikN2mfCf4LkSGszHUsYqa1xOh34ExwJFpBgH9wJl5F88IYX9jZtP X-Received: by 10.55.195.219 with SMTP id r88mr61596217qkl.219.1516284551380; Thu, 18 Jan 2018 06:09:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516284551; cv=none; d=google.com; s=arc-20160816; b=idXvSJp+7F+L8J0gwn/gpoDERKpPrJ8hneSDnVAvkmUyy/cbRsCotaC5INN7UzA+Ms 0W8EG9dKJKEllhQfH7RVJkqSQdL/vsXEdG3+dJOqZv+/UlCgWYX5Ltxt8E1cAdVkTtLc LbdQ6z5259zH2rUDm61RA5qcnV1Uk9YBRanrOryMan8hy+f4F52CuKnNzQZfY4NKVgPx tvpF3yGaFpk3yY4/A97F1BCJ+FTctE5KYUv71KxDQY7otW+kHN7F12llWENLW4wOPtMD it7ZvudpYele2HjILi4fVbixKfem8aX/w/+XOVjyRALWMTABI/Ma/sXSNzYj+r2dyPqN Plow== 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=XnHdbQvbyb8e862lqfeNCHUXyErlnVo/WC1gdFS5T7s=; b=CP2i64UJ6m8OvB69sOvBHi/OFhyi6BCamAYIM3R5o0WgB+KbgOSmD4MsH2Jb8CzZxi fk+fwx1nPYWcPZuUsUYzuWNk7A3ArPcSQYqVSR4sEfuqhIKjYKc+ohNZSCTZaf+ra8We RwkjnuJ5kPPcWHcH5wxgphQHUOvNztGlq4784O+2jd90cAHW9WCU1m1TeKdIxRtB0fsn WjmLdDQ0eFGICGYlWTMLqTUkX/ThFqEULmeiBx4N3CWD+gMBQ4XCDpCiwKY/Y9rSihnY spfw0TZzwg7le0mx9tEj8aljyipVrWnPoNuQ/In4unpAZYv+vALYTkhTGBuIIs8rtPnT urMg== 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 d58si642731qte.288.2018.01.18.06.09.11; Thu, 18 Jan 2018 06:09:11 -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 11E9E6282D; Thu, 18 Jan 2018 14:09:11 +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 3499D62815; Thu, 18 Jan 2018 14:03:34 +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 1C1B9627F1; Thu, 18 Jan 2018 14:03:12 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 14833627F8 for ; Thu, 18 Jan 2018 14:01:23 +0000 (UTC) Received: from mxback6g.mail.yandex.net (mxback6g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:167]) by forward100p.mail.yandex.net (Yandex) with ESMTP id D114D5103629 for ; Thu, 18 Jan 2018 17:01:21 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback6g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 0pCPGZE9dX-1L4monrV; Thu, 18 Jan 2018 17:01:21 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id sNY3tHYRi1-1Lh494JR; Thu, 18 Jan 2018 17:01:21 +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, 18 Jan 2018 17:01:16 +0300 Message-Id: <1516284076-2857-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516284076-2857-1-git-send-email-odpbot@yandex.ru> References: <1516284076-2857-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 381 Subject: [lng-odp] [PATCH CATERPILLAR v4 5/5] 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 381 (bogdanPricope:cat_benchmark_poc) ** https://github.com/Linaro/odp/pull/381 ** Patch: https://github.com/Linaro/odp/pull/381.patch ** Base sha: 4d17f8ae64aba0e6f24877be30f86ae5880cef7e ** Merge commit sha: c651bdf2f6e197eb49c2aecff6f64a247db2b982 **/ example/instrum/Makefile.am | 18 ++++++++++++++---- example/instrum/drv.h | 3 +++ example/instrum/instrum.c | 4 ++++ example/instrum/sched.h | 3 +++ example/m4/configure.m4 | 17 ++++++++++++----- 5 files changed, 36 insertions(+), 9 deletions(-) diff --git a/example/instrum/Makefile.am b/example/instrum/Makefile.am index 452b36c46..30c26046f 100644 --- a/example/instrum/Makefile.am +++ b/example/instrum/Makefile.am @@ -25,10 +25,20 @@ noinst_HEADERS = \ $(srcdir)/drv.h \ $(srcdir)/sched.h -__LIB__libinstrum_la_SOURCES = \ +INSTRUM_SRC = \ instrum.c \ store.c \ papi_cnt.c \ - init.c \ - drv.c \ - sched.c + init.c + +if CODE_INSTRUM_SCHED +AM_CFLAGS += -DCODE_INSTRUM_SCHED +INSTRUM_SRC += sched.c +endif + +if CODE_INSTRUM_DDF +AM_CFLAGS += -DCODE_INSTRUM_DDF +INSTRUM_SRC += drv.c +endif + +__LIB__libinstrum_la_SOURCES = $(INSTRUM_SRC) diff --git a/example/instrum/drv.h b/example/instrum/drv.h index 12441a7e4..ed3dd7a08 100644 --- a/example/instrum/drv.h +++ b/example/instrum/drv.h @@ -7,6 +7,8 @@ #ifndef __INSTRUM_DRV_H__ #define __INSTRUM_DRV_H__ +#ifdef CODE_INSTRUM_DDF + #ifdef __cplusplus extern "C" { #endif @@ -16,4 +18,5 @@ int instr_odpdrv_init(void); #ifdef __cplusplus } #endif +#endif /* CODE_INSTRUM_DDF */ #endif /* __INSTRUM_DRV_H__ */ diff --git a/example/instrum/instrum.c b/example/instrum/instrum.c index 05b38da68..93b6cc78f 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_DDF if (instr_odpdrv_init()) return; +#endif /* CODE_INSTRUM_DDF */ +#ifdef CODE_INSTRUM_SCHED if (instr_odpsched_init()) return; +#endif /* CODE_INSTRUM_SCHED */ } static __attribute__((destructor)) void teardown_wrappers(void) 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 d2258bf27..970dfd927 100644 --- a/example/m4/configure.m4 +++ b/example/m4/configure.m4 @@ -7,15 +7,22 @@ AC_ARG_ENABLE([test-example], [test_example=yes]) AM_CONDITIONAL([test_example], [test x$test_example = xyes ]) -PAPI_PATH="" -code_instrumentation=no AC_ARG_WITH([papi-path], AS_HELP_STRING([--with-papi-path=DIR path to papi install directory]), [PAPI_PATH="$withval" - code_instrumentation=yes],[]) - + code_instrumentation=yes], + [PAPI_PATH="" + code_instrumentation=no]) AC_SUBST([PAPI_PATH]) -AM_CONDITIONAL([CODE_INSTRUM], [test x$code_instrumentation = xyes ]) +AM_CONDITIONAL([CODE_INSTRUM], [test x$code_instrumentation = xyes]) + +AC_ARG_WITH([code-instrum-profile], +AS_HELP_STRING([--with-code-instrum-profile=all|scheduler|ddf 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_DDF],[test $code_instrum_profile = "all" || test $code_instrum_profile = "ddf"]) AC_CONFIG_FILES([example/classifier/Makefile example/generator/Makefile