Merge pull request #17 from intel/prep270

Updates for 2.7.0 release.

README.md

@@ -25,7 +25,9 @@ Micro-benchmarks can be executed by svr-info to assess the health of the target
 ```
 ./svr-info -benchmark all
 ```
-Note: **Benchmarks should not be run on live/production systems.** Production workload performance may be impacted.
+Notes:
+- **Benchmarks should not be run on live/production systems.** Production workload performance may be impacted.
+- Running all benchmarks, i.e., `--benchmark all`, will take 4+ minutes to run. The frequency benchmark execution time increases with core count (approx. (# of cores + 10)s). If not all benchmarks are required, use the `--help` option to see how to choose specific benchmarks, e.g., `--benchmark cpu,disk`.
 ## System Profiling
 Subsystems on live/production system(s) can be profiled by svr-info. See the help (-h) for the complete list of subsystems. To profile all subsystems:
 ```

RELEASE_NOTES

@@ -7,6 +7,20 @@ Fully Supported Platforms
 - Operating Systems: Ubuntu 16.04, 18.04, 20.04, 22.04, CentOS 7, Amazon Linux 2, Debian 11, RHEL 9, Rocky Linux 8
   Note: svr-info may work on other micro-architectures and Linux distributions, but has not been thoroughly tested
 
+2.7.0
+Features Added
+- Power & Performance Setting Labels refined. Now includes "Performance", "Balance Performance", "Normal", "Normal Powersave", "Balance Powersave", and "Powersave". Report output also includes specific EPB value, e.g., "Performance (6)".
+- Excel 'brief' report's Marketing Claim entry now includes on-CPU accelerator count.
+- Extended the Accelerators table to indicate the configuration of work queues for DSA and IAX.
+- Extended Insights to trigger if work queues are not configured for DSA and IAX.
+Bugs Fixed
+- Fixed merging of call stacks collected with the -analyze option.
+- Added timeout to collector when attempting to install and uninstall kernel modules to avoid potential hang.
+Known Issues
+- The storage micro-benchmark may not run on CentOS due to OS locale settings.
+- CPU cache sizes are reported in aggregate on Ubuntu 20.04 and newer.
+- DRAM population and CPU frequencies may not be accurate on some public cloud IaaS VMs.
+
 2.6.0
 Features Added
 - Enable MLC on AMD by configuring huge pages

builder/Dockerfile

@@ -26,7 +26,7 @@ RUN cp /usr/local/lib/libz.a /usr/lib/x86_64-linux-gnu/libz.a
 RUN curl -s https://gitlab.com/akihe/radamsa/uploads/a2228910d0d3c68d19c09cee3943d7e5/radamsa-0.6.c.gz | gzip -d | cc -O2 -x c -o /usr/local/bin/radamsa -
 
 # Install Go
-ARG GO_VERSION="1.20.4"
+ARG GO_VERSION="1.20.7"
 RUN wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz
 RUN tar -C /usr/local -xzf go${GO_VERSION}.linux-amd64.tar.gz
 RUN rm go${GO_VERSION}.linux-amd64.tar.gz

go.work

@@ -1,14 +1,25 @@
 go 1.20
 
 use ./src/collector
+
 use ./src/msrbusy
+
 use ./src/orchestrator
+
 use ./src/rdmsr
+
 use ./src/reporter
+
 use ./src/wrmsr
+
 use ./src/pkg/commandfile
+
 use ./src/pkg/core
+
 use ./src/pkg/cpu
+
 use ./src/pkg/msr
+
 use ./src/pkg/progress
-use ./src/pkg/target
+
+use ./src/pkg/target

go.work.sum

@@ -1,22 +1,13 @@
+github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/hyperjumptech/hyper-mux v1.1.0/go.mod h1:qdok3j+/VEtFvJ+YOotTNskGg2BXg3UJTbycU2xFDvE=
+github.com/rs/cors v1.8.0/go.mod h1:EBwu+T5AvHOcXwvZIkQFjUN6s8Czyqw12GL/Y0tUyRM=
 github.com/xuri/excelize/v2 v2.7.0 h1:Hri/czwyRCW6f6zrCDWXcXKshlq4xAZNpNOpdfnFhEw=
 github.com/xuri/excelize/v2 v2.7.0/go.mod h1:ebKlRoS+rGyLMyUx3ErBECXs/HNYqyj+PbkkKRK5vSI=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
 golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
 golang.org/x/image v0.0.0-20220902085622-e7cb96979f69/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
 golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
 golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

src/Makefile

@@ -181,10 +181,10 @@ spectre-meltdown-checker:
 
 sshpass:
 ifeq ("$(wildcard sshpass)","")
-	wget https://cytranet.dl.sourceforge.net/project/sshpass/sshpass/1.09/sshpass-1.09.tar.gz
-	tar -xf sshpass-1.09.tar.gz
-	mv sshpass-1.09 sshpass
-	rm sshpass-1.09.tar.gz
+	wget https://cytranet.dl.sourceforge.net/project/sshpass/sshpass/1.10/sshpass-1.10.tar.gz
+	tar -xf sshpass-1.10.tar.gz
+	mv sshpass-1.10 sshpass
+	rm sshpass-1.10.tar.gz
 	cd sshpass && ./configure
 endif
 	cd sshpass && make

src/calcfreq/calcfreq.c

@@ -171,15 +171,15 @@ void Usage(const char* error)
         fprintf(stderr, "%s\n\n", error);
     }
 
-    fprintf(stderr, "   -t : number of physical cores to run this on...optional, defaults to all\n");
-    fprintf(stderr, "   -c : core count at which to start...optional, defaults to 1\n");
-    fprintf(stderr, "   -x : iterations in millions...optional, defaults to 100M\n");
-    fprintf(stderr, "   -a : set to 1 if HT threads get consecutive cpu #s...optional, defaults to 0 (alternating cpu #s)\n");
+    fprintf(stderr, "   -t : number of physical cores to scale up to. Default=0 (only give P1 freq)\n");
+    fprintf(stderr, "   -c : core count at which to start. Default=1\n");
+    fprintf(stderr, "   -x : iterations in millions. Default=100000000\n");
+    fprintf(stderr, "   -a : set to 1 if HT threads get consecutive cpu #s. Default=0 (alternating cpu #s)\n");
     fprintf(stderr, "   -h : display this usage information\n");
     fprintf(stderr, "   -v : display calcfreq version\n");
     fprintf(stderr, "\nExamples:\n");
-    fprintf(stderr, "   ./calcfreq\n");
-    fprintf(stderr, "   ./calcfreq -t4 -c2 -x10 -a1\n");
+    fprintf(stderr, "   ./calcfreq                  # only collect P1 Freq\n");
+    fprintf(stderr, "   ./calcfreq -t4 -c2 -x10 -a1 # measure freq. with 2 to 4 cores busy at 10 iter.\n");
 
     if (error) {
         exit(1);

src/collector/collector_linux.go

@@ -80,12 +80,14 @@ func installMods(mods string, sudoPassword string) (installedMods []string) {
 	if len(mods) > 0 {
 		modList := strings.Split(mods, ",")
 		for _, mod := range modList {
-			log.Printf("Attempting to install kernel module: %s", mod)
-			_, _, _, err := runSuperUserCommand(fmt.Sprintf("modprobe --first-time %s > /dev/null 2>&1", mod), sudoPassword, 0)
-			if err == nil {
-				log.Printf("Installed kernel module %s", mod)
-				installedMods = append(installedMods, mod)
+			log.Printf("Installing kernel module: %s", mod)
+			_, _, _, err := runSuperUserCommand(fmt.Sprintf("modprobe --first-time %s > /dev/null 2>&1", mod), sudoPassword, 10)
+			if err != nil {
+				log.Printf("Kernel module %s already installed or problem installing: %v", mod, err)
+				continue
 			}
+			installedMods = append(installedMods, mod)
+			log.Printf("Installed kernel module %s", mod)
 		}
 	}
 	return installedMods
@@ -94,11 +96,12 @@ func installMods(mods string, sudoPassword string) (installedMods []string) {
 func uninstallMods(modList []string, sudoPassword string) (err error) {
 	for _, mod := range modList {
 		log.Printf("Uninstalling kernel module %s", mod)
-		_, _, _, err = runSuperUserCommand(fmt.Sprintf("modprobe -r %s", mod), sudoPassword, 0)
+		_, _, _, err = runSuperUserCommand(fmt.Sprintf("modprobe -r %s", mod), sudoPassword, 10)
 		if err != nil {
-			log.Printf("Error: %v", err)
-			return
+			log.Printf("Error uninstalling kernel module %s: %v", mod, err)
+			continue
 		}
+		log.Printf("Uninstalled kernel module %s", mod)
 	}
 	return
 }

src/collector/go.mod

@@ -9,7 +9,11 @@ require (
 	intel.com/svr-info/pkg/target v0.0.0-00010101000000-000000000000
 )
 
-require github.com/creasty/defaults v1.6.0 // indirect
+require (
+	github.com/creasty/defaults v1.6.0 // indirect
+	github.com/kr/pretty v0.1.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+)
 
 replace intel.com/svr-info/pkg/core => ../pkg/core
 

src/collector/go.sum

@@ -1,6 +1,8 @@
 github.com/creasty/defaults v1.6.0 h1:ltuE9cfphUtlrBeomuu8PEyISTXnxqkBIoQfXgv7BSc=
 github.com/creasty/defaults v1.6.0/go.mod h1:iGzKe6pbEHnpMPtfDXZEr0NVxWnPTjb1bbDy08fPzYM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

src/orchestrator/go.mod

@@ -16,7 +16,7 @@ replace intel.com/svr-info/pkg/commandfile => ../pkg/commandfile
 
 require (
 	golang.org/x/exp v0.0.0-20230321023759-10a507213a29
-	golang.org/x/term v0.9.0
+	golang.org/x/term v0.10.0
 	gopkg.in/yaml.v2 v2.4.0
 	intel.com/svr-info/pkg/commandfile v0.0.0-00010101000000-000000000000
 	intel.com/svr-info/pkg/core v0.0.0-00010101000000-000000000000
@@ -26,5 +26,7 @@ require (
 
 require (
 	github.com/creasty/defaults v1.6.0 // indirect
-	golang.org/x/sys v0.9.0 // indirect
+	github.com/kr/pretty v0.1.0 // indirect
+	golang.org/x/sys v0.10.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )

src/orchestrator/go.sum

@@ -1,12 +1,14 @@
 github.com/creasty/defaults v1.6.0 h1:ltuE9cfphUtlrBeomuu8PEyISTXnxqkBIoQfXgv7BSc=
 github.com/creasty/defaults v1.6.0/go.mod h1:iGzKe6pbEHnpMPtfDXZEr0NVxWnPTjb1bbDy08fPzYM=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
 golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
-golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
-golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28=
-golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
+golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
+golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

src/orchestrator/resources/collector_reports.yaml.tmpl

@@ -276,6 +276,12 @@ commands:
   - label: lspci devices
     command: lspci -d 8086:3258 | wc -l
     parallel: true 
+  - label: iax devices
+    command: ls -1 /dev/iax
+    parallel: true
+  - label: dsa devices
+    command: ls -1 /dev/dsa
+    parallel: true
 ############
 # Profile command below
 # Note that this is one command because we want the profiling options to run in parallel with

src/pkg/cpu/go.mod

@@ -3,3 +3,8 @@ module intel.com/svr-info/pkg/cpu/v2
 go 1.20
 
 require gopkg.in/yaml.v2 v2.4.0
+
+require (
+	github.com/kr/pretty v0.1.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+)

src/pkg/cpu/go.sum

@@ -1,4 +1,6 @@
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

src/pkg/progress/go.mod

@@ -2,6 +2,6 @@ module intel.com/svr-info/pkg/progress/v2
 
 go 1.20
 
-require golang.org/x/term v0.9.0
+require golang.org/x/term v0.10.0
 
-require golang.org/x/sys v0.9.0 // indirect
+require golang.org/x/sys v0.10.0 // indirect

src/pkg/progress/go.sum

@@ -1,4 +1,4 @@
-golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
-golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28=
-golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo=
+golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
+golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
+golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=

src/reporter/go.mod

@@ -43,7 +43,8 @@ require (
 	go.uber.org/zap v1.21.0 // indirect
 	golang.org/x/crypto v0.8.0 // indirect
 	golang.org/x/net v0.9.0 // indirect
-	golang.org/x/sys v0.7.0 // indirect
+	golang.org/x/sys v0.10.0 // indirect
+	golang.org/x/term v0.10.0 // indirect
 	golang.org/x/text v0.9.0 // indirect
 	gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
 	gopkg.in/src-d/go-git.v4 v4.13.1 // indirect

src/reporter/go.sum

@@ -123,13 +123,13 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
 golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ=
 golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
+golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

src/reporter/report.go

@@ -94,22 +94,23 @@ func NewBriefReport(sources []*Source, fullReport *Report, cpusInfo *cpu.CPU) (r
 	}
 	tableDiskSummary := newDiskSummaryTable(fullReport.findTable("Disk"), Storage)
 	tableNicSummary := newNICSummaryTable(fullReport.findTable("NIC"), Network)
+	tableAcceleratorSummary := newAcceleratorSummaryTable(fullReport.findTable("Accelerator"), CPUCategory)
 	report.Tables = append(report.Tables,
 		[]*Table{
 			fullReport.findTable("Host"),
 			newSystemSummaryTable(fullReport.findTable("System"), System),
 			newBaseboardSummaryTable(fullReport.findTable("Baseboard"), System),
 			newChassisSummaryTable(fullReport.findTable("Chassis"), System),
 			newCPUBriefTable(fullReport.findTable("CPU"), CPUCategory),
-			newAcceleratorSummaryTable(fullReport.findTable("Accelerator"), CPUCategory),
+			tableAcceleratorSummary,
 			newMemoryBriefTable(fullReport.findTable("Memory"), Memory),
 			tableNicSummary,
 			tableDiskSummary,
 			newBIOSSummaryTable(fullReport.findTable("BIOS"), Software),
 			newOperatingSystemBriefTable(fullReport.findTable("Operating System"), Software),
 			fullReport.findTable("Power"),
 			newVulnerabilitySummaryTable(fullReport.findTable("Vulnerability"), Security),
-			newMarketingClaimTable(fullReport, tableNicSummary, tableDiskSummary, NoCategory),
+			newMarketingClaimTable(fullReport, tableNicSummary, tableDiskSummary, tableAcceleratorSummary, NoCategory),
 		}...,
 	)
 	// TODO: remove check when code is stable