From ac4407e52514679012312e7f223c342f9223ddff Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Fri, 21 Aug 2020 09:42:49 -0700
Subject: [PATCH] Fix *movsi_internal

---
 gcc/config/i386/cpuid.h                      | 5 +++++
 gcc/config/i386/i386.md                      | 2 ++
 gcc/testsuite/gcc.target/i386/avx512-check.h | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/gcc/config/i386/cpuid.h b/gcc/config/i386/cpuid.h
index bca61d620db..ecb249fade7 100644
--- a/gcc/config/i386/cpuid.h
+++ b/gcc/config/i386/cpuid.h
@@ -24,6 +24,9 @@
 #ifndef _CPUID_H_INCLUDED
 #define _CPUID_H_INCLUDED
 
+#pragma GCC push_options
+#pragma GCC target("no-avx")
+
 /* %eax */
 #define bit_AVX512BF16	(1 << 5)
 
@@ -324,4 +327,6 @@ __cpuidex (int __cpuid_info[4], int __leaf, int __subleaf)
 		 __cpuid_info[2], __cpuid_info[3]);
 }
 
+#pragma GCC pop_options
+
 #endif /* _CPUID_H_INCLUDED */
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 446793b78db..cf5828c23d5 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -2349,6 +2349,8 @@ (define_insn "*movsi_internal"
   [(set (attr "isa")
      (cond [(eq_attr "alternative" "12,13")
 	      (const_string "sse2")
+	    (eq_attr "alternative" "14,15,16,17")
+	      (const_string "avx512f")
 	   ]
 	   (const_string "*")))
    (set (attr "type")
diff --git a/gcc/testsuite/gcc.target/i386/avx512-check.h b/gcc/testsuite/gcc.target/i386/avx512-check.h
index 0a377dba1d5..094453e5e0e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512-check.h
+++ b/gcc/testsuite/gcc.target/i386/avx512-check.h
@@ -25,6 +25,9 @@ do_test (void)
 }
 #endif
 
+#pragma GCC push_options
+#pragma GCC target("no-avx")
+
 static int
 check_osxsave (void)
 {
@@ -110,3 +113,5 @@ main ()
 #endif
   return 0;
 }
+
+#pragma GCC pop_options
-- 
2.26.2