From patchwork Thu Oct 7 11:05:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Clark X-Patchwork-Id: 12541591 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6BFEC433F5 for ; Thu, 7 Oct 2021 11:08:34 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 8064C610C7 for ; Thu, 7 Oct 2021 11:08:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8064C610C7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=WdQyyYnoatvBQF3EZVtIYgqGGywCjnurBls0LkgL2HU=; b=1tEyOwJeE0oj+I g7anx1sFK0RIcGIrIUXk4gduip35TCoti4QV1/XlpimUniaPSz0kexLjXHw+W44nqgtk7l3Kp+fxt Eq+JAKb0TLHc2Q9qsBe5f0JRX0CqaJ3HCFp0CEJV8XIKRnlzJpiQPjzeKbd3LSrubJGIt18xZuGZN 9/S8yUwSFCD2FLhnCF4OpHBJM/xauX4t56j7AbK01T8F3ZZDa7/QRoAXMyURb+X9g28cDk/F+XQ44 IzgqGXfxFxe2oc288qn2hitoOlr9RynnOYURQ2yETIZtipQgW9XmptRSWL0dRBOZsVtpi9+v9f6Ei /Uyt+bvV6BN8/5EzDDBQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYRE3-00H0T4-An; Thu, 07 Oct 2021 11:06:11 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYRDy-00H0Rc-Eu for linux-arm-kernel@lists.infradead.org; Thu, 07 Oct 2021 11:06:07 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5D8E56D; Thu, 7 Oct 2021 04:06:00 -0700 (PDT) Received: from e121896.Emea.Arm.com (e121896.Emea.Arm.com [10.32.36.22]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 727533F70D; Thu, 7 Oct 2021 04:05:56 -0700 (PDT) From: James Clark To: acme@kernel.org, john.garry@huawei.com, ak@linux.intel.com, linux-perf-users@vger.kernel.org Cc: Nick.Forrington@arm.com, Andrew.Kilroy@arm.com, James Clark , Will Deacon , Mathieu Poirier , Leo Yan , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 0/3] perf tools: Enable strict JSON parsing Date: Thu, 7 Oct 2021 12:05:39 +0100 Message-Id: <20211007110543.564963-1-james.clark@arm.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211007_040606_588548_C756DAE3 X-CRM114-Status: UNSURE ( 7.23 ) X-CRM114-Notice: Please train this message. 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 After a discussion on "[PATCH 1/4] perf vendor events: Syntax corrections in Neoverse N1 json", John Garry suggested that we can just modify the parser to make it more strict. Hopefully this will remove the need to apply any future JSON comma fixup commits. Applies on top of "[PATCH v2 1/3] perf vendor events: Syntax corrections in Neoverse N1 json" on perf/core. Also available at: git clone --branch james-json-parse-fix git@git.gitlab.arm.com:linux-arm/linux-jc.git James Clark (3): perf vendor-events: Fix all remaining invalid JSON files perf tools: Make the JSON parser more conformant when in strict mode perf tools: Enable strict JSON parsing .../arch/arm64/ampere/emag/bus.json | 2 +- .../arch/arm64/ampere/emag/cache.json | 20 ++++----- .../arch/arm64/ampere/emag/clock.json | 2 +- .../arch/arm64/ampere/emag/exception.json | 4 +- .../arch/arm64/ampere/emag/instruction.json | 10 ++--- .../arch/arm64/ampere/emag/memory.json | 4 +- .../arch/arm64/hisilicon/hip08/metrics.json | 2 +- .../pmu-events/arch/nds32/n13/atcpmu.json | 2 +- .../pmu-events/arch/s390/cf_z10/basic.json | 2 +- .../pmu-events/arch/s390/cf_z10/crypto.json | 2 +- .../pmu-events/arch/s390/cf_z10/extended.json | 2 +- .../pmu-events/arch/s390/cf_z13/basic.json | 2 +- .../pmu-events/arch/s390/cf_z13/crypto.json | 2 +- .../pmu-events/arch/s390/cf_z13/extended.json | 2 +- .../pmu-events/arch/s390/cf_z14/basic.json | 2 +- .../pmu-events/arch/s390/cf_z14/crypto.json | 2 +- .../pmu-events/arch/s390/cf_z14/extended.json | 2 +- .../pmu-events/arch/s390/cf_z15/basic.json | 2 +- .../pmu-events/arch/s390/cf_z15/crypto.json | 2 +- .../pmu-events/arch/s390/cf_z15/crypto6.json | 2 +- .../pmu-events/arch/s390/cf_z15/extended.json | 2 +- .../pmu-events/arch/s390/cf_z196/basic.json | 2 +- .../pmu-events/arch/s390/cf_z196/crypto.json | 2 +- .../arch/s390/cf_z196/extended.json | 2 +- .../pmu-events/arch/s390/cf_zec12/basic.json | 2 +- .../pmu-events/arch/s390/cf_zec12/crypto.json | 2 +- .../arch/s390/cf_zec12/extended.json | 2 +- .../arch/test/test_soc/cpu/uncore.json | 2 +- .../arch/x86/icelakex/icx-metrics.json | 2 +- tools/perf/pmu-events/jsmn.c | 43 ++++++++++++++++++- 30 files changed, 85 insertions(+), 46 deletions(-) Reviewed-by: Andi Kleen