This is an archive of the discontinued LLVM Phabricator instance.

Differential D17520

AMDGPU: Fix inconsistent register name for flat_scratch
ClosedPublic

Authored by arsenm on Feb 22 2016, 12:44 PM.

Download Raw Diff

Details

Reviewers

• tstellarAMD

Diff Detail

Event Timeline

arsenm updated this revision to Diff 48719.Feb 22 2016, 12:44 PM

arsenm retitled this revision from to AMDGPU: Fix inconsistent register name for flat_scratch.

arsenm updated this object.

arsenm added a reviewer: • tstellarAMD.

arsenm added a subscriber: cfe-commits.

LGTM.

This revision is now accepted and ready to land.Feb 24 2016, 7:04 PM

r262123

Revision Contents

Path

Size

lib/

Basic/

Targets.cpp

4 lines

test/

CodeGenOpenCL/

amdgcn-flat-scratch-name.cl

15 lines

Diff 48719

lib/Basic/Targets.cpp

Show First 20 Lines • Show All 2,041 Lines • ▼ Show 20 Lines	const char * const AMDGPUTargetInfo::GCCRegNames[] = {
"s64", "s65", "s66", "s67", "s68", "s69", "s70", "s71",		"s64", "s65", "s66", "s67", "s68", "s69", "s70", "s71",
"s72", "s73", "s74", "s75", "s76", "s77", "s78", "s79",		"s72", "s73", "s74", "s75", "s76", "s77", "s78", "s79",
"s80", "s81", "s82", "s83", "s84", "s85", "s86", "s87",		"s80", "s81", "s82", "s83", "s84", "s85", "s86", "s87",
"s88", "s89", "s90", "s91", "s92", "s93", "s94", "s95",		"s88", "s89", "s90", "s91", "s92", "s93", "s94", "s95",
"s96", "s97", "s98", "s99", "s100", "s101", "s102", "s103",		"s96", "s97", "s98", "s99", "s100", "s101", "s102", "s103",
"s104", "s105", "s106", "s107", "s108", "s109", "s110", "s111",		"s104", "s105", "s106", "s107", "s108", "s109", "s110", "s111",
"s112", "s113", "s114", "s115", "s116", "s117", "s118", "s119",		"s112", "s113", "s114", "s115", "s116", "s117", "s118", "s119",
"s120", "s121", "s122", "s123", "s124", "s125", "s126", "s127"		"s120", "s121", "s122", "s123", "s124", "s125", "s126", "s127"
"exec", "vcc", "scc", "m0", "flat_scr", "exec_lo", "exec_hi",		"exec", "vcc", "scc", "m0", "flat_scratch", "exec_lo", "exec_hi",
"vcc_lo", "vcc_hi", "flat_scr_lo", "flat_scr_hi"		"vcc_lo", "vcc_hi", "flat_scratch_lo", "flat_scratch_hi"
};		};

ArrayRef<const char *> AMDGPUTargetInfo::getGCCRegNames() const {		ArrayRef<const char *> AMDGPUTargetInfo::getGCCRegNames() const {
return llvm::makeArrayRef(GCCRegNames);		return llvm::makeArrayRef(GCCRegNames);
}		}

bool AMDGPUTargetInfo::initFeatureMap(		bool AMDGPUTargetInfo::initFeatureMap(
llvm::StringMap<bool> &Features,		llvm::StringMap<bool> &Features,
▲ Show 20 Lines • Show All 5,996 Lines • Show Last 20 Lines

test/CodeGenOpenCL/amdgcn-flat-scratch-name.cl

This file was added.

				// REQUIRES: amdgpu-registered-target
				// RUN: %clang_cc1 -triple amdgcn-unknown-unknown -S -emit-llvm -o - %s \| FileCheck %s

				// CHECK-LABEL: @use_flat_scratch_name
				kernel void use_flat_scratch_name()
				{
				// CHECK: tail call void asm sideeffect "s_mov_b64 flat_scratch, 0", "~{flat_scratch}"()
				__asm__ volatile("s_mov_b64 flat_scratch, 0" : : : "flat_scratch");

				// CHECK: tail call void asm sideeffect "s_mov_b32 flat_scratch_lo, 0", "~{flat_scratch_lo}"()
				__asm__ volatile("s_mov_b32 flat_scratch_lo, 0" : : : "flat_scratch_lo");

				// CHECK: tail call void asm sideeffect "s_mov_b32 flat_scratch_hi, 0", "~{flat_scratch_hi}"()
				__asm__ volatile("s_mov_b32 flat_scratch_hi, 0" : : : "flat_scratch_hi");
				}