x86: Don't check PTWRITE in tst-cpu-features-cpuinfo.c

Message ID 20220126202833.1810866-1-hjl.tools@gmail.com
State Committed
Commit 61a4425dd412701f6c3545d8c1acd7e1a378ee8b
Headers
Series x86: Don't check PTWRITE in tst-cpu-features-cpuinfo.c |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit fail Patch caused testsuite regressions

Commit Message

H.J. Lu Jan. 26, 2022, 8:28 p.m. UTC
  Don't check PTWRITE against /proc/cpuinfo since kernel doesn't report
PTWRITE in /proc/cpuinfo.
---
 sysdeps/x86/tst-cpu-features-cpuinfo.c | 3 +++
 1 file changed, 3 insertions(+)
  

Comments

H.J. Lu Feb. 12, 2022, 3:50 p.m. UTC | #1
On Wed, Jan 26, 2022 at 12:28 PM H.J. Lu <hjl.tools@gmail.com> wrote:
>
> Don't check PTWRITE against /proc/cpuinfo since kernel doesn't report
> PTWRITE in /proc/cpuinfo.
> ---
>  sysdeps/x86/tst-cpu-features-cpuinfo.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/sysdeps/x86/tst-cpu-features-cpuinfo.c b/sysdeps/x86/tst-cpu-features-cpuinfo.c
> index 91a656b61d..981b2be5fd 100644
> --- a/sysdeps/x86/tst-cpu-features-cpuinfo.c
> +++ b/sysdeps/x86/tst-cpu-features-cpuinfo.c
> @@ -218,7 +218,10 @@ do_test (int argc, char **argv)
>    fails += CHECK_PROC (popcnt, POPCNT);
>    fails += CHECK_PROC (3dnowprefetch, PREFETCHW);
>    fails += CHECK_PROC (prefetchwt1, PREFETCHWT1);
> +#if 0
> +  /* NB: /proc/cpuinfo doesn't report this feature.  */
>    fails += CHECK_PROC (ptwrite, PTWRITE);
> +#endif
>    fails += CHECK_PROC (pse, PSE);
>    fails += CHECK_PROC (pse36, PSE_36);
>    fails += CHECK_PROC (psn, PSN);
> --
> 2.34.1
>

I will check in this next Monday to fix the test on Intel Alder Lake.
  

Patch

diff --git a/sysdeps/x86/tst-cpu-features-cpuinfo.c b/sysdeps/x86/tst-cpu-features-cpuinfo.c
index 91a656b61d..981b2be5fd 100644
--- a/sysdeps/x86/tst-cpu-features-cpuinfo.c
+++ b/sysdeps/x86/tst-cpu-features-cpuinfo.c
@@ -218,7 +218,10 @@  do_test (int argc, char **argv)
   fails += CHECK_PROC (popcnt, POPCNT);
   fails += CHECK_PROC (3dnowprefetch, PREFETCHW);
   fails += CHECK_PROC (prefetchwt1, PREFETCHWT1);
+#if 0
+  /* NB: /proc/cpuinfo doesn't report this feature.  */
   fails += CHECK_PROC (ptwrite, PTWRITE);
+#endif
   fails += CHECK_PROC (pse, PSE);
   fails += CHECK_PROC (pse36, PSE_36);
   fails += CHECK_PROC (psn, PSN);