| Message ID | 20210121194740.2786158-1-hjl.tools@gmail.com |
|---|---|
| State | Committed |
| Headers |
Return-Path: <libc-alpha-bounces@sourceware.org> X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 82B8F39540B5; Thu, 21 Jan 2021 19:47:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 82B8F39540B5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1611258468; bh=kcZYIKAOUQWUw5ivzaNrlHSFli3NQVEGHPb7b764vwQ=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=vX2/vIG4IKPhKz0NyYDCqS4mmH6TZGkfBuRCCnKjuyzaCQBjs5btgqrZGjv+Hf2Mn luJi75z2md3F2sX97p4503FEeob81yBazu/w8t7cNfWdnuS6dJQuLbrfow1ijlGr87 rOaBZdkV7lK9UlkXQrQYVY8/R/Vz9VmJgE8ERWDo= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by sourceware.org (Postfix) with ESMTPS id 1018E3875409 for <libc-alpha@sourceware.org>; Thu, 21 Jan 2021 19:47:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1018E3875409 Received: by mail-pj1-x102b.google.com with SMTP id lw17so5288589pjb.0 for <libc-alpha@sourceware.org>; Thu, 21 Jan 2021 11:47:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=kcZYIKAOUQWUw5ivzaNrlHSFli3NQVEGHPb7b764vwQ=; b=Zaq4dSTTq1tK76LtCsGC6j2VRfEAPsYABYTWCEXMFf533JAsiOUv1v7mwAlJ5lVR5U jRVdBZXIC55bZyqARGvCZlD43HKDshOT3vEL8W88Ut974Yb1IPEvDFTU2qwac7eNWo5u mCvIL5Hbfvd6oWbONxnC4afCtjOC9aLhHMs2OLaidLof0w0rwQq0N/eP7U4R/QqpQAoe f9XazLdOywJdBAIMOnTRLeEioy4CqiyPPWalFsTPtytkyYgsw70hajdX5/WXTmRgi5bC g8igtHOq5xqzUBXe1SFAm2FPBYwVHHQjW6n/RH7uPhGX1+r6MasN5GHJWkCrQD8pIRoJ mLcg== X-Gm-Message-State: AOAM531qhQXjrf+l97ZtJ67JfNZyJPgtLpCvNxNrU8R3Dwe5EdbgQiJw hV3wdgKwaiPK98Prn3q+O+92+Ksn60M= X-Google-Smtp-Source: ABdhPJzCVqQTFqDImbujKR9fyECBcJpgj4S32A1H4XtWvQQNwh5yPAj/nsWfn435mZMAhzPR2YBYmA== X-Received: by 2002:a17:90a:6643:: with SMTP id f3mr1110118pjm.33.1611258464673; Thu, 21 Jan 2021 11:47:44 -0800 (PST) Received: from gnu-cfl-2.localdomain (c-69-181-90-243.hsd1.ca.comcast.net. [69.181.90.243]) by smtp.gmail.com with ESMTPSA id h8sm7281992pjc.2.2021.01.21.11.47.43 for <libc-alpha@sourceware.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jan 2021 11:47:43 -0800 (PST) Received: from gnu-cfl-2.localdomain (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id 7CB881A0169 for <libc-alpha@sourceware.org>; Thu, 21 Jan 2021 11:47:42 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH] x86: Properly match CPU feature [BZ #27222] Date: Thu, 21 Jan 2021 11:47:40 -0800 Message-Id: <20210121194740.2786158-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3039.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list <libc-alpha.sourceware.org> List-Unsubscribe: <https://sourceware.org/mailman/options/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=unsubscribe> List-Archive: <https://sourceware.org/pipermail/libc-alpha/> List-Post: <mailto:libc-alpha@sourceware.org> List-Help: <mailto:libc-alpha-request@sourceware.org?subject=help> List-Subscribe: <https://sourceware.org/mailman/listinfo/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=subscribe> From: "H.J. Lu via Libc-alpha" <libc-alpha@sourceware.org> Reply-To: "H.J. Lu" <hjl.tools@gmail.com> Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" <libc-alpha-bounces@sourceware.org> |
| Series |
x86: Properly match CPU feature [BZ #27222]
|
|
Commit Message
H.J. Lu
Jan. 21, 2021, 7:47 p.m. UTC
/proc/cpuinfo has flags : fpu vme de pse ... ssse3 ... SSE3 in /proc/cpuinfo is displaced as "pni". Search "pni" instead of "sse3" for SSE3. After finding a match for a string, verify the previous character is space and the next character is space or null byte to avoid matching "XXXYYYXXX" with "YYY". --- sysdeps/x86/tst-cpu-features-cpuinfo.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
Comments
On Thu, Jan 21, 2021 at 11:47 AM H.J. Lu <hjl.tools@gmail.com> wrote: > > /proc/cpuinfo has > > flags : fpu vme de pse ... ssse3 ... > > SSE3 in /proc/cpuinfo is displaced as "pni". Search "pni" instead of > "sse3" for SSE3. After finding a match for a string, verify the previous > character is space and the next character is space or null byte to avoid > matching "XXXYYYXXX" with "YYY". > --- > sysdeps/x86/tst-cpu-features-cpuinfo.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/sysdeps/x86/tst-cpu-features-cpuinfo.c b/sysdeps/x86/tst-cpu-features-cpuinfo.c > index 771771c959..9308349869 100644 > --- a/sysdeps/x86/tst-cpu-features-cpuinfo.c > +++ b/sysdeps/x86/tst-cpu-features-cpuinfo.c > @@ -64,7 +64,12 @@ check_proc (const char *proc_name, int flag, int usable, const char *name) > return 0; > } > printf (" %s: %d\n", name, flag); > - if (strstr (cpu_flags, proc_name) != NULL) > + char *str = strstr (cpu_flags, proc_name); > + size_t len = strlen (proc_name); > + /* Don't match "ssse3" with "sse3". */ > + if (str != NULL > + && str[-1] == ' ' > + && (str[len] == ' ' || str[len] == '\0')) > found = 1; > printf (" cpuinfo (%s): %d\n", proc_name, found); > > @@ -206,7 +211,7 @@ do_test (int argc, char **argv) > fails += CHECK_PROC (ssbd, SSBD); > fails += CHECK_PROC (sse, SSE); > fails += CHECK_PROC (sse2, SSE2); > - fails += CHECK_PROC (sse3, SSE3); > + fails += CHECK_PROC (pni, SSE3); > fails += CHECK_PROC (sse4_1, SSE4_1); > fails += CHECK_PROC (sse4_2, SSE4_2); > fails += CHECK_PROC (sse4a, SSE4A); > -- > 2.29.2 > I am checking it in.
On 22/01/2021 12:01, H.J. Lu via Libc-alpha wrote: > On Thu, Jan 21, 2021 at 11:47 AM H.J. Lu <hjl.tools@gmail.com> wrote: >> >> /proc/cpuinfo has >> >> flags : fpu vme de pse ... ssse3 ... >> >> SSE3 in /proc/cpuinfo is displaced as "pni". Search "pni" instead of >> "sse3" for SSE3. After finding a match for a string, verify the previous >> character is space and the next character is space or null byte to avoid >> matching "XXXYYYXXX" with "YYY". >> --- >> sysdeps/x86/tst-cpu-features-cpuinfo.c | 9 +++++++-- >> 1 file changed, 7 insertions(+), 2 deletions(-) >> >> diff --git a/sysdeps/x86/tst-cpu-features-cpuinfo.c b/sysdeps/x86/tst-cpu-features-cpuinfo.c >> index 771771c959..9308349869 100644 >> --- a/sysdeps/x86/tst-cpu-features-cpuinfo.c >> +++ b/sysdeps/x86/tst-cpu-features-cpuinfo.c >> @@ -64,7 +64,12 @@ check_proc (const char *proc_name, int flag, int usable, const char *name) >> return 0; >> } >> printf (" %s: %d\n", name, flag); >> - if (strstr (cpu_flags, proc_name) != NULL) >> + char *str = strstr (cpu_flags, proc_name); >> + size_t len = strlen (proc_name); >> + /* Don't match "ssse3" with "sse3". */ >> + if (str != NULL >> + && str[-1] == ' ' >> + && (str[len] == ' ' || str[len] == '\0')) >> found = 1; >> printf (" cpuinfo (%s): %d\n", proc_name, found); >> >> @@ -206,7 +211,7 @@ do_test (int argc, char **argv) >> fails += CHECK_PROC (ssbd, SSBD); >> fails += CHECK_PROC (sse, SSE); >> fails += CHECK_PROC (sse2, SSE2); >> - fails += CHECK_PROC (sse3, SSE3); >> + fails += CHECK_PROC (pni, SSE3); >> fails += CHECK_PROC (sse4_1, SSE4_1); >> fails += CHECK_PROC (sse4_2, SSE4_2); >> fails += CHECK_PROC (sse4a, SSE4A); >> -- >> 2.29.2 >> > > I am checking it in. > Ok for 2.33.
On Fri, Jan 22, 2021 at 8:56 AM Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org> wrote: > > > > On 22/01/2021 12:01, H.J. Lu via Libc-alpha wrote: > > On Thu, Jan 21, 2021 at 11:47 AM H.J. Lu <hjl.tools@gmail.com> wrote: > >> > >> /proc/cpuinfo has > >> > >> flags : fpu vme de pse ... ssse3 ... > >> > >> SSE3 in /proc/cpuinfo is displaced as "pni". Search "pni" instead of > >> "sse3" for SSE3. After finding a match for a string, verify the previous > >> character is space and the next character is space or null byte to avoid > >> matching "XXXYYYXXX" with "YYY". > >> --- > >> sysdeps/x86/tst-cpu-features-cpuinfo.c | 9 +++++++-- > >> 1 file changed, 7 insertions(+), 2 deletions(-) > >> > >> diff --git a/sysdeps/x86/tst-cpu-features-cpuinfo.c b/sysdeps/x86/tst-cpu-features-cpuinfo.c > >> index 771771c959..9308349869 100644 > >> --- a/sysdeps/x86/tst-cpu-features-cpuinfo.c > >> +++ b/sysdeps/x86/tst-cpu-features-cpuinfo.c > >> @@ -64,7 +64,12 @@ check_proc (const char *proc_name, int flag, int usable, const char *name) > >> return 0; > >> } > >> printf (" %s: %d\n", name, flag); > >> - if (strstr (cpu_flags, proc_name) != NULL) > >> + char *str = strstr (cpu_flags, proc_name); > >> + size_t len = strlen (proc_name); > >> + /* Don't match "ssse3" with "sse3". */ > >> + if (str != NULL > >> + && str[-1] == ' ' > >> + && (str[len] == ' ' || str[len] == '\0')) > >> found = 1; > >> printf (" cpuinfo (%s): %d\n", proc_name, found); > >> > >> @@ -206,7 +211,7 @@ do_test (int argc, char **argv) > >> fails += CHECK_PROC (ssbd, SSBD); > >> fails += CHECK_PROC (sse, SSE); > >> fails += CHECK_PROC (sse2, SSE2); > >> - fails += CHECK_PROC (sse3, SSE3); > >> + fails += CHECK_PROC (pni, SSE3); > >> fails += CHECK_PROC (sse4_1, SSE4_1); > >> fails += CHECK_PROC (sse4_2, SSE4_2); > >> fails += CHECK_PROC (sse4a, SSE4A); > >> -- > >> 2.29.2 > >> > > > > I am checking it in. > > > > Ok for 2.33. I am checking in this different variant.
------ FAIL: elf/tst-cpu-features-cpuinfo ------ Checking HAS_CPU_FEATURE (ACPI): HAS_CPU_FEATURE (ACPI): 0 cpuinfo (acpi): 0 Checking HAS_CPU_FEATURE (ADX): HAS_CPU_FEATURE (ADX): 0 cpuinfo (adx): 0 Checking HAS_CPU_FEATURE (APIC): HAS_CPU_FEATURE (APIC): 1 cpuinfo (apic): 1 Checking HAS_CPU_FEATURE (AES): HAS_CPU_FEATURE (AES): 1 cpuinfo (aes): 1 Checking HAS_CPU_FEATURE (AMX_BF16): HAS_CPU_FEATURE (AMX_BF16): 0 cpuinfo (amx_bf16): 0 Checking HAS_CPU_FEATURE (AMX_INT8): HAS_CPU_FEATURE (AMX_INT8): 0 cpuinfo (amx_int8): 0 Checking HAS_CPU_FEATURE (AMX_TILE): HAS_CPU_FEATURE (AMX_TILE): 0 cpuinfo (amx_tile): 0 Checking HAS_CPU_FEATURE (ARCH_CAPABILITIES): HAS_CPU_FEATURE (ARCH_CAPABILITIES): 1 cpuinfo (arch_capabilities): 1 Checking HAS_CPU_FEATURE (AVX): HAS_CPU_FEATURE (AVX): 1 cpuinfo (avx): 1 Checking HAS_CPU_FEATURE (AVX2): HAS_CPU_FEATURE (AVX2): 0 cpuinfo (avx2): 0 Checking HAS_CPU_FEATURE (AVX512_4FMAPS): HAS_CPU_FEATURE (AVX512_4FMAPS): 0 cpuinfo (avx512_4fmaps): 0 Checking HAS_CPU_FEATURE (AVX512_4VNNIW): HAS_CPU_FEATURE (AVX512_4VNNIW): 0 cpuinfo (avx512_4vnniw): 0 Checking HAS_CPU_FEATURE (AVX512_BF16): HAS_CPU_FEATURE (AVX512_BF16): 0 cpuinfo (avx512_bf16): 0 Checking HAS_CPU_FEATURE (AVX512_BITALG): HAS_CPU_FEATURE (AVX512_BITALG): 0 cpuinfo (avx512_bitalg): 0 Checking HAS_CPU_FEATURE (AVX512_IFMA): HAS_CPU_FEATURE (AVX512_IFMA): 0 cpuinfo (avx512ifma): 0 Checking HAS_CPU_FEATURE (AVX512_VBMI): HAS_CPU_FEATURE (AVX512_VBMI): 0 cpuinfo (avx512vbmi): 0 Checking HAS_CPU_FEATURE (AVX512_VBMI2): HAS_CPU_FEATURE (AVX512_VBMI2): 0 cpuinfo (avx512_vbmi2): 0 Checking HAS_CPU_FEATURE (AVX512_VNNI): HAS_CPU_FEATURE (AVX512_VNNI): 0 cpuinfo (avx512_vnni): 0 Checking HAS_CPU_FEATURE (AVX512_VP2INTERSECT): HAS_CPU_FEATURE (AVX512_VP2INTERSECT): 0 cpuinfo (avx512_vp2intersect): 0 Checking HAS_CPU_FEATURE (AVX512_VPOPCNTDQ): HAS_CPU_FEATURE (AVX512_VPOPCNTDQ): 0 cpuinfo (avx512_vpopcntdq): 0 Checking HAS_CPU_FEATURE (AVX512BW): HAS_CPU_FEATURE (AVX512BW): 0 cpuinfo (avx512bw): 0 Checking HAS_CPU_FEATURE (AVX512CD): HAS_CPU_FEATURE (AVX512CD): 0 cpuinfo (avx512cd): 0 Checking HAS_CPU_FEATURE (AVX512ER): HAS_CPU_FEATURE (AVX512ER): 0 cpuinfo (avx512er): 0 Checking HAS_CPU_FEATURE (AVX512DQ): HAS_CPU_FEATURE (AVX512DQ): 0 cpuinfo (avx512dq): 0 Checking HAS_CPU_FEATURE (AVX512F): HAS_CPU_FEATURE (AVX512F): 0 cpuinfo (avx512f): 0 Checking HAS_CPU_FEATURE (AVX512PF): HAS_CPU_FEATURE (AVX512PF): 0 cpuinfo (avx512pf): 0 Checking HAS_CPU_FEATURE (AVX512VL): HAS_CPU_FEATURE (AVX512VL): 0 cpuinfo (avx512vl): 0 Checking HAS_CPU_FEATURE (BMI1): HAS_CPU_FEATURE (BMI1): 1 cpuinfo (bmi1): 1 Checking HAS_CPU_FEATURE (BMI2): HAS_CPU_FEATURE (BMI2): 0 cpuinfo (bmi2): 0 Checking HAS_CPU_FEATURE (CLDEMOTE): HAS_CPU_FEATURE (CLDEMOTE): 0 cpuinfo (cldemote): 0 Checking HAS_CPU_FEATURE (CLFLUSHOPT): HAS_CPU_FEATURE (CLFLUSHOPT): 0 cpuinfo (clflushopt): 0 Checking HAS_CPU_FEATURE (CLFSH): HAS_CPU_FEATURE (CLFSH): 1 cpuinfo (clflush): 1 Checking HAS_CPU_FEATURE (CLWB): HAS_CPU_FEATURE (CLWB): 0 cpuinfo (clwb): 0 Checking HAS_CPU_FEATURE (CMOV): HAS_CPU_FEATURE (CMOV): 1 cpuinfo (cmov): 1 Checking HAS_CPU_FEATURE (CMPXCHG16B): HAS_CPU_FEATURE (CMPXCHG16B): 1 cpuinfo (cx16): 1 Checking HAS_CPU_FEATURE (CNXT_ID): HAS_CPU_FEATURE (CNXT_ID): 0 cpuinfo (cnxt_id): 0 Checking HAS_CPU_FEATURE (CORE_CAPABILITIES): HAS_CPU_FEATURE (CORE_CAPABILITIES): 0 cpuinfo (core_capabilities): 0 Checking HAS_CPU_FEATURE (CX8): HAS_CPU_FEATURE (CX8): 1 cpuinfo (cx8): 1 Checking HAS_CPU_FEATURE (DCA): HAS_CPU_FEATURE (DCA): 0 cpuinfo (dca): 0 Checking HAS_CPU_FEATURE (DE): HAS_CPU_FEATURE (DE): 1 cpuinfo (de): 1 Checking HAS_CPU_FEATURE (DEPR_FPU_CS_DS): HAS_CPU_FEATURE (DEPR_FPU_CS_DS): 0 cpuinfo (zero_fcs_fds): 0 Checking HAS_CPU_FEATURE (DS): HAS_CPU_FEATURE (DS): 0 cpuinfo (dts): 0 Checking HAS_CPU_FEATURE (DS_CPL): HAS_CPU_FEATURE (DS_CPL): 0 cpuinfo (ds_cpl): 0 Checking HAS_CPU_FEATURE (DTES64): HAS_CPU_FEATURE (DTES64): 0 cpuinfo (dtes64): 0 Checking HAS_CPU_FEATURE (EIST): HAS_CPU_FEATURE (EIST): 0 cpuinfo (est): 0 Checking HAS_CPU_FEATURE (ENQCMD): HAS_CPU_FEATURE (ENQCMD): 0 cpuinfo (enqcmd): 0 Checking HAS_CPU_FEATURE (ERMS): HAS_CPU_FEATURE (ERMS): 0 cpuinfo (erms): 0 Checking HAS_CPU_FEATURE (F16C): HAS_CPU_FEATURE (F16C): 1 cpuinfo (f16c): 1 Checking HAS_CPU_FEATURE (FMA): HAS_CPU_FEATURE (FMA): 1 cpuinfo (fma): 1 Checking HAS_CPU_FEATURE (FMA4): HAS_CPU_FEATURE (FMA4): 1 cpuinfo (fma4): 1 Checking HAS_CPU_FEATURE (FPU): HAS_CPU_FEATURE (FPU): 1 cpuinfo (fpu): 1 Checking HAS_CPU_FEATURE (FSGSBASE): HAS_CPU_FEATURE (FSGSBASE): 0 cpuinfo (fsgsbase): 0 Checking HAS_CPU_FEATURE (FSRM): HAS_CPU_FEATURE (FSRM): 0 cpuinfo (fsrm): 0 Checking HAS_CPU_FEATURE (FXSR): HAS_CPU_FEATURE (FXSR): 1 cpuinfo (fxsr): 1 Checking HAS_CPU_FEATURE (GFNI): HAS_CPU_FEATURE (GFNI): 0 cpuinfo (gfni): 0 Checking HAS_CPU_FEATURE (HLE): HAS_CPU_FEATURE (HLE): 0 cpuinfo (hle): 0 Checking HAS_CPU_FEATURE (HTT): HAS_CPU_FEATURE (HTT): 0 cpuinfo (ht): 0 Checking HAS_CPU_FEATURE (HYBRID): HAS_CPU_FEATURE (HYBRID): 0 cpuinfo (hybrid): 0 Checking HAS_CPU_FEATURE (IBRS_IBPB): HAS_CPU_FEATURE (IBRS_IBPB): 0 cpuinfo (ibrs): 0 Checking HAS_CPU_FEATURE (IBT): HAS_CPU_FEATURE (IBT): 0 cpuinfo (ibt): 0 Checking HAS_CPU_FEATURE (INVARIANT_TSC): HAS_CPU_FEATURE (INVARIANT_TSC): 0 cpuinfo (invariant_tsc): 0 Checking HAS_CPU_FEATURE (INVPCID): HAS_CPU_FEATURE (INVPCID): 0 cpuinfo (invpcid): 0 Checking HAS_CPU_FEATURE (L1D_FLUSH): HAS_CPU_FEATURE (L1D_FLUSH): 0 cpuinfo (flush_l1d): 0 Checking HAS_CPU_FEATURE (LAHF64_SAHF64): HAS_CPU_FEATURE (LAHF64_SAHF64): 1 cpuinfo (lahf_lm): 1 Checking HAS_CPU_FEATURE (LM): HAS_CPU_FEATURE (LM): 1 cpuinfo (lm): 1 Checking HAS_CPU_FEATURE (LWP): HAS_CPU_FEATURE (LWP): 0 cpuinfo (lwp): 0 Checking HAS_CPU_FEATURE (LZCNT): HAS_CPU_FEATURE (LZCNT): 1 cpuinfo (abm): 1 Checking HAS_CPU_FEATURE (MCA): HAS_CPU_FEATURE (MCA): 1 cpuinfo (mca): 1 Checking HAS_CPU_FEATURE (MCE): HAS_CPU_FEATURE (MCE): 1 cpuinfo (mce): 1 Checking HAS_CPU_FEATURE (MD_CLEAR): HAS_CPU_FEATURE (MD_CLEAR): 0 cpuinfo (md_clear): 0 Checking HAS_CPU_FEATURE (MMX): HAS_CPU_FEATURE (MMX): 1 cpuinfo (mmx): 1 Checking HAS_CPU_FEATURE (MONITOR): HAS_CPU_FEATURE (MONITOR): 0 cpuinfo (monitor): 0 Checking HAS_CPU_FEATURE (MOVBE): HAS_CPU_FEATURE (MOVBE): 0 cpuinfo (movbe): 0 Checking HAS_CPU_FEATURE (MOVDIRI): HAS_CPU_FEATURE (MOVDIRI): 0 cpuinfo (movdiri): 0 Checking HAS_CPU_FEATURE (MOVDIR64B): HAS_CPU_FEATURE (MOVDIR64B): 0 cpuinfo (movdir64b): 0 Checking HAS_CPU_FEATURE (MPX): HAS_CPU_FEATURE (MPX): 0 cpuinfo (mpx): 0 Checking HAS_CPU_FEATURE (MSR): HAS_CPU_FEATURE (MSR): 1 cpuinfo (msr): 1 Checking HAS_CPU_FEATURE (MTRR): HAS_CPU_FEATURE (MTRR): 1 cpuinfo (mtrr): 1 Checking HAS_CPU_FEATURE (NX): HAS_CPU_FEATURE (NX): 1 cpuinfo (nx): 1 Checking HAS_CPU_FEATURE (OSPKE): HAS_CPU_FEATURE (OSPKE): 0 cpuinfo (ospke): 0 Checking HAS_CPU_FEATURE (PAE): HAS_CPU_FEATURE (PAE): 1 cpuinfo (pae): 1 Checking HAS_CPU_FEATURE (PAGE1GB): HAS_CPU_FEATURE (PAGE1GB): 1 cpuinfo (pdpe1gb): 1 Checking HAS_CPU_FEATURE (PAT): HAS_CPU_FEATURE (PAT): 1 cpuinfo (pat): 1 Checking HAS_CPU_FEATURE (PBE): HAS_CPU_FEATURE (PBE): 0 cpuinfo (pbe): 0 Checking HAS_CPU_FEATURE (PCID): HAS_CPU_FEATURE (PCID): 0 cpuinfo (pcid): 0 Checking HAS_CPU_FEATURE (PCLMULQDQ): HAS_CPU_FEATURE (PCLMULQDQ): 1 cpuinfo (pclmulqdq): 1 Checking HAS_CPU_FEATURE (PCONFIG): HAS_CPU_FEATURE (PCONFIG): 0 cpuinfo (pconfig): 0 Checking HAS_CPU_FEATURE (PDCM): HAS_CPU_FEATURE (PDCM): 0 cpuinfo (pdcm): 0 Checking HAS_CPU_FEATURE (PGE): HAS_CPU_FEATURE (PGE): 1 cpuinfo (pge): 1 Checking HAS_CPU_FEATURE (PKS): HAS_CPU_FEATURE (PKS): 0 cpuinfo (pks): 0 Checking HAS_CPU_FEATURE (PKU): HAS_CPU_FEATURE (PKU): 0 cpuinfo (pku): 0 Checking HAS_CPU_FEATURE (POPCNT): HAS_CPU_FEATURE (POPCNT): 1 cpuinfo (popcnt): 1 Checking HAS_CPU_FEATURE (PREFETCHW): HAS_CPU_FEATURE (PREFETCHW): 1 cpuinfo (3dnowprefetch): 1 Checking HAS_CPU_FEATURE (PREFETCHWT1): HAS_CPU_FEATURE (PREFETCHWT1): 0 cpuinfo (prefetchwt1): 0 Checking HAS_CPU_FEATURE (PSE): HAS_CPU_FEATURE (PSE): 1 cpuinfo (pse): 1 Checking HAS_CPU_FEATURE (PSE_36): HAS_CPU_FEATURE (PSE_36): 1 cpuinfo (pse36): 1 Checking HAS_CPU_FEATURE (PSN): HAS_CPU_FEATURE (PSN): 0 cpuinfo (psn): 0 Checking HAS_CPU_FEATURE (RDPID): HAS_CPU_FEATURE (RDPID): 0 cpuinfo (rdpid): 0 Checking HAS_CPU_FEATURE (RDRAND): HAS_CPU_FEATURE (RDRAND): 0 cpuinfo (rdrand): 0 Checking HAS_CPU_FEATURE (RDSEED): HAS_CPU_FEATURE (RDSEED): 0 cpuinfo (rdseed): 0 Checking HAS_CPU_FEATURE (RDT_A): HAS_CPU_FEATURE (RDT_A): 0 cpuinfo (rdt_a): 0 Checking HAS_CPU_FEATURE (RDT_M): HAS_CPU_FEATURE (RDT_M): 0 cpuinfo (cqm): 0 Checking HAS_CPU_FEATURE (RDTSCP): HAS_CPU_FEATURE (RDTSCP): 1 cpuinfo (rdtscp): 1 Checking HAS_CPU_FEATURE (RTM): HAS_CPU_FEATURE (RTM): 0 cpuinfo (rtm): 0 Checking HAS_CPU_FEATURE (SDBG): HAS_CPU_FEATURE (SDBG): 0 cpuinfo (sdbg): 0 Checking HAS_CPU_FEATURE (SEP): HAS_CPU_FEATURE (SEP): 1 cpuinfo (sep): 1 Checking HAS_CPU_FEATURE (SERIALIZE): HAS_CPU_FEATURE (SERIALIZE): 0 cpuinfo (serialize): 0 Checking HAS_CPU_FEATURE (SGX): HAS_CPU_FEATURE (SGX): 0 cpuinfo (sgx): 0 Checking HAS_CPU_FEATURE (SGX_LC): HAS_CPU_FEATURE (SGX_LC): 0 cpuinfo (sgx_lc): 0 Checking HAS_CPU_FEATURE (SHA): HAS_CPU_FEATURE (SHA): 0 cpuinfo (sha_ni): 0 Checking HAS_CPU_FEATURE (SHSTK): HAS_CPU_FEATURE (SHSTK): 0 cpuinfo (shstk): 0 Checking HAS_CPU_FEATURE (SMAP): HAS_CPU_FEATURE (SMAP): 0 cpuinfo (smap): 0 Checking HAS_CPU_FEATURE (SMEP): HAS_CPU_FEATURE (SMEP): 0 cpuinfo (smep): 0 Checking HAS_CPU_FEATURE (SMX): HAS_CPU_FEATURE (SMX): 0 cpuinfo (smx): 0 Checking HAS_CPU_FEATURE (SS): HAS_CPU_FEATURE (SS): 0 cpuinfo (ss): 0 Checking HAS_CPU_FEATURE (SSBD): HAS_CPU_FEATURE (SSBD): 0 cpuinfo (ssbd): 1 *** failure *** Checking HAS_CPU_FEATURE (SSE): HAS_CPU_FEATURE (SSE): 1 cpuinfo (sse): 1 Checking HAS_CPU_FEATURE (SSE2): HAS_CPU_FEATURE (SSE2): 1 cpuinfo (sse2): 1 Checking HAS_CPU_FEATURE (SSE3): HAS_CPU_FEATURE (SSE3): 1 cpuinfo (pni): 1 Checking HAS_CPU_FEATURE (SSE4_1): HAS_CPU_FEATURE (SSE4_1): 1 cpuinfo (sse4_1): 1 Checking HAS_CPU_FEATURE (SSE4_2): HAS_CPU_FEATURE (SSE4_2): 1 cpuinfo (sse4_2): 1 Checking HAS_CPU_FEATURE (SSE4A): HAS_CPU_FEATURE (SSE4A): 1 cpuinfo (sse4a): 1 Checking HAS_CPU_FEATURE (SSSE3): HAS_CPU_FEATURE (SSSE3): 1 cpuinfo (ssse3): 1 Checking HAS_CPU_FEATURE (STIBP): HAS_CPU_FEATURE (STIBP): 0 cpuinfo (stibp): 0 Checking HAS_CPU_FEATURE (SVM): HAS_CPU_FEATURE (SVM): 1 cpuinfo (svm): 1 Checking HAS_CPU_FEATURE (TBM): HAS_CPU_FEATURE (TBM): 0 cpuinfo (tbm): 1 *** failure *** Checking HAS_CPU_FEATURE (TM): HAS_CPU_FEATURE (TM): 0 cpuinfo (tm): 0 Checking HAS_CPU_FEATURE (TM2): HAS_CPU_FEATURE (TM2): 0 cpuinfo (tm2): 0 Checking HAS_CPU_FEATURE (TRACE): HAS_CPU_FEATURE (TRACE): 0 cpuinfo (intel_pt): 0 Checking HAS_CPU_FEATURE (TSC): HAS_CPU_FEATURE (TSC): 1 cpuinfo (tsc): 1 Checking HAS_CPU_FEATURE (TSC_ADJUST): HAS_CPU_FEATURE (TSC_ADJUST): 1 cpuinfo (tsc_adjust): 1 Checking HAS_CPU_FEATURE (TSC_DEADLINE): HAS_CPU_FEATURE (TSC_DEADLINE): 1 cpuinfo (tsc_deadline_timer): 1 Checking HAS_CPU_FEATURE (TSXLDTRK): HAS_CPU_FEATURE (TSXLDTRK): 0 cpuinfo (tsxldtrk): 0 Checking HAS_CPU_FEATURE (UMIP): HAS_CPU_FEATURE (UMIP): 0 cpuinfo (umip): 0 Checking HAS_CPU_FEATURE (VAES): HAS_CPU_FEATURE (VAES): 0 cpuinfo (vaes): 0 Checking HAS_CPU_FEATURE (VME): HAS_CPU_FEATURE (VME): 1 cpuinfo (vme): 1 Checking HAS_CPU_FEATURE (VMX): HAS_CPU_FEATURE (VMX): 0 cpuinfo (vmx): 0 Checking HAS_CPU_FEATURE (VPCLMULQDQ): HAS_CPU_FEATURE (VPCLMULQDQ): 0 cpuinfo (vpclmulqdq): 0 Checking HAS_CPU_FEATURE (WAITPKG): HAS_CPU_FEATURE (WAITPKG): 0 cpuinfo (waitpkg): 0 Checking HAS_CPU_FEATURE (WBNOINVD): HAS_CPU_FEATURE (WBNOINVD): 0 cpuinfo (wbnoinvd): 0 Checking HAS_CPU_FEATURE (X2APIC): HAS_CPU_FEATURE (X2APIC): 1 cpuinfo (x2apic): 1 Checking HAS_CPU_FEATURE (XFD): HAS_CPU_FEATURE (XFD): 0 cpuinfo (xfd): 0 Checking HAS_CPU_FEATURE (XGETBV_ECX_1): HAS_CPU_FEATURE (XGETBV_ECX_1): 0 cpuinfo (xgetbv1): 0 Checking HAS_CPU_FEATURE (XOP): HAS_CPU_FEATURE (XOP): 1 cpuinfo (xop): 1 Checking HAS_CPU_FEATURE (XSAVE): HAS_CPU_FEATURE (XSAVE): 1 cpuinfo (xsave): 1 Checking HAS_CPU_FEATURE (XSAVEC): HAS_CPU_FEATURE (XSAVEC): 0 cpuinfo (xsavec): 0 Checking HAS_CPU_FEATURE (XSAVEOPT): HAS_CPU_FEATURE (XSAVEOPT): 0 cpuinfo (xsaveopt): 0 Checking HAS_CPU_FEATURE (XSAVES): HAS_CPU_FEATURE (XSAVES): 0 cpuinfo (xsaves): 0 Checking HAS_CPU_FEATURE (XTPRUPDCTRL): HAS_CPU_FEATURE (XTPRUPDCTRL): 0 cpuinfo (xtpr): 0 2 differences between /proc/cpuinfo and glibc code. Andreas.
diff --git a/sysdeps/x86/tst-cpu-features-cpuinfo.c b/sysdeps/x86/tst-cpu-features-cpuinfo.c index 771771c959..9308349869 100644 --- a/sysdeps/x86/tst-cpu-features-cpuinfo.c +++ b/sysdeps/x86/tst-cpu-features-cpuinfo.c @@ -64,7 +64,12 @@ check_proc (const char *proc_name, int flag, int usable, const char *name) return 0; } printf (" %s: %d\n", name, flag); - if (strstr (cpu_flags, proc_name) != NULL) + char *str = strstr (cpu_flags, proc_name); + size_t len = strlen (proc_name); + /* Don't match "ssse3" with "sse3". */ + if (str != NULL + && str[-1] == ' ' + && (str[len] == ' ' || str[len] == '\0')) found = 1; printf (" cpuinfo (%s): %d\n", proc_name, found); @@ -206,7 +211,7 @@ do_test (int argc, char **argv) fails += CHECK_PROC (ssbd, SSBD); fails += CHECK_PROC (sse, SSE); fails += CHECK_PROC (sse2, SSE2); - fails += CHECK_PROC (sse3, SSE3); + fails += CHECK_PROC (pni, SSE3); fails += CHECK_PROC (sse4_1, SSE4_1); fails += CHECK_PROC (sse4_2, SSE4_2); fails += CHECK_PROC (sse4a, SSE4A);