Commit 379a6f88 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r325655: 

------------------------------------------------------------------------
r325655 | ctopper | 2018-02-21 01:16:50 +0100 (Wed, 21 Feb 2018) | 8 lines

[X86] Disable CLWB in Cannon Lake

Cannon Lake does not support CLWB, therefore it
does not include all features listed under SKX.

Patch by Gabor Buella

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

llvm-svn: 325672
parent 0bb5f10a

clang/lib/Basic/Targets/X86.cpp

+2 −1
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ bool X86TargetInfo::initFeatureMap( 
    setFeatureEnabledImpl(Features, "avx512bw", true);

    setFeatureEnabledImpl(Features, "avx512vl", true);

    setFeatureEnabledImpl(Features, "pku", true);

    if (Kind != CK_Cannonlake) // CNL inherits all SKX features, except CLWB

      setFeatureEnabledImpl(Features, "clwb", true);

    LLVM_FALLTHROUGH;

  case CK_SkylakeClient:

clang/test/Preprocessor/predefined-arch-macros.c

+2 −2
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ 
// CHECK_CNL_M32: #define __BMI2__ 1

// CHECK_CNL_M32: #define __BMI__ 1

// CHECK_CNL_M32: #define __CLFLUSHOPT__ 1

// CHECK_CNL_M32: #define __CLWB__ 1

// CHECK_CNL_M32-NOT: #define __CLWB__ 1

// CHECK_CNL_M32: #define __F16C__ 1

// CHECK_CNL_M32: #define __FMA__ 1

// CHECK_CNL_M32: #define __LZCNT__ 1
@@ -1019,7 +1019,7 @@ 
// CHECK_CNL_M64: #define __BMI2__ 1

// CHECK_CNL_M64: #define __BMI__ 1

// CHECK_CNL_M64: #define __CLFLUSHOPT__ 1

// CHECK_CNL_M64: #define __CLWB__ 1

// CHECK_CNL_M64-NOT: #define __CLWB__ 1

// CHECK_CNL_M64: #define __F16C__ 1

// CHECK_CNL_M64: #define __FMA__ 1

// CHECK_CNL_M64: #define __LZCNT__ 1