Merge changes from TFS (dotnet/coreclr#15732)

* Remove unused CORJIT_FLAG_USE_SSE3_4 This changes the JIT-EE interface GUID. This is the desktop side of dotnet/coreclr#14825. [tfs-changeset: 1685154] * Pick up rest of desktop side changes Commit migrated from dotnet/coreclr@38ec680
shangte · Jan 4, 2018 · 83d834b · 83d834b
1 parent 01652b1
commit 83d834b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 22 deletions.
diff --git a/src/coreclr/src/inc/corinfo.h b/src/coreclr/src/inc/corinfo.h
@@ -213,14 +213,13 @@ TODO: Talk about initializing strutures before use
     #define SELECTANY extern __declspec(selectany)
 #endif
 
-SELECTANY const GUID JITEEVersionIdentifier = { /* a6860f80-01cb-4f87-82c2-a8e5a744f2fa */
-    0xa6860f80,
-    0x01cb,
-    0x4f87,
-    {0x82, 0xc2, 0xa8, 0xe5, 0xa7, 0x44, 0xf2, 0xfa}
+SELECTANY const GUID JITEEVersionIdentifier = { /* e042cffc-cf03-4315-96b9-5fd01dc15923 */
+    0xe042cffc,
+    0xcf03,
+    0x4315,
+    {0x96, 0xb9, 0x5f, 0xd0, 0x1d, 0xc1, 0x59, 0x23}
 };
 
-
 //////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
 // END JITEEVersionIdentifier

diff --git a/src/coreclr/src/inc/corjitflags.h b/src/coreclr/src/inc/corjitflags.h
@@ -52,16 +52,16 @@ class CORJIT_FLAGS
 
     #endif // !defined(_TARGET_X86_)
 
+        CORJIT_FLAG_UNUSED6                 = 13,
+
     #if defined(_TARGET_X86_) || defined(_TARGET_AMD64_)
 
-        CORJIT_FLAG_USE_SSE3_4              = 13,
         CORJIT_FLAG_USE_AVX                 = 14,
         CORJIT_FLAG_USE_AVX2                = 15,
         CORJIT_FLAG_USE_AVX_512             = 16,
 
     #else // !defined(_TARGET_X86_) && !defined(_TARGET_AMD64_)
 
-        CORJIT_FLAG_UNUSED6                 = 13,
         CORJIT_FLAG_UNUSED7                 = 14,
         CORJIT_FLAG_UNUSED8                 = 15,
         CORJIT_FLAG_UNUSED9                 = 16,

diff --git a/src/coreclr/src/jit/jitee.h b/src/coreclr/src/jit/jitee.h
@@ -39,16 +39,16 @@ class JitFlags
 
     #endif // !defined(_TARGET_X86_)
 
+        JIT_FLAG_UNUSED6                 = 13,
+
     #if defined(_TARGET_X86_) || defined(_TARGET_AMD64_)
 
-        JIT_FLAG_USE_SSE3_4              = 13,
         JIT_FLAG_USE_AVX                 = 14,
         JIT_FLAG_USE_AVX2                = 15,
         JIT_FLAG_USE_AVX_512             = 16,
 
     #else // !defined(_TARGET_X86_) && !defined(_TARGET_AMD64_)
 
-        JIT_FLAG_UNUSED6                 = 13,
         JIT_FLAG_UNUSED7                 = 14,
         JIT_FLAG_UNUSED8                 = 15,
         JIT_FLAG_UNUSED9                 = 16,
@@ -248,7 +248,6 @@ class JitFlags
 
 #if defined(_TARGET_X86_) || defined(_TARGET_AMD64_)
 
-        FLAGS_EQUAL(CORJIT_FLAGS::CORJIT_FLAG_USE_SSE3_4, JIT_FLAG_USE_SSE3_4);
         FLAGS_EQUAL(CORJIT_FLAGS::CORJIT_FLAG_USE_AVX, JIT_FLAG_USE_AVX);
         FLAGS_EQUAL(CORJIT_FLAGS::CORJIT_FLAG_USE_AVX2, JIT_FLAG_USE_AVX2);
         FLAGS_EQUAL(CORJIT_FLAGS::CORJIT_FLAG_USE_AVX_512, JIT_FLAG_USE_AVX_512);

diff --git a/src/coreclr/src/vm/codeman.cpp b/src/coreclr/src/vm/codeman.cpp
@@ -1328,11 +1328,6 @@ void EEJitManager::SetCpuInfo()
         //    SSSE3 - ECX bit 9    (buffer[9]  & 0x02)
         //    SSE4.2 - ECX bit 20  (buffer[10] & 0x10)
         //    POPCNT - ECX bit 23  (buffer[10] & 0x80)
-        // CORJIT_FLAG_USE_SSE3_4 if the following feature bits are set (input EAX of 1)
-        //    SSE3 - ECX bit 0     (buffer[8]  & 0x01)
-        //    SSSE3 - ECX bit 9    (buffer[9]  & 0x02)
-        //    SSE4.1 - ECX bit 19  (buffer[10] & 0x08)
-        //    SSE4.2 - ECX bit 20  (buffer[10] & 0x10)
         // CORJIT_FLAG_USE_AVX if the following feature bits are set (input EAX of 1), and xmmYmmStateSupport returns 1:
         //    OSXSAVE - ECX bit 27 (buffer[11] & 0x08)
         //    AVX - ECX bit 28     (buffer[11] & 0x10)
@@ -1372,12 +1367,6 @@ void EEJitManager::SetCpuInfo()
                             CPUCompileFlags.Set(CORJIT_FLAGS::CORJIT_FLAG_USE_POPCNT);
                         }
                     }
-
-                    if (((buffer[10] & 0x08) != 0) &&       // SSE4.1
-                        ((buffer[10] & 0x10) != 0))         // SSE4.2
-                    {
-                        CPUCompileFlags.Set(CORJIT_FLAGS::CORJIT_FLAG_USE_SSE3_4);
-                    }
                 }
             }