This is an archive of the discontinued LLVM Phabricator instance.

Differential D11985

AMDGPU/SI: Fix printing useless info with amdhsa
ClosedPublic

Authored by arsenm on Aug 12 2015, 12:01 PM.

Download Raw Diff

Details

Reviewers

• tstellarAMD

Summary

The comments at the bottom would all report 0 if amdhsa was used.

Diff Detail

Event Timeline

arsenm updated this revision to Diff 31967.Aug 12 2015, 12:01 PM

arsenm retitled this revision from to AMDGPU/SI: Fix printing useless info with amdhsa.

arsenm updated this object.

arsenm added a reviewer: • tstellarAMD.

arsenm added a subscriber: llvm-commits.

LGTM.

This revision is now accepted and ready to land.Aug 13 2015, 10:44 AM

r245135

Revision Contents

Path

Size

lib/

Target/

AMDGPU/

AMDGPUAsmPrinter.cpp

2 lines

test/

CodeGen/

AMDGPU/

3 lines

Diff 31967

lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp

Show First 20 Lines • Show All 119 Lines • ▼ Show 20 Lines	bool AMDGPUAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
MCContext &Context = getObjFileLowering().getContext();		MCContext &Context = getObjFileLowering().getContext();
MCSectionELF *ConfigSection =		MCSectionELF *ConfigSection =
Context.getELFSection(".AMDGPU.config", ELF::SHT_PROGBITS, 0);		Context.getELFSection(".AMDGPU.config", ELF::SHT_PROGBITS, 0);
OutStreamer->SwitchSection(ConfigSection);		OutStreamer->SwitchSection(ConfigSection);

const AMDGPUSubtarget &STM = MF.getSubtarget<AMDGPUSubtarget>();		const AMDGPUSubtarget &STM = MF.getSubtarget<AMDGPUSubtarget>();
SIProgramInfo KernelInfo;		SIProgramInfo KernelInfo;
if (STM.getGeneration() >= AMDGPUSubtarget::SOUTHERN_ISLANDS) {		if (STM.getGeneration() >= AMDGPUSubtarget::SOUTHERN_ISLANDS) {
if (!STM.isAmdHsaOS()) {
getSIProgramInfo(KernelInfo, MF);		getSIProgramInfo(KernelInfo, MF);
		if (!STM.isAmdHsaOS()) {
EmitProgramInfoSI(MF, KernelInfo);		EmitProgramInfoSI(MF, KernelInfo);
}		}
// Emit directives		// Emit directives
AMDGPUTargetStreamer *TS =		AMDGPUTargetStreamer *TS =
static_cast<AMDGPUTargetStreamer *>(OutStreamer->getTargetStreamer());		static_cast<AMDGPUTargetStreamer *>(OutStreamer->getTargetStreamer());
TS->EmitDirectiveHSACodeObjectVersion(1, 0);		TS->EmitDirectiveHSACodeObjectVersion(1, 0);
AMDGPU::IsaVersion ISA = STM.getIsaVersion();		AMDGPU::IsaVersion ISA = STM.getIsaVersion();
TS->EmitDirectiveHSACodeObjectISA(ISA.Major, ISA.Minor, ISA.Stepping,		TS->EmitDirectiveHSACodeObjectISA(ISA.Major, ISA.Minor, ISA.Stepping,
▲ Show 20 Lines • Show All 390 Lines • Show Last 20 Lines

test/CodeGen/AMDGPU/register-count-comments.ll

	; RUN: llc -march=amdgcn -mcpu=SI -verify-machineinstrs -asm-verbose < %s \| FileCheck -check-prefix=SI %s			; RUN: llc -march=amdgcn -verify-machineinstrs -asm-verbose < %s \| FileCheck -check-prefix=SI %s
				; RUN: llc -march=amdgcn -mtriple=amdgcn-unknown-amdhsa -verify-machineinstrs -asm-verbose < %s \| FileCheck -check-prefix=SI %s

	declare i32 @llvm.SI.tid() nounwind readnone			declare i32 @llvm.SI.tid() nounwind readnone

	; SI-LABEL: {{^}}foo:			; SI-LABEL: {{^}}foo:
	; SI: .section .AMDGPU.csdata			; SI: .section .AMDGPU.csdata
	; SI: ; Kernel info:			; SI: ; Kernel info:
	; SI: ; NumSgprs: {{[0-9]+}}			; SI: ; NumSgprs: {{[0-9]+}}
	; SI: ; NumVgprs: {{[0-9]+}}			; SI: ; NumVgprs: {{[0-9]+}}
	Show All 18 Lines