FreddyYe updated this revision to Diff 468387.
FreddyYe added a comment.
Merge raptorlake patch and address comments.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D135937/new/
https://reviews.llvm.org/D135937
Files:
clang/docs/ReleaseNotes.rst
clang/lib/Basic/Targets/X86.cpp
clang/test/CodeGen/attr-target-mv.c
clang/test/CodeGen/target-builtin-noerror.c
clang/test/Driver/x86-march.c
clang/test/Misc/target-invalid-cpu-note.c
clang/test/Preprocessor/predefined-arch-macros.c
compiler-rt/lib/builtins/cpu_model.c
llvm/docs/ReleaseNotes.rst
llvm/include/llvm/Support/X86TargetParser.def
llvm/include/llvm/Support/X86TargetParser.h
llvm/lib/Support/Host.cpp
llvm/lib/Support/X86TargetParser.cpp
llvm/lib/Target/X86/X86.td
llvm/test/CodeGen/X86/cpus-intel.ll
Index: llvm/test/CodeGen/X86/cpus-intel.ll
===================================================================
--- llvm/test/CodeGen/X86/cpus-intel.ll
+++ llvm/test/CodeGen/X86/cpus-intel.ll
@@ -17,6 +17,8 @@
; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=yonah 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=prescott 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=lakemont 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
+; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=raptorlake 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
+; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=meteorlake 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=nocona 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=core2 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
@@ -52,6 +54,8 @@
; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=tremont 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=knl 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=knm 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
+; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=raptorlake 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
+; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=meteorlake 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
define void @foo() {
ret void
Index: llvm/lib/Target/X86/X86.td
===================================================================
--- llvm/lib/Target/X86/X86.td
+++ llvm/lib/Target/X86/X86.td
@@ -1481,6 +1481,10 @@
ProcessorFeatures.SPRFeatures, ProcessorFeatures.SPRTuning>;
def : ProcModel<"alderlake", AlderlakePModel,
ProcessorFeatures.ADLFeatures, ProcessorFeatures.ADLTuning>;
+def : ProcModel<"raptorlake", AlderlakePModel,
+ ProcessorFeatures.ADLFeatures, ProcessorFeatures.ADLTuning>;
+def : ProcModel<"meteorlake", AlderlakePModel,
+ ProcessorFeatures.ADLFeatures, ProcessorFeatures.ADLTuning>;
// AMD CPUs.
Index: llvm/lib/Support/X86TargetParser.cpp
===================================================================
--- llvm/lib/Support/X86TargetParser.cpp
+++ llvm/lib/Support/X86TargetParser.cpp
@@ -370,6 +370,10 @@
{ {"sapphirerapids"}, CK_SapphireRapids, FEATURE_AVX512BF16, FeaturesSapphireRapids },
// Alderlake microarchitecture based processors.
{ {"alderlake"}, CK_Alderlake, FEATURE_AVX2, FeaturesAlderlake },
+ // Raptorlake microarchitecture based processors.
+ { {"raptorlake"}, CK_Raptorlake, FEATURE_AVX2, FeaturesAlderlake },
+ // Meteorlake microarchitecture based processors.
+ { {"meteorlake"}, CK_Meteorlake, FEATURE_AVX2, FeaturesAlderlake },
// Knights Landing processor.
{ {"knl"}, CK_KNL, FEATURE_AVX512F, FeaturesKNL },
// Knights Mill processor.
Index: llvm/lib/Support/Host.cpp
===================================================================
--- llvm/lib/Support/Host.cpp
+++ llvm/lib/Support/Host.cpp
@@ -820,6 +820,21 @@
*Subtype = X86::INTEL_COREI7_ALDERLAKE;
break;
+ // Raptorlake:
+ case 0xb7:
+ CPU = "raptorlake";
+ *Type = X86::INTEL_COREI7;
+ *Subtype = X86::INTEL_COREI7_RAPTORLAKE;
+ break;
+
+ // Meteorlake:
+ case 0xb5:
+ case 0xaa:
+ case 0xac:
+ CPU = "meteorlake";
+ *Type = X86::INTEL_COREI7;
+ *Subtype = X86::INTEL_COREI7_METEORLAKE;
+
// Icelake Xeon:
case 0x6a:
case 0x6c:
Index: llvm/include/llvm/Support/X86TargetParser.h
===================================================================
--- llvm/include/llvm/Support/X86TargetParser.h
+++ llvm/include/llvm/Support/X86TargetParser.h
@@ -104,6 +104,8 @@
CK_Tigerlake,
CK_SapphireRapids,
CK_Alderlake,
+ CK_Raptorlake,
+ CK_Meteorlake,
CK_KNL,
CK_KNM,
CK_Lakemont,
Index: llvm/include/llvm/Support/X86TargetParser.def
===================================================================
--- llvm/include/llvm/Support/X86TargetParser.def
+++ llvm/include/llvm/Support/X86TargetParser.def
@@ -89,6 +89,8 @@
X86_CPU_SUBTYPE(INTEL_COREI7_ALDERLAKE, "alderlake")
X86_CPU_SUBTYPE(AMDFAM19H_ZNVER3, "znver3")
X86_CPU_SUBTYPE(INTEL_COREI7_ROCKETLAKE, "rocketlake")
+X86_CPU_SUBTYPE(INTEL_COREI7_RAPTORLAKE, "raptorlake")
+X86_CPU_SUBTYPE(INTEL_COREI7_METEORLAKE, "meteorlake")
#undef X86_CPU_SUBTYPE
// This macro is used for cpu types present in compiler-rt/libgcc. The third
Index: llvm/docs/ReleaseNotes.rst
===================================================================
--- llvm/docs/ReleaseNotes.rst
+++ llvm/docs/ReleaseNotes.rst
@@ -130,6 +130,8 @@
Changes to the X86 Backend
--------------------------
+- Support ``-mcpu=raptorlake``
+- Support ``-mcpu=meteorlake``
Changes to the OCaml bindings
-----------------------------
Index: compiler-rt/lib/builtins/cpu_model.c
===================================================================
--- compiler-rt/lib/builtins/cpu_model.c
+++ compiler-rt/lib/builtins/cpu_model.c
@@ -107,6 +107,9 @@
INTEL_COREI7_ALDERLAKE,
AMDFAM19H_ZNVER3,
INTEL_COREI7_ROCKETLAKE,
+ ZHAOXIN_FAM7H_LUJIAZUI,
+ INTEL_COREI7_RAPTORLAKE,
+ INTEL_COREI7_METEORLAKE,
CPU_SUBTYPE_MAX
};
@@ -460,6 +463,20 @@
*Subtype = INTEL_COREI7_SAPPHIRERAPIDS;
break;
+ // Raptorlake:
+ CPU = "raptorlake";
+ *Type = INTEL_COREI7;
+ *Subtype = INTEL_COREI7_RAPTORLAKE;
+ break;
+
+ // Meteorlake:
+ case 0xb5:
+ case 0xaa:
+ case 0xac:
+ CPU = "meteorlake";
+ *Type = INTEL_COREI7;
+ *Subtype = INTEL_COREI7_METEORLAKE;
+
case 0x1c: // Most 45 nm Intel Atom processors
case 0x26: // 45 nm Atom Lincroft
case 0x27: // 32 nm Atom Medfield
Index: clang/test/Preprocessor/predefined-arch-macros.c
===================================================================
--- clang/test/Preprocessor/predefined-arch-macros.c
+++ clang/test/Preprocessor/predefined-arch-macros.c
@@ -2230,6 +2230,258 @@
// RUN: | FileCheck %s -check-prefix=CHECK_LAKEMONT_M64
// CHECK_LAKEMONT_M64: error:
+// RUN: %clang -march=raptorlake -m32 -E -dM %s -o - 2>&1 \
+// RUN: -target i386-unknown-linux \
+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_RPL_M32
+// CHECK_RPL_M32: #define __ADX__ 1
+// CHECK_RPL_M32: #define __AES__ 1
+// CHECK_RPL_M32: #define __AVX2__ 1
+// CHECK_RPL_M32-NOT: AVX512
+// CHECK_RPL_M32: #define __AVXVNNI__ 1
+// CHECK_RPL_M32: #define __AVX__ 1
+// CHECK_RPL_M32: #define __BMI2__ 1
+// CHECK_RPL_M32: #define __BMI__ 1
+// CHECK_RPL_M32: #define __CLDEMOTE__ 1
+// CHECK_RPL_M32: #define __CLFLUSHOPT__ 1
+// CHECK_RPL_M32: #define __CLWB__ 1
+// CHECK_RPL_M32: #define __F16C__ 1
+// CHECK_RPL_M32: #define __FMA__ 1
+// CHECK_RPL_M32: #define __FSGSBASE__ 1
+// CHECK_RPL_M32: #define __FXSR__ 1
+// CHECK_RPL_M32: #define __GFNI__ 1
+// CHECK_RPL_M32: #define __HRESET__ 1
+// CHECK_RPL_M32: #define __INVPCID__ 1
+// CHECK_RPL_M32: #define __KL__ 1
+// CHECK_RPL_M32: #define __LZCNT__ 1
+// CHECK_RPL_M32: #define __MMX__ 1
+// CHECK_RPL_M32: #define __MOVBE__ 1
+// CHECK_RPL_M32: #define __MOVDIR64B__ 1
+// CHECK_RPL_M32: #define __MOVDIRI__ 1
+// CHECK_RPL_M32: #define __PCLMUL__ 1
+// CHECK_RPL_M32: #define __PCONFIG__ 1
+// CHECK_RPL_M32: #define __PKU__ 1
+// CHECK_RPL_M32: #define __POPCNT__ 1
+// CHECK_RPL_M32: #define __PRFCHW__ 1
+// CHECK_RPL_M32: #define __PTWRITE__ 1
+// CHECK_RPL_M32: #define __RDPID__ 1
+// CHECK_RPL_M32: #define __RDRND__ 1
+// CHECK_RPL_M32: #define __RDSEED__ 1
+// CHECK_RPL_M32: #define __SERIALIZE__ 1
+// CHECK_RPL_M32: #define __SGX__ 1
+// CHECK_RPL_M32: #define __SHA__ 1
+// CHECK_RPL_M32: #define __SHSTK__ 1
+// CHECK_RPL_M32: #define __SSE2__ 1
+// CHECK_RPL_M32: #define __SSE3__ 1
+// CHECK_RPL_M32: #define __SSE4_1__ 1
+// CHECK_RPL_M32: #define __SSE4_2__ 1
+// CHECK_RPL_M32: #define __SSE_MATH__ 1
+// CHECK_RPL_M32: #define __SSE__ 1
+// CHECK_RPL_M32: #define __SSSE3__ 1
+// CHECK_RPL_M32: #define __VAES__ 1
+// CHECK_RPL_M32: #define __VPCLMULQDQ__ 1
+// CHECK_RPL_M32: #define __WAITPKG__ 1
+// CHECK_RPL_M32: #define __WIDEKL__ 1
+// CHECK_RPL_M32: #define __XSAVEC__ 1
+// CHECK_RPL_M32: #define __XSAVEOPT__ 1
+// CHECK_RPL_M32: #define __XSAVES__ 1
+// CHECK_RPL_M32: #define __XSAVE__ 1
+// CHECK_RPL_M32: #define __corei7 1
+// CHECK_RPL_M32: #define __corei7__ 1
+// CHECK_RPL_M32: #define __i386 1
+// CHECK_RPL_M32: #define __i386__ 1
+// CHECK_RPL_M32: #define __tune_corei7__ 1
+// CHECK_RPL_M32: #define i386 1
+
+// RUN: %clang -march=raptorlake -m64 -E -dM %s -o - 2>&1 \
+// RUN: -target i386-unknown-linux \
+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_RPL_M64
+// CHECK_RPL_M64: #define __ADX__ 1
+// CHECK_RPL_M64: #define __AES__ 1
+// CHECK_RPL_M64: #define __AVX2__ 1
+// CHECK_RPL_M64-NOT: AVX512
+// CHECK_RPL_M64: #define __AVXVNNI__ 1
+// CHECK_RPL_M64: #define __AVX__ 1
+// CHECK_RPL_M64: #define __BMI2__ 1
+// CHECK_RPL_M64: #define __BMI__ 1
+// CHECK_RPL_M64: #define __CLDEMOTE__ 1
+// CHECK_RPL_M64: #define __CLFLUSHOPT__ 1
+// CHECK_RPL_M64: #define __CLWB__ 1
+// CHECK_RPL_M64: #define __F16C__ 1
+// CHECK_RPL_M64: #define __FMA__ 1
+// CHECK_RPL_M64: #define __FSGSBASE__ 1
+// CHECK_RPL_M64: #define __FXSR__ 1
+// CHECK_RPL_M64: #define __GFNI__ 1
+// CHECK_RPL_M64: #define __HRESET__ 1
+// CHECK_RPL_M64: #define __INVPCID__ 1
+// CHECK_RPL_M64: #define __KL__ 1
+// CHECK_RPL_M64: #define __LZCNT__ 1
+// CHECK_RPL_M64: #define __MMX__ 1
+// CHECK_RPL_M64: #define __MOVBE__ 1
+// CHECK_RPL_M64: #define __MOVDIR64B__ 1
+// CHECK_RPL_M64: #define __MOVDIRI__ 1
+// CHECK_RPL_M64: #define __PCLMUL__ 1
+// CHECK_RPL_M64: #define __PCONFIG__ 1
+// CHECK_RPL_M64: #define __PKU__ 1
+// CHECK_RPL_M64: #define __POPCNT__ 1
+// CHECK_RPL_M64: #define __PRFCHW__ 1
+// CHECK_RPL_M64: #define __PTWRITE__ 1
+// CHECK_RPL_M64: #define __RDPID__ 1
+// CHECK_RPL_M64: #define __RDRND__ 1
+// CHECK_RPL_M64: #define __RDSEED__ 1
+// CHECK_RPL_M64: #define __SERIALIZE__ 1
+// CHECK_RPL_M64: #define __SGX__ 1
+// CHECK_RPL_M64: #define __SHA__ 1
+// CHECK_RPL_M64: #define __SHSTK__ 1
+// CHECK_RPL_M64: #define __SSE2_MATH__ 1
+// CHECK_RPL_M64: #define __SSE2__ 1
+// CHECK_RPL_M64: #define __SSE3__ 1
+// CHECK_RPL_M64: #define __SSE4_1__ 1
+// CHECK_RPL_M64: #define __SSE4_2__ 1
+// CHECK_RPL_M64: #define __SSE_MATH__ 1
+// CHECK_RPL_M64: #define __SSE__ 1
+// CHECK_RPL_M64: #define __SSSE3__ 1
+// CHECK_RPL_M64: #define __VAES__ 1
+// CHECK_RPL_M64: #define __VPCLMULQDQ__ 1
+// CHECK_RPL_M64: #define __WAITPKG__ 1
+// CHECK_RPL_M64: #define __WIDEKL__ 1
+// CHECK_RPL_M64: #define __XSAVEC__ 1
+// CHECK_RPL_M64: #define __XSAVEOPT__ 1
+// CHECK_RPL_M64: #define __XSAVES__ 1
+// CHECK_RPL_M64: #define __XSAVE__ 1
+// CHECK_RPL_M64: #define __amd64 1
+// CHECK_RPL_M64: #define __amd64__ 1
+// CHECK_RPL_M64: #define __corei7 1
+// CHECK_RPL_M64: #define __corei7__ 1
+// CHECK_RPL_M64: #define __tune_corei7__ 1
+// CHECK_RPL_M64: #define __x86_64 1
+// CHECK_RPL_M64: #define __x86_64__ 1
+
+// RUN: %clang -march=meteorlake -m32 -E -dM %s -o - 2>&1 \
+// RUN: -target i386-unknown-linux \
+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MTL_M32
+// CHECK_MTL_M32: #define __ADX__ 1
+// CHECK_MTL_M32: #define __AES__ 1
+// CHECK_MTL_M32: #define __AVX2__ 1
+// CHECK_MTL_M32-NOT: AVX512
+// CHECK_MTL_M32: #define __AVXVNNI__ 1
+// CHECK_MTL_M32: #define __AVX__ 1
+// CHECK_MTL_M32: #define __BMI2__ 1
+// CHECK_MTL_M32: #define __BMI__ 1
+// CHECK_MTL_M32: #define __CLDEMOTE__ 1
+// CHECK_MTL_M32: #define __CLFLUSHOPT__ 1
+// CHECK_MTL_M32: #define __CLWB__ 1
+// CHECK_MTL_M32: #define __F16C__ 1
+// CHECK_MTL_M32: #define __FMA__ 1
+// CHECK_MTL_M32: #define __FSGSBASE__ 1
+// CHECK_MTL_M32: #define __FXSR__ 1
+// CHECK_MTL_M32: #define __GFNI__ 1
+// CHECK_MTL_M32: #define __HRESET__ 1
+// CHECK_MTL_M32: #define __INVPCID__ 1
+// CHECK_MTL_M32: #define __KL__ 1
+// CHECK_MTL_M32: #define __LZCNT__ 1
+// CHECK_MTL_M32: #define __MMX__ 1
+// CHECK_MTL_M32: #define __MOVBE__ 1
+// CHECK_MTL_M32: #define __MOVDIR64B__ 1
+// CHECK_MTL_M32: #define __MOVDIRI__ 1
+// CHECK_MTL_M32: #define __PCLMUL__ 1
+// CHECK_MTL_M32: #define __PCONFIG__ 1
+// CHECK_MTL_M32: #define __PKU__ 1
+// CHECK_MTL_M32: #define __POPCNT__ 1
+// CHECK_MTL_M32: #define __PRFCHW__ 1
+// CHECK_MTL_M32: #define __PTWRITE__ 1
+// CHECK_MTL_M32: #define __RDPID__ 1
+// CHECK_MTL_M32: #define __RDRND__ 1
+// CHECK_MTL_M32: #define __RDSEED__ 1
+// CHECK_MTL_M32: #define __SERIALIZE__ 1
+// CHECK_MTL_M32: #define __SGX__ 1
+// CHECK_MTL_M32: #define __SHA__ 1
+// CHECK_MTL_M32: #define __SHSTK__ 1
+// CHECK_MTL_M32: #define __SSE2__ 1
+// CHECK_MTL_M32: #define __SSE3__ 1
+// CHECK_MTL_M32: #define __SSE4_1__ 1
+// CHECK_MTL_M32: #define __SSE4_2__ 1
+// CHECK_MTL_M32: #define __SSE_MATH__ 1
+// CHECK_MTL_M32: #define __SSE__ 1
+// CHECK_MTL_M32: #define __SSSE3__ 1
+// CHECK_MTL_M32: #define __VAES__ 1
+// CHECK_MTL_M32: #define __VPCLMULQDQ__ 1
+// CHECK_MTL_M32: #define __WAITPKG__ 1
+// CHECK_MTL_M32: #define __WIDEKL__ 1
+// CHECK_MTL_M32: #define __XSAVEC__ 1
+// CHECK_MTL_M32: #define __XSAVEOPT__ 1
+// CHECK_MTL_M32: #define __XSAVES__ 1
+// CHECK_MTL_M32: #define __XSAVE__ 1
+// CHECK_MTL_M32: #define __corei7 1
+// CHECK_MTL_M32: #define __corei7__ 1
+// CHECK_MTL_M32: #define __i386 1
+// CHECK_MTL_M32: #define __i386__ 1
+// CHECK_MTL_M32: #define __tune_corei7__ 1
+// CHECK_MTL_M32: #define i386 1
+
+// RUN: %clang -march=meteorlake -m64 -E -dM %s -o - 2>&1 \
+// RUN: -target i386-unknown-linux \
+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MTL_M64
+// CHECK_MTL_M64: #define __ADX__ 1
+// CHECK_MTL_M64: #define __AES__ 1
+// CHECK_MTL_M64: #define __AVX2__ 1
+// CHECK_MTL_M64-NOT: AVX512
+// CHECK_MTL_M64: #define __AVXVNNI__ 1
+// CHECK_MTL_M64: #define __AVX__ 1
+// CHECK_MTL_M64: #define __BMI2__ 1
+// CHECK_MTL_M64: #define __BMI__ 1
+// CHECK_MTL_M64: #define __CLDEMOTE__ 1
+// CHECK_MTL_M64: #define __CLFLUSHOPT__ 1
+// CHECK_MTL_M64: #define __CLWB__ 1
+// CHECK_MTL_M64: #define __F16C__ 1
+// CHECK_MTL_M64: #define __FMA__ 1
+// CHECK_MTL_M64: #define __FSGSBASE__ 1
+// CHECK_MTL_M64: #define __FXSR__ 1
+// CHECK_MTL_M64: #define __GFNI__ 1
+// CHECK_MTL_M64: #define __HRESET__ 1
+// CHECK_MTL_M64: #define __INVPCID__ 1
+// CHECK_MTL_M64: #define __KL__ 1
+// CHECK_MTL_M64: #define __LZCNT__ 1
+// CHECK_MTL_M64: #define __MMX__ 1
+// CHECK_MTL_M64: #define __MOVBE__ 1
+// CHECK_MTL_M64: #define __MOVDIR64B__ 1
+// CHECK_MTL_M64: #define __MOVDIRI__ 1
+// CHECK_MTL_M64: #define __PCLMUL__ 1
+// CHECK_MTL_M64: #define __PCONFIG__ 1
+// CHECK_MTL_M64: #define __PKU__ 1
+// CHECK_MTL_M64: #define __POPCNT__ 1
+// CHECK_MTL_M64: #define __PRFCHW__ 1
+// CHECK_MTL_M64: #define __PTWRITE__ 1
+// CHECK_MTL_M64: #define __RDPID__ 1
+// CHECK_MTL_M64: #define __RDRND__ 1
+// CHECK_MTL_M64: #define __RDSEED__ 1
+// CHECK_MTL_M64: #define __SERIALIZE__ 1
+// CHECK_MTL_M64: #define __SGX__ 1
+// CHECK_MTL_M64: #define __SHA__ 1
+// CHECK_MTL_M64: #define __SHSTK__ 1
+// CHECK_MTL_M64: #define __SSE2_MATH__ 1
+// CHECK_MTL_M64: #define __SSE2__ 1
+// CHECK_MTL_M64: #define __SSE3__ 1
+// CHECK_MTL_M64: #define __SSE4_1__ 1
+// CHECK_MTL_M64: #define __SSE4_2__ 1
+// CHECK_MTL_M64: #define __SSE_MATH__ 1
+// CHECK_MTL_M64: #define __SSE__ 1
+// CHECK_MTL_M64: #define __SSSE3__ 1
+// CHECK_MTL_M64: #define __VAES__ 1
+// CHECK_MTL_M64: #define __VPCLMULQDQ__ 1
+// CHECK_MTL_M64: #define __WAITPKG__ 1
+// CHECK_MTL_M64: #define __WIDEKL__ 1
+// CHECK_MTL_M64: #define __XSAVEC__ 1
+// CHECK_MTL_M64: #define __XSAVEOPT__ 1
+// CHECK_MTL_M64: #define __XSAVES__ 1
+// CHECK_MTL_M64: #define __XSAVE__ 1
+// CHECK_MTL_M64: #define __amd64 1
+// CHECK_MTL_M64: #define __amd64__ 1
+// CHECK_MTL_M64: #define __corei7 1
+// CHECK_MTL_M64: #define __corei7__ 1
+// CHECK_MTL_M64: #define __tune_corei7__ 1
+// CHECK_MTL_M64: #define __x86_64 1
+// CHECK_MTL_M64: #define __x86_64__ 1
+
// RUN: %clang -march=geode -m32 -E -dM %s -o - 2>&1 \
// RUN: -target i386-unknown-linux \
// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_GEODE_M32
Index: clang/test/Misc/target-invalid-cpu-note.c
===================================================================
--- clang/test/Misc/target-invalid-cpu-note.c
+++ clang/test/Misc/target-invalid-cpu-note.c
@@ -13,19 +13,19 @@
// RUN: not %clang_cc1 -triple i386--- -target-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix X86
// X86: error: unknown target CPU 'not-a-cpu'
-// X86-NEXT: note: valid target CPU values are: i386, i486, winchip-c6, winchip2, c3, i586, pentium, pentium-mmx, pentiumpro, i686, pentium2, pentium3, pentium3m, pentium-m, c3-2, yonah, pentium4, pentium4m, prescott, nocona, core2, penryn, bonnell, atom, silvermont, slm, goldmont, goldmont-plus, tremont, nehalem, corei7, westmere, sandybridge, corei7-avx, ivybridge, core-avx-i, haswell, core-avx2, broadwell, skylake, skylake-avx512, skx, cascadelake, cooperlake, cannonlake, icelake-client, rocketlake, icelake-server, tigerlake, sapphirerapids, alderlake, knl, knm, lakemont, k6, k6-2, k6-3, athlon, athlon-tbird, athlon-xp, athlon-mp, athlon-4, k8, athlon64, athlon-fx, opteron, k8-sse3, athlon64-sse3, opteron-sse3, amdfam10, barcelona, btver1, btver2, bdver1, bdver2, bdver3, bdver4, znver1, znver2, znver3, x86-64, x86-64-v2, x86-64-v3, x86-64-v4, geode{{$}}
+// X86-NEXT: note: valid target CPU values are: i386, i486, winchip-c6, winchip2, c3, i586, pentium, pentium-mmx, pentiumpro, i686, pentium2, pentium3, pentium3m, pentium-m, c3-2, yonah, pentium4, pentium4m, prescott, nocona, core2, penryn, bonnell, atom, silvermont, slm, goldmont, goldmont-plus, tremont, nehalem, corei7, westmere, sandybridge, corei7-avx, ivybridge, core-avx-i, haswell, core-avx2, broadwell, skylake, skylake-avx512, skx, cascadelake, cooperlake, cannonlake, icelake-client, rocketlake, icelake-server, tigerlake, sapphirerapids, alderlake, raptorlake, meteorlake, knl, knm, lakemont, k6, k6-2, k6-3, athlon, athlon-tbird, athlon-xp, athlon-mp, athlon-4, k8, athlon64, athlon-fx, opteron, k8-sse3, athlon64-sse3, opteron-sse3, amdfam10, barcelona, btver1, btver2, bdver1, bdver2, bdver3, bdver4, znver1, znver2, znver3, x86-64, x86-64-v2, x86-64-v3, x86-64-v4, geode{{$}}
// RUN: not %clang_cc1 -triple x86_64--- -target-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix X86_64
// X86_64: error: unknown target CPU 'not-a-cpu'
-// X86_64-NEXT: note: valid target CPU values are: nocona, core2, penryn, bonnell, atom, silvermont, slm, goldmont, goldmont-plus, tremont, nehalem, corei7, westmere, sandybridge, corei7-avx, ivybridge, core-avx-i, haswell, core-avx2, broadwell, skylake, skylake-avx512, skx, cascadelake, cooperlake, cannonlake, icelake-client, rocketlake, icelake-server, tigerlake, sapphirerapids, alderlake, knl, knm, k8, athlon64, athlon-fx, opteron, k8-sse3, athlon64-sse3, opteron-sse3, amdfam10, barcelona, btver1, btver2, bdver1, bdver2, bdver3, bdver4, znver1, znver2, znver3, x86-64, x86-64-v2, x86-64-v3, x86-64-v4{{$}}
+// X86_64-NEXT: note: valid target CPU values are: nocona, core2, penryn, bonnell, atom, silvermont, slm, goldmont, goldmont-plus, tremont, nehalem, corei7, westmere, sandybridge, corei7-avx, ivybridge, core-avx-i, haswell, core-avx2, broadwell, skylake, skylake-avx512, skx, cascadelake, cooperlake, cannonlake, icelake-client, rocketlake, icelake-server, tigerlake, sapphirerapids, alderlake, raptorlake, meteorlake, knl, knm, k8, athlon64, athlon-fx, opteron, k8-sse3, athlon64-sse3, opteron-sse3, amdfam10, barcelona, btver1, btver2, bdver1, bdver2, bdver3, bdver4, znver1, znver2, znver3, x86-64, x86-64-v2, x86-64-v3, x86-64-v4{{$}}
// RUN: not %clang_cc1 -triple i386--- -tune-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix TUNE_X86
// TUNE_X86: error: unknown target CPU 'not-a-cpu'
-// TUNE_X86-NEXT: note: valid target CPU values are: i386, i486, winchip-c6, winchip2, c3, i586, pentium, pentium-mmx, pentiumpro, i686, pentium2, pentium3, pentium3m, pentium-m, c3-2, yonah, pentium4, pentium4m, prescott, nocona, core2, penryn, bonnell, atom, silvermont, slm, goldmont, goldmont-plus, tremont, nehalem, corei7, westmere, sandybridge, corei7-avx, ivybridge, core-avx-i, haswell, core-avx2, broadwell, skylake, skylake-avx512, skx, cascadelake, cooperlake, cannonlake, icelake-client, rocketlake, icelake-server, tigerlake, sapphirerapids, alderlake, knl, knm, lakemont, k6, k6-2, k6-3, athlon, athlon-tbird, athlon-xp, athlon-mp, athlon-4, k8, athlon64, athlon-fx, opteron, k8-sse3, athlon64-sse3, opteron-sse3, amdfam10, barcelona, btver1, btver2, bdver1, bdver2, bdver3, bdver4, znver1, znver2, znver3, x86-64, geode{{$}}
+// TUNE_X86-NEXT: note: valid target CPU values are: i386, i486, winchip-c6, winchip2, c3, i586, pentium, pentium-mmx, pentiumpro, i686, pentium2, pentium3, pentium3m, pentium-m, c3-2, yonah, pentium4, pentium4m, prescott, nocona, core2, penryn, bonnell, atom, silvermont, slm, goldmont, goldmont-plus, tremont, nehalem, corei7, westmere, sandybridge, corei7-avx, ivybridge, core-avx-i, haswell, core-avx2, broadwell, skylake, skylake-avx512, skx, cascadelake, cooperlake, cannonlake, icelake-client, rocketlake, icelake-server, tigerlake, sapphirerapids, alderlake, raptorlake, meteorlake, knl, knm, lakemont, k6, k6-2, k6-3, athlon, athlon-tbird, athlon-xp, athlon-mp, athlon-4, k8, athlon64, athlon-fx, opteron, k8-sse3, athlon64-sse3, opteron-sse3, amdfam10, barcelona, btver1, btver2, bdver1, bdver2, bdver3, bdver4, znver1, znver2, znver3, x86-64, geode{{$}}
// RUN: not %clang_cc1 -triple x86_64--- -tune-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix TUNE_X86_64
// TUNE_X86_64: error: unknown target CPU 'not-a-cpu'
-// TUNE_X86_64-NEXT: note: valid target CPU values are: i386, i486, winchip-c6, winchip2, c3, i586, pentium, pentium-mmx, pentiumpro, i686, pentium2, pentium3, pentium3m, pentium-m, c3-2, yonah, pentium4, pentium4m, prescott, nocona, core2, penryn, bonnell, atom, silvermont, slm, goldmont, goldmont-plus, tremont, nehalem, corei7, westmere, sandybridge, corei7-avx, ivybridge, core-avx-i, haswell, core-avx2, broadwell, skylake, skylake-avx512, skx, cascadelake, cooperlake, cannonlake, icelake-client, rocketlake, icelake-server, tigerlake, sapphirerapids, alderlake, knl, knm, lakemont, k6, k6-2, k6-3, athlon, athlon-tbird, athlon-xp, athlon-mp, athlon-4, k8, athlon64, athlon-fx, opteron, k8-sse3, athlon64-sse3, opteron-sse3, amdfam10, barcelona, btver1, btver2, bdver1, bdver2, bdver3, bdver4, znver1, znver2, znver3, x86-64, geode{{$}}
+// TUNE_X86_64-NEXT: note: valid target CPU values are: i386, i486, winchip-c6, winchip2, c3, i586, pentium, pentium-mmx, pentiumpro, i686, pentium2, pentium3, pentium3m, pentium-m, c3-2, yonah, pentium4, pentium4m, prescott, nocona, core2, penryn, bonnell, atom, silvermont, slm, goldmont, goldmont-plus, tremont, nehalem, corei7, westmere, sandybridge, corei7-avx, ivybridge, core-avx-i, haswell, core-avx2, broadwell, skylake, skylake-avx512, skx, cascadelake, cooperlake, cannonlake, icelake-client, rocketlake, icelake-server, tigerlake, sapphirerapids, alderlake, raptorlake, meteorlake, knl, knm, lakemont, k6, k6-2, k6-3, athlon, athlon-tbird, athlon-xp, athlon-mp, athlon-4, k8, athlon64, athlon-fx, opteron, k8-sse3, athlon64-sse3, opteron-sse3, amdfam10, barcelona, btver1, btver2, bdver1, bdver2, bdver3, bdver4, znver1, znver2, znver3, x86-64, geode{{$}}
// RUN: not %clang_cc1 -triple nvptx--- -target-cpu not-a-cpu -fsyntax-only %s 2>&1 | FileCheck %s --check-prefix NVPTX
// NVPTX: error: unknown target CPU 'not-a-cpu'
Index: clang/test/Driver/x86-march.c
===================================================================
--- clang/test/Driver/x86-march.c
+++ clang/test/Driver/x86-march.c
@@ -111,6 +111,13 @@
// RUN: %clang -target x86_64-unknown-unknown -c -### %s -march=tremont 2>&1 \
// RUN: | FileCheck %s -check-prefix=tremont
// tremont: "-target-cpu" "tremont"
+// RUN: %clang -target x86_64-unknown-unknown -c -### %s -march=raptorlake 2>&1 \
+// RUN: | FileCheck %s -check-prefix=raptorlake
+// raptorlake: "-target-cpu" "raptorlake"
+//
+// RUN: %clang -target x86_64-unknown-unknown -c -### %s -march=meteorlake 2>&1 \
+// RUN: | FileCheck %s -check-prefix=meteorlake
+// meteorlake: "-target-cpu" "meteorlake"
//
// RUN: %clang -target x86_64-unknown-unknown -c -### %s -march=sapphirerapids 2>&1 \
// RUN: | FileCheck %s -check-prefix=sapphirerapids
Index: clang/test/CodeGen/target-builtin-noerror.c
===================================================================
--- clang/test/CodeGen/target-builtin-noerror.c
+++ clang/test/CodeGen/target-builtin-noerror.c
@@ -115,7 +115,9 @@
(void)__builtin_cpu_is("ivybridge");
(void)__builtin_cpu_is("knl");
(void)__builtin_cpu_is("knm");
+ (void)__builtin_cpu_is("meteorlake");
(void)__builtin_cpu_is("nehalem");
+ (void)__builtin_cpu_is("raptorlake");
(void)__builtin_cpu_is("rocketlake");
(void)__builtin_cpu_is("sandybridge");
(void)__builtin_cpu_is("shanghai");
Index: clang/test/CodeGen/attr-target-mv.c
===================================================================
--- clang/test/CodeGen/attr-target-mv.c
+++ clang/test/CodeGen/attr-target-mv.c
@@ -15,6 +15,8 @@
int __attribute__((target("arch=alderlake"))) foo(void) {return 11;}
int __attribute__((target("arch=rocketlake"))) foo(void) {return 12;}
int __attribute__((target("arch=core2"))) foo(void) {return 13;}
+int __attribute__((target("arch=raptorlake"))) foo(void) {return 14;}
+int __attribute__((target("arch=meteorlake"))) foo(void) {return 15;}
int __attribute__((target("default"))) foo(void) { return 2; }
int bar(void) {
@@ -149,6 +151,10 @@
// LINUX: ret i32 12
// LINUX: define{{.*}} i32 @foo.arch_core2()
// LINUX: ret i32 13
+// LINUX: define{{.*}} i32 @foo.arch_raptorlake()
+// LINUX: ret i32 14
+// LINUX: define{{.*}} i32 @foo.arch_meteorlake()
+// LINUX: ret i32 15
// LINUX: define{{.*}} i32 @foo()
// LINUX: ret i32 2
// LINUX: define{{.*}} i32 @bar()
@@ -180,6 +186,10 @@
// WINDOWS: ret i32 12
// WINDOWS: define dso_local i32 @foo.arch_core2()
// WINDOWS: ret i32 13
+// WINDOWS: define dso_local i32 @foo.arch_raptorlake()
+// WINDOWS: ret i32 14
+// WINDOWS: define dso_local i32 @foo.arch_meteorlake()
+// WINDOWS: ret i32 15
// WINDOWS: define dso_local i32 @foo()
// WINDOWS: ret i32 2
// WINDOWS: define dso_local i32 @bar()
Index: clang/lib/Basic/Targets/X86.cpp
===================================================================
--- clang/lib/Basic/Targets/X86.cpp
+++ clang/lib/Basic/Targets/X86.cpp
@@ -510,6 +510,8 @@
case CK_Tigerlake:
case CK_SapphireRapids:
case CK_Alderlake:
+ case CK_Raptorlake:
+ case CK_Meteorlake:
// FIXME: Historically, we defined this legacy name, it would be nice to
// remove it at some point. We've never exposed fine-grained names for
// recent primary x86 CPUs, and we should keep it that way.
@@ -1366,6 +1368,8 @@
case CK_Rocketlake:
case CK_IcelakeServer:
case CK_Alderlake:
+ case CK_Raptorlake:
+ case CK_Meteorlake:
case CK_KNL:
case CK_KNM:
// K7
Index: clang/docs/ReleaseNotes.rst
===================================================================
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -550,6 +550,8 @@
--------------------
- Support ``-mindirect-branch-cs-prefix`` for call and jmp to indirect thunk.
- Fix 32-bit ``__fastcall`` and ``__vectorcall`` ABI mismatch with MSVC.
+- Support ``-march=raptorlake``
+- Support ``-march=meteorlake``
DWARF Support in Clang
----------------------
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
