This is an archive of the discontinued LLVM Phabricator instance.

Differential D91200

[PowerPC] Prevent the use of MMA with P9 and earlier
ClosedPublic

Authored by bsaleil on Nov 10 2020, 12:12 PM.

Details

Reviewers
nemanjai
saghir
lei
amyk
Group Reviewers
Restricted Project
Commits
rG170e45ae186b: [PowerPC] Prevent the use of MMA with P9 and earlier
Summary

We want to allow using MMA on P10 CPU only. This patch prevents the use of MMA with the -mmma option on P9 CPUs and earlier.

Diff Detail

Event Timeline

bsaleil created this revision.Nov 10 2020, 12:12 PM
Herald added subscribers: cfe-commits, shchenz, kbarton. · View Herald TranscriptNov 10 2020, 12:12 PM
bsaleil requested review of this revision.Nov 10 2020, 12:12 PM
Harbormaster completed remote builds in B78355: Diff 304289.Nov 10 2020, 1:31 PM
bsaleil updated this revision to Diff 304662.Nov 11 2020, 2:46 PM

clang-format

Harbormaster completed remote builds in B78530: Diff 304662.Nov 11 2020, 4:02 PM
amyk accepted this revision as: amyk.Nov 12 2020, 7:05 AM

Overall LGTM.

This revision is now accepted and ready to land.Nov 12 2020, 7:05 AM
This revision was landed with ongoing or failed builds.Nov 12 2020, 8:37 AM
Closed by commit rG170e45ae186b: [PowerPC] Prevent the use of MMA with P9 and earlier (authored by bsaleil). · Explain Why
This revision was automatically updated to reflect the committed changes.
bsaleil added a commit: rG170e45ae186b: [PowerPC] Prevent the use of MMA with P9 and earlier.

Revision Contents

PathSize
clang/
lib/
Basic/
Targets/
7 lines
test/
Driver/
22 lines
Preprocessor/
2 lines

Diff 304852

clang/lib/Basic/Targets/PPC.cpp

Show First 20 Lines • Show All 341 Lines • ▼ Show 20 Linesbool PPCTargetInfo::initFeatureMap(
if (!(ArchDefs & ArchDefinePwr9) && (ArchDefs & ArchDefinePpcgr) && if (!(ArchDefs & ArchDefinePwr9) && (ArchDefs & ArchDefinePpcgr) &&
llvm::find(FeaturesVec, "+float128") != FeaturesVec.end()) { llvm::find(FeaturesVec, "+float128") != FeaturesVec.end()) {
// We have __float128 on PPC but not power 9 and above. // We have __float128 on PPC but not power 9 and above.
Diags.Report(diag::err_opt_not_valid_with_opt) << "-mfloat128" << CPU; Diags.Report(diag::err_opt_not_valid_with_opt) << "-mfloat128" << CPU;
return false; return false;
} }
if (!(ArchDefs & ArchDefinePwr10) &&
llvm::find(FeaturesVec, "+mma") != FeaturesVec.end()) {
// We have MMA on PPC but not power 10 and above.
Diags.Report(diag::err_opt_not_valid_with_opt) << "-mmma" << CPU;
return false;
}
return TargetInfo::initFeatureMap(Features, Diags, CPU, FeaturesVec); return TargetInfo::initFeatureMap(Features, Diags, CPU, FeaturesVec);
} }
// Add any Power10 specific features. // Add any Power10 specific features.
void PPCTargetInfo::addP10SpecificFeatures( void PPCTargetInfo::addP10SpecificFeatures(
llvm::StringMap<bool> &Features) const { llvm::StringMap<bool> &Features) const {
Features["htm"] = false; // HTM was removed for P10. Features["htm"] = false; // HTM was removed for P10.
Features["paired-vector-memops"] = true; Features["paired-vector-memops"] = true;
▲ Show 20 Lines • Show All 190 Lines • Show Last 20 Lines

clang/test/Driver/ppc-mma-support-check.c

  • This file was added.
// RUN: not %clang -target powerpc64le-unknown-linux-gnu -fsyntax-only \
// RUN: -mcpu=pwr10 -mmma %s 2>&1 | FileCheck %s --check-prefix=HASMMA
// RUN: not %clang -target powerpc64le-unknown-linux-gnu -fsyntax-only \
// RUN: -mcpu=power10 -mmma %s 2>&1 | FileCheck %s --check-prefix=HASMMA
// RUN: not %clang -target powerpc64le-unknown-linux-gnu -fsyntax-only \
// RUN: -mcpu=pwr9 -mmma %s 2>&1 | FileCheck %s --check-prefix=NOMMA
// RUN: not %clang -target powerpc64le-unknown-linux-gnu -fsyntax-only \
// RUN: -mcpu=pwr8 -mmma %s 2>&1 | FileCheck %s --check-prefix=NOMMA
// RUN: not %clang -target powerpc64le-unknown-linux-gnu -fsyntax-only \
// RUN: -mcpu=pwr7 -mmma %s 2>&1 | FileCheck %s --check-prefix=NOMMA
// RUN: not %clang -target powerpc64le-unknown-linux-gnu -fsyntax-only \
// RUN: -mmma %s 2>&1 | FileCheck %s --check-prefix=NOMMA
#ifdef __MMA__
static_assert(false, "MMA enabled");
#endif
// HASMMA: MMA enabled
// HASMMA-NOT: option '-mmma' cannot be specified with
// NOMMA: option '-mmma' cannot be specified with

clang/test/Preprocessor/init-ppc64.c

Show First 20 Lines • Show All 642 Lines • ▼ Show 20 Lines
// PPCFUTURE:#define _ARCH_PWR6 1 // PPCFUTURE:#define _ARCH_PWR6 1
// PPCFUTURE-NOT:#define _ARCH_PWR6X 1 // PPCFUTURE-NOT:#define _ARCH_PWR6X 1
// PPCFUTURE:#define _ARCH_PWR7 1 // PPCFUTURE:#define _ARCH_PWR7 1
// PPCFUTURE:#define _ARCH_PWR8 1 // PPCFUTURE:#define _ARCH_PWR8 1
// PPCFUTURE:#define _ARCH_PWR9 1 // PPCFUTURE:#define _ARCH_PWR9 1
// PPCFUTURE:#define _ARCH_PWR_FUTURE 1 // PPCFUTURE:#define _ARCH_PWR_FUTURE 1
// PPCFUTURE:#define __MMA__ 1 // PPCFUTURE:#define __MMA__ 1
// //
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-none-none -target-feature +mma -target-cpu power9 -fno-signed-char < /dev/null | FileCheck -check-prefix PPC-MMA %s // RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-none-none -target-feature +mma -target-cpu power10 -fno-signed-char < /dev/null | FileCheck -check-prefix PPC-MMA %s
// PPC-MMA:#define __MMA__ 1 // PPC-MMA:#define __MMA__ 1
// //
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-none-none -target-feature +float128 -target-cpu power9 -fno-signed-char < /dev/null | FileCheck -check-prefix PPC-FLOAT128 %s // RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-none-none -target-feature +float128 -target-cpu power9 -fno-signed-char < /dev/null | FileCheck -check-prefix PPC-FLOAT128 %s
// PPC-FLOAT128:#define __FLOAT128__ 1 // PPC-FLOAT128:#define __FLOAT128__ 1
// //
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-ibm-aix7.1.0.0 -fno-signed-char < /dev/null | FileCheck -match-full-lines -check-prefix PPC64-AIX %s // RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-ibm-aix7.1.0.0 -fno-signed-char < /dev/null | FileCheck -match-full-lines -check-prefix PPC64-AIX %s
// //
// PPC64-AIX:#define _AIX 1 // PPC64-AIX:#define _AIX 1
▲ Show 20 Lines • Show All 425 Lines • Show Last 20 Lines