From patchwork Thu Jan 21 19:47:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 41786 Return-Path: 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 ; 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 ; 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 (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 ; 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 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" /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);