From owner-svn-src-all@freebsd.org Thu May 24 06:54:32 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 96007F5D6C9; Thu, 24 May 2018 06:54:32 +0000 (UTC) (envelope-from mmacy@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ED0C67A09B; Thu, 24 May 2018 06:54:31 +0000 (UTC) (envelope-from mmacy@freebsd.org) Received: from mail-io0-f169.google.com (mail-io0-f169.google.com [209.85.223.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) (Authenticated sender: mmacy) by smtp.freebsd.org (Postfix) with ESMTPSA id B6C58E9D9; Thu, 24 May 2018 06:54:31 +0000 (UTC) (envelope-from mmacy@freebsd.org) Received: by mail-io0-f169.google.com with SMTP id c9-v6so1014587iob.12; Wed, 23 May 2018 23:54:31 -0700 (PDT) X-Gm-Message-State: ALKqPwfxKn+G8eH2+7hyzgzDCy3J+C2oYaFWRx9HdnciDpiPxD+F2DtZ KKCdPfgOviU4Djjrujv9gQOVBg4KUtLErVb0gpk= X-Google-Smtp-Source: ADUXVKKzyv5nn4bMxWPCguA7kxUki9OXKSHZPLpw6QjlwIOGlBE5Ni18Azdi/Xg6M+3hhuyI1LQ0xIB5ADmEGkFXtok= X-Received: by 2002:a6b:5009:: with SMTP id e9-v6mr5529518iob.5.1527144871335; Wed, 23 May 2018 23:54:31 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:85ca:0:0:0:0:0 with HTTP; Wed, 23 May 2018 23:54:31 -0700 (PDT) In-Reply-To: <201805240650.w4O6oSLw003786@slippy.cwsent.com> References: <201805240647.w4O6lesD071041@repo.freebsd.org> <201805240650.w4O6oSLw003786@slippy.cwsent.com> From: Matthew Macy Date: Wed, 23 May 2018 23:54:31 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r334134 - head/lib/libpmcstat To: Cy Schubert Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 May 2018 06:54:32 -0000 Bugs in the code I'd just imported because I imported from the wrong branch :-/ On Wed, May 23, 2018 at 11:50 PM, Cy Schubert wrote: > In message <201805240647.w4O6lesD071041@repo.freebsd.org>, Matt Macy > writes: >> Author: mmacy >> Date: Thu May 24 06:47:40 2018 >> New Revision: 334134 >> URL: https://svnweb.freebsd.org/changeset/base/334134 >> >> Log: >> libpmcstat: import aliases table and bug fixes > > Which bugs? > >> >> Modified: >> head/lib/libpmcstat/libpmcstat_pmu_util.c >> >> Modified: head/lib/libpmcstat/libpmcstat_pmu_util.c >> ============================================================================= >> = >> --- head/lib/libpmcstat/libpmcstat_pmu_util.c Thu May 24 06:47:04 2018 >> (r334133) >> +++ head/lib/libpmcstat/libpmcstat_pmu_util.c Thu May 24 06:47:40 2018 >> (r334134) >> @@ -42,6 +42,39 @@ >> #include "pmu-events/pmu-events.h" >> >> #if defined(__amd64__) >> +struct pmu_alias { >> + const char *pa_alias; >> + const char *pa_name; >> +}; >> +static struct pmu_alias pmu_alias_table[] = { >> + { "UNHALTED_CORE_CYCLES", "CPU_CLK_UNHALTED.THREAD_P_ANY"}, >> + { "UNHALTED-CORE-CYCLES", "CPU_CLK_UNHALTED.THREAD_P_ANY"}, >> + { "LLC_MISSES", "LONGEST_LAT_CACHE.MISS"}, >> + { "LLC-MISSES", "LONGEST_LAT_CACHE.MISS"}, >> + { "LLC_REFERENCE", "LONGEST_LAT_CACHE.REFERENCE"}, >> + { "LLC-REFERENCE", "LONGEST_LAT_CACHE.REFERENCE"}, >> + { "LLC_MISS_RHITM", "mem_load_l3_miss_retired.remote_hitm"}, >> + { "LLC-MISS-RHITM", "mem_load_l3_miss_retired.remote_hitm"}, >> + { "RESOURCE_STALL", "RESOURCE_STALLS.ANY"}, >> + { "RESOURCE_STALLS_ANY", "RESOURCE_STALLS.ANY"}, >> + { "BRANCH_INSTRUCTION_RETIRED", "BR_INST_RETIRED.ALL_BRANCHES"}, >> + { "BRANCH-INSTRUCTION-RETIRED", "BR_INST_RETIRED.ALL_BRANCHES"}, >> + { "BRANCH_MISSES_RETIRED", "BR_MISP_RETIRED.ALL_BRANCHES"}, >> + { "BRANCH-MISSES-RETIRED", "BR_MISP_RETIRED.ALL_BRANCHES"}, >> + { NULL, NULL }, >> +}; >> + >> +static const char * >> +pmu_alias_get(const char *name) >> +{ >> + struct pmu_alias *pa; >> + >> + for (pa = pmu_alias_table; pa->pa_alias != NULL; pa++) >> + if (strcasecmp(name, pa->pa_alias) == 0) >> + return (pa->pa_name); >> + return (name); >> +} >> + >> struct pmu_event_desc { >> uint32_t ped_umask; >> uint32_t ped_event; >> @@ -75,9 +108,12 @@ pmu_event_get(const char *event_name) >> >> if ((pme = pmu_events_map_get()) == NULL) >> return (NULL); >> - for (pe = pme->table; pe->name != NULL; pe++) >> - if (strcmp(pe->name, event_name) == 0) >> + for (pe = pme->table; pe->name || pe->desc || pe->event; pe++) { >> + if (pe->name == NULL) >> + continue; >> + if (strcasecmp(pe->name, event_name) == 0) >> return (pe); >> + } >> return (NULL); >> } >> >> @@ -100,7 +136,7 @@ pmu_parse_event(struct pmu_event_desc *ped, const char >> if (strcmp(key, "event") == 0) >> ped->ped_event = strtol(value, NULL, 16); >> if (strcmp(key, "period") == 0) >> - ped->ped_umask = strtol(value, NULL, 10); >> + ped->ped_period = strtol(value, NULL, 10); >> } >> free(event); >> return (0); >> @@ -112,6 +148,7 @@ pmcstat_pmu_sample_rate_get(const char *event_name) >> const struct pmu_event *pe; >> struct pmu_event_desc ped; >> >> + event_name = pmu_alias_get(event_name); >> if ((pe = pmu_event_get(event_name)) == NULL) >> return (DEFAULT_SAMPLE_COUNT); >> if (pe->alias && (pe = pmu_event_get(pe->alias)) == NULL) >> > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: http://www.FreeBSD.org > > The need of the many outweighs the greed of the few. > >