This is an archive of the discontinued LLVM Phabricator instance.

AMDGPU: Fix printing trailing whitespace after s_endpgm
ClosedPublic

Authored by arsenm on Jun 13 2019, 7:56 AM.

Reviewers

dstuttard
dp

Looks fine.

This revision is now accepted and ready to land.Jun 14 2019, 3:26 AM

r363384

Path

Size

lib/

Target/

AMDGPU/

MCTargetDesc/

2 lines

2 lines

test/

MC/

AMDGPU/

7 lines

	Show First 20 Lines • Show All 1,343 Lines • ▼ Show 20 Lines
	void AMDGPUInstPrinter::printEndpgm(const MCInst *MI, unsigned OpNo,			void AMDGPUInstPrinter::printEndpgm(const MCInst *MI, unsigned OpNo,
	const MCSubtargetInfo &STI,			const MCSubtargetInfo &STI,
	raw_ostream &O) {			raw_ostream &O) {
	uint16_t Imm = MI->getOperand(OpNo).getImm();			uint16_t Imm = MI->getOperand(OpNo).getImm();
	if (Imm == 0) {			if (Imm == 0) {
	return;			return;
	}			}

	O << formatDec(Imm);			O << ' ' << formatDec(Imm);
	}			}

	#include "AMDGPUGenAsmWriter.inc"			#include "AMDGPUGenAsmWriter.inc"

	void R600InstPrinter::printInst(const MCInst *MI, raw_ostream &O,			void R600InstPrinter::printInst(const MCInst *MI, raw_ostream &O,
	StringRef Annot, const MCSubtargetInfo &STI) {			StringRef Annot, const MCSubtargetInfo &STI) {
	O.flush();			O.flush();
	printInstruction(MI, O);			printInstruction(MI, O);
	▲ Show 20 Lines • Show All 199 Lines • Show Last 20 Lines

Show First 20 Lines • Show All 913 Lines • ▼ Show 20 Lines	class SOPP <bits<7> op, dag ins, string asm, list<dag> pattern = []> :
let UseNamedOperandTable = 1;		let UseNamedOperandTable = 1;
}		}


def S_NOP : SOPP <0x00000000, (ins i16imm:$simm16), "s_nop $simm16">;		def S_NOP : SOPP <0x00000000, (ins i16imm:$simm16), "s_nop $simm16">;

let isTerminator = 1 in {		let isTerminator = 1 in {

def S_ENDPGM : SOPP <0x00000001, (ins EndpgmImm:$simm16), "s_endpgm $simm16"> {		def S_ENDPGM : SOPP <0x00000001, (ins EndpgmImm:$simm16), "s_endpgm$simm16"> {
let isBarrier = 1;		let isBarrier = 1;
let isReturn = 1;		let isReturn = 1;
}		}

def S_ENDPGM_SAVED : SOPP <0x0000001B, (ins), "s_endpgm_saved"> {		def S_ENDPGM_SAVED : SOPP <0x0000001B, (ins), "s_endpgm_saved"> {
let SubtargetPredicate = isGFX8Plus;		let SubtargetPredicate = isGFX8Plus;
let simm16 = 0;		let simm16 = 0;
let isBarrier = 1;		let isBarrier = 1;
▲ Show 20 Lines • Show All 665 Lines • Show Last 20 Lines

				// RUN: llvm-mc -arch=amdgcn %s \| FileCheck -strict-whitespace %s -check-prefix=WHITESPACE
	// RUN: llvm-mc -arch=amdgcn -show-encoding %s \| FileCheck %s --check-prefix=GCN			// RUN: llvm-mc -arch=amdgcn -show-encoding %s \| FileCheck %s --check-prefix=GCN
	// RUN: llvm-mc -arch=amdgcn -mcpu=gfx900 -filetype=obj %s \| llvm-objcopy -S -K keep_symbol - \| llvm-objdump -disassemble -mcpu=gfx900 - \| FileCheck %s --check-prefix=BIN			// RUN: llvm-mc -arch=amdgcn -mcpu=gfx900 -filetype=obj %s \| llvm-objcopy -S -K keep_symbol - \| llvm-objdump -disassemble -mcpu=gfx900 - \| FileCheck %s --check-prefix=BIN

				// WHITESPACE: s_endpgm{{$}}
	// GCN: s_endpgm ; encoding: [0x00,0x00,0x81,0xbf]			// GCN: s_endpgm ; encoding: [0x00,0x00,0x81,0xbf]
	// BIN: s_endpgm // 000000000000: BF810000			// BIN: s_endpgm // 000000000000: BF810000
	s_endpgm			s_endpgm

				// WHITESPACE: s_endpgm{{$}}
	// GCN: s_endpgm ; encoding: [0x00,0x00,0x81,0xbf]			// GCN: s_endpgm ; encoding: [0x00,0x00,0x81,0xbf]
	// BIN: s_endpgm // 000000000004: BF810000			// BIN: s_endpgm // 000000000004: BF810000
	s_endpgm 0			s_endpgm 0

				// WHITESPACE: s_endpgm 1{{$}}
	// GCN: s_endpgm 1 ; encoding: [0x01,0x00,0x81,0xbf]			// GCN: s_endpgm 1 ; encoding: [0x01,0x00,0x81,0xbf]
	// BIN: s_endpgm 1 // 000000000008: BF810001			// BIN: s_endpgm 1 // 000000000008: BF810001
	s_endpgm 1			s_endpgm 1