[llvm] r315526 - AMDGPU/NFC: Minor clean ups in HSA metadata
Konstantin Zhuravlyov via llvm-commits
llvm-commits at lists.llvm.org
Wed Oct 11 15:59:35 PDT 2017
Author: kzhuravl
Date: Wed Oct 11 15:59:35 2017
New Revision: 315526
URL: http://llvm.org/viewvc/llvm-project?rev=315526&view=rev
Log:
AMDGPU/NFC: Minor clean ups in HSA metadata
- Use HSA metadata streamer directly from AMDGPUAsmPrinter
- Make naming consistent with PAL metadata
Differential Revision: https://reviews.llvm.org/D38746
Modified:
llvm/trunk/include/llvm/Support/AMDGPUMetadata.h
llvm/trunk/lib/Support/AMDGPUMetadata.cpp
llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.h
llvm/trunk/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp
llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUHSAMetadataStreamer.cpp
llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUHSAMetadataStreamer.h
llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp
llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h
Modified: llvm/trunk/include/llvm/Support/AMDGPUMetadata.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/AMDGPUMetadata.h?rev=315526&r1=315525&r2=315526&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/AMDGPUMetadata.h (original)
+++ llvm/trunk/include/llvm/Support/AMDGPUMetadata.h Wed Oct 11 15:59:35 2017
@@ -406,15 +406,13 @@ struct Metadata final {
/// \brief Default constructor.
Metadata() = default;
+};
- /// \brief Converts \p YamlString to \p HSAMetadata.
- static std::error_code fromYamlString(std::string YamlString,
- Metadata &HSAMetadata);
+/// \brief Converts \p String to \p HSAMetadata.
+std::error_code fromString(std::string String, Metadata &HSAMetadata);
- /// \brief Converts \p HSAMetadata to \p YamlString.
- static std::error_code toYamlString(Metadata HSAMetadata,
- std::string &YamlString);
-};
+/// \brief Converts \p HSAMetadata to \p String.
+std::error_code toString(Metadata HSAMetadata, std::string &String);
} // end namespace HSAMD
Modified: llvm/trunk/lib/Support/AMDGPUMetadata.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/AMDGPUMetadata.cpp?rev=315526&r1=315525&r2=315526&view=diff
==============================================================================
--- llvm/trunk/lib/Support/AMDGPUMetadata.cpp (original)
+++ llvm/trunk/lib/Support/AMDGPUMetadata.cpp Wed Oct 11 15:59:35 2017
@@ -196,18 +196,14 @@ struct MappingTraits<HSAMD::Metadata> {
namespace AMDGPU {
namespace HSAMD {
-/* static */
-std::error_code Metadata::fromYamlString(
- std::string YamlString, Metadata &HSAMetadata) {
- yaml::Input YamlInput(YamlString);
+std::error_code fromString(std::string String, Metadata &HSAMetadata) {
+ yaml::Input YamlInput(String);
YamlInput >> HSAMetadata;
return YamlInput.error();
}
-/* static */
-std::error_code Metadata::toYamlString(
- Metadata HSAMetadata, std::string &YamlString) {
- raw_string_ostream YamlStream(YamlString);
+std::error_code toString(Metadata HSAMetadata, std::string &String) {
+ raw_string_ostream YamlStream(String);
yaml::Output YamlOutput(YamlStream, nullptr, std::numeric_limits<int>::max());
YamlOutput << HSAMetadata;
return std::error_code();
Modified: llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp?rev=315526&r1=315525&r2=315526&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp Wed Oct 11 15:59:35 2017
@@ -127,7 +127,8 @@ void AMDGPUAsmPrinter::EmitStartOfAsmFil
getTargetStreamer().EmitDirectiveHSACodeObjectVersion(2, 1);
getTargetStreamer().EmitDirectiveHSACodeObjectISA(
ISA.Major, ISA.Minor, ISA.Stepping, "AMD", "AMDGPU");
- getTargetStreamer().EmitStartOfHSAMetadata(M);
+
+ HSAMetadataStream.begin(M);
}
void AMDGPUAsmPrinter::EmitEndOfAsmFile(Module &M) {
@@ -145,7 +146,8 @@ void AMDGPUAsmPrinter::EmitEndOfAsmFile(
if (TM.getTargetTriple().getOS() != Triple::AMDHSA)
return;
- getTargetStreamer().EmitEndOfHSAMetadata();
+ HSAMetadataStream.end();
+ getTargetStreamer().EmitHSAMetadata(HSAMetadataStream.getHSAMetadata());
}
bool AMDGPUAsmPrinter::isBlockOnlyReachableByFallthrough(
@@ -178,7 +180,8 @@ void AMDGPUAsmPrinter::EmitFunctionBodyS
if (TM.getTargetTriple().getOS() != Triple::AMDHSA)
return;
- getTargetStreamer().EmitKernelHSAMetadata(*MF->getFunction(), KernelCode);
+
+ HSAMetadataStream.emitKernel(*MF->getFunction(), KernelCode);
}
void AMDGPUAsmPrinter::EmitFunctionEntryLabel() {
Modified: llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.h?rev=315526&r1=315525&r2=315526&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.h (original)
+++ llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.h Wed Oct 11 15:59:35 2017
@@ -17,6 +17,7 @@
#include "AMDGPU.h"
#include "AMDKernelCodeT.h"
+#include "MCTargetDesc/AMDGPUHSAMetadataStreamer.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/CodeGen/AsmPrinter.h"
#include <cstddef>
@@ -112,6 +113,8 @@ private:
SIProgramInfo CurrentProgramInfo;
DenseMap<const Function *, SIFunctionResourceInfo> CallGraphResourceInfo;
+
+ AMDGPU::HSAMD::MetadataStreamer HSAMetadataStream;
std::map<uint32_t, uint32_t> PALMetadataMap;
uint64_t getFunctionCodeSize(const MachineFunction &MF) const;
Modified: llvm/trunk/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp?rev=315526&r1=315525&r2=315526&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp Wed Oct 11 15:59:35 2017
@@ -827,12 +827,12 @@ private:
bool ParseDirectiveMajorMinor(uint32_t &Major, uint32_t &Minor);
bool ParseDirectiveHSACodeObjectVersion();
bool ParseDirectiveHSACodeObjectISA();
- bool ParseDirectiveHSAMetadata();
bool ParseAMDKernelCodeTValue(StringRef ID, amd_kernel_code_t &Header);
bool ParseDirectiveAMDKernelCodeT();
bool subtargetHasRegister(const MCRegisterInfo &MRI, unsigned RegNo) const;
bool ParseDirectiveAMDGPUHsaKernel();
+ bool ParseDirectiveHSAMetadata();
bool ParseDirectivePALMetadata();
bool AddNextRegisterToList(unsigned& Reg, unsigned& RegWidth,
@@ -2400,49 +2400,6 @@ bool AMDGPUAsmParser::ParseDirectiveHSAC
return false;
}
-bool AMDGPUAsmParser::ParseDirectiveHSAMetadata() {
- std::string YamlString;
- raw_string_ostream YamlStream(YamlString);
-
- getLexer().setSkipSpace(false);
-
- bool FoundEnd = false;
- while (!getLexer().is(AsmToken::Eof)) {
- while (getLexer().is(AsmToken::Space)) {
- YamlStream << getLexer().getTok().getString();
- Lex();
- }
-
- if (getLexer().is(AsmToken::Identifier)) {
- StringRef ID = getLexer().getTok().getIdentifier();
- if (ID == AMDGPU::HSAMD::AssemblerDirectiveEnd) {
- Lex();
- FoundEnd = true;
- break;
- }
- }
-
- YamlStream << Parser.parseStringToEndOfStatement()
- << getContext().getAsmInfo()->getSeparatorString();
-
- Parser.eatToEndOfStatement();
- }
-
- getLexer().setSkipSpace(true);
-
- if (getLexer().is(AsmToken::Eof) && !FoundEnd) {
- return TokError(
- "expected directive .end_amd_amdgpu_hsa_metadata not found");
- }
-
- YamlStream.flush();
-
- if (!getTargetStreamer().EmitHSAMetadata(YamlString))
- return Error(getParser().getTok().getLoc(), "invalid code object metadata");
-
- return false;
-}
-
bool AMDGPUAsmParser::ParseAMDKernelCodeTValue(StringRef ID,
amd_kernel_code_t &Header) {
SmallString<40> ErrStr;
@@ -2495,6 +2452,49 @@ bool AMDGPUAsmParser::ParseDirectiveAMDG
return false;
}
+bool AMDGPUAsmParser::ParseDirectiveHSAMetadata() {
+ std::string HSAMetadataString;
+ raw_string_ostream YamlStream(HSAMetadataString);
+
+ getLexer().setSkipSpace(false);
+
+ bool FoundEnd = false;
+ while (!getLexer().is(AsmToken::Eof)) {
+ while (getLexer().is(AsmToken::Space)) {
+ YamlStream << getLexer().getTok().getString();
+ Lex();
+ }
+
+ if (getLexer().is(AsmToken::Identifier)) {
+ StringRef ID = getLexer().getTok().getIdentifier();
+ if (ID == AMDGPU::HSAMD::AssemblerDirectiveEnd) {
+ Lex();
+ FoundEnd = true;
+ break;
+ }
+ }
+
+ YamlStream << Parser.parseStringToEndOfStatement()
+ << getContext().getAsmInfo()->getSeparatorString();
+
+ Parser.eatToEndOfStatement();
+ }
+
+ getLexer().setSkipSpace(true);
+
+ if (getLexer().is(AsmToken::Eof) && !FoundEnd) {
+ return TokError(Twine("expected directive ") +
+ Twine(HSAMD::AssemblerDirectiveEnd) + Twine("not found"));
+ }
+
+ YamlStream.flush();
+
+ if (!getTargetStreamer().EmitHSAMetadata(HSAMetadataString))
+ return Error(getParser().getTok().getLoc(), "invalid HSA metadata");
+
+ return false;
+}
+
bool AMDGPUAsmParser::ParseDirectivePALMetadata() {
PALMD::Metadata PALMetadata;
for (;;) {
@@ -2521,15 +2521,15 @@ bool AMDGPUAsmParser::ParseDirective(Asm
if (IDVal == ".hsa_code_object_isa")
return ParseDirectiveHSACodeObjectISA();
- if (IDVal == AMDGPU::HSAMD::AssemblerDirectiveBegin)
- return ParseDirectiveHSAMetadata();
-
if (IDVal == ".amd_kernel_code_t")
return ParseDirectiveAMDKernelCodeT();
if (IDVal == ".amdgpu_hsa_kernel")
return ParseDirectiveAMDGPUHsaKernel();
+ if (IDVal == AMDGPU::HSAMD::AssemblerDirectiveBegin)
+ return ParseDirectiveHSAMetadata();
+
if (IDVal == PALMD::AssemblerDirective)
return ParseDirectivePALMetadata();
Modified: llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUHSAMetadataStreamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUHSAMetadataStreamer.cpp?rev=315526&r1=315525&r2=315526&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUHSAMetadataStreamer.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUHSAMetadataStreamer.cpp Wed Oct 11 15:59:35 2017
@@ -32,29 +32,30 @@ static cl::opt<bool> VerifyHSAMetadata(
namespace AMDGPU {
namespace HSAMD {
-void MetadataStreamer::dump(StringRef YamlString) const {
- errs() << "AMDGPU HSA Metadata:\n" << YamlString << '\n';
+void MetadataStreamer::dump(StringRef HSAMetadataString) const {
+ errs() << "AMDGPU HSA Metadata:\n" << HSAMetadataString << '\n';
}
-void MetadataStreamer::verify(StringRef YamlString) const {
+void MetadataStreamer::verify(StringRef HSAMetadataString) const {
errs() << "AMDGPU HSA Metadata Parser Test: ";
- HSAMD::Metadata FromYamlString;
- if (Metadata::fromYamlString(YamlString, FromYamlString)) {
+ HSAMD::Metadata FromHSAMetadataString;
+ if (fromString(HSAMetadataString, FromHSAMetadataString)) {
errs() << "FAIL\n";
return;
}
- std::string ToYamlString;
- if (Metadata::toYamlString(FromYamlString, ToYamlString)) {
+ std::string ToHSAMetadataString;
+ if (toString(FromHSAMetadataString, ToHSAMetadataString)) {
errs() << "FAIL\n";
return;
}
- errs() << (YamlString == ToYamlString ? "PASS" : "FAIL") << '\n';
- if (YamlString != ToYamlString) {
- errs() << "Original input: " << YamlString << '\n'
- << "Produced output: " << ToYamlString << '\n';
+ errs() << (HSAMetadataString == ToHSAMetadataString ? "PASS" : "FAIL")
+ << '\n';
+ if (HSAMetadataString != ToHSAMetadataString) {
+ errs() << "Original input: " << HSAMetadataString << '\n'
+ << "Produced output: " << ToHSAMetadataString << '\n';
}
}
@@ -395,6 +396,17 @@ void MetadataStreamer::begin(const Modul
emitPrintf(Mod);
}
+void MetadataStreamer::end() {
+ std::string HSAMetadataString;
+ if (auto Error = toString(HSAMetadata, HSAMetadataString))
+ return;
+
+ if (DumpHSAMetadata)
+ dump(HSAMetadataString);
+ if (VerifyHSAMetadata)
+ verify(HSAMetadataString);
+}
+
void MetadataStreamer::emitKernel(const Function &Func,
const amd_kernel_code_t &KernelCode) {
if (Func.getCallingConv() != CallingConv::AMDGPU_KERNEL)
@@ -411,26 +423,6 @@ void MetadataStreamer::emitKernel(const
emitKernelDebugProps(KernelCode);
}
-ErrorOr<std::string> MetadataStreamer::toYamlString() {
- std::string ToYamlString;
- if (auto Error = Metadata::toYamlString(HSAMetadata, ToYamlString))
- return Error;
-
- if (DumpHSAMetadata)
- dump(ToYamlString);
- if (VerifyHSAMetadata)
- verify(ToYamlString);
-
- return ToYamlString;
-}
-
-ErrorOr<std::string> MetadataStreamer::toYamlString(StringRef YamlString) {
- if (auto Error = Metadata::fromYamlString(YamlString, HSAMetadata))
- return Error;
-
- return toYamlString();
-}
-
} // end namespace HSAMD
} // end namespace AMDGPU
} // end namespace llvm
Modified: llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUHSAMetadataStreamer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUHSAMetadataStreamer.h?rev=315526&r1=315525&r2=315526&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUHSAMetadataStreamer.h (original)
+++ llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUHSAMetadataStreamer.h Wed Oct 11 15:59:35 2017
@@ -20,7 +20,6 @@
#include "AMDKernelCodeT.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/AMDGPUMetadata.h"
-#include "llvm/Support/ErrorOr.h"
namespace llvm {
@@ -39,9 +38,9 @@ private:
Metadata HSAMetadata;
AMDGPUAS AMDGPUASI;
- void dump(StringRef YamlString) const;
+ void dump(StringRef HSAMetadataString) const;
- void verify(StringRef YamlString) const;
+ void verify(StringRef HSAMetadataString) const;
AccessQualifier getAccessQualifier(StringRef AccQual) const;
@@ -81,15 +80,15 @@ public:
MetadataStreamer() = default;
~MetadataStreamer() = default;
+ const Metadata &getHSAMetadata() const {
+ return HSAMetadata;
+ }
+
void begin(const Module &Mod);
- void end() {}
+ void end();
void emitKernel(const Function &Func, const amd_kernel_code_t &KernelCode);
-
- ErrorOr<std::string> toYamlString();
-
- ErrorOr<std::string> toYamlString(StringRef YamlString);
};
} // end namespace HSAMD
Modified: llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp?rev=315526&r1=315525&r2=315526&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp Wed Oct 11 15:59:35 2017
@@ -42,18 +42,12 @@ using namespace llvm::AMDGPU;
AMDGPUTargetStreamer::AMDGPUTargetStreamer(MCStreamer &S)
: MCTargetStreamer(S) {}
-void AMDGPUTargetStreamer::EmitStartOfHSAMetadata(const Module &Mod) {
- HSAMetadataStreamer.begin(Mod);
-}
-
-void AMDGPUTargetStreamer::EmitKernelHSAMetadata(
- const Function &Func, const amd_kernel_code_t &KernelCode) {
- HSAMetadataStreamer.emitKernel(Func, KernelCode);
-}
+bool AMDGPUTargetStreamer::EmitHSAMetadata(StringRef HSAMetadataString) {
+ HSAMD::Metadata HSAMetadata;
+ if (auto Error = HSAMD::fromString(HSAMetadataString, HSAMetadata))
+ return false;
-void AMDGPUTargetStreamer::EmitEndOfHSAMetadata() {
- HSAMetadataStreamer.end();
- EmitHSAMetadata(HSAMetadataStreamer.toYamlString().get());
+ return EmitHSAMetadata(HSAMetadata);
}
//===----------------------------------------------------------------------===//
@@ -100,23 +94,22 @@ void AMDGPUTargetAsmStreamer::EmitAMDGPU
}
}
-bool AMDGPUTargetAsmStreamer::EmitHSAMetadata(StringRef YamlString) {
- auto VerifiedYamlString = HSAMetadataStreamer.toYamlString(YamlString);
- if (!VerifiedYamlString)
+bool AMDGPUTargetAsmStreamer::EmitHSAMetadata(
+ const AMDGPU::HSAMD::Metadata &HSAMetadata) {
+ std::string HSAMetadataString;
+ if (auto Error = HSAMD::toString(HSAMetadata, HSAMetadataString))
return false;
- OS << '\t' << AMDGPU::HSAMD::AssemblerDirectiveBegin << '\n';
- OS << VerifiedYamlString.get();
- OS << '\t' << AMDGPU::HSAMD::AssemblerDirectiveEnd << '\n';
-
+ OS << '\t' << HSAMD::AssemblerDirectiveBegin << '\n';
+ OS << HSAMetadataString << '\n';
+ OS << '\t' << HSAMD::AssemblerDirectiveEnd << '\n';
return true;
}
bool AMDGPUTargetAsmStreamer::EmitPALMetadata(
const PALMD::Metadata &PALMetadata) {
std::string PALMetadataString;
- auto Error = PALMD::toString(PALMetadata, PALMetadataString);
- if (Error)
+ if (auto Error = PALMD::toString(PALMetadata, PALMetadataString))
return false;
OS << '\t' << PALMD::AssemblerDirective << PALMetadataString << '\n';
@@ -215,9 +208,10 @@ void AMDGPUTargetELFStreamer::EmitAMDGPU
Symbol->setType(ELF::STT_AMDGPU_HSA_KERNEL);
}
-bool AMDGPUTargetELFStreamer::EmitHSAMetadata(StringRef YamlString) {
- auto VerifiedYamlString = HSAMetadataStreamer.toYamlString(YamlString);
- if (!VerifiedYamlString)
+bool AMDGPUTargetELFStreamer::EmitHSAMetadata(
+ const AMDGPU::HSAMD::Metadata &HSAMetadata) {
+ std::string HSAMetadataString;
+ if (auto Error = HSAMD::toString(HSAMetadata, HSAMetadataString))
return false;
// Create two labels to mark the beginning and end of the desc field
@@ -234,11 +228,10 @@ bool AMDGPUTargetELFStreamer::EmitHSAMet
ElfNote::NT_AMDGPU_HSA_CODE_OBJECT_METADATA,
[&](MCELFStreamer &OS) {
OS.EmitLabel(DescBegin);
- OS.EmitBytes(VerifiedYamlString.get());
+ OS.EmitBytes(HSAMetadataString);
OS.EmitLabel(DescEnd);
}
);
-
return true;
}
Modified: llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h?rev=315526&r1=315525&r2=315526&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h (original)
+++ llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h Wed Oct 11 15:59:35 2017
@@ -10,9 +10,9 @@
#ifndef LLVM_LIB_TARGET_AMDGPU_MCTARGETDESC_AMDGPUTARGETSTREAMER_H
#define LLVM_LIB_TARGET_AMDGPU_MCTARGETDESC_AMDGPUTARGETSTREAMER_H
-#include "AMDGPUHSAMetadataStreamer.h"
#include "AMDKernelCodeT.h"
#include "llvm/MC/MCStreamer.h"
+#include "llvm/Support/AMDGPUMetadata.h"
namespace llvm {
#include "AMDGPUPTNote.h"
@@ -27,7 +27,6 @@ class Type;
class AMDGPUTargetStreamer : public MCTargetStreamer {
protected:
- AMDGPU::HSAMD::MetadataStreamer HSAMetadataStreamer;
MCContext &getContext() const { return Streamer.getContext(); }
public:
@@ -44,15 +43,11 @@ public:
virtual void EmitAMDGPUSymbolType(StringRef SymbolName, unsigned Type) = 0;
- virtual void EmitStartOfHSAMetadata(const Module &Mod);
-
- virtual void EmitKernelHSAMetadata(
- const Function &Func, const amd_kernel_code_t &KernelCode);
-
- virtual void EmitEndOfHSAMetadata();
+ /// \returns True on success, false on failure.
+ virtual bool EmitHSAMetadata(StringRef HSAMetadataString);
/// \returns True on success, false on failure.
- virtual bool EmitHSAMetadata(StringRef YamlString) = 0;
+ virtual bool EmitHSAMetadata(const AMDGPU::HSAMD::Metadata &HSAMetadata) = 0;
/// \returns True on success, false on failure.
virtual bool EmitPALMetadata(const AMDGPU::PALMD::Metadata &PALMetadata) = 0;
@@ -74,7 +69,7 @@ public:
void EmitAMDGPUSymbolType(StringRef SymbolName, unsigned Type) override;
/// \returns True on success, false on failure.
- bool EmitHSAMetadata(StringRef YamlString) override;
+ bool EmitHSAMetadata(const AMDGPU::HSAMD::Metadata &HSAMetadata) override;
/// \returns True on success, false on failure.
bool EmitPALMetadata(const AMDGPU::PALMD::Metadata &PALMetadata) override;
@@ -104,7 +99,7 @@ public:
void EmitAMDGPUSymbolType(StringRef SymbolName, unsigned Type) override;
/// \returns True on success, false on failure.
- bool EmitHSAMetadata(StringRef YamlString) override;
+ bool EmitHSAMetadata(const AMDGPU::HSAMD::Metadata &HSAMetadata) override;
/// \returns True on success, false on failure.
bool EmitPALMetadata(const AMDGPU::PALMD::Metadata &PALMetadata) override;
More information about the llvm-commits
mailing list