Merge pull request #22 from intel/prep273

Prep273
intel · Sep 15, 2023 · da8cf93 · da8cf93
2 parents 4566597 + 7ab8f46
commit da8cf93
Show file tree

Hide file tree

Showing 11 changed files with 103 additions and 101 deletions.
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -7,6 +7,19 @@ 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.3
+Sub-components Updated
+- spectre-meltdown-checker -- updated to latest HEAD commit
+- others -- internal components used to collect data and generate reports
+Features Added
+- None
+Bugs Fixed
+- None
+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.7.2
 Features Added
 - None

diff --git a/builder/Dockerfile b/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.7"
+ARG GO_VERSION="1.21.1"
 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

diff --git a/src/Makefile b/src/Makefile
@@ -64,23 +64,25 @@ wrmsr:
 msrbusy:
 	cd msrbusy && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -ldflags '-s -w -X main.gVersion=$(VERSION)' -o msrbusy
 
+ASYNCPROFILER_VERSION := 2.9
 async-profiler:
 ifeq ("$(wildcard async-profiler)","")
-ifeq ("$(wildcard async-profiler-2.9-linux-x64.tar.gz)","")
-	wget https://github.com/jvm-profiling-tools/async-profiler/releases/download/v2.9/async-profiler-2.9-linux-x64.tar.gz
+ifeq ("$(wildcard async-profiler-$(ASYNCPROFILER_VERSION)-linux-x64.tar.gz)","")
+	wget https://github.com/jvm-profiling-tools/async-profiler/releases/download/v$(ASYNCPROFILER_VERSION)/async-profiler-$(ASYNCPROFILER_VERSION)-linux-x64.tar.gz
 endif
-	tar -xf async-profiler-2.9-linux-x64.tar.gz && mv async-profiler-2.9-linux-x64 async-profiler
+	tar -xf async-profiler-$(ASYNCPROFILER_VERSION)-linux-x64.tar.gz && mv async-profiler-$(ASYNCPROFILER_VERSION)-linux-x64 async-profiler
 endif
 
 calcfreq:
 	cd calcfreq && VERSION=$(VERSION) make
 
+CPUID_VERSION := 20230614
 cpuid:
 ifeq ("$(wildcard cpuid)","")
-ifeq ("$(wildcard cpuid-20221003.src.tar.gz)","")
-	wget http://www.etallen.com/cpuid/cpuid-20221003.src.tar.gz
+ifeq ("$(wildcard cpuid-$(CPUID_VERSION).src.tar.gz)","")
+	wget http://www.etallen.com/cpuid/cpuid-$(CPUID_VERSION).src.tar.gz
 endif	
-	tar -xf cpuid-20221003.src.tar.gz && mv cpuid-20221003/ cpuid/
+	tar -xf cpuid-$(CPUID_VERSION).src.tar.gz && mv cpuid-$(CPUID_VERSION)/ cpuid/
 endif	
 	# gcc 4.8 doesn't support -Wimplicit-fallthrough option
 	cd cpuid && sed -i s/"-Wimplicit-fallthrough"/""/ Makefile
@@ -92,7 +94,7 @@ ifeq ("$(wildcard dmidecode)","")
 else
 	cd dmidecode && git checkout master && git pull
 endif
-	cd dmidecode && git checkout dmidecode-3-4
+	cd dmidecode && git checkout dmidecode-3-5
 	cd dmidecode && make
 
 ethtool:
@@ -181,12 +183,13 @@ else
 	cd spectre-meltdown-checker && git checkout master && git pull
 endif
 
+SSHPASS_VERSION := 1.10
 sshpass:
 ifeq ("$(wildcard sshpass)","")
-	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
+	wget https://cytranet.dl.sourceforge.net/project/sshpass/sshpass/$(SSHPASS_VERSION)/sshpass-$(SSHPASS_VERSION).tar.gz
+	tar -xf sshpass-$(SSHPASS_VERSION).tar.gz
+	mv sshpass-$(SSHPASS_VERSION) sshpass
+	rm sshpass-$(SSHPASS_VERSION).tar.gz
 	cd sshpass && ./configure
 endif
 	cd sshpass && make
@@ -211,12 +214,13 @@ ifeq ("$(wildcard sysstat/Makefile)","")
 endif
 	cd sysstat && make
 
+LINUX_VERSION := 6.1.52
 linux-source:
 ifeq ("$(wildcard linux)","")
-ifeq ("$(wildcard linux-6.0.7.tar.xz)","")
-	wget https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.7.tar.xz
+ifeq ("$(wildcard linux-$(LINUX_VERSION).tar.xz)","")
+	wget https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-$(LINUX_VERSION).tar.xz
 endif
-	tar -xf linux-6.0.7.tar.xz && mv linux-6.0.7/ linux/
+	tar -xf linux-$(LINUX_VERSION).tar.xz && mv linux-$(LINUX_VERSION)/ linux/
 endif
 
 turbostat: linux-source

diff --git a/src/orchestrator/go.mod b/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.11.0
+	golang.org/x/term v0.12.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
@@ -27,6 +27,6 @@ require (
 require (
 	github.com/creasty/defaults v1.6.0 // indirect
 	github.com/kr/pretty v0.1.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/sys v0.12.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )
diff --git a/src/orchestrator/go.sum b/src/orchestrator/go.sum
@@ -7,10 +7,10 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 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.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0=
-golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
+golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 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/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

diff --git a/src/pkg/progress/go.mod b/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.11.0
+require golang.org/x/term v0.12.0
 
-require golang.org/x/sys v0.11.0 // indirect
+require golang.org/x/sys v0.12.0 // indirect
diff --git a/src/pkg/progress/go.sum b/src/pkg/progress/go.sum
@@ -1,4 +1,4 @@
-golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0=
-golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
+golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
diff --git a/src/reporter/go.mod b/src/reporter/go.mod
@@ -14,38 +14,36 @@ replace intel.com/svr-info/pkg/target => ../pkg/target
 
 require (
 	github.com/google/go-cmp v0.5.9
-	github.com/hyperjumptech/grule-rule-engine v1.13.0
-	github.com/xuri/excelize/v2 v2.7.1
+	github.com/hyperjumptech/grule-rule-engine v1.14.1
+	github.com/xuri/excelize/v2 v2.8.0
 	gopkg.in/yaml.v2 v2.4.0
 	intel.com/svr-info/pkg/core v0.0.0-00010101000000-000000000000
 	intel.com/svr-info/pkg/cpu v0.0.0-00010101000000-000000000000
 )
 
 require (
-	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220527190237-ee62e23da966 // indirect
-	github.com/bmatcuk/doublestar v1.3.2 // indirect
+	github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
+	github.com/bmatcuk/doublestar v1.3.4 // indirect
 	github.com/emirpasic/gods v1.12.0 // indirect
-	github.com/google/uuid v1.1.1 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/richardlehane/mscfb v1.0.4 // indirect
 	github.com/richardlehane/msoleps v1.0.3 // indirect
 	github.com/sergi/go-diff v1.0.0 // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/src-d/gcfg v1.4.0 // indirect
 	github.com/xanzy/ssh-agent v0.2.1 // indirect
-	github.com/xuri/efp v0.0.0-20220603152613-6918739fd470 // indirect
-	github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
-	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.10.0 // indirect
-	golang.org/x/term v0.10.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
+	github.com/xuri/efp v0.0.0-20230802181842-ad255f2331ca // indirect
+	github.com/xuri/nfp v0.0.0-20230819163627-dc951e3ffe1a // indirect
+	go.uber.org/multierr v1.10.0 // indirect
+	go.uber.org/zap v1.25.0 // indirect
+	golang.org/x/crypto v0.12.0 // indirect
+	golang.org/x/net v0.14.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/text v0.12.0 // indirect
 	gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
 	gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect