From 640b110254c6843e9d136ffeecf4f952bdfd3423 Mon Sep 17 00:00:00 2001 From: 0z5a Date: Sat, 14 Nov 2026 18:13:24 +0100 Subject: [PATCH] loongarch: fix CPUCFG /proc/cpuinfo flag string (cfg -> cpucfg) The kernel lists the CPUCFG feature as "cpucfg" in /proc/cpuinfo (arch/loongarch/kernel/proc.c since v5.19). The table looked for "cfg", which HasWord() never matches, so CPUCFG was always false. The two LoongArch tests use real cpuinfo dumps that contain "cpucfg" but asserted false; expect true. --- src/impl_loongarch_linux.c | 2 +- test/cpuinfo_loongarch_test.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/impl_loongarch_linux.c b/src/impl_loongarch_linux.c index da3e8cf7..9d832914 100644 --- a/src/impl_loongarch_linux.c +++ b/src/impl_loongarch_linux.c @@ -23,7 +23,7 @@ // Definitions for introspection. //////////////////////////////////////////////////////////////////////////////// #define INTROSPECTION_TABLE \ - LINE(LOONGARCH_CPUCFG, CPUCFG, "cfg", HWCAP_LOONGARCH_CPUCFG, 0) \ + LINE(LOONGARCH_CPUCFG, CPUCFG, "cpucfg", HWCAP_LOONGARCH_CPUCFG, 0) \ LINE(LOONGARCH_LAM, LAM, "lam", HWCAP_LOONGARCH_LAM, 0) \ LINE(LOONGARCH_UAL, UAL, "ual", HWCAP_LOONGARCH_UAL, 0) \ LINE(LOONGARCH_FPU, FPU, "fpu", HWCAP_LOONGARCH_FPU, 0) \ diff --git a/test/cpuinfo_loongarch_test.cc b/test/cpuinfo_loongarch_test.cc index 14f544f7..74ab0147 100644 --- a/test/cpuinfo_loongarch_test.cc +++ b/test/cpuinfo_loongarch_test.cc @@ -87,7 +87,7 @@ ISA : loongarch32 loongarch64 Features : cpucfg lam ual fpu lsx lasx crc32 complex crypto lvz lbt_x86 lbt_arm lbt_mips Hardware Watchpoint : yes, iwatch count: 8, dwatch count: 8)"); const auto info = GetLoongArchInfo(); - EXPECT_FALSE(info.features.CPUCFG); + EXPECT_TRUE(info.features.CPUCFG); EXPECT_TRUE(info.features.LAM); EXPECT_TRUE(info.features.UAL); EXPECT_TRUE(info.features.FPU); @@ -168,7 +168,7 @@ ISA : loongarch32 loongarch64 Features : cpucfg lam ual fpu crc32 Hardware Watchpoint : yes, iwatch count: 0, dwatch count: 0)"); const auto info = GetLoongArchInfo(); - EXPECT_FALSE(info.features.CPUCFG); + EXPECT_TRUE(info.features.CPUCFG); EXPECT_TRUE(info.features.LAM); EXPECT_TRUE(info.features.UAL); EXPECT_TRUE(info.features.FPU);