Skip to content

Commit 8e86772

Browse files
FreddyLeafKornevNikita
FreddyLeaf
authored and
KornevNikita
committed
Reland "[X86] Support -march=diamondrapids (#113881)" (#116564)
Ref.: https://cdrdv2.intel.com/v1/dl/getContent/671368
1 parent fe8e81b commit 8e86772

File tree

16 files changed

+141
-0
lines changed

16 files changed

+141
-0
lines changed

‎clang/docs/ReleaseNotes.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,8 @@ X86 Support
630630
- Support ISA of ``AMX-AVX512``.
631631
- Support ISA of ``AMX-TF32``.
632632

633+
- Supported ``-march/tune=diamondrapids``
634+
633635
Arm and AArch64 Support
634636
^^^^^^^^^^^^^^^^^^^^^^^
635637

‎clang/lib/Basic/Targets/X86.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,7 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
659659
case CK_GraniterapidsD:
660660
case CK_Emeraldrapids:
661661
case CK_Clearwaterforest:
662+
case CK_Diamondrapids:
662663
// FIXME: Historically, we defined this legacy name, it would be nice to
663664
// remove it at some point. We've never exposed fine-grained names for
664665
// recent primary x86 CPUs, and we should keep it that way.
@@ -1643,6 +1644,7 @@ std::optional<unsigned> X86TargetInfo::getCPUCacheLineSize() const {
16431644
case CK_GraniterapidsD:
16441645
case CK_Emeraldrapids:
16451646
case CK_Clearwaterforest:
1647+
case CK_Diamondrapids:
16461648
case CK_KNL:
16471649
case CK_KNM:
16481650
// K7

‎clang/test/CodeGen/attr-cpuspecific-cpus.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ ATTR(cpu_specific(icelake_client)) void CPU(void){}
4343
ATTR(cpu_specific(tigerlake)) void CPU(void){}
4444
ATTR(cpu_specific(alderlake)) void CPU(void){}
4545
ATTR(cpu_specific(sapphirerapids)) void CPU(void){}
46+
ATTR(cpu_specific(diamondrapids)) void CPU(void){}
4647

4748
// ALIAS CPUs
4849
ATTR(cpu_specific(pentium_iii_no_xmm_regs)) void CPU0(void){}

‎clang/test/CodeGen/attr-target-mv.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ int __attribute__((target("arch=lunarlake"))) foo(void) {return 23;}
2929
int __attribute__((target("arch=gracemont"))) foo(void) {return 24;}
3030
int __attribute__((target("arch=pantherlake"))) foo(void) {return 25;}
3131
int __attribute__((target("arch=clearwaterforest"))) foo(void) {return 26;}
32+
int __attribute__((target("arch=diamondrapids"))) foo(void) {return 27;}
3233
int __attribute__((target("default"))) foo(void) { return 2; }
3334

3435
int bar(void) {

‎clang/test/CodeGen/target-builtin-noerror.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,4 +209,5 @@ void verifycpustrings(void) {
209209
(void)__builtin_cpu_is("znver3");
210210
(void)__builtin_cpu_is("znver4");
211211
(void)__builtin_cpu_is("znver5");
212+
(void)__builtin_cpu_is("diamondrapids");
212213
}

‎clang/test/Driver/x86-march.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,10 @@
120120
// RUN: | FileCheck %s -check-prefix=clearwaterforest
121121
// clearwaterforest: "-target-cpu" "clearwaterforest"
122122
//
123+
// RUN: %clang -target x86_64-unknown-unknown -c -### %s -march=diamondrapids 2>&1 \
124+
// RUN: | FileCheck %s -check-prefix=diamondrapids
125+
// diamondrapids: "-target-cpu" "diamondrapids"
126+
//
123127
// RUN: %clang -target x86_64-unknown-unknown -c -### %s -march=lakemont 2>&1 \
124128
// RUN: | FileCheck %s -check-prefix=lakemont
125129
// lakemont: "-target-cpu" "lakemont"

‎clang/test/Misc/target-invalid-cpu-note/x86.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
// X86-SAME: {{^}}, graniterapids-d
7070
// X86-SAME: {{^}}, emeraldrapids
7171
// X86-SAME: {{^}}, clearwaterforest
72+
// X86-SAME: {{^}}, diamondrapids
7273
// X86-SAME: {{^}}, knl
7374
// X86-SAME: {{^}}, knm
7475
// X86-SAME: {{^}}, lakemont
@@ -155,6 +156,7 @@
155156
// X86_64-SAME: {{^}}, graniterapids-d
156157
// X86_64-SAME: {{^}}, emeraldrapids
157158
// X86_64-SAME: {{^}}, clearwaterforest
159+
// X86_64-SAME: {{^}}, diamondrapids
158160
// X86_64-SAME: {{^}}, knl
159161
// X86_64-SAME: {{^}}, knm
160162
// X86_64-SAME: {{^}}, k8
@@ -250,6 +252,7 @@
250252
// TUNE_X86-SAME: {{^}}, graniterapids-d
251253
// TUNE_X86-SAME: {{^}}, emeraldrapids
252254
// TUNE_X86-SAME: {{^}}, clearwaterforest
255+
// TUNE_X86-SAME: {{^}}, diamondrapids
253256
// TUNE_X86-SAME: {{^}}, knl
254257
// TUNE_X86-SAME: {{^}}, knm
255258
// TUNE_X86-SAME: {{^}}, lakemont
@@ -352,6 +355,7 @@
352355
// TUNE_X86_64-SAME: {{^}}, graniterapids-d
353356
// TUNE_X86_64-SAME: {{^}}, emeraldrapids
354357
// TUNE_X86_64-SAME: {{^}}, clearwaterforest
358+
// TUNE_X86_64-SAME: {{^}}, diamondrapids
355359
// TUNE_X86_64-SAME: {{^}}, knl
356360
// TUNE_X86_64-SAME: {{^}}, knm
357361
// TUNE_X86_64-SAME: {{^}}, lakemont

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

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1867,13 +1867,23 @@
18671867
// RUN: %clang -march=graniterapids-d -m32 -E -dM %s -o - 2>&1 \
18681868
// RUN: --target=i386 \
18691869
// RUN: | FileCheck -match-full-lines %s -check-prefixes=CHECK_GNR_M32,CHECK_GNRD_M32
1870+
// RUN: %clang -march=diamondrapids -m32 -E -dM %s -o - 2>&1 \
1871+
// RUN: --target=i386 \
1872+
// RUN: | FileCheck -match-full-lines %s -check-prefixes=CHECK_GNR_M32,CHECK_GNRD_M32,CHECK_DMR_M32
18701873
// CHECK_GNR_M32: #define __AES__ 1
1874+
// CHECK_DMR_M32: #define __AMX_AVX512__ 1
18711875
// CHECK_GNR_M32: #define __AMX_BF16__ 1
18721876
// CHECK_GNR_M32-NOT: #define __AMX_COMPLEX__ 1
18731877
// CHECK_GNRD_M32: #define __AMX_COMPLEX__ 1
18741878
// CHECK_GNR_M32: #define __AMX_FP16__ 1
1879+
// CHECK_DMR_M32: #define __AMX_FP8__ 1
18751880
// CHECK_GNR_M32: #define __AMX_INT8__ 1
1881+
// CHECK_DMR_M32: #define __AMX_MOVRS__ 1
1882+
// CHECK_DMR_M32: #define __AMX_TF32__ 1
18761883
// CHECK_GNR_M32: #define __AMX_TILE__ 1
1884+
// CHECK_DMR_M32: #define __AMX_TRANSPOSE__ 1
1885+
// CHECK_DMR_M32: #define __AVX10_2_512__ 1
1886+
// CHECK_DMR_M32: #define __AVX10_2__ 1
18771887
// CHECK_GNR_M32: #define __AVX2__ 1
18781888
// CHECK_GNR_M32: #define __AVX512BF16__ 1
18791889
// CHECK_GNR_M32: #define __AVX512BITALG__ 1
@@ -1888,13 +1898,21 @@
18881898
// CHECK_GNR_M32: #define __AVX512VL__ 1
18891899
// CHECK_GNR_M32: #define __AVX512VNNI__ 1
18901900
// CHECK_GNR_M32: #define __AVX512VPOPCNTDQ__ 1
1901+
// CHECK_DMR_M32: #define __AVXIFMA__ 1
1902+
// CHECK_DMR_M32: #define __AVXNECONVERT__ 1
1903+
// CHECK_DMR_M32: #define __AVXVNNIINT16__ 1
1904+
// CHECK_DMR_M32: #define __AVXVNNIINT8__ 1
18911905
// CHECK_GNR_M32: #define __AVXVNNI__ 1
18921906
// CHECK_GNR_M32: #define __AVX__ 1
18931907
// CHECK_GNR_M32: #define __BMI2__ 1
18941908
// CHECK_GNR_M32: #define __BMI__ 1
1909+
// CHECK_DMR_M32: #define __CCMP__ 1
1910+
// CHECK_DMR_M32: #define __CF__ 1
18951911
// CHECK_GNR_M32: #define __CLDEMOTE__ 1
18961912
// CHECK_GNR_M32: #define __CLFLUSHOPT__ 1
18971913
// CHECK_GNR_M32: #define __CLWB__ 1
1914+
// CHECK_DMR_M32: #define __CMPCCXADD__ 1
1915+
// CHECK_DMR_M32: #define __EGPR__ 1
18981916
// CHECK_GNR_M32: #define __ENQCMD__ 1
18991917
// CHECK_GNR_M32: #define __EVEX256__ 1
19001918
// CHECK_GNR_M32: #define __EVEX512__ 1
@@ -1905,20 +1923,28 @@
19051923
// CHECK_GNR_M32: #define __LZCNT__ 1
19061924
// CHECK_GNR_M32: #define __MMX__ 1
19071925
// CHECK_GNR_M32: #define __MOVBE__ 1
1926+
// CHECK_DMR_M32: #define __MOVRS__ 1
1927+
// CHECK_DMR_M32: #define __NDD__ 1
1928+
// CHECK_DMR_M32: #define __NF__ 1
19081929
// CHECK_GNR_M32: #define __PCLMUL__ 1
19091930
// CHECK_GNR_M32: #define __PCONFIG__ 1
19101931
// CHECK_GNR_M32: #define __PKU__ 1
19111932
// CHECK_GNR_M32: #define __POPCNT__ 1
1933+
// CHECK_DMR_M32: #define __PPX__ 1
19121934
// CHECK_GNR_M32: #define __PREFETCHI__ 1
19131935
// CHECK_GNR_M32: #define __PRFCHW__ 1
19141936
// CHECK_GNR_M32: #define __PTWRITE__ 1
1937+
// CHECK_DMR_M32: #define __PUSH2POP2__ 1
19151938
// CHECK_GNR_M32: #define __RDPID__ 1
19161939
// CHECK_GNR_M32: #define __RDRND__ 1
19171940
// CHECK_GNR_M32: #define __RDSEED__ 1
19181941
// CHECK_GNR_M32: #define __SERIALIZE__ 1
19191942
// CHECK_GNR_M32: #define __SGX__ 1
1943+
// CHECK_DMR_M32: #define __SHA512__ 1
19201944
// CHECK_GNR_M32: #define __SHA__ 1
19211945
// CHECK_GNR_M32: #define __SHSTK__ 1
1946+
// CHECK_DMR_M32: #define __SM3__ 1
1947+
// CHECK_DMR_M32: #define __SM4__ 1
19221948
// CHECK_GNR_M32: #define __SSE2__ 1
19231949
// CHECK_GNR_M32: #define __SSE3__ 1
19241950
// CHECK_GNR_M32: #define __SSE4_1__ 1
@@ -1935,6 +1961,7 @@
19351961
// CHECK_GNR_M32: #define __XSAVEOPT__ 1
19361962
// CHECK_GNR_M32: #define __XSAVES__ 1
19371963
// CHECK_GNR_M32: #define __XSAVE__ 1
1964+
// CHECK_DMR_M32: #define __ZU__ 1
19381965
// CHECK_GNR_M32: #define __corei7 1
19391966
// CHECK_GNR_M32: #define __corei7__ 1
19401967
// CHECK_GNR_M32: #define __i386 1
@@ -1948,13 +1975,23 @@
19481975
// RUN: %clang -march=graniterapids-d -m64 -E -dM %s -o - 2>&1 \
19491976
// RUN: --target=x86_64 \
19501977
// RUN: | FileCheck -match-full-lines %s -check-prefixes=CHECK_GNR_M64,CHECK_GNRD_M64
1978+
// RUN: %clang -march=diamondrapids -m64 -E -dM %s -o - 2>&1 \
1979+
// RUN: --target=x86_64 \
1980+
// RUN: | FileCheck -match-full-lines %s -check-prefixes=CHECK_GNR_M64,CHECK_GNRD_M64,CHECK_DMR_M64
19511981
// CHECK_GNR_M64: #define __AES__ 1
1982+
// CHECK_DMR_M64: #define __AMX_AVX512__ 1
19521983
// CHECK_GNR_M64: #define __AMX_BF16__ 1
19531984
// CHECK_GNR_M64-NOT: #define __AMX_COMPLEX__ 1
19541985
// CHECK_GNRD_M64: #define __AMX_COMPLEX__ 1
19551986
// CHECK_GNR_M64: #define __AMX_FP16__ 1
1987+
// CHECK_DMR_M64: #define __AMX_FP8__ 1
19561988
// CHECK_GNR_M64: #define __AMX_INT8__ 1
1989+
// CHECK_DMR_M64: #define __AMX_MOVRS__ 1
1990+
// CHECK_DMR_M64: #define __AMX_TF32__ 1
19571991
// CHECK_GNR_M64: #define __AMX_TILE__ 1
1992+
// CHECK_DMR_M64: #define __AMX_TRANSPOSE__ 1
1993+
// CHECK_DMR_M64: #define __AVX10_2_512__ 1
1994+
// CHECK_DMR_M64: #define __AVX10_2__ 1
19581995
// CHECK_GNR_M64: #define __AVX2__ 1
19591996
// CHECK_GNR_M64: #define __AVX512BF16__ 1
19601997
// CHECK_GNR_M64: #define __AVX512BITALG__ 1
@@ -1969,13 +2006,21 @@
19692006
// CHECK_GNR_M64: #define __AVX512VL__ 1
19702007
// CHECK_GNR_M64: #define __AVX512VNNI__ 1
19712008
// CHECK_GNR_M64: #define __AVX512VPOPCNTDQ__ 1
2009+
// CHECK_DMR_M64: #define __AVXIFMA__ 1
2010+
// CHECK_DMR_M64: #define __AVXNECONVERT__ 1
2011+
// CHECK_DMR_M64: #define __AVXVNNIINT16__ 1
2012+
// CHECK_DMR_M64: #define __AVXVNNIINT8__ 1
19722013
// CHECK_GNR_M64: #define __AVXVNNI__ 1
19732014
// CHECK_GNR_M64: #define __AVX__ 1
19742015
// CHECK_GNR_M64: #define __BMI2__ 1
19752016
// CHECK_GNR_M64: #define __BMI__ 1
2017+
// CHECK_DMR_M64: #define __CCMP__ 1
2018+
// CHECK_DMR_M64: #define __CF__ 1
19762019
// CHECK_GNR_M64: #define __CLDEMOTE__ 1
19772020
// CHECK_GNR_M64: #define __CLFLUSHOPT__ 1
19782021
// CHECK_GNR_M64: #define __CLWB__ 1
2022+
// CHECK_DMR_M64: #define __CMPCCXADD__ 1
2023+
// CHECK_DMR_M64: #define __EGPR__ 1
19792024
// CHECK_GNR_M64: #define __ENQCMD__ 1
19802025
// CHECK_GNR_M64: #define __EVEX256__ 1
19812026
// CHECK_GNR_M64: #define __EVEX512__ 1
@@ -1986,20 +2031,28 @@
19862031
// CHECK_GNR_M64: #define __LZCNT__ 1
19872032
// CHECK_GNR_M64: #define __MMX__ 1
19882033
// CHECK_GNR_M64: #define __MOVBE__ 1
2034+
// CHECK_DMR_M64: #define __MOVRS__ 1
2035+
// CHECK_DMR_M64: #define __NDD__ 1
2036+
// CHECK_DMR_M64: #define __NF__ 1
19892037
// CHECK_GNR_M64: #define __PCLMUL__ 1
19902038
// CHECK_GNR_M64: #define __PCONFIG__ 1
19912039
// CHECK_GNR_M64: #define __PKU__ 1
19922040
// CHECK_GNR_M64: #define __POPCNT__ 1
2041+
// CHECK_DMR_M64: #define __PPX__ 1
19932042
// CHECK_GNR_M64: #define __PREFETCHI__ 1
19942043
// CHECK_GNR_M64: #define __PRFCHW__ 1
19952044
// CHECK_GNR_M64: #define __PTWRITE__ 1
2045+
// CHECK_DMR_M64: #define __PUSH2POP2__ 1
19962046
// CHECK_GNR_M64: #define __RDPID__ 1
19972047
// CHECK_GNR_M64: #define __RDRND__ 1
19982048
// CHECK_GNR_M64: #define __RDSEED__ 1
19992049
// CHECK_GNR_M64: #define __SERIALIZE__ 1
20002050
// CHECK_GNR_M64: #define __SGX__ 1
2051+
// CHECK_DMR_M64: #define __SHA512__ 1
20012052
// CHECK_GNR_M64: #define __SHA__ 1
20022053
// CHECK_GNR_M64: #define __SHSTK__ 1
2054+
// CHECK_DMR_M64: #define __SM3__ 1
2055+
// CHECK_DMR_M64: #define __SM4__ 1
20032056
// CHECK_GNR_M64: #define __SSE2__ 1
20042057
// CHECK_GNR_M64: #define __SSE3__ 1
20052058
// CHECK_GNR_M64: #define __SSE4_1__ 1
@@ -2016,6 +2069,7 @@
20162069
// CHECK_GNR_M64: #define __XSAVEOPT__ 1
20172070
// CHECK_GNR_M64: #define __XSAVES__ 1
20182071
// CHECK_GNR_M64: #define __XSAVE__ 1
2072+
// CHECK_DMR_M64: #define __ZU__ 1
20192073
// CHECK_GNR_M64: #define __amd64 1
20202074
// CHECK_GNR_M64: #define __amd64__ 1
20212075
// CHECK_GNR_M64: #define __corei7 1

‎compiler-rt/lib/builtins/cpu_model/x86.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ enum ProcessorSubtypes {
103103
INTEL_COREI7_ARROWLAKE_S,
104104
INTEL_COREI7_PANTHERLAKE,
105105
AMDFAM1AH_ZNVER5,
106+
INTEL_COREI7_DIAMONDRAPIDS,
106107
CPU_SUBTYPE_MAX
107108
};
108109

@@ -598,6 +599,19 @@ static const char *getIntelProcessorTypeAndSubtype(unsigned Family,
598599
break;
599600
}
600601
break;
602+
case 19:
603+
switch (Model) {
604+
// Diamond Rapids:
605+
case 0x01:
606+
CPU = "diamondrapids";
607+
*Type = INTEL_COREI7;
608+
*Subtype = INTEL_COREI7_DIAMONDRAPIDS;
609+
break;
610+
611+
default: // Unknown family 19 CPU.
612+
break;
613+
}
614+
break;
601615
default:
602616
break; // Unknown.
603617
}

‎llvm/docs/ReleaseNotes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@ Changes to the X86 Backend
197197

198198
* Supported ISA of `MSR_IMM`.
199199

200+
* Supported ``-mcpu=diamondrapids``
201+
200202
Changes to the OCaml bindings
201203
-----------------------------
202204

0 commit comments

Comments
 (0)