From nobody Fri Jun 09 19:58:02 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QdBhV3j18z4cKdJ; Fri, 9 Jun 2023 19:58:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QdBhV2rv7z4J55; Fri, 9 Jun 2023 19:58:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686340682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OUzR3CHDA0tUIDpmpLkYaJggomBxxM5gQRU8MNN0tzQ=; b=rcaHWUl1ookScl3K7CUc2mw3T5BP2KQS9lgB1ciF9q0Z3fjeq2I8bb4EGGcT80QHqrDXZ+ 8jkoEHoLgFoniRd+/d28g7obILKw9ruNpgOfi2EHSO5m1WHEl35Q9ibdUxpIYOwS/WqIDk Nvry4gTQyVL8jesoUZbRViKWF7CzU/LRO6QEQr2nnivOLx88TwGj+szERS1zEIR+19/qLu pnLr7xRgFteq3+dEKJ/n/etKywZPX90ndKbTAz1U9j+JKIFPW2m8Atw0Q1qQdLB3m9UaC3 uWk3XZRk+sosch+30nRzkkKr1zspN5+uz9OBUvF1StFI6cr4/yiyqsrpHZh+Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686340682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OUzR3CHDA0tUIDpmpLkYaJggomBxxM5gQRU8MNN0tzQ=; b=sbrn/D8a+wNF8IvVIwC4RY9eDdwbxoIeL6u64PDIvlCQ2D8UG49mZ2VAeDM0cRwnYQxlEC H0SSPvynSbf8+TRK/qZtjAzPQnNj9O46mmmZEXRdK3ES8mma+hWB+eESHTovEbmXZi6s5x ww/7DHqD7QwT4e8hwHaBx1cT+VaZ8A4GcBEYLfjWQ/Jq5mFlzYHxgMhoV9o+PO8h+gsole 2EK7dS4EgdP/mnho1ahQwv37HRMt4o8wOREU/QiiMrCkOjdI/Hj+EQWcSkfdVSeU4oh1Dr AKs7Nh793unhz1Cw0NexwmQVHBGIJvlJdbhFk8OWstZIGjuiiQfHkj2SCSM5ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686340682; a=rsa-sha256; cv=none; b=bQXT6E+5vUb2eLt3u80X19AoKWpiO9Hm/EZbZF1uzBxgKZx+dYCigcHsfJbNnumt6q+rvK pX5U6IdPbw3Te5JlXw5WM+v5uO4iFkyTW37ngIaIfqtL+Kh1D78bhPHfjkpKtOC/aI9zN4 zaEfEi0Zin+OJc9gm0UWjGsm+UACii6oHGcOP6HIaLkGLQN05DkiajARBkKqNXcjA+kAEX NxLnrNYLowsbYPwAZUIGOoUVn8c6AX7Hwzhn7uEAfkhXmRZFSWxOUOG30bt1IhGIVQzhCh OtxodMQOBlLbhwbx1t+cek8XXycq3VFUGArQ23EdHiJn7eVoegT8ixetIWJJRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QdBhV1gGFzndy; Fri, 9 Jun 2023 19:58:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 359Jw2WG072044; Fri, 9 Jun 2023 19:58:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 359Jw2uj072043; Fri, 9 Jun 2023 19:58:02 GMT (envelope-from git) Date: Fri, 9 Jun 2023 19:58:02 GMT Message-Id: <202306091958.359Jw2uj072043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 2fc54435a6c4 - stable/13 - pmc_events.h: event list formatting List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2fc54435a6c4874aeacd027faf18f1ad64b5492d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=2fc54435a6c4874aeacd027faf18f1ad64b5492d commit 2fc54435a6c4874aeacd027faf18f1ad64b5492d Author: Mitchell Horne AuthorDate: 2023-05-05 21:57:14 +0000 Commit: Mitchell Horne CommitDate: 2023-06-09 18:14:58 +0000 pmc_events.h: event list formatting Improve the legibility of the list. Bump overall indentation, fix some whitespace, and sort the IAF block. Reviewed by: jkoshy MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39903 (cherry picked from commit b6c9d2a3f892169d4a6acc92869f9d9db52876ea) --- sys/dev/hwpmc/pmc_events.h | 56 +++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/sys/dev/hwpmc/pmc_events.h b/sys/dev/hwpmc/pmc_events.h index 7a3ef832b47c..6df2ef4d82d7 100644 --- a/sys/dev/hwpmc/pmc_events.h +++ b/sys/dev/hwpmc/pmc_events.h @@ -1843,34 +1843,34 @@ __PMC_EV_ALIAS("unhalted-reference-cycles", IAF_CPU_CLK_UNHALTED_REF) * 0x14100 0x0100 ARMv8 events * 0x20000 0x1000 Software events */ -#define __PMC_EVENTS() \ - __PMC_EV_BLOCK(TSC, 0x01000) \ - __PMC_EV_TSC() \ - __PMC_EV_BLOCK(IAF, 0x10000) \ - __PMC_EV_IAF() \ - __PMC_EV_BLOCK(K7, 0x2000) \ - __PMC_EV_K7() \ - __PMC_EV_BLOCK(K8, 0x2080) \ - __PMC_EV_K8() \ - __PMC_EV_BLOCK(MIPS24K, 0x11300) \ - __PMC_EV_MIPS24K() \ - __PMC_EV_BLOCK(OCTEON, 0x11400) \ - __PMC_EV_OCTEON() \ - __PMC_EV_BLOCK(MIPS74K, 0x11500) \ - __PMC_EV_MIPS74K() \ - __PMC_EV_BLOCK(BERI, 0x11600) \ - __PMC_EV_BERI() \ - __PMC_EV_BLOCK(PPC7450, 0x13000) \ - __PMC_EV_PPC7450() \ - __PMC_EV_BLOCK(PPC970, 0x13100) \ - __PMC_EV_PPC970() \ - __PMC_EV_BLOCK(POWER8, 0x13200) \ - __PMC_EV_POWER8() \ - __PMC_EV_BLOCK(E500, 0x13300) \ - __PMC_EV_E500() \ - __PMC_EV_BLOCK(ARMV7, 0x14000) \ - __PMC_EV_ARMV7() \ - __PMC_EV_BLOCK(ARMV8, 0x14100) \ +#define __PMC_EVENTS() \ + __PMC_EV_BLOCK(TSC, 0x01000) \ + __PMC_EV_TSC() \ + __PMC_EV_BLOCK(K7, 0x02000) \ + __PMC_EV_K7() \ + __PMC_EV_BLOCK(K8, 0x02080) \ + __PMC_EV_K8() \ + __PMC_EV_BLOCK(IAF, 0x10000) \ + __PMC_EV_IAF() \ + __PMC_EV_BLOCK(MIPS24K, 0x11300) \ + __PMC_EV_MIPS24K() \ + __PMC_EV_BLOCK(OCTEON, 0x11400) \ + __PMC_EV_OCTEON() \ + __PMC_EV_BLOCK(MIPS74K, 0x11500) \ + __PMC_EV_MIPS74K() \ + __PMC_EV_BLOCK(BERI, 0x11600) \ + __PMC_EV_BERI() \ + __PMC_EV_BLOCK(PPC7450, 0x13000) \ + __PMC_EV_PPC7450() \ + __PMC_EV_BLOCK(PPC970, 0x13100) \ + __PMC_EV_PPC970() \ + __PMC_EV_BLOCK(POWER8, 0x13200) \ + __PMC_EV_POWER8() \ + __PMC_EV_BLOCK(E500, 0x13300) \ + __PMC_EV_E500() \ + __PMC_EV_BLOCK(ARMV7, 0x14000) \ + __PMC_EV_ARMV7() \ + __PMC_EV_BLOCK(ARMV8, 0x14100) \ __PMC_EV_ARMV8() #define PMC_EVENT_FIRST PMC_EV_TSC_TSC