replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[llvm-objdump] Tidy up AMDGCNPrettyPrinter 

llvm-svn: 363650
This commit is contained in:
Fangrui Song 2019-06-18 06:35:18 +00:00
parent 2d94dd812f
commit 291e11ea02
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/test/CodeGen/AMDGPU/nop-data.ll
View File

@ -78,7 +78,7 @@ entry:
; CHECK-NEXT: s_nop 0
; CHECK-NEXT: s_nop 0 // 0000000001FC: BF800000
; CHECK-NEXT: {{^$}}
; CHECK-EMPTY:
; CHECK-NEXT: kernel1:
; CHECK-NEXT: s_endpgm
define amdgpu_kernel void @kernel1(i32 addrspace(1)* addrspace(4)* %ptr.out) align 256 {

26
llvm/tools/llvm-objdump/llvm-objdump.cpp
View File

@ -658,6 +658,7 @@ public:
}
};
PrettyPrinter PrettyPrinterInst;
class HexagonPrettyPrinter : public PrettyPrinter {
public:
void printLead(ArrayRef<uint8_t> Bytes, uint64_t Address,
@ -748,8 +749,6 @@ public:
if (SP && (PrintSource || PrintLines))
SP->printSourceLine(OS, Address);
typedef support::ulittle32_t U32;
if (MI) {
SmallString<40> InstStr;
raw_svector_ostream IS(InstStr);
@ -763,7 +762,7 @@ public:
// remaining
if (Bytes.size() >= 4) {
OS << format("\t.long 0x%08" PRIx32 " ",
static_cast<uint32_t>(*reinterpret_cast<const U32*>(Bytes.data())));
support::endian::read32<support::little>(Bytes.data()));
OS.indent(42);
} else {
OS << format("\t.byte 0x%02" PRIx8, Bytes[0]);
@ -773,20 +772,21 @@ public:
}
}
OS << format("// %012" PRIX64 ": ", Address.Address);
if (Bytes.size() >=4) {
for (auto D : makeArrayRef(reinterpret_cast<const U32*>(Bytes.data()),
Bytes.size() / sizeof(U32)))
// D should be explicitly casted to uint32_t here as it is passed
// by format to snprintf as vararg.
OS << format("%08" PRIX32 " ", static_cast<uint32_t>(D));
OS << format("// %012" PRIX64 ":", Address.Address);
if (Bytes.size() >= 4) {
// D should be casted to uint32_t here as it is passed by format to
// snprintf as vararg.
for (uint32_t D : makeArrayRef(
reinterpret_cast<const support::little32_t *>(Bytes.data()),
Bytes.size() / 4))
OS << format(" %08" PRIX32, D);
} else {
for (unsigned int i = 0; i < Bytes.size(); i++)
OS << format("%02" PRIX8 " ", Bytes[i]);
for (unsigned char B : Bytes)
OS << format(" %02" PRIX8, B);
}
if (!Annot.empty())
OS << "// " << Annot;
OS << " // " << Annot;
}
};
AMDGCNPrettyPrinter AMDGCNPrettyPrinterInst;