[X86] Consolidate wide Key Locker intrinsics into the same header as the other Key Locker intrinsics.

Author: topperc

clang/lib/Headers/CMakeLists.txt

@@ -73,7 +73,6 @@ set(files
   invpcidintrin.h
   iso646.h
   keylockerintrin.h
-  keylocker_wide_intrin.h
   limits.h
   lwpintrin.h
   lzcntintrin.h

clang/lib/Headers/immintrin.h

@@ -472,15 +472,10 @@ _storebe_i64(void * __P, long long __D) {
 #endif
 
 #if !(defined(_MSC_VER) || defined(__SCE__)) || __has_feature(modules) ||      \
-    defined(__KL__)
+    defined(__KL__) || defined(__WIDEKL__)
 #include <keylockerintrin.h>
 #endif
 
-#if !(defined(_MSC_VER) || defined(__SCE__)) || __has_feature(modules) ||      \
-    defined(__WIDEKL__)
-#include <keylocker_wide_intrin.h>
-#endif
-
 #if !(defined(_MSC_VER) || defined(__SCE__)) || __has_feature(modules) ||      \
     defined(__AMXTILE__) || defined(__AMXINT8__) || defined(__AMXBF16__)
 #include <amxintrin.h>