From c4f2a0ecffcf0ad6738ef4a41e7434406b94c5b3 Mon Sep 17 00:00:00 2001
From: Haochen Jiang <haochen.jiang@intel.com>
Date: Thu, 24 Aug 2023 14:35:03 +0800
Subject: [PATCH] Revert "i386: Add AVX2 pragma wrapper for AVX512DQVL intrins"

This reverts commit 68f7cb6cf9e8b9f2254855507f3b479552adda5f.
---
 gcc/config/i386/avx512vldqintrin.h         | 11 -----------
 gcc/testsuite/gcc.target/i386/pr111051-1.c | 11 -----------
 2 files changed, 22 deletions(-)
 delete mode 100644 gcc/testsuite/gcc.target/i386/pr111051-1.c

diff --git a/gcc/config/i386/avx512vldqintrin.h b/gcc/config/i386/avx512vldqintrin.h
index db900ebf467f..1fbf93a0b522 100644
--- a/gcc/config/i386/avx512vldqintrin.h
+++ b/gcc/config/i386/avx512vldqintrin.h
@@ -28,12 +28,6 @@
 #ifndef _AVX512VLDQINTRIN_H_INCLUDED
 #define _AVX512VLDQINTRIN_H_INCLUDED
 
-#if !defined(__AVX2__)
-#pragma GCC push_options
-#pragma GCC target("avx2")
-#define __DISABLE_AVX2__
-#endif /* __AVX2__ */
-
 extern __inline __m256i
 __attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
 _mm256_cvttpd_epi64 (__m256d __A)
@@ -2008,9 +2002,4 @@ _mm256_maskz_insertf64x2 (__mmask8 __U, __m256d __A, __m128d __B,
 
 #endif
 
-#ifdef __DISABLE_AVX2__
-#undef __DISABLE_AVX2__
-#pragma GCC pop_options
-#endif /* __DISABLE_AVX2__ */
-
 #endif /* _AVX512VLDQINTRIN_H_INCLUDED */
diff --git a/gcc/testsuite/gcc.target/i386/pr111051-1.c b/gcc/testsuite/gcc.target/i386/pr111051-1.c
deleted file mode 100644
index 973007043cb0..000000000000
--- a/gcc/testsuite/gcc.target/i386/pr111051-1.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/* { dg-do compile } */
-
-#include <immintrin.h>
-
-#pragma GCC target("avx512vl,avx512dq")
-
-void foo (__m256i i)
-{
-  volatile __m256d v1 = _mm256_cvtepi64_pd (i);
-}
-
-- 
2.47.3