[src/trunk]: src/usr.sbin/cpuctl/arch Print 1GB TLB entry at the same leve's ...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/43076f9518fd
branches:  trunk
changeset: 1027176:43076f9518fd
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Dec 09 14:23:06 2021 +0000

description:
Print 1GB TLB entry at the same leve's line.

Example:
  before:
    cpu0: ITLB: 128 4KB entries 8-way, 2M/4M: 8 entries
    cpu0: DTLB: 64 4KB entries 4-way
    cpu0: L2 STLB: 4K/2M: 1024 entries
    cpu0: L1 1GB page DTLB: 4 1GB entries 4-way

  after:
    cpu0: ITLB: 128 4KB entries 8-way, 2M/4M: 8 entries
    cpu0: DTLB: 64 4KB entries 4-way, 4 1GB entries 4-way
    cpu0: L2 STLB: 4K/2M: 1024 entries

diffstat:

 usr.sbin/cpuctl/arch/i386.c |  24 ++++++------------------
 1 files changed, 6 insertions(+), 18 deletions(-)

diffs (69 lines):

diff -r 40cb6fcd5124 -r 43076f9518fd usr.sbin/cpuctl/arch/i386.c
--- a/usr.sbin/cpuctl/arch/i386.c       Thu Dec 09 07:33:24 2021 +0000
+++ b/usr.sbin/cpuctl/arch/i386.c       Thu Dec 09 14:23:06 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i386.c,v 1.123 2021/10/27 04:15:42 mrg Exp $   */
+/*     $NetBSD: i386.c,v 1.124 2021/12/09 14:23:06 msaitoh Exp $       */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.123 2021/10/27 04:15:42 mrg Exp $");
+__RCSID("$NetBSD: i386.c,v 1.124 2021/12/09 14:23:06 msaitoh Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -2420,11 +2420,13 @@
 
        sep = print_tlb_config(ci, CAI_ITLB, "ITLB:", NULL);
        sep = print_tlb_config(ci, CAI_ITLB2, "ITLB:", sep);
+       sep = print_tlb_config(ci, CAI_L1_1GBITLB, "ITLB:", sep);
        if (sep != NULL)
                aprint_verbose("\n");
 
        sep = print_tlb_config(ci, CAI_DTLB, "DTLB:", NULL);
        sep = print_tlb_config(ci, CAI_DTLB2, "DTLB:", sep);
+       sep = print_tlb_config(ci, CAI_L1_1GBDTLB, "DTLB:", sep);
        if (sep != NULL)
                aprint_verbose("\n");
 
@@ -2438,11 +2440,13 @@
 
        sep = print_tlb_config(ci, CAI_L2_ITLB, "L2 ITLB:", NULL);
        sep = print_tlb_config(ci, CAI_L2_ITLB2, "L2 ITLB:", sep);
+       sep = print_tlb_config(ci, CAI_L2_1GBITLB, "L2 ITLB:", sep);
        if (sep != NULL)
                aprint_verbose("\n");
 
        sep = print_tlb_config(ci, CAI_L2_DTLB, "L2 DTLB:", NULL);
        sep = print_tlb_config(ci, CAI_L2_DTLB2, "L2 DTLB:", sep);
+       sep = print_tlb_config(ci, CAI_L2_1GBDTLB, "L2 DTLB:", sep);
        if (sep != NULL)
                aprint_verbose("\n");
 
@@ -2451,22 +2455,6 @@
        sep = print_tlb_config(ci, CAI_L2_STLB3, "L2 STLB:", sep);
        if (sep != NULL)
                aprint_verbose("\n");
-
-       sep = print_tlb_config(ci, CAI_L1_1GBITLB, "L1 1GB page ITLB:", NULL);
-       if (sep != NULL)
-               aprint_verbose("\n");
-
-       sep = print_tlb_config(ci, CAI_L1_1GBDTLB, "L1 1GB page DTLB:", NULL);
-       if (sep != NULL)
-               aprint_verbose("\n");
-
-       sep = print_tlb_config(ci, CAI_L2_1GBITLB, "L2 1GB page ITLB:", NULL);
-       if (sep != NULL)
-               aprint_verbose("\n");
-
-       sep = print_tlb_config(ci, CAI_L2_1GBDTLB, "L2 1GB page DTLB:", NULL);
-       if (sep != NULL)
-               aprint_verbose("\n");
 }
 
 static void