Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp18194400rwd; Tue, 27 Jun 2023 13:07:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4RwjjaRYybcSrxX09tiZtgvWCuOcfLtmaZSY3PXmzcflyxy6/4nH9GsGt/I3f+ZaB0XQ6S X-Received: by 2002:a05:6512:401b:b0:4fb:7592:7e03 with SMTP id br27-20020a056512401b00b004fb75927e03mr5556220lfb.20.1687896465097; Tue, 27 Jun 2023 13:07:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687896465; cv=none; d=google.com; s=arc-20160816; b=ZfSSz6n94DnCMO8mai52dvIEL+drSPUmD17IalKqbbOlvDj/TonuIiBkxbiA4Kkmbh VUNHO+pF6OBVt4V8umRr3Kj1lVQUYU2U2ENX94AXtfAd/BZDR+TTvQZ/3eMx9m1V4kDj KS2joIyDM+AvuYj/8id6nE5TaWtsspVdolqE5YQB1yLPIlIvfeyr4bKlrN6yCw41XQkT pqlFCn1hu6trEVl001mzGPy7f0fEsKDwgn4Ke7wFAV9vE87TEqopq4l0Nz1xqx4rNAFH lohmD/MQQwRCnC8iXvlkR8u2XfNfgYULvPExBdP5gOy0t8GEDWLF7adZnmUK3gMx6gXu Q+Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version; bh=YkgMTSrjdbqAFyDm9Q2orLw8KinsbWeLoikM6fKWrC0=; fh=B7aPz4xvHAGTonltig1U0lI8iRw9TTyBgw4FmjHsBkI=; b=mOeawlTxsGAF1NxNmWzbgWLoq+NaGGK+mDH9aco0xYqcqX9FRzqBJIsbOFNLQzxfTD kfo+0Pt9iSo3EhrkQlglso80NV9kOLIgnBWuiKfGfdwISZenBaAOnrC4K/ZhvNULs+LQ Nd0/mWdKC4UqFwnaQQssUNtbQQIoel/ZONWw4REmdApx+b7KxE9G/yFzuFoSW+f1Cnly FdR11nzTwgR+oB2EBVYx+oKySTRAJRgZm7e/U3N6Zyp3xD3hmqkZmY9y78jRyVxbbP31 /EDY1Z0HEQ8SYXLgjqmfS9QpjeB+01hJHPIzg/Ff+iHTaLpFLmUiSREA5aUqYrwCUim5 yM8g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f3-20020a056402160300b0051d9a7acfecsi2730661edv.575.2023.06.27.13.07.19; Tue, 27 Jun 2023 13:07:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229888AbjF0TeA convert rfc822-to-8bit (ORCPT + 99 others); Tue, 27 Jun 2023 15:34:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229483AbjF0Td7 (ORCPT ); Tue, 27 Jun 2023 15:33:59 -0400 Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BCA31BC3; Tue, 27 Jun 2023 12:33:58 -0700 (PDT) Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-5700b15c12fso52289837b3.1; Tue, 27 Jun 2023 12:33:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687894437; x=1690486437; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nEEQwXF6153JBPAVoTjMd1AVh+oNM4vqAmX0ynTyiqE=; b=AF2w6bgthwYBxLkX70SaP35HCkk7GtKB+tyiVZFHr/6Yl+waihjqZwD8ScCUXINnKC jJnyRoSp07F0JFdKKUBtKU4MD8nS+fS3oTi6/wg/yCntMDaPUJfVUeuZMfTsZu0yuC5B ianPpixnGjeCdjuyUZHvGIdkbZtCg4jB8hHYpZBri57BeJt4IybsrXDhf1pjLA1z1D9b 2PZTI0lxKr2zBkWU9CYfPpHrB5Wnsc9NgL5XyliZHt/WLqQApVGo0SxbdEN10YTdn5Ri VdURM0WvqaOK6OTLGZ4HjjQsWH47wHqGh0jvLNpAFeDlwGE6nnZ11jjVbSqCm9eVaswR Dv6g== X-Gm-Message-State: AC+VfDwsntPd73+/XT5VNYOFKAluqsuvuelXc+2HXpPl1zeFVX/0Wm3a kSYSf+oIXaqXq+Mzuq8u0/dTCmHRPX5f8AZzqXk= X-Received: by 2002:a25:b09f:0:b0:be3:bf87:3ebc with SMTP id f31-20020a25b09f000000b00be3bf873ebcmr30298883ybj.56.1687894437518; Tue, 27 Jun 2023 12:33:57 -0700 (PDT) MIME-Version: 1.0 References: <20230626053048.257959-1-irogers@google.com> In-Reply-To: From: Namhyung Kim Date: Tue, 27 Jun 2023 12:33:46 -0700 Message-ID: Subject: Re: [PATCH v1] perf pmu: Correct auto_merge_stats test To: Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , Kan Liang , James Clark , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Kleen Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 26, 2023 at 3:15 PM Namhyung Kim wrote: > > Hi Ian, > > On Sun, Jun 25, 2023 at 10:31 PM Ian Rogers wrote: > > > > The original logic was: > > https://lore.kernel.org/all/20230527072210.2900565-35-irogers@google.com/ > > return !is_pmu_hybrid(pmu->name) > > > > is_pmu_hybrid was removed but with the incorrect condition which was > > fixed for core PMUs but not uncore. This change fixes both. > > > > Fixes: e23421426e13 ("perf pmu: Correct perf_pmu__auto_merge_stats() affecting hybrid") > > Signed-off-by: Ian Rogers > > Tested-by: Namhyung Kim Applied to perf-tools-next, thanks!