This is an archive of the discontinued LLVM Phabricator instance.

Differential D16303

AMDGPU: Remove unused address spaces
ClosedPublic

Authored by arsenm on Jan 18 2016, 1:18 PM.

Details

Reviewers
• tstellarAMD

Diff Detail

Event Timeline

• tstellarAMD updated this revision to Diff 45211.Jan 18 2016, 1:18 PM
• tstellarAMD retitled this revision from to AMDGPU: Remove unused address spaces.
• tstellarAMD updated this object.
• tstellarAMD added a reviewer: arsenm.
• tstellarAMD added a subscriber: llvm-commits.
Herald added a subscriber: arsenm. · View Herald TranscriptJan 18 2016, 1:18 PM
arsenm edited edge metadata.Jan 18 2016, 1:19 PM

The datalayout string also needs to be updated (possibly in clang too)

arsenm commandeered this revision.May 24 2016, 12:37 PM
arsenm edited reviewers, added: • tstellarAMD; removed: arsenm.
Herald added a subscriber: kzhuravl. · View Herald TranscriptMay 24 2016, 12:37 PM
arsenm updated this revision to Diff 58293.May 24 2016, 12:37 PM

Update datalayout. Also return a single StringRef instead of building a string.

• tstellarAMD edited edge metadata.May 25 2016, 9:26 AM

Do we need to update clang too?

arsenm added a comment.May 25 2016, 9:57 AM
In D16303#439357, @tstellarAMD wrote:

Do we need to update clang too?

Yes, I have that patch ready too

• tstellarAMD accepted this revision.May 30 2016, 2:32 PM
• tstellarAMD edited edge metadata.

LGTM.

This revision is now accepted and ready to land.May 30 2016, 2:32 PM
arsenm closed this revision.May 31 2016, 10:05 AM

r271296, r271297

Revision Contents

PathSize
lib/
Target/
AMDGPU/
2 lines
20 lines

Diff 58293

lib/Target/AMDGPU/AMDGPU.h

Show First 20 Lines • Show All 151 Lines • ▼ Show 20 Linesenum AddressSpaces : unsigned {
CONSTANT_BUFFER_8 = 16, CONSTANT_BUFFER_8 = 16,
CONSTANT_BUFFER_9 = 17, CONSTANT_BUFFER_9 = 17,
CONSTANT_BUFFER_10 = 18, CONSTANT_BUFFER_10 = 18,
CONSTANT_BUFFER_11 = 19, CONSTANT_BUFFER_11 = 19,
CONSTANT_BUFFER_12 = 20, CONSTANT_BUFFER_12 = 20,
CONSTANT_BUFFER_13 = 21, CONSTANT_BUFFER_13 = 21,
CONSTANT_BUFFER_14 = 22, CONSTANT_BUFFER_14 = 22,
CONSTANT_BUFFER_15 = 23, CONSTANT_BUFFER_15 = 23,
ADDRESS_NONE = 24, ///< Address space for unknown memory.
LAST_ADDRESS = ADDRESS_NONE,
// Some places use this if the address space can't be determined. // Some places use this if the address space can't be determined.
UNKNOWN_ADDRESS_SPACE = ~0u UNKNOWN_ADDRESS_SPACE = ~0u
}; };
} // namespace AMDGPUAS } // namespace AMDGPUAS
#endif #endif

lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

Show First 20 Lines • Show All 71 Lines • ▼ Show 20 Lines
static MachineSchedRegistry static MachineSchedRegistry
R600SchedRegistry("r600", "Run R600's custom scheduler", R600SchedRegistry("r600", "Run R600's custom scheduler",
createR600MachineScheduler); createR600MachineScheduler);
static MachineSchedRegistry static MachineSchedRegistry
SISchedRegistry("si", "Run SI's custom scheduler", SISchedRegistry("si", "Run SI's custom scheduler",
createSIMachineScheduler); createSIMachineScheduler);
static std::string computeDataLayout(const Triple &TT) { static StringRef computeDataLayout(const Triple &TT) {
std::string Ret = "e-p:32:32"; if (TT.getArch() == Triple::r600) {
// 32-bit pointers.
if (TT.getArch() == Triple::amdgcn) { return "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128"
// 32-bit private, local, and region pointers. 64-bit global and constant. "-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64";
Ret += "-p1:64:64-p2:64:64-p3:32:32-p4:64:64-p5:32:32-p24:64:64";
} }
Ret += "-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256" // 32-bit private, local, and region pointers. 64-bit global, constant and
"-v512:512-v1024:1024-v2048:2048-n32:64"; // flat.
return "e-p:32:32-p1:64:64-p2:64:64-p3:32:32-p4:64:64-p5:32:32"
return Ret; "-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128"
"-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64";
} }
LLVM_READNONE LLVM_READNONE
static StringRef getGPUOrDefault(const Triple &TT, StringRef GPU) { static StringRef getGPUOrDefault(const Triple &TT, StringRef GPU) {
if (!GPU.empty()) if (!GPU.empty())
return GPU; return GPU;
// HSA only supports CI+, so change the default GPU to a CI for HSA. // HSA only supports CI+, so change the default GPU to a CI for HSA.
▲ Show 20 Lines • Show All 317 Lines • Show Last 20 Lines