Skip to content

Commit ff22515

Browse files
authored
Revert "[X86][AMX] Support AMX-AVX512" (#115570)
Reverts #114070 Reason: Causes `immintrin.h` to fail to compile if `-msse` and `-mno-sse2` are passed to clang: #114070 (comment)
1 parent 818d715 commit ff22515

31 files changed

+12
-1567
lines changed

clang/docs/ReleaseNotes.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,6 @@ X86 Support
739739
* Supported intrinsics of ``_mm(256|512)_(mask(z))_loadrs_epi(8|16|32|64)``.
740740
- Support ISA of ``AMX-FP8``.
741741
- Support ISA of ``AMX-TRANSPOSE``.
742-
- Support ISA of ``AMX-AVX512``.
743742

744743
Arm and AArch64 Support
745744
^^^^^^^^^^^^^^^^^^^^^^^

clang/include/clang/Basic/BuiltinsX86_64.def

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,6 @@ TARGET_BUILTIN(__builtin_ia32_t2rpntlvwz0t1_internal, "vUsUsUsV256i*V256i*vC*z",
133133
TARGET_BUILTIN(__builtin_ia32_t2rpntlvwz1_internal, "vUsUsUsV256i*V256i*vC*z", "n", "amx-transpose")
134134
TARGET_BUILTIN(__builtin_ia32_t2rpntlvwz1t1_internal, "vUsUsUsV256i*V256i*vC*z", "n", "amx-transpose")
135135
TARGET_BUILTIN(__builtin_ia32_ttransposed_internal, "V256iUsUsV256i", "n", "amx-transpose")
136-
TARGET_BUILTIN(__builtin_ia32_tcvtrowd2ps_internal, "V16fUsUsV256iUi", "n", "amx-avx512,avx10.2-512")
137-
TARGET_BUILTIN(__builtin_ia32_tcvtrowps2pbf16h_internal, "V32yUsUsV256iUi", "n", "amx-avx512,avx10.2-512")
138-
TARGET_BUILTIN(__builtin_ia32_tcvtrowps2pbf16l_internal, "V32yUsUsV256iUi", "n", "amx-avx512,avx10.2-512")
139-
TARGET_BUILTIN(__builtin_ia32_tcvtrowps2phh_internal, "V32xUsUsV256iUi", "n", "amx-avx512,avx10.2-512")
140-
TARGET_BUILTIN(__builtin_ia32_tcvtrowps2phl_internal, "V32xUsUsV256iUi", "n", "amx-avx512,avx10.2-512")
141-
TARGET_BUILTIN(__builtin_ia32_tilemovrow_internal, "V16iUsUsV256iUi", "n", "amx-avx512,avx10.2-512")
142136
// AMX
143137
TARGET_BUILTIN(__builtin_ia32_tile_loadconfig, "vvC*", "n", "amx-tile")
144138
TARGET_BUILTIN(__builtin_ia32_tile_storeconfig, "vvC*", "n", "amx-tile")
@@ -165,13 +159,6 @@ TARGET_BUILTIN(__builtin_ia32_t2rpntlvwz1, "vIUcvC*z", "n", "amx-transpose")
165159
TARGET_BUILTIN(__builtin_ia32_t2rpntlvwz1t1, "vIUcvC*z", "n","amx-transpose")
166160
TARGET_BUILTIN(__builtin_ia32_ttransposed, "vIUcIUc", "n", "amx-transpose")
167161

168-
TARGET_BUILTIN(__builtin_ia32_tcvtrowd2ps, "V16fIUcUi", "n", "amx-avx512,avx10.2-512")
169-
TARGET_BUILTIN(__builtin_ia32_tcvtrowps2pbf16h, "V32yIUcUi", "n", "amx-avx512,avx10.2-512")
170-
TARGET_BUILTIN(__builtin_ia32_tcvtrowps2pbf16l, "V32yIUcUi", "n", "amx-avx512,avx10.2-512")
171-
TARGET_BUILTIN(__builtin_ia32_tcvtrowps2phh, "V32xIUcUi", "n", "amx-avx512,avx10.2-512")
172-
TARGET_BUILTIN(__builtin_ia32_tcvtrowps2phl, "V32xIUcUi", "n", "amx-avx512,avx10.2-512")
173-
TARGET_BUILTIN(__builtin_ia32_tilemovrow, "V16iIUcUi", "n", "amx-avx512,avx10.2-512")
174-
175162
TARGET_BUILTIN(__builtin_ia32_prefetchi, "vvC*Ui", "nc", "prefetchi")
176163
TARGET_BUILTIN(__builtin_ia32_cmpccxadd32, "Siv*SiSiIi", "n", "cmpccxadd")
177164
TARGET_BUILTIN(__builtin_ia32_cmpccxadd64, "SLLiSLLi*SLLiSLLiIi", "n", "cmpccxadd")

clang/include/clang/Driver/Options.td

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6285,8 +6285,6 @@ def mno_80387 : Flag<["-"], "mno-80387">, Alias<mno_x87>;
62856285
def mno_fp_ret_in_387 : Flag<["-"], "mno-fp-ret-in-387">, Alias<mno_x87>;
62866286
def mmmx : Flag<["-"], "mmmx">, Group<m_x86_Features_Group>;
62876287
def mno_mmx : Flag<["-"], "mno-mmx">, Group<m_x86_Features_Group>;
6288-
def mamx_avx512 : Flag<["-"], "mamx-avx512">, Group<m_x86_Features_Group>;
6289-
def mno_amx_avx512 : Flag<["-"], "mno-amx-avx512">, Group<m_x86_Features_Group>;
62906288
def mamx_bf16 : Flag<["-"], "mamx-bf16">, Group<m_x86_Features_Group>;
62916289
def mno_amx_bf16 : Flag<["-"], "mno-amx-bf16">, Group<m_x86_Features_Group>;
62926290
def mamx_complex : Flag<["-"], "mamx-complex">, Group<m_x86_Features_Group>;

clang/lib/Basic/Targets/X86.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,6 @@ bool X86TargetInfo::handleTargetFeatures(std::vector<std::string> &Features,
432432
HasAMXFP8 = true;
433433
} else if (Feature == "+amx-transpose") {
434434
HasAMXTRANSPOSE = true;
435-
} else if (Feature == "+amx-avx512") {
436-
HasAMXAVX512 = true;
437435
} else if (Feature == "+cmpccxadd") {
438436
HasCMPCCXADD = true;
439437
} else if (Feature == "+raoint") {
@@ -957,8 +955,6 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
957955
Builder.defineMacro("__AMX_FP8__");
958956
if (HasAMXTRANSPOSE)
959957
Builder.defineMacro("__AMX_TRANSPOSE__");
960-
if (HasAMXAVX512)
961-
Builder.defineMacro("__AMX_AVX512__");
962958
if (HasCMPCCXADD)
963959
Builder.defineMacro("__CMPCCXADD__");
964960
if (HasRAOINT)
@@ -1084,7 +1080,6 @@ bool X86TargetInfo::isValidFeatureName(StringRef Name) const {
10841080
return llvm::StringSwitch<bool>(Name)
10851081
.Case("adx", true)
10861082
.Case("aes", true)
1087-
.Case("amx-avx512", true)
10881083
.Case("amx-bf16", true)
10891084
.Case("amx-complex", true)
10901085
.Case("amx-fp16", true)
@@ -1205,7 +1200,6 @@ bool X86TargetInfo::hasFeature(StringRef Feature) const {
12051200
return llvm::StringSwitch<bool>(Feature)
12061201
.Case("adx", HasADX)
12071202
.Case("aes", HasAES)
1208-
.Case("amx-avx512", HasAMXAVX512)
12091203
.Case("amx-bf16", HasAMXBF16)
12101204
.Case("amx-complex", HasAMXCOMPLEX)
12111205
.Case("amx-fp16", HasAMXFP16)

clang/lib/Basic/Targets/X86.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ class LLVM_LIBRARY_VISIBILITY X86TargetInfo : public TargetInfo {
159159
bool HasAMXCOMPLEX = false;
160160
bool HasAMXFP8 = false;
161161
bool HasAMXTRANSPOSE = false;
162-
bool HasAMXAVX512 = false;
163162
bool HasSERIALIZE = false;
164163
bool HasTSXLDTRK = false;
165164
bool HasUSERMSR = false;

clang/lib/Headers/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ set(x86_files
146146
adcintrin.h
147147
adxintrin.h
148148
ammintrin.h
149-
amxavx512intrin.h
150149
amxcomplexintrin.h
151150
amxfp16intrin.h
152151
amxfp8intrin.h

0 commit comments

Comments
 (0)