From 016eaa988b43ff2ca5d1cc06a5a587f15750f98e Mon Sep 17 00:00:00 2001 From: jharper5 Date: Tue, 6 Feb 2024 17:24:29 -0800 Subject: [PATCH 1/3] work-around cpuid utility infinite loop on some systems --- third_party/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/third_party/Makefile b/third_party/Makefile index 9c835f4..ecc83d1 100644 --- a/third_party/Makefile +++ b/third_party/Makefile @@ -39,6 +39,7 @@ endif tar -xf async-profiler-$(ASYNCPROFILER_VERSION)-linux-x64.tar.gz && mv async-profiler-$(ASYNCPROFILER_VERSION)-linux-x64 async-profiler endif +# if you change the version, check the sed hacks below CPUID_VERSION := 20230614 cpuid: ifeq ("$(wildcard cpuid)","") @@ -49,6 +50,8 @@ endif endif # gcc 4.8 doesn't support -Wimplicit-fallthrough option cd cpuid && sed -i s/"-Wimplicit-fallthrough"/""/ Makefile + # modifies one line to short-circuit output due to potential infinite loop on some systems + cd cpuid && sed -i s/"(words\[WORD_EAX\] & 0xfff)"/0/ cpuid.c cd cpuid && make dmidecode: From e50ae69b780e3aaa29baea52c0f2fabd626a40d5 Mon Sep 17 00:00:00 2001 From: jharper5 Date: Wed, 7 Feb 2024 05:45:20 -0800 Subject: [PATCH 2/3] prep for 2.9.1 release --- RELEASE_NOTES | 4 ++++ version.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 13a9745..77ad7b7 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -6,6 +6,10 @@ 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.9.1 +Bugs Fixed +- Extremely long run time on some EMR virtual machines + 2.9.0 Features Added - Report CPU temperature when CPUs have been active when '-benchmark turbo' is run diff --git a/version.txt b/version.txt index f3ac133..38d56e5 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.9.0 \ No newline at end of file +2.9.1 \ No newline at end of file From 6070c98e8562acf50469dfe7f027fa833e6c4413 Mon Sep 17 00:00:00 2001 From: jharper5 Date: Wed, 7 Feb 2024 09:02:37 -0800 Subject: [PATCH 3/3] fix sed --- third_party/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/Makefile b/third_party/Makefile index ecc83d1..c5dcc31 100644 --- a/third_party/Makefile +++ b/third_party/Makefile @@ -51,7 +51,7 @@ endif # gcc 4.8 doesn't support -Wimplicit-fallthrough option cd cpuid && sed -i s/"-Wimplicit-fallthrough"/""/ Makefile # modifies one line to short-circuit output due to potential infinite loop on some systems - cd cpuid && sed -i s/"(words\[WORD_EAX\] & 0xfff)"/0/ cpuid.c + cd cpuid && sed -i 11242s/"(words\[WORD_EAX\] & 0xfff)"/0/ cpuid.c cd cpuid && make dmidecode: