From patchwork Mon Feb 5 16:00: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: 126915 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2096294ljc; Mon, 5 Feb 2018 08:06:57 -0800 (PST) X-Google-Smtp-Source: AH8x227Tvb998bogE9E02+JxZYubsAFRnb6y6K051uXcWrqerWFKDvMcuQDCN0zNdiV/mkdV7v6N X-Received: by 10.55.87.198 with SMTP id l189mr77536565qkb.325.1517846817228; Mon, 05 Feb 2018 08:06:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517846817; cv=none; d=google.com; s=arc-20160816; b=K25Tr3/2XmupmRnd5mEugY2VP5RmIwhLWgvtXcTXzyDkntwE3n4Zm8fssIice7+Dim IJoxE8QxVhaTFme56OPsWZawT1Cmh6zSUtsZYT6o4bfu4QTKq+sAOClAK31CDldpcm2k Y6bDtShndBSYkF8MhxfP+DtvWL0Hok8wcWgrnNd1HB18YUGaHnJIyBBm3kPVvewCaR0l sDfn1v7IXWsYX25hKmCEOHKrXopKkXoIoGg1Axjr1uAmZKM53OVdLDFUAv59ELNaDQGi sLOMrpCnEcvWwlIQwNu5euSwAaeUBQHeP6P+cFiyidKpHwexzN+e9ADp27vMvWbSAcYX N6Dw== 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=3fvFVOYM4EFLZXtdHEx8DuDKF8UvR+KzvXjltOajWGE=; b=FEEhSJMVw06yuF73wka1fc6dT+DsaPj0+QwzcUVBEdSxAiFPOkLIjwwUl8zRPbAtM9 CSfrYzboDIrgjdqY5xTfxcL3bHHqsgt8KXUL+HvgceCoK7s9IrN0ocL7ldm+9HRa6BNc /Ku2CpStu13DOYcbBFONu5xcP9l29e3y7ZHi+RpO8779wxe4vo+TwpWAlx3FTtE52LGX mGuwEQf6VKjM71+tigMQsNv8nPTzO3KQZqeoJEqGJtw8gBlYDrcSKt4oJU9zrI+xHY6y 8X2rXBEUWKro5ffl5Utas7CX1iqPO6d8HBmUEcSTJ94CG4WTSKk4sxxgnjpqQnft8T6V 5j9A== 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 d188si216749qkf.340.2018.02.05.08.06.56; Mon, 05 Feb 2018 08:06:57 -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 E28D06277A; Mon, 5 Feb 2018 16:06:56 +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_H3, RCVD_IN_MSPIKE_WL 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 6A24161831; Mon, 5 Feb 2018 16:01:03 +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 4BE45617C4; Mon, 5 Feb 2018 16:00:36 +0000 (UTC) Received: from forward103j.mail.yandex.net (forward103j.mail.yandex.net [5.45.198.246]) by lists.linaro.org (Postfix) with ESMTPS id 51B20607D5 for ; Mon, 5 Feb 2018 16:00:25 +0000 (UTC) Received: from mxback7g.mail.yandex.net (mxback7g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:168]) by forward103j.mail.yandex.net (Yandex) with ESMTP id 0B08734C2C8B for ; Mon, 5 Feb 2018 19:00:24 +0300 (MSK) Received: from smtp2o.mail.yandex.net (smtp2o.mail.yandex.net [2a02:6b8:0:1a2d::26]) by mxback7g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Nj4LQkclKE-0NGCURGr; Mon, 05 Feb 2018 19:00:23 +0300 Received: by smtp2o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id sIMWrr2EaX-0MpifssT; Mon, 05 Feb 2018 19:00:23 +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: Mon, 5 Feb 2018 19:00:16 +0300 Message-Id: <1517846418-10342-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517846418-10342-1-git-send-email-odpbot@yandex.ru> References: <1517846418-10342-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 443 Subject: [lng-odp] [PATCH v3 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: 27a7923236030fed0272cc9072f0cde62496e91d ** Merge commit sha: be5c8bc74d773397cd54e079ddbad67c56d6fa33 **/ 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 852bdc77f..368f24c7d 100644 --- a/example/instrum/Makefile.am +++ b/example/instrum/Makefile.am @@ -11,13 +11,11 @@ AM_LDFLAGS = $(PAPI_LIBS) 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 \ @@ -25,3 +23,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 d925bbe78..f2ed909e1 100644 --- a/example/m4/configure.m4 +++ b/example/m4/configure.m4 @@ -17,6 +17,14 @@ AC_ARG_ENABLE([code-instrum], 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