This is an archive of the discontinued LLVM Phabricator instance.

Differential D147525

[X86] Add AMX_COMPLEX to Graniterapids
ClosedPublic

Authored by FreddyYe on Apr 4 2023, 6:20 AM.

Details

Reviewers
LuoYuanke
pengfei
skan
xiangzhangllvm
craig.topper
Commits
rG847abddedca9: [X86] Add AMX_COMPLEX to Graniterapids
Summary

This patch also rename AMXCOMPLEX to AMX_COMPLEX

Diff Detail

Event Timeline

FreddyYe created this revision.Apr 4 2023, 6:20 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 4 2023, 6:20 AM
Herald added subscribers: pengfei, hiraditya. · View Herald Transcript
FreddyYe requested review of this revision.Apr 4 2023, 6:20 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptApr 4 2023, 6:20 AM
Herald added subscribers: llvm-commits, cfe-commits. · View Herald Transcript
FreddyYe updated this revision to Diff 510772.Apr 4 2023, 6:22 AM

clang-format

FreddyYe added reviewers: LuoYuanke, pengfei, skan, xiangzhangllvm, craig.topper.Apr 4 2023, 6:23 AM
FreddyYe updated this revision to Diff 510783.Apr 4 2023, 6:35 AM

Remove redundant file.

skan accepted this revision.Apr 4 2023, 6:40 AM

LGTM

This revision is now accepted and ready to land.Apr 4 2023, 6:40 AM
Harbormaster completed remote builds in B223565: Diff 510783.Apr 4 2023, 7:41 AM
xiangzhangllvm accepted this revision.Apr 4 2023, 6:55 PM

LGTM

Closed by commit rG847abddedca9: [X86] Add AMX_COMPLEX to Graniterapids (authored by FreddyYe). · Explain WhyApr 5 2023, 10:20 PM
This revision was automatically updated to reflect the committed changes.
FreddyYe added a commit: rG847abddedca9: [X86] Add AMX_COMPLEX to Graniterapids.

Revision Contents

PathSize
clang/
lib/
Basic/
Targets/
2 lines
Headers/
2 lines
test/
Preprocessor/
2 lines
4 lines
llvm/
lib/
Target/
X86/
3 lines
TargetParser/
3 lines

Diff 511273

clang/lib/Basic/Targets/X86.cpp

Show First 20 Lines • Show All 796 Lines • ▼ Show 20 Lines if (HasAMXTILE)
Builder.defineMacro("__AMX_TILE__"); Builder.defineMacro("__AMX_TILE__");
if (HasAMXINT8) if (HasAMXINT8)
Builder.defineMacro("__AMX_INT8__"); Builder.defineMacro("__AMX_INT8__");
if (HasAMXBF16) if (HasAMXBF16)
Builder.defineMacro("__AMX_BF16__"); Builder.defineMacro("__AMX_BF16__");
if (HasAMXFP16) if (HasAMXFP16)
Builder.defineMacro("__AMX_FP16__"); Builder.defineMacro("__AMX_FP16__");
if (HasAMXCOMPLEX) if (HasAMXCOMPLEX)
Builder.defineMacro("__AMXCOMPLEX__"); Builder.defineMacro("__AMX_COMPLEX__");
if (HasCMPCCXADD) if (HasCMPCCXADD)
Builder.defineMacro("__CMPCCXADD__"); Builder.defineMacro("__CMPCCXADD__");
if (HasRAOINT) if (HasRAOINT)
Builder.defineMacro("__RAOINT__"); Builder.defineMacro("__RAOINT__");
if (HasAVXIFMA) if (HasAVXIFMA)
Builder.defineMacro("__AVXIFMA__"); Builder.defineMacro("__AVXIFMA__");
if (HasAVXNECONVERT) if (HasAVXNECONVERT)
Builder.defineMacro("__AVXNECONVERT__"); Builder.defineMacro("__AVXNECONVERT__");
▲ Show 20 Lines • Show All 808 Lines • Show Last 20 Lines

clang/lib/Headers/immintrin.h

Show First 20 Lines • Show All 620 Lines • ▼ Show 20 Lines
#endif #endif
#if !(defined(_MSC_VER) || defined(__SCE__)) || __has_feature(modules) || \ #if !(defined(_MSC_VER) || defined(__SCE__)) || __has_feature(modules) || \
defined(__AMX_TILE__) || defined(__AMX_INT8__) || defined(__AMX_BF16__) defined(__AMX_TILE__) || defined(__AMX_INT8__) || defined(__AMX_BF16__)
#include <amxintrin.h> #include <amxintrin.h>
#endif #endif
#if !(defined(_MSC_VER) || defined(__SCE__)) || __has_feature(modules) || \ #if !(defined(_MSC_VER) || defined(__SCE__)) || __has_feature(modules) || \
defined(__AMXCOMPLEX__) defined(__AMX_COMPLEX__)
#include <amxcomplexintrin.h> #include <amxcomplexintrin.h>
#endif #endif
#if !(defined(_MSC_VER) || defined(__SCE__)) || __has_feature(modules) || \ #if !(defined(_MSC_VER) || defined(__SCE__)) || __has_feature(modules) || \
defined(__AVX512VP2INTERSECT__) defined(__AVX512VP2INTERSECT__)
#include <avx512vp2intersectintrin.h> #include <avx512vp2intersectintrin.h>
#endif #endif
▲ Show 20 Lines • Show All 105 Lines • Show Last 20 Lines

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

Show First 20 Lines • Show All 1,792 Lines • ▼ Show 20 Lines
// CHECK_SPR_M64: #define __x86_64 1 // CHECK_SPR_M64: #define __x86_64 1
// CHECK_SPR_M64: #define __x86_64__ 1 // CHECK_SPR_M64: #define __x86_64__ 1
// RUN: %clang -march=graniterapids -m32 -E -dM %s -o - 2>&1 \ // RUN: %clang -march=graniterapids -m32 -E -dM %s -o - 2>&1 \
// RUN: --target=i386 \ // RUN: --target=i386 \
// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_GNR_M32 // RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_GNR_M32
// CHECK_GNR_M32: #define __AES__ 1 // CHECK_GNR_M32: #define __AES__ 1
// CHECK_GNR_M32: #define __AMX_BF16__ 1 // CHECK_GNR_M32: #define __AMX_BF16__ 1
// CHECK_GNR_M32: #define __AMX_COMPLEX__ 1
// CHECK_GNR_M32: #define __AMX_FP16__ 1 // CHECK_GNR_M32: #define __AMX_FP16__ 1
// CHECK_GNR_M32: #define __AMX_INT8__ 1 // CHECK_GNR_M32: #define __AMX_INT8__ 1
// CHECK_GNR_M32: #define __AMX_TILE__ 1 // CHECK_GNR_M32: #define __AMX_TILE__ 1
// CHECK_GNR_M32: #define __AVX2__ 1 // CHECK_GNR_M32: #define __AVX2__ 1
// CHECK_GNR_M32: #define __AVX512BF16__ 1 // CHECK_GNR_M32: #define __AVX512BF16__ 1
// CHECK_GNR_M32: #define __AVX512BITALG__ 1 // CHECK_GNR_M32: #define __AVX512BITALG__ 1
// CHECK_GNR_M32: #define __AVX512BW__ 1 // CHECK_GNR_M32: #define __AVX512BW__ 1
// CHECK_GNR_M32: #define __AVX512CD__ 1 // CHECK_GNR_M32: #define __AVX512CD__ 1
▲ Show 20 Lines • Show All 58 Lines • ▼ Show 20 Lines
// CHECK_GNR_M32: #define __tune_corei7__ 1 // CHECK_GNR_M32: #define __tune_corei7__ 1
// CHECK_GNR_M32: #define i386 1 // CHECK_GNR_M32: #define i386 1
// RUN: %clang -march=graniterapids -m64 -E -dM %s -o - 2>&1 \ // RUN: %clang -march=graniterapids -m64 -E -dM %s -o - 2>&1 \
// RUN: --target=x86_64 \ // RUN: --target=x86_64 \
// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_GNR_M64 // RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_GNR_M64
// CHECK_GNR_M64: #define __AES__ 1 // CHECK_GNR_M64: #define __AES__ 1
// CHECK_GNR_M64: #define __AMX_BF16__ 1 // CHECK_GNR_M64: #define __AMX_BF16__ 1
// CHECK_GNR_M64: #define __AMX_COMPLEX__ 1
// CHECK_GNR_M64: #define __AMX_FP16__ 1 // CHECK_GNR_M64: #define __AMX_FP16__ 1
// CHECK_GNR_M64: #define __AMX_INT8__ 1 // CHECK_GNR_M64: #define __AMX_INT8__ 1
// CHECK_GNR_M64: #define __AMX_TILE__ 1 // CHECK_GNR_M64: #define __AMX_TILE__ 1
// CHECK_GNR_M64: #define __AVX2__ 1 // CHECK_GNR_M64: #define __AVX2__ 1
// CHECK_GNR_M64: #define __AVX512BF16__ 1 // CHECK_GNR_M64: #define __AVX512BF16__ 1
// CHECK_GNR_M64: #define __AVX512BITALG__ 1 // CHECK_GNR_M64: #define __AVX512BITALG__ 1
// CHECK_GNR_M64: #define __AVX512BW__ 1 // CHECK_GNR_M64: #define __AVX512BW__ 1
// CHECK_GNR_M64: #define __AVX512CD__ 1 // CHECK_GNR_M64: #define __AVX512CD__ 1
▲ Show 20 Lines • Show All 2,524 Lines • Show Last 20 Lines

clang/test/Preprocessor/x86_target_features.c

Show First 20 Lines • Show All 556 Lines • ▼ Show 20 Lines
// RUN: -mno-amx-tile -x c -E -dM -o - %s | FileCheck -check-prefix=NO-AMX-FP16 %s // RUN: -mno-amx-tile -x c -E -dM -o - %s | FileCheck -check-prefix=NO-AMX-FP16 %s
// NO-AMX-FP16-NOT: #define __AMX_FP16__ 1 // NO-AMX-FP16-NOT: #define __AMX_FP16__ 1
// NO-AMX-FP16-NOT: #define __AMX_TILE__ 1 // NO-AMX-FP16-NOT: #define __AMX_TILE__ 1
// RUN: %clang -target x86_64-unknown-linux-gnu -march=x86-64 -mamx-complex -x c \ // RUN: %clang -target x86_64-unknown-linux-gnu -march=x86-64 -mamx-complex -x c \
// RUN: -E -dM -o - %s | FileCheck -check-prefix=AMX-COMPLEX %s // RUN: -E -dM -o - %s | FileCheck -check-prefix=AMX-COMPLEX %s
// AMX-COMPLEX: #define __AMXCOMPLEX__ 1 // AMX-COMPLEX: #define __AMX_COMPLEX__ 1
// RUN: %clang -target x86_64-unknown-linux-gnu -march=x86-64 -mno-amx-complex -x c \ // RUN: %clang -target x86_64-unknown-linux-gnu -march=x86-64 -mno-amx-complex -x c \
// RUN: -E -dM -o - %s | FileCheck -check-prefix=NO-AMX-COMPLEX %s // RUN: -E -dM -o - %s | FileCheck -check-prefix=NO-AMX-COMPLEX %s
// RUN: %clang -target x86_64-unknown-linux-gnu -march=x86-64 -mamx-complex -mno-amx-tile \ // RUN: %clang -target x86_64-unknown-linux-gnu -march=x86-64 -mamx-complex -mno-amx-tile \
// RUN: -x c -E -dM -o - %s | FileCheck -check-prefix=NO-AMX-COMPLEX %s // RUN: -x c -E -dM -o - %s | FileCheck -check-prefix=NO-AMX-COMPLEX %s
// NO-AMX-COMPLEX-NOT: #define __AMXCOMPLEX__ 1 // NO-AMX-COMPLEX-NOT: #define __AMX_COMPLEX__ 1
// RUN: %clang -target i386-unknown-unknown -march=atom -mavxvnni -x c -E -dM -o - %s | FileCheck -match-full-lines --check-prefix=AVXVNNI %s // RUN: %clang -target i386-unknown-unknown -march=atom -mavxvnni -x c -E -dM -o - %s | FileCheck -match-full-lines --check-prefix=AVXVNNI %s
// AVXVNNI: #define __AVX2__ 1 // AVXVNNI: #define __AVX2__ 1
// AVXVNNI: #define __AVXVNNI__ 1 // AVXVNNI: #define __AVXVNNI__ 1
// RUN: %clang -target i386-unknown-unknown -march=atom -mno-avxvnni -x c -E -dM -o - %s | FileCheck -match-full-lines --check-prefix=NOAVXVNNI %s // RUN: %clang -target i386-unknown-unknown -march=atom -mno-avxvnni -x c -E -dM -o - %s | FileCheck -match-full-lines --check-prefix=NOAVXVNNI %s
▲ Show 20 Lines • Show All 97 Lines • Show Last 20 Lines

llvm/lib/Target/X86/X86.td

Show First 20 Lines • Show All 1,048 Lines • ▼ Show 20 Lines list<SubtargetFeature> SPRAdditionalTuning = [TuningMULCFalseDeps,
TuningGETMANTFalseDeps, TuningGETMANTFalseDeps,
TuningMULLQFalseDeps]; TuningMULLQFalseDeps];
list<SubtargetFeature> SPRTuning = !listconcat(ICXTuning, SPRAdditionalTuning); list<SubtargetFeature> SPRTuning = !listconcat(ICXTuning, SPRAdditionalTuning);
list<SubtargetFeature> SPRFeatures = list<SubtargetFeature> SPRFeatures =
!listconcat(ICXFeatures, SPRAdditionalFeatures); !listconcat(ICXFeatures, SPRAdditionalFeatures);
// Graniterapids // Graniterapids
list<SubtargetFeature> GNRAdditionalFeatures = [FeatureAMXFP16, list<SubtargetFeature> GNRAdditionalFeatures = [FeatureAMXFP16,
FeaturePREFETCHI]; FeaturePREFETCHI,
FeatureAMXCOMPLEX];
list<SubtargetFeature> GNRFeatures = list<SubtargetFeature> GNRFeatures =
!listconcat(SPRFeatures, GNRAdditionalFeatures); !listconcat(SPRFeatures, GNRAdditionalFeatures);
// Atom // Atom
list<SubtargetFeature> AtomFeatures = [FeatureX87, list<SubtargetFeature> AtomFeatures = [FeatureX87,
FeatureCX8, FeatureCX8,
FeatureCMOV, FeatureCMOV,
FeatureMMX, FeatureMMX,
▲ Show 20 Lines • Show All 772 Lines • Show Last 20 Lines

llvm/lib/TargetParser/X86TargetParser.cpp

Show First 20 Lines • Show All 202 Lines • ▼ Show 20 Linesconstexpr FeatureBitset FeaturesTigerlake =
FeatureCLWB | FeatureMOVDIRI | FeatureSHSTK | FeatureKL | FeatureWIDEKL; FeatureCLWB | FeatureMOVDIRI | FeatureSHSTK | FeatureKL | FeatureWIDEKL;
constexpr FeatureBitset FeaturesSapphireRapids = constexpr FeatureBitset FeaturesSapphireRapids =
FeaturesICLServer | FeatureAMX_BF16 | FeatureAMX_INT8 | FeatureAMX_TILE | FeaturesICLServer | FeatureAMX_BF16 | FeatureAMX_INT8 | FeatureAMX_TILE |
FeatureAVX512BF16 | FeatureAVX512FP16 | FeatureAVXVNNI | FeatureCLDEMOTE | FeatureAVX512BF16 | FeatureAVX512FP16 | FeatureAVXVNNI | FeatureCLDEMOTE |
FeatureENQCMD | FeatureMOVDIR64B | FeatureMOVDIRI | FeaturePTWRITE | FeatureENQCMD | FeatureMOVDIR64B | FeatureMOVDIRI | FeaturePTWRITE |
FeatureSERIALIZE | FeatureSHSTK | FeatureTSXLDTRK | FeatureUINTR | FeatureSERIALIZE | FeatureSHSTK | FeatureTSXLDTRK | FeatureUINTR |
FeatureWAITPKG; FeatureWAITPKG;
constexpr FeatureBitset FeaturesGraniteRapids = constexpr FeatureBitset FeaturesGraniteRapids =
FeaturesSapphireRapids | FeatureAMX_FP16 | FeaturePREFETCHI; FeaturesSapphireRapids | FeatureAMX_FP16 | FeaturePREFETCHI |
FeatureAMX_COMPLEX;
// Intel Atom processors. // Intel Atom processors.
// Bonnell has feature parity with Core2 and adds MOVBE. // Bonnell has feature parity with Core2 and adds MOVBE.
constexpr FeatureBitset FeaturesBonnell = FeaturesCore2 | FeatureMOVBE; constexpr FeatureBitset FeaturesBonnell = FeaturesCore2 | FeatureMOVBE;
// Silvermont has parity with Westmere and Bonnell plus PRFCHW and RDRND. // Silvermont has parity with Westmere and Bonnell plus PRFCHW and RDRND.
constexpr FeatureBitset FeaturesSilvermont = constexpr FeatureBitset FeaturesSilvermont =
FeaturesBonnell | FeaturesWestmere | FeaturePRFCHW | FeatureRDRND; FeaturesBonnell | FeaturesWestmere | FeaturePRFCHW | FeatureRDRND;
constexpr FeatureBitset FeaturesGoldmont = constexpr FeatureBitset FeaturesGoldmont =
▲ Show 20 Lines • Show All 526 Lines • Show Last 20 Lines