From 98f3d779b73ca9d8ebeb46e2cd6e312bbc20a3f3 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Thu, 10 Nov 2022 17:07:11 -0800 Subject: [PATCH] arch-x86: X86ISA default vector_string to HygonGenuine This commit, https://gem5-review.googlesource.com/c/public/gem5/+/64831, changed the default 'vendor_string' for the 'X86ISA' SimObject from 'M5 Simulator' and 'AuthenticAMD'. Unforunately due to an issue highlighted here: https://gem5.atlassian.net/browse/GEM5-1300 we cannot use the 'AuthenticAMD'. Therefore, this change updates the default vector_string to HygonGenuine. The HygonGenuine is simple but works. Change-Id: I21421da8ae73e76d9daaf2fdd0b3238d5b309172 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/65492 Tested-by: kokoro Maintainer: Bobby Bruce Reviewed-by: Bobby Bruce Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/65611 Reviewed-by: Matt Sinclair --- src/arch/x86/X86ISA.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/arch/x86/X86ISA.py b/src/arch/x86/X86ISA.py index 2760b7672d..bb72c415e9 100644 --- a/src/arch/x86/X86ISA.py +++ b/src/arch/x86/X86ISA.py @@ -42,6 +42,15 @@ class X86ISA(BaseISA): cxx_class = "gem5::X86ISA::ISA" cxx_header = "arch/x86/isa.hh" + # Here we set the default vector string to "HygonGenuine". Previously this + # "M5 Simulator" but due to stricter checks in newer versions of GLIBC, + # the CPUID is checked for the required features. As "M5 Simulator" is not + # genuine CPUID, an error is returned. This change + # https://gem5-review.googlesource.com/c/public/gem5/+/64831 changed this + # to "GenuineAMD" but due to issues with booting the Linux Kernel using + # this vector string (highlighted here: + # https://gem5.atlassian.net/browse/GEM5-1300) we opted to use + # "HygonGenuine" instead. vendor_string = Param.String( - "AuthenticAMD", "Vendor string for CPUID instruction" + "HygonGenuine", "Vendor string for CPUID instruction" )