From patchwork Mon Aug 5 19:44:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13753997 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 031BEC3DA4A for ; Mon, 5 Aug 2024 19:46:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:To:From:Subject :References:Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Lfe4gxEvYKxDxRwW2qESsqEIUodbK6p7qv/mhdEEZFQ=; b=M2xRemkZG7si7PVY+762oDQ0nZ 6p1whq0/HULLIyvMr0Ottg/xDVQHyT4Fqab/gbqMc3YSXH4QJCKvGG+lwXoJgA1cizg3/oGgbrepH tUHEAqD5Mgz5c3rvI5y84lEf6/AsCLbJJnSeFPlJUBEbZ9PAu9SnXWfwaXE6YtxEEtrYoeXlPP0Jk xKf+EHCGVLoyg/C8KgWlv1hAm5/ClZKIuswDjbwH4tjqSJOEPZi3MxbmUL5HW3rLY3KthUQqo1yHG WEfe9vb37hi8sMF4aGRQyQvNcN3HjTeIOIntd708BzCPe4GvT1fBTkUQqrqEFBRcPlB0Kx4vdz+ct jZigs4zQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sb3fK-0000000H4Hw-1hBJ; Mon, 05 Aug 2024 19:46:46 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sb3dJ-0000000H3Xh-0KsF for linux-arm-kernel@lists.infradead.org; Mon, 05 Aug 2024 19:44:42 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-e0b3742b309so16577021276.1 for ; Mon, 05 Aug 2024 12:44:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1722887079; x=1723491879; darn=lists.infradead.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=Lfe4gxEvYKxDxRwW2qESsqEIUodbK6p7qv/mhdEEZFQ=; b=th8ctGH/tvOeVkICXtC9iF71jrbKdZfrRCz82faohW+rJ/MIQzfU7f56Jjf+OEcQ4s xZcvjtPE8JktgLbeoZaxzqjJ1kYe+KQ/nO5bJAitHAAG9syDuj5gDYdmVHg3K+Spn4o5 lE0OaYsvBuD7nBZMYhHkCGmd7DVbIFHYf65BZi6atg2J5Q1fiOPlTp8rB4pR8yYzs17/ rvTPOakUxmRY0TWQR5r/RDXN0X9AKs6aeM2FymMySHrF7g98DmaLTBhIX+av3G89J/LN OUO/ufDzUXt4EPCgvgqNkPSx1xRngM6nQu3cbLT9htz41yPpKapX4dMY/J8mt72+B654 BbBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722887079; x=1723491879; 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=Lfe4gxEvYKxDxRwW2qESsqEIUodbK6p7qv/mhdEEZFQ=; b=PeUiqdB22Z4Cg4aYtsJ0Sl/D5qFfz4TW+HtbUZUt76gu7lAGlh3wrU+LPgbqA0NITM NPDHGqvHBP8NSP85pUnfoGNgD4UsTUb0OvkUypnCQCxk7/USsXcv1kRLOiCvANS9JW05 pvkpHTZ5UzSwvPh9KV5C6voAztOupxNirJRLXSnhMG+hOvjB4wOf4NhWDhL1/HdzatNp O/6mN0PXYlEoWF0U40iJ5swm7omvSxJvsoWAF9NImfzyLCKSVj8gQ6hM1/L19xmpPSbK zc6sQm0P23HdCamkIB2bq3qbXhFZqcqKunBM+geSngBifX5i93r9UhYTD6khRrq+z2Hz US/g== X-Forwarded-Encrypted: i=1; AJvYcCV19nweJcF9m5JgpenNJpbtZhceppNOotbaKvU7vL89ohFA0KgsxfRbhX5j0ZsVGnjxM23USyLc3dIsoEM0FBczEbdkzfQT4N71zP2fks/0ccXPrQk= X-Gm-Message-State: AOJu0Ywh9i+3rraXCb/C4pkWQJYYOo/H73p/DIHXSM5ffYvA+EGjkaCv AOzr0+rj3fwrDwFMvvar+IEyeY1yuG5sPp/lw2EPCrQnEilpEIMIyFNvjk+kxQaar5DAZp059Gs QCk+2LQ== X-Google-Smtp-Source: AGHT+IGrmti4jOH/kazGkyLVxy/soVqkMo0+E8STQu6tXr+6jrpf9QaL4kxNGpeU3MiUA4lgzpOT4h7CHrFx X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:1f65:8dc8:61d0:4b08]) (user=irogers job=sendgmr) by 2002:a05:6902:2311:b0:e0b:6bb1:fac with SMTP id 3f1490d57ef6-e0bde421a34mr35840276.9.1722887079301; Mon, 05 Aug 2024 12:44:39 -0700 (PDT) Date: Mon, 5 Aug 2024 12:44:23 -0700 In-Reply-To: <20240805194424.597244-1-irogers@google.com> Message-Id: <20240805194424.597244-4-irogers@google.com> Mime-Version: 1.0 References: <20240805194424.597244-1-irogers@google.com> X-Mailer: git-send-email 2.46.0.rc2.264.g509ed76dc8-goog Subject: [PATCH v1 4/5] perf pmu-events: Remove duplicated riscv firmware event 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 , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Paul Walmsley , Palmer Dabbelt , Albert Ou , Samuel Holland , Charles Ci-Jyun Wu , Locus Wei-Han Chen , Atish Patra , Ji Sheng Teoh , Inochi Amaoto , Jing Zhang , Xu Yang , Sandipan Das , Guilherme Amadio , Changbin Du , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org, vincent.chen@sifive.com, greentime.hu@sifive.com, Eric Lin X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240805_124441_400266_81A96D67 X-CRM114-Status: GOOD ( 11.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org FW_SFENCE_VMA_RECEIVED is repeated twice in the file which will break invariants in perf list as discussed in this thread: https://lore.kernel.org/linux-perf-users/20240719081651.24853-1-eric.lin@sifive.com/ Signed-off-by: Ian Rogers --- tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json | 3 --- tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json | 3 --- .../perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json | 3 --- .../perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json | 3 --- 4 files changed, 12 deletions(-) diff --git a/tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json b/tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json index 9b4a032186a7..5a996fa4b837 100644 --- a/tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json +++ b/tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json @@ -35,9 +35,6 @@ { "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" }, - { - "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" - }, { "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED" }, diff --git a/tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json b/tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json index 9b4a032186a7..5a996fa4b837 100644 --- a/tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json +++ b/tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json @@ -35,9 +35,6 @@ { "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" }, - { - "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" - }, { "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED" }, diff --git a/tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json b/tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json index 9b4a032186a7..5a996fa4b837 100644 --- a/tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json +++ b/tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json @@ -35,9 +35,6 @@ { "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" }, - { - "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" - }, { "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED" }, diff --git a/tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json b/tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json index 9b4a032186a7..5a996fa4b837 100644 --- a/tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json +++ b/tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json @@ -35,9 +35,6 @@ { "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" }, - { - "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" - }, { "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED" },