This is an archive of the discontinued LLVM Phabricator instance.

Differential D23746

Basic/Targets.cpp: Add polaris10 and polaris11 gpus
ClosedPublic

Authored by olesalscheider on Aug 20 2016, 5:19 AM.

Details

Reviewers
• tstellarAMD
cfe-commits
arsenm
Commits
rGee91f8f9f0fe: Merging r280120:
rGc37d69f1ee48: Basic/Targets.cpp: Add polaris10 and polaris11 gpus
rC280120: Basic/Targets.cpp: Add polaris10 and polaris11 gpus
rL280120: Basic/Targets.cpp: Add polaris10 and polaris11 gpus

Diff Detail

Event Timeline

olesalscheider updated this revision to Diff 68777.Aug 20 2016, 5:19 AM
olesalscheider retitled this revision from to Basic/Targets.cpp: Add polaris10 and polaris11 gpus.
olesalscheider updated this object.
olesalscheider added reviewers: cfe-commits, • tstellarAMD, arsenm.
olesalscheider updated this revision to Diff 68779.Aug 20 2016, 6:10 AM
• tstellarAMD requested changes to this revision.Aug 26 2016, 5:28 PM
• tstellarAMD edited edge metadata.
• tstellarAMD added inline comments.
lib/Basic/Targets.cpp
1959

We're trying to move to more descriptive GPU family names, so this should be GK_GFX8 instead of GK_ARCTIC_ISLANDS. GK_VOLCANIC_ISLANDS should also be changed to GK_GFX8, but that can be done in another patch, and would not be a prerequisite for this patch.

This revision now requires changes to proceed.Aug 26 2016, 5:28 PM
arsenm added inline comments.Aug 26 2016, 6:08 PM
lib/Basic/Targets.cpp
1959

For now I think polaris10/11 should just be left as VOLCANIC_ISLANDS

olesalscheider added inline comments.Aug 27 2016, 7:02 AM
lib/Basic/Targets.cpp
1959

Ok... I'll leave it as VOLCANIC_ISLANDS and propose a follow-up patch that replaces all GCN names then.

olesalscheider updated this revision to Diff 69485.Aug 27 2016, 7:03 AM
olesalscheider edited edge metadata.
• tstellarAMD accepted this revision.Aug 30 2016, 7:43 AM
• tstellarAMD edited edge metadata.

LGTM.

This revision is now accepted and ready to land.Aug 30 2016, 7:43 AM
Closed by commit rL280120: Basic/Targets.cpp: Add polaris10 and polaris11 gpus (authored by olesalscheider). · Explain WhyAug 30 2016, 11:08 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Basic/
32 lines

Diff 68777

lib/Basic/Targets.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 1,950 Lines • ▼ Show 20 Lines enum GPUKind {
GK_R700_DOUBLE_OPS, GK_R700_DOUBLE_OPS,
GK_EVERGREEN, GK_EVERGREEN,
GK_EVERGREEN_DOUBLE_OPS, GK_EVERGREEN_DOUBLE_OPS,
GK_NORTHERN_ISLANDS, GK_NORTHERN_ISLANDS,
GK_CAYMAN, GK_CAYMAN,
GK_SOUTHERN_ISLANDS, GK_SOUTHERN_ISLANDS,
GK_SEA_ISLANDS, GK_SEA_ISLANDS,
GK_VOLCANIC_ISLANDS GK_VOLCANIC_ISLANDS
} GPU; } GPU;
tstellarAMDUnsubmitted
Not Done
ReplyInline Actions

We're trying to move to more descriptive GPU family names, so this should be GK_GFX8 instead of GK_ARCTIC_ISLANDS. GK_VOLCANIC_ISLANDS should also be changed to GK_GFX8, but that can be done in another patch, and would not be a prerequisite for this patch.

tstellarAMD: We're trying to move to more descriptive GPU family names, so this should be GK_GFX8 instead of…
arsenmUnsubmitted
Not Done
ReplyInline Actions

For now I think polaris10/11 should just be left as VOLCANIC_ISLANDS

arsenm: For now I think polaris10/11 should just be left as VOLCANIC_ISLANDS
olesalscheiderAuthorUnsubmitted
Not Done
ReplyInline Actions

Ok... I'll leave it as VOLCANIC_ISLANDS and propose a follow-up patch that replaces all GCN names then.

olesalscheider: Ok... I'll leave it as VOLCANIC_ISLANDS and propose a follow-up patch that replaces all GCN…
bool hasFP64:1; bool hasFP64:1;
bool hasFMAF:1; bool hasFMAF:1;
bool hasLDEXPF:1; bool hasLDEXPF:1;
bool hasDenormSupport:1; bool hasDenormSupport:1;
static bool isAMDGCN(const llvm::Triple &TT) { static bool isAMDGCN(const llvm::Triple &TT) {
return TT.getArch() == llvm::Triple::amdgcn; return TT.getArch() == llvm::Triple::amdgcn;
▲ Show 20 Lines • Show All 137 Lines • ▼ Show 20 Lines return llvm::StringSwitch<GPUKind>(Name)
.Case("caicos", GK_NORTHERN_ISLANDS) .Case("caicos", GK_NORTHERN_ISLANDS)
.Case("cayman", GK_CAYMAN) .Case("cayman", GK_CAYMAN)
.Case("aruba", GK_CAYMAN) .Case("aruba", GK_CAYMAN)
.Default(GK_NONE); .Default(GK_NONE);
} }
static GPUKind parseAMDGCNName(StringRef Name) { static GPUKind parseAMDGCNName(StringRef Name) {
return llvm::StringSwitch<GPUKind>(Name) return llvm::StringSwitch<GPUKind>(Name)
.Case("tahiti", GK_SOUTHERN_ISLANDS) .Case("tahiti", GK_SOUTHERN_ISLANDS)
.Case("pitcairn", GK_SOUTHERN_ISLANDS) .Case("pitcairn", GK_SOUTHERN_ISLANDS)
.Case("verde", GK_SOUTHERN_ISLANDS) .Case("verde", GK_SOUTHERN_ISLANDS)
.Case("oland", GK_SOUTHERN_ISLANDS) .Case("oland", GK_SOUTHERN_ISLANDS)
.Case("hainan", GK_SOUTHERN_ISLANDS) .Case("hainan", GK_SOUTHERN_ISLANDS)
.Case("bonaire", GK_SEA_ISLANDS) .Case("bonaire", GK_SEA_ISLANDS)
.Case("kabini", GK_SEA_ISLANDS) .Case("kabini", GK_SEA_ISLANDS)
.Case("kaveri", GK_SEA_ISLANDS) .Case("kaveri", GK_SEA_ISLANDS)
.Case("hawaii", GK_SEA_ISLANDS) .Case("hawaii", GK_SEA_ISLANDS)
.Case("mullins", GK_SEA_ISLANDS) .Case("mullins", GK_SEA_ISLANDS)
.Case("tonga", GK_VOLCANIC_ISLANDS) .Case("tonga", GK_VOLCANIC_ISLANDS)
.Case("iceland", GK_VOLCANIC_ISLANDS) .Case("iceland", GK_VOLCANIC_ISLANDS)
.Case("carrizo", GK_VOLCANIC_ISLANDS) .Case("carrizo", GK_VOLCANIC_ISLANDS)
.Case("fiji", GK_VOLCANIC_ISLANDS) .Case("fiji", GK_VOLCANIC_ISLANDS)
.Case("stoney", GK_VOLCANIC_ISLANDS) .Case("stoney", GK_VOLCANIC_ISLANDS)
.Case("polaris10", GK_VOLCANIC_ISLANDS)
.Case("polaris11", GK_VOLCANIC_ISLANDS)
.Default(GK_NONE); .Default(GK_NONE);
} }
bool setCPU(const std::string &Name) override { bool setCPU(const std::string &Name) override {
if (getTriple().getArch() == llvm::Triple::amdgcn) if (getTriple().getArch() == llvm::Triple::amdgcn)
GPU = parseAMDGCNName(Name); GPU = parseAMDGCNName(Name);
else else
GPU = parseR600Name(Name); GPU = parseR600Name(Name);
▲ Show 20 Lines • Show All 6,530 Lines • Show Last 20 Lines