[llvm-branch-commits] [compiler-rt-branch] r367996 - Merging r367929:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Aug  6 01:26:06 2019
New Revision: 367996

URL: http://llvm.org/viewvc/llvm-project?rev=367996&view=rev
Log:
Merging r367929:
------------------------------------------------------------------------
r367929 | echristo | 2019-08-05 23:25:59 +0200 (Mon, 05 Aug 2019) | 5 lines

BMI2 support is indicated in bit eight of EBX, not nine.
See Intel SDM, Vol 2A, Table 3-8:
https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-vol-2a-manual.pdf#page=296

Differential Revision: https://reviews.llvm.org/D65766
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_90/   (props changed)
    compiler-rt/branches/release_90/lib/builtins/cpu_model.c

Propchange: compiler-rt/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  6 01:26:06 2019
@@ -1 +1 @@
-/compiler-rt/trunk:367442
+/compiler-rt/trunk:367442,367929

Modified: compiler-rt/branches/release_90/lib/builtins/cpu_model.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_90/lib/builtins/cpu_model.c?rev=367996&r1=367995&r2=367996&view=diff
==============================================================================
--- compiler-rt/branches/release_90/lib/builtins/cpu_model.c (original)
+++ compiler-rt/branches/release_90/lib/builtins/cpu_model.c Tue Aug  6 01:26:06 2019
@@ -543,7 +543,7 @@ static void getAvailableFeatures(unsigne
     setFeature(FEATURE_BMI);
   if (HasLeaf7 && ((EBX >> 5) & 1) && HasAVX)
     setFeature(FEATURE_AVX2);
-  if (HasLeaf7 && ((EBX >> 9) & 1))
+  if (HasLeaf7 && ((EBX >> 8) & 1))
     setFeature(FEATURE_BMI2);
   if (HasLeaf7 && ((EBX >> 16) & 1) && HasAVX512Save)
     setFeature(FEATURE_AVX512F);