From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB72E1AA1F6 for ; Fri, 8 Nov 2024 18:48:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731091684; cv=none; b=FWCq/OSJ2I0tnp8aSRh76Qqk/d/puurxHm3FcCVaUgIbaVcrBChJO6/yP/NQgrO5bpYfSVVTGG6t6jV/CxL/zhy+QeSKmUCd3OoJuQpIXPIGrVfAA85ZazfWcl5FZZvwX+b2uhiKwA4RYxDok0NE7/C0r9IOIMwZlQMtebsxZmg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731091684; c=relaxed/simple; bh=xunf4UD8j9u0pgFlFlHCMfIam9X2Ammz7QNjpmkuuIY=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=aaAVMFVfEotWv4iAV/Y8YUuE2lTsBVMtmCv//ZExu8qwS5aN1CgT9uJR8xT5DkMvxzDl1XuuAnqkUa8amq0soogteRuQE2GCNuksoHrx0trwWofWEDcN2vQGsfbQKqUcrle8bBmDgyOFJ0HHkJaSfvGvG9dJ1uefbrCJB4ij9U8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=lsJfQ+nV; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="lsJfQ+nV" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6ea8a5e862eso30427577b3.0 for ; Fri, 08 Nov 2024 10:48:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1731091681; x=1731696481; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=lh8Vm/QOELe+otL4qaVRvKv87LkZrYQhVCrXoxQ0vBg=; b=lsJfQ+nVBNXjXiJCTTxWWhHGrw5R7Uyk5iD4xMHhxRtXffSFQMM4LXLYoPNUZFFlHf gMuBmbbDvtGcg/duAKxSU2hTchSYRMmhirMCnzngota4kLcT2seuTbEdKm8Q3axn00G/ S5/f2rrZMifE8IRTcpWO74G8MvZWmHs/PracsP7H9xArmjlCmCl+tfbZyHA8NXkU2WaV WIO9h7uHXm+YOs5zNvGcyXwOXD+rP5CtE+b5ZEwLYa96dg1pWdrNVBDivmVc/ndPqqVo zQwQEBBWe1JekxrtTr5XVI7vxO1/0b5Tx3aaXdhKSN3YCW3MBORH5iLzfnIBwj72dNw1 ebhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731091681; x=1731696481; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=lh8Vm/QOELe+otL4qaVRvKv87LkZrYQhVCrXoxQ0vBg=; b=ZhIx6ilNNTvCIr70WkPNUQw8sPGeiwz6NWMaFfNbDPSrzPcANkGEKCzVcIvKotfFIu s9MWsBb5VFHxeILlrUXTQf6DvsRa+YBVlkI5HLAeOys1X3URq6DayNEwi8Gus4C4k6qQ hh0cw7FVcG8FR4j9MfhCSUvclcJ0DxZGRPME0vKEXgNVCHAgznZjiAo9dJC9f2kAvdJB PyfpJKn/9yuRw02EJFRJfJOgCWw936lx7SCIfJl+I+AcEAqSCepG/a6vzjunxuFZC/jL 2dbMZNYaHfhfTAXQKdn0KepkHX17CRVzGEqWFxK3Ss5uAQMizlaSAVEmzsRRmuN9am7o 22yA== X-Forwarded-Encrypted: i=1; AJvYcCUViE3sK27P+1wdURTJhgXD6jZ9fE+M5In6iBXQGMmUE84/58zcC6zH7PiyT8cxZ08XzLAlEzLwN1tvFsddeRGI@vger.kernel.org X-Gm-Message-State: AOJu0YyL5eFZ66SyILPAZNs8CVGlBdyiQ0EDDCHjTYymEgHUXUixsOf7 xWXZUjSXb7UxRK2pYnMR0VLssG2hQB9PvZXSPalxZw8JtNuCpx2jd1v2mM0xs+s0nysktuWBQpm awGLpsw== X-Google-Smtp-Source: AGHT+IFPk7Rumt8mMYRdDzGIzXRZaVCwQYz/e0WwSEXkae/UW6D+RBmX2yv8dudXz0wiceaycmFGRt5CNVcv X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:6fd2:1e36:6d8c:7c49]) (user=irogers job=sendgmr) by 2002:a0d:ef05:0:b0:6ea:881b:b545 with SMTP id 00721157ae682-6eade535166mr659907b3.4.1731091681015; Fri, 08 Nov 2024 10:48:01 -0800 (PST) Date: Fri, 8 Nov 2024 10:47:48 -0800 In-Reply-To: <20241108184751.359237-1-irogers@google.com> Message-Id: <20241108184751.359237-4-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241108184751.359237-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.277.g8800431eea-goog Subject: [PATCH v4 3/6] perf trace-event: Always build trace-event-info.c From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Athira Jajeev , James Clark , Dominique Martinet , Yang Li , Colin Ian King , Yang Jihong , "Steinar H. Gunderson" , Oliver Upton , Ilkka Koskinen , Ze Gao , Weilin Wang , Ben Gainey , zhaimingbing , Zixian Cai , Andi Kleen , Paran Lee , Thomas Falcon , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, "Steven Rostedt (Google)" Content-Type: text/plain; charset="UTF-8" trace-event-info.c has no libtraceevent depdendencies, always build it and use it in builtin-record and perf_event_attr printing. Signed-off-by: Ian Rogers --- tools/perf/builtin-record.c | 2 -- tools/perf/util/Build | 2 +- tools/perf/util/perf_event_attr_fprintf.c | 4 ---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index f83252472921..0b637cea4850 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -1748,10 +1748,8 @@ static void record__init_features(struct record *rec) if (rec->no_buildid) perf_header__clear_feat(&session->header, HEADER_BUILD_ID); -#ifdef HAVE_LIBTRACEEVENT if (!have_tracepoints(&rec->evlist->core.entries)) perf_header__clear_feat(&session->header, HEADER_TRACING_DATA); -#endif if (!rec->opts.branch_stack) perf_header__clear_feat(&session->header, HEADER_BRANCH_STACK); diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 1eedead5f2f2..609c69995c51 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -85,7 +85,7 @@ perf-util-y += pmu-flex.o perf-util-y += pmu-bison.o perf-util-y += tool_pmu.o perf-util-y += svghelper.o -perf-util-$(CONFIG_LIBTRACEEVENT) += trace-event-info.o +perf-util-y += trace-event-info.o perf-util-y += trace-event-scripting.o perf-util-$(CONFIG_LIBTRACEEVENT) += trace-event.o perf-util-$(CONFIG_LIBTRACEEVENT) += trace-event-parse.o diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c index 59fbbba79697..a73c74b99a3b 100644 --- a/tools/perf/util/perf_event_attr_fprintf.c +++ b/tools/perf/util/perf_event_attr_fprintf.c @@ -212,7 +212,6 @@ static void __p_config_hw_cache_id(char *buf, size_t size, u64 value) } } -#ifdef HAVE_LIBTRACEEVENT static void __p_config_tracepoint_id(char *buf, size_t size, u64 value) { char *str = tracepoint_id_to_name(value); @@ -220,7 +219,6 @@ static void __p_config_tracepoint_id(char *buf, size_t size, u64 value) print_id_hex(str); free(str); } -#endif static void __p_config_id(struct perf_pmu *pmu, char *buf, size_t size, u32 type, u64 value) { @@ -238,9 +236,7 @@ static void __p_config_id(struct perf_pmu *pmu, char *buf, size_t size, u32 type case PERF_TYPE_HW_CACHE: return __p_config_hw_cache_id(buf, size, value); case PERF_TYPE_TRACEPOINT: -#ifdef HAVE_LIBTRACEEVENT return __p_config_tracepoint_id(buf, size, value); -#endif case PERF_TYPE_RAW: case PERF_TYPE_BREAKPOINT: default: -- 2.47.0.277.g8800431eea-goog