This is an archive of the discontinued LLVM Phabricator instance.

Differential D53472

Add gfx904 and gfx906 to GPU Arch
ClosedPublic

Authored by yaxunl on Oct 20 2018, 5:04 AM.

Details

Reviewers
tra
Commits
rG83b5f35d85dd: Add gfx904 and gfx906 to GPU Arch
rC344996: Add gfx904 and gfx906 to GPU Arch
rL344996: Add gfx904 and gfx906 to GPU Arch

Diff Detail

Event Timeline

yaxunl created this revision.Oct 20 2018, 5:04 AM
Herald added a subscriber: jholewinski. · View Herald TranscriptOct 20 2018, 5:04 AM
tra accepted this revision.Oct 22 2018, 1:59 PM
This revision is now accepted and ready to land.Oct 22 2018, 1:59 PM
Closed by commit rL344996: Add gfx904 and gfx906 to GPU Arch (authored by yaxunl). · Explain WhyOct 22 2018, 7:07 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptOct 22 2018, 7:07 PM

Revision Contents

PathSize
include/
clang/
Basic/
2 lines
lib/
Basic/
10 lines
Targets/
2 lines

Diff 170311

include/clang/Basic/Cuda.h

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Linesenum class CudaArch {
GFX703, GFX703,
GFX704, GFX704,
GFX801, GFX801,
GFX802, GFX802,
GFX803, GFX803,
GFX810, GFX810,
GFX900, GFX900,
GFX902, GFX902,
GFX904,
GFX906,
LAST, LAST,
}; };
const char *CudaArchToString(CudaArch A); const char *CudaArchToString(CudaArch A);
// The input should have the form "sm_20". // The input should have the form "sm_20".
CudaArch StringToCudaArch(llvm::StringRef S); CudaArch StringToCudaArch(llvm::StringRef S);
enum class CudaVirtualArch { enum class CudaVirtualArch {
Show All 34 Lines

lib/Basic/Cuda.cpp

Show First 20 Lines • Show All 84 Lines • ▼ Show 20 Linesconst char *CudaArchToString(CudaArch A) {
case CudaArch::GFX803: // fiji,polaris10 case CudaArch::GFX803: // fiji,polaris10
return "gfx803"; return "gfx803";
case CudaArch::GFX810: // stoney case CudaArch::GFX810: // stoney
return "gfx810"; return "gfx810";
case CudaArch::GFX900: // vega, instinct case CudaArch::GFX900: // vega, instinct
return "gfx900"; return "gfx900";
case CudaArch::GFX902: // TBA case CudaArch::GFX902: // TBA
return "gfx902"; return "gfx902";
case CudaArch::GFX904: // TBA
return "gfx904";
case CudaArch::GFX906: // TBA
return "gfx906";
} }
llvm_unreachable("invalid enum"); llvm_unreachable("invalid enum");
} }
CudaArch StringToCudaArch(llvm::StringRef S) { CudaArch StringToCudaArch(llvm::StringRef S) {
return llvm::StringSwitch<CudaArch>(S) return llvm::StringSwitch<CudaArch>(S)
.Case("sm_20", CudaArch::SM_20) .Case("sm_20", CudaArch::SM_20)
.Case("sm_21", CudaArch::SM_21) .Case("sm_21", CudaArch::SM_21)
Show All 18 Lines return llvm::StringSwitch<CudaArch>(S)
.Case("gfx703", CudaArch::GFX703) .Case("gfx703", CudaArch::GFX703)
.Case("gfx704", CudaArch::GFX704) .Case("gfx704", CudaArch::GFX704)
.Case("gfx801", CudaArch::GFX801) .Case("gfx801", CudaArch::GFX801)
.Case("gfx802", CudaArch::GFX802) .Case("gfx802", CudaArch::GFX802)
.Case("gfx803", CudaArch::GFX803) .Case("gfx803", CudaArch::GFX803)
.Case("gfx810", CudaArch::GFX810) .Case("gfx810", CudaArch::GFX810)
.Case("gfx900", CudaArch::GFX900) .Case("gfx900", CudaArch::GFX900)
.Case("gfx902", CudaArch::GFX902) .Case("gfx902", CudaArch::GFX902)
.Case("gfx904", CudaArch::GFX904)
.Case("gfx906", CudaArch::GFX906)
.Default(CudaArch::UNKNOWN); .Default(CudaArch::UNKNOWN);
} }
const char *CudaVirtualArchToString(CudaVirtualArch A) { const char *CudaVirtualArchToString(CudaVirtualArch A) {
switch (A) { switch (A) {
case CudaVirtualArch::UNKNOWN: case CudaVirtualArch::UNKNOWN:
return "unknown"; return "unknown";
case CudaVirtualArch::COMPUTE_20: case CudaVirtualArch::COMPUTE_20:
▲ Show 20 Lines • Show All 93 Lines • ▼ Show 20 LinesCudaVirtualArch VirtualArchForCudaArch(CudaArch A) {
case CudaArch::GFX703: case CudaArch::GFX703:
case CudaArch::GFX704: case CudaArch::GFX704:
case CudaArch::GFX801: case CudaArch::GFX801:
case CudaArch::GFX802: case CudaArch::GFX802:
case CudaArch::GFX803: case CudaArch::GFX803:
case CudaArch::GFX810: case CudaArch::GFX810:
case CudaArch::GFX900: case CudaArch::GFX900:
case CudaArch::GFX902: case CudaArch::GFX902:
case CudaArch::GFX904:
case CudaArch::GFX906:
return CudaVirtualArch::COMPUTE_AMDGCN; return CudaVirtualArch::COMPUTE_AMDGCN;
} }
llvm_unreachable("invalid enum"); llvm_unreachable("invalid enum");
} }
CudaVersion MinVersionForCudaArch(CudaArch A) { CudaVersion MinVersionForCudaArch(CudaArch A) {
switch (A) { switch (A) {
case CudaArch::LAST: case CudaArch::LAST:
Show All 28 LinesCudaVersion MinVersionForCudaArch(CudaArch A) {
case CudaArch::GFX703: case CudaArch::GFX703:
case CudaArch::GFX704: case CudaArch::GFX704:
case CudaArch::GFX801: case CudaArch::GFX801:
case CudaArch::GFX802: case CudaArch::GFX802:
case CudaArch::GFX803: case CudaArch::GFX803:
case CudaArch::GFX810: case CudaArch::GFX810:
case CudaArch::GFX900: case CudaArch::GFX900:
case CudaArch::GFX902: case CudaArch::GFX902:
case CudaArch::GFX904:
case CudaArch::GFX906:
return CudaVersion::CUDA_70; return CudaVersion::CUDA_70;
} }
llvm_unreachable("invalid enum"); llvm_unreachable("invalid enum");
} }
CudaVersion MaxVersionForCudaArch(CudaArch A) { CudaVersion MaxVersionForCudaArch(CudaArch A) {
switch (A) { switch (A) {
case CudaArch::UNKNOWN: case CudaArch::UNKNOWN:
Show All 23 Lines

lib/Basic/Targets/NVPTX.cpp

Show First 20 Lines • Show All 182 Lines • ▼ Show 20 Lines std::string CUDAArchCode = [this] {
case CudaArch::GFX703: case CudaArch::GFX703:
case CudaArch::GFX704: case CudaArch::GFX704:
case CudaArch::GFX801: case CudaArch::GFX801:
case CudaArch::GFX802: case CudaArch::GFX802:
case CudaArch::GFX803: case CudaArch::GFX803:
case CudaArch::GFX810: case CudaArch::GFX810:
case CudaArch::GFX900: case CudaArch::GFX900:
case CudaArch::GFX902: case CudaArch::GFX902:
case CudaArch::GFX904:
case CudaArch::GFX906:
case CudaArch::LAST: case CudaArch::LAST:
break; break;
case CudaArch::UNKNOWN: case CudaArch::UNKNOWN:
assert(false && "No GPU arch when compiling CUDA device code."); assert(false && "No GPU arch when compiling CUDA device code.");
return ""; return "";
case CudaArch::SM_20: case CudaArch::SM_20:
return "200"; return "200";
case CudaArch::SM_21: case CudaArch::SM_21:
Show All 38 Lines