[llvm] r298560 - [AMDGPU] Do not emit isa info as code object metadata
Konstantin Zhuravlyov via llvm-commits
llvm-commits at lists.llvm.org
Wed Mar 22 16:27:09 PDT 2017
Author: kzhuravl
Date: Wed Mar 22 18:27:09 2017
New Revision: 298560
URL: http://llvm.org/viewvc/llvm-project?rev=298560&view=rev
Log:
[AMDGPU] Do not emit isa info as code object metadata
- It was decided to expose this information through other means (rocr)
Differential Revision: https://reviews.llvm.org/D30970
Removed:
llvm/trunk/test/MC/AMDGPU/code-object-metadata-isa.s
Modified:
llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
llvm/trunk/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp
llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUCodeObjectMetadata.h
llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUCodeObjectMetadataStreamer.cpp
llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUCodeObjectMetadataStreamer.h
llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp
llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h
llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-from-llvm-ir-full.ll
llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-invalid-ocl-version-1.ll
llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-invalid-ocl-version-2.ll
llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-invalid-ocl-version-3.ll
llvm/trunk/test/MC/AMDGPU/code-object-metadata-kernel-args.s
llvm/trunk/test/MC/AMDGPU/code-object-metadata-kernel-attrs.s
llvm/trunk/test/MC/AMDGPU/hsa.s
Modified: llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp?rev=298560&r1=298559&r2=298560&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp Wed Mar 22 18:27:09 2017
@@ -116,15 +116,14 @@ void AMDGPUAsmPrinter::EmitStartOfAsmFil
getTargetStreamer().EmitDirectiveHSACodeObjectVersion(2, 1);
getTargetStreamer().EmitDirectiveHSACodeObjectISA(
ISA.Major, ISA.Minor, ISA.Stepping, "AMD", "AMDGPU");
- getTargetStreamer().EmitStartOfCodeObjectMetadata(
- getSTI()->getFeatureBits(), M);
+ getTargetStreamer().EmitStartOfCodeObjectMetadata(M);
}
void AMDGPUAsmPrinter::EmitEndOfAsmFile(Module &M) {
if (TM.getTargetTriple().getOS() != Triple::AMDHSA)
return;
- getTargetStreamer().EmitEndOfCodeObjectMetadata(getSTI()->getFeatureBits());
+ getTargetStreamer().EmitEndOfCodeObjectMetadata();
}
bool AMDGPUAsmPrinter::isBlockOnlyReachableByFallthrough(
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=298560&r1=298559&r2=298560&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp Wed Mar 22 18:27:09 2017
@@ -2296,7 +2296,7 @@ bool AMDGPUAsmParser::ParseDirectiveCode
YamlStream.flush();
- if (!getTargetStreamer().EmitCodeObjectMetadata(getFeatureBits(), YamlString))
+ if (!getTargetStreamer().EmitCodeObjectMetadata(YamlString))
return Error(getParser().getTok().getLoc(), "invalid code object metadata");
return false;
Modified: llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUCodeObjectMetadata.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUCodeObjectMetadata.h?rev=298560&r1=298559&r2=298560&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUCodeObjectMetadata.h (original)
+++ llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUCodeObjectMetadata.h Wed Mar 22 18:27:09 2017
@@ -99,67 +99,6 @@ enum class ValueType : uint8_t {
};
//===----------------------------------------------------------------------===//
-// Instruction Set Architecture Metadata (ISA).
-//===----------------------------------------------------------------------===//
-namespace Isa {
-
-namespace Key {
-/// \brief Key for Isa::Metadata::mWavefrontSize.
-constexpr char WavefrontSize[] = "WavefrontSize";
-/// \brief Key for Isa::Metadata::mLocalMemorySize.
-constexpr char LocalMemorySize[] = "LocalMemorySize";
-/// \brief Key for Isa::Metadata::mEUsPerCU.
-constexpr char EUsPerCU[] = "EUsPerCU";
-/// \brief Key for Isa::Metadata::mMaxWavesPerEU.
-constexpr char MaxWavesPerEU[] = "MaxWavesPerEU";
-/// \brief Key for Isa::Metadata::mMaxFlatWorkGroupSize.
-constexpr char MaxFlatWorkGroupSize[] = "MaxFlatWorkGroupSize";
-/// \brief Key for Isa::Metadata::mSGPRAllocGranule.
-constexpr char SGPRAllocGranule[] = "SGPRAllocGranule";
-/// \brief Key for Isa::Metadata::mTotalNumSGPRs.
-constexpr char TotalNumSGPRs[] = "TotalNumSGPRs";
-/// \brief Key for Isa::Metadata::mAddressableNumSGPRs.
-constexpr char AddressableNumSGPRs[] = "AddressableNumSGPRs";
-/// \brief Key for Isa::Metadata::mVGPRAllocGranule.
-constexpr char VGPRAllocGranule[] = "VGPRAllocGranule";
-/// \brief Key for Isa::Metadata::mTotalNumVGPRs.
-constexpr char TotalNumVGPRs[] = "TotalNumVGPRs";
-/// \brief Key for Isa::Metadata::mAddressableNumVGPRs.
-constexpr char AddressableNumVGPRs[] = "AddressableNumVGPRs";
-} // end namespace Key
-
-/// \brief In-memory representation of instruction set architecture metadata.
-struct Metadata final {
- /// \brief Wavefront size. Required.
- uint32_t mWavefrontSize = 0;
- /// \brief Local memory size in bytes. Required.
- uint32_t mLocalMemorySize = 0;
- /// \brief Number of execution units per compute unit. Required.
- uint32_t mEUsPerCU = 0;
- /// \brief Maximum number of waves per execution unit. Required.
- uint32_t mMaxWavesPerEU = 0;
- /// \brief Maximum flat work group size. Required.
- uint32_t mMaxFlatWorkGroupSize = 0;
- /// \brief SGPR allocation granularity. Required.
- uint32_t mSGPRAllocGranule = 0;
- /// \brief Total number of SGPRs. Required.
- uint32_t mTotalNumSGPRs = 0;
- /// \brief Addressable number of SGPRs. Required.
- uint32_t mAddressableNumSGPRs = 0;
- /// \brief VGPR allocation granularity. Required.
- uint32_t mVGPRAllocGranule = 0;
- /// \brief Total number of VGPRs. Required.
- uint32_t mTotalNumVGPRs = 0;
- /// \brief Addressable number of VGPRs. Required.
- uint32_t mAddressableNumVGPRs = 0;
-
- /// \brief Default constructor.
- Metadata() = default;
-};
-
-} // end namespace Isa
-
-//===----------------------------------------------------------------------===//
// Kernel Metadata.
//===----------------------------------------------------------------------===//
namespace Kernel {
@@ -449,8 +388,6 @@ struct Metadata final {
namespace Key {
/// \brief Key for CodeObject::Metadata::mVersion.
constexpr char Version[] = "Version";
-/// \brief Key for CodeObject::Metadata::mIsa.
-constexpr char Isa[] = "Isa";
/// \brief Key for CodeObject::Metadata::mPrintf.
constexpr char Printf[] = "Printf";
/// \brief Key for CodeObject::Metadata::mKernels.
@@ -461,8 +398,6 @@ constexpr char Kernels[] = "Kernels";
struct Metadata final {
/// \brief Code object metadata version. Required.
std::vector<uint32_t> mVersion = std::vector<uint32_t>();
- /// \brief Instruction set architecture metadata. Optional.
- Isa::Metadata mIsa = Isa::Metadata();
/// \brief Printf metadata. Optional.
std::vector<std::string> mPrintf = std::vector<std::string>();
/// \brief Kernels metadata. Optional.
Modified: llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUCodeObjectMetadataStreamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUCodeObjectMetadataStreamer.cpp?rev=298560&r1=298559&r2=298560&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUCodeObjectMetadataStreamer.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUCodeObjectMetadataStreamer.cpp Wed Mar 22 18:27:09 2017
@@ -15,7 +15,6 @@
#include "AMDGPU.h"
#include "AMDGPUCodeObjectMetadataStreamer.h"
-#include "Utils/AMDGPUBaseInfo.h"
#include "llvm/ADT/StringSwitch.h"
#include "llvm/IR/Constants.h"
#include "llvm/IR/Module.h"
@@ -23,7 +22,6 @@
using namespace llvm::AMDGPU;
using namespace llvm::AMDGPU::CodeObject;
-using namespace llvm::AMDGPU::IsaInfo;
LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint32_t)
LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(std::string)
@@ -103,23 +101,6 @@ struct ScalarEnumerationTraits<ValueType
};
template <>
-struct MappingTraits<Isa::Metadata> {
- static void mapping(IO &YIO, Isa::Metadata &MD) {
- YIO.mapRequired(Isa::Key::WavefrontSize, MD.mWavefrontSize);
- YIO.mapRequired(Isa::Key::LocalMemorySize, MD.mLocalMemorySize);
- YIO.mapRequired(Isa::Key::EUsPerCU, MD.mEUsPerCU);
- YIO.mapRequired(Isa::Key::MaxWavesPerEU, MD.mMaxWavesPerEU);
- YIO.mapRequired(Isa::Key::MaxFlatWorkGroupSize, MD.mMaxFlatWorkGroupSize);
- YIO.mapRequired(Isa::Key::SGPRAllocGranule, MD.mSGPRAllocGranule);
- YIO.mapRequired(Isa::Key::TotalNumSGPRs, MD.mTotalNumSGPRs);
- YIO.mapRequired(Isa::Key::AddressableNumSGPRs, MD.mAddressableNumSGPRs);
- YIO.mapRequired(Isa::Key::VGPRAllocGranule, MD.mVGPRAllocGranule);
- YIO.mapRequired(Isa::Key::TotalNumVGPRs, MD.mTotalNumVGPRs);
- YIO.mapRequired(Isa::Key::AddressableNumVGPRs, MD.mAddressableNumVGPRs);
- }
-};
-
-template <>
struct MappingTraits<Kernel::Attrs::Metadata> {
static void mapping(IO &YIO, Kernel::Attrs::Metadata &MD) {
YIO.mapOptional(Kernel::Attrs::Key::ReqdWorkGroupSize,
@@ -215,7 +196,6 @@ template <>
struct MappingTraits<CodeObject::Metadata> {
static void mapping(IO &YIO, CodeObject::Metadata &MD) {
YIO.mapRequired(Key::Version, MD.mVersion);
- YIO.mapOptional(Key::Isa, MD.mIsa);
YIO.mapOptional(Key::Printf, MD.mPrintf, std::vector<std::string>());
if (!MD.mKernels.empty() || !YIO.outputting())
YIO.mapOptional(Key::Kernels, MD.mKernels);
@@ -417,22 +397,6 @@ void MetadataStreamer::emitVersion() {
Version.push_back(MetadataVersionMinor);
}
-void MetadataStreamer::emitIsa(const FeatureBitset &Features) {
- auto &Isa = CodeObjectMetadata.mIsa;
-
- Isa.mWavefrontSize = getWavefrontSize(Features);
- Isa.mLocalMemorySize = getLocalMemorySize(Features);
- Isa.mEUsPerCU = getEUsPerCU(Features);
- Isa.mMaxWavesPerEU = getMaxWavesPerEU(Features);
- Isa.mMaxFlatWorkGroupSize = getMaxFlatWorkGroupSize(Features);
- Isa.mSGPRAllocGranule = getSGPRAllocGranule(Features);
- Isa.mTotalNumSGPRs = getTotalNumSGPRs(Features);
- Isa.mAddressableNumSGPRs = getAddressableNumSGPRs(Features);
- Isa.mVGPRAllocGranule = getVGPRAllocGranule(Features);
- Isa.mTotalNumVGPRs = getTotalNumVGPRs(Features);
- Isa.mAddressableNumVGPRs = getAddressableNumVGPRs(Features);
-}
-
void MetadataStreamer::emitPrintf(const Module &Mod) {
auto &Printf = CodeObjectMetadata.mPrintf;
@@ -611,9 +575,8 @@ void MetadataStreamer::emitKernelDebugPr
KernelCode.debug_wavefront_private_segment_offset_sgpr;
}
-void MetadataStreamer::begin(const FeatureBitset &Features, const Module &Mod) {
+void MetadataStreamer::begin(const Module &Mod) {
emitVersion();
- emitIsa(Features);
emitPrintf(Mod);
}
@@ -646,12 +609,10 @@ ErrorOr<std::string> MetadataStreamer::t
return YamlString;
}
-ErrorOr<std::string> MetadataStreamer::toYamlString(
- const FeatureBitset &Features, StringRef YamlString) {
+ErrorOr<std::string> MetadataStreamer::toYamlString(StringRef YamlString) {
if (auto Error = Metadata::fromYamlString(YamlString, CodeObjectMetadata))
return Error;
- emitIsa(Features);
return toYamlString();
}
Modified: llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUCodeObjectMetadataStreamer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUCodeObjectMetadataStreamer.h?rev=298560&r1=298559&r2=298560&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUCodeObjectMetadataStreamer.h (original)
+++ llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUCodeObjectMetadataStreamer.h Wed Mar 22 18:27:09 2017
@@ -25,7 +25,6 @@ namespace llvm {
class Argument;
class DataLayout;
-class FeatureBitset;
class Function;
class MDNode;
class Module;
@@ -57,8 +56,6 @@ private:
void emitVersion();
- void emitIsa(const FeatureBitset &Features);
-
void emitPrintf(const Module &Mod);
void emitKernelLanguage(const Function &Func);
@@ -82,7 +79,7 @@ public:
MetadataStreamer() = default;
~MetadataStreamer() = default;
- void begin(const FeatureBitset &Features, const Module &Mod);
+ void begin(const Module &Mod);
void end() {}
@@ -90,8 +87,7 @@ public:
ErrorOr<std::string> toYamlString();
- ErrorOr<std::string> toYamlString(const FeatureBitset &Features,
- StringRef YamlString);
+ ErrorOr<std::string> toYamlString(StringRef YamlString);
};
} // end namespace CodeObject
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=298560&r1=298559&r2=298560&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp Wed Mar 22 18:27:09 2017
@@ -42,9 +42,8 @@ using namespace llvm::AMDGPU;
AMDGPUTargetStreamer::AMDGPUTargetStreamer(MCStreamer &S)
: MCTargetStreamer(S) {}
-void AMDGPUTargetStreamer::EmitStartOfCodeObjectMetadata(
- const FeatureBitset &Features, const Module &Mod) {
- CodeObjectMetadataStreamer.begin(Features, Mod);
+void AMDGPUTargetStreamer::EmitStartOfCodeObjectMetadata(const Module &Mod) {
+ CodeObjectMetadataStreamer.begin(Mod);
}
void AMDGPUTargetStreamer::EmitKernelCodeObjectMetadata(
@@ -52,11 +51,9 @@ void AMDGPUTargetStreamer::EmitKernelCod
CodeObjectMetadataStreamer.emitKernel(Func, KernelCode);
}
-void AMDGPUTargetStreamer::EmitEndOfCodeObjectMetadata(
- const FeatureBitset &Features) {
+void AMDGPUTargetStreamer::EmitEndOfCodeObjectMetadata() {
CodeObjectMetadataStreamer.end();
- EmitCodeObjectMetadata(Features,
- CodeObjectMetadataStreamer.toYamlString().get());
+ EmitCodeObjectMetadata(CodeObjectMetadataStreamer.toYamlString().get());
}
//===----------------------------------------------------------------------===//
@@ -113,10 +110,8 @@ void AMDGPUTargetAsmStreamer::EmitAMDGPU
OS << "\t.amdgpu_hsa_program_global " << GlobalName << '\n';
}
-bool AMDGPUTargetAsmStreamer::EmitCodeObjectMetadata(
- const FeatureBitset &Features, StringRef YamlString) {
- auto VerifiedYamlString =
- CodeObjectMetadataStreamer.toYamlString(Features, YamlString);
+bool AMDGPUTargetAsmStreamer::EmitCodeObjectMetadata(StringRef YamlString) {
+ auto VerifiedYamlString = CodeObjectMetadataStreamer.toYamlString(YamlString);
if (!VerifiedYamlString)
return false;
@@ -237,10 +232,8 @@ void AMDGPUTargetELFStreamer::EmitAMDGPU
Symbol->setBinding(ELF::STB_GLOBAL);
}
-bool AMDGPUTargetELFStreamer::EmitCodeObjectMetadata(
- const FeatureBitset &Features, StringRef YamlString) {
- auto VerifiedYamlString =
- CodeObjectMetadataStreamer.toYamlString(Features, YamlString);
+bool AMDGPUTargetELFStreamer::EmitCodeObjectMetadata(StringRef YamlString) {
+ auto VerifiedYamlString = CodeObjectMetadataStreamer.toYamlString(YamlString);
if (!VerifiedYamlString)
return false;
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=298560&r1=298559&r2=298560&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h (original)
+++ llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h Wed Mar 22 18:27:09 2017
@@ -18,7 +18,6 @@ namespace llvm {
#include "AMDGPUPTNote.h"
class DataLayout;
-class FeatureBitset;
class Function;
class MCELFStreamer;
class MCSymbol;
@@ -49,17 +48,15 @@ public:
virtual void EmitAMDGPUHsaProgramScopeGlobal(StringRef GlobalName) = 0;
- virtual void EmitStartOfCodeObjectMetadata(const FeatureBitset &Features,
- const Module &Mod);
+ virtual void EmitStartOfCodeObjectMetadata(const Module &Mod);
virtual void EmitKernelCodeObjectMetadata(
const Function &Func, const amd_kernel_code_t &KernelCode);
- virtual void EmitEndOfCodeObjectMetadata(const FeatureBitset &Features);
+ virtual void EmitEndOfCodeObjectMetadata();
/// \returns True on success, false on failure.
- virtual bool EmitCodeObjectMetadata(const FeatureBitset &Features,
- StringRef YamlString) = 0;
+ virtual bool EmitCodeObjectMetadata(StringRef YamlString) = 0;
};
class AMDGPUTargetAsmStreamer final : public AMDGPUTargetStreamer {
@@ -82,8 +79,7 @@ public:
void EmitAMDGPUHsaProgramScopeGlobal(StringRef GlobalName) override;
/// \returns True on success, false on failure.
- bool EmitCodeObjectMetadata(const FeatureBitset &Features,
- StringRef YamlString) override;
+ bool EmitCodeObjectMetadata(StringRef YamlString) override;
};
class AMDGPUTargetELFStreamer final : public AMDGPUTargetStreamer {
@@ -114,8 +110,7 @@ public:
void EmitAMDGPUHsaProgramScopeGlobal(StringRef GlobalName) override;
/// \returns True on success, false on failure.
- bool EmitCodeObjectMetadata(const FeatureBitset &Features,
- StringRef YamlString) override;
+ bool EmitCodeObjectMetadata(StringRef YamlString) override;
};
}
Modified: llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-from-llvm-ir-full.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-from-llvm-ir-full.ll?rev=298560&r1=298559&r2=298560&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-from-llvm-ir-full.ll (original)
+++ llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-from-llvm-ir-full.ll Wed Mar 22 18:27:09 2017
@@ -16,28 +16,7 @@
; CHECK: ---
; CHECK: Version: [ 1, 0 ]
-
-; CHECK: Isa:
-; CHECK: WavefrontSize: 64
-; CHECK: LocalMemorySize: 65536
-; CHECK: EUsPerCU: 4
-; CHECK: MaxWavesPerEU: 10
-; CHECK: MaxFlatWorkGroupSize: 2048
-; GFX700: SGPRAllocGranule: 8
-; GFX800: SGPRAllocGranule: 16
-; GFX900: SGPRAllocGranule: 16
-; GFX700: TotalNumSGPRs: 512
-; GFX800: TotalNumSGPRs: 800
-; GFX900: TotalNumSGPRs: 800
-; GFX700: AddressableNumSGPRs: 104
-; GFX800: AddressableNumSGPRs: 96
-; GFX900: AddressableNumSGPRs: 102
-; CHECK: VGPRAllocGranule: 4
-; CHECK: TotalNumVGPRs: 256
-; CHECK: AddressableNumVGPRs: 256
-
; CHECK: Printf: [ '1:1:4:%d\n', '2:1:8:%g\n' ]
-
; CHECK: Kernels:
; CHECK: - Name: test_char
@@ -1274,8 +1253,8 @@ define amdgpu_kernel void @test_pointee_
; NOTES-NEXT: Owner Data size Description
; NOTES-NEXT: AMD 0x00000008 Unknown note type: (0x00000001)
; NOTES-NEXT: AMD 0x0000001b Unknown note type: (0x00000003)
-; GFX700: AMD 0x0000928a Unknown note type: (0x0000000a)
-; GFX800: AMD 0x000092a9 Unknown note type: (0x0000000a)
-; GFX900: AMD 0x0000928b Unknown note type: (0x0000000a)
+; GFX700: AMD 0x00009171 Unknown note type: (0x0000000a)
+; GFX800: AMD 0x00009190 Unknown note type: (0x0000000a)
+; GFX900: AMD 0x00009171 Unknown note type: (0x0000000a)
; PARSER: AMDGPU Code Object Metadata Parser Test: PASS
Modified: llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-invalid-ocl-version-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-invalid-ocl-version-1.ll?rev=298560&r1=298559&r2=298560&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-invalid-ocl-version-1.ll (original)
+++ llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-invalid-ocl-version-1.ll Wed Mar 22 18:27:09 2017
@@ -4,18 +4,6 @@
; CHECK: ---
; CHECK: Version: [ 1, 0 ]
-; CHECK: Isa:
-; CHECK: WavefrontSize: 64
-; CHECK: LocalMemorySize: 65536
-; CHECK: EUsPerCU: 4
-; CHECK: MaxWavesPerEU: 10
-; CHECK: MaxFlatWorkGroupSize: 2048
-; CHECK: SGPRAllocGranule: 8
-; CHECK: TotalNumSGPRs: 512
-; CHECK: AddressableNumSGPRs: 104
-; CHECK: VGPRAllocGranule: 4
-; CHECK: TotalNumVGPRs: 256
-; CHECK: AddressableNumVGPRs: 256
; CHECK: ...
!opencl.ocl.version = !{}
Modified: llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-invalid-ocl-version-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-invalid-ocl-version-2.ll?rev=298560&r1=298559&r2=298560&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-invalid-ocl-version-2.ll (original)
+++ llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-invalid-ocl-version-2.ll Wed Mar 22 18:27:09 2017
@@ -4,18 +4,6 @@
; CHECK: ---
; CHECK: Version: [ 1, 0 ]
-; CHECK: Isa:
-; CHECK: WavefrontSize: 64
-; CHECK: LocalMemorySize: 65536
-; CHECK: EUsPerCU: 4
-; CHECK: MaxWavesPerEU: 10
-; CHECK: MaxFlatWorkGroupSize: 2048
-; CHECK: SGPRAllocGranule: 8
-; CHECK: TotalNumSGPRs: 512
-; CHECK: AddressableNumSGPRs: 104
-; CHECK: VGPRAllocGranule: 4
-; CHECK: TotalNumVGPRs: 256
-; CHECK: AddressableNumVGPRs: 256
; CHECK: ...
!opencl.ocl.version = !{!0}
Modified: llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-invalid-ocl-version-3.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-invalid-ocl-version-3.ll?rev=298560&r1=298559&r2=298560&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-invalid-ocl-version-3.ll (original)
+++ llvm/trunk/test/CodeGen/AMDGPU/code-object-metadata-invalid-ocl-version-3.ll Wed Mar 22 18:27:09 2017
@@ -4,18 +4,6 @@
; CHECK: ---
; CHECK: Version: [ 1, 0 ]
-; CHECK: Isa:
-; CHECK: WavefrontSize: 64
-; CHECK: LocalMemorySize: 65536
-; CHECK: EUsPerCU: 4
-; CHECK: MaxWavesPerEU: 10
-; CHECK: MaxFlatWorkGroupSize: 2048
-; CHECK: SGPRAllocGranule: 8
-; CHECK: TotalNumSGPRs: 512
-; CHECK: AddressableNumSGPRs: 104
-; CHECK: VGPRAllocGranule: 4
-; CHECK: TotalNumVGPRs: 256
-; CHECK: AddressableNumVGPRs: 256
; CHECK: ...
!opencl.ocl.version = !{!0}
Removed: llvm/trunk/test/MC/AMDGPU/code-object-metadata-isa.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AMDGPU/code-object-metadata-isa.s?rev=298559&view=auto
==============================================================================
--- llvm/trunk/test/MC/AMDGPU/code-object-metadata-isa.s (original)
+++ llvm/trunk/test/MC/AMDGPU/code-object-metadata-isa.s (removed)
@@ -1,98 +0,0 @@
-// RUN: llvm-mc -triple=amdgcn-amd-amdhsa -mcpu=gfx700 -show-encoding %s | FileCheck --check-prefix=CHECK --check-prefix=GFX700 %s
-// RUN: llvm-mc -triple=amdgcn-amd-amdhsa -mcpu=gfx800 -show-encoding %s | FileCheck --check-prefix=CHECK --check-prefix=GFX800 %s
-// RUN: llvm-mc -triple=amdgcn-amd-amdhsa -mcpu=gfx900 -show-encoding %s | FileCheck --check-prefix=CHECK --check-prefix=GFX900 %s
-
-// CHECK: .amdgpu_code_object_metadata
-// CHECK: Version: [ 1, 0 ]
-// CHECK: Isa:
-// CHECK: WavefrontSize: 64
-// CHECK: LocalMemorySize: 65536
-// CHECK: EUsPerCU: 4
-// CHECK: MaxWavesPerEU: 10
-// CHECK: MaxFlatWorkGroupSize: 2048
-// GFX700: SGPRAllocGranule: 8
-// GFX800: SGPRAllocGranule: 16
-// GFX900: SGPRAllocGranule: 16
-// GFX700: TotalNumSGPRs: 512
-// GFX800: TotalNumSGPRs: 800
-// GFX900: TotalNumSGPRs: 800
-// GFX700: AddressableNumSGPRs: 104
-// GFX800: AddressableNumSGPRs: 96
-// GFX900: AddressableNumSGPRs: 102
-// CHECK: VGPRAllocGranule: 4
-// CHECK: TotalNumVGPRs: 256
-// CHECK: AddressableNumVGPRs: 256
-// CHECK: Printf: [ '1:1:4:%d\n', '2:1:8:%g\n' ]
-// CHECK: Kernels:
-// CHECK: - Name: test_kernel
-// CHECK: Language: OpenCL C
-// CHECK: LanguageVersion: [ 2, 0 ]
-// CHECK: Args:
-// CHECK: - Size: 1
-// CHECK: Align: 1
-// CHECK: Kind: ByValue
-// CHECK: ValueType: I8
-// CHECK: AccQual: Default
-// CHECK: TypeName: char
-// CHECK: - Size: 8
-// CHECK: Align: 8
-// CHECK: Kind: HiddenGlobalOffsetX
-// CHECK: ValueType: I64
-// CHECK: - Size: 8
-// CHECK: Align: 8
-// CHECK: Kind: HiddenGlobalOffsetY
-// CHECK: ValueType: I64
-// CHECK: - Size: 8
-// CHECK: Align: 8
-// CHECK: Kind: HiddenGlobalOffsetZ
-// CHECK: ValueType: I64
-// CHECK: - Size: 8
-// CHECK: Align: 8
-// CHECK: Kind: HiddenPrintfBuffer
-// CHECK: ValueType: I8
-// CHECK: AddrSpaceQual: Global
-// CHECK: .end_amdgpu_code_object_metadata
-.amdgpu_code_object_metadata
- Version: [ 1, 0 ]
- Isa:
- WavefrontSize: 1
- LocalMemorySize: 1
- EUsPerCU: 1
- MaxWavesPerEU: 1
- MaxFlatWorkGroupSize: 1
- SGPRAllocGranule: 1
- TotalNumSGPRs: 1
- AddressableNumSGPRs: 1
- VGPRAllocGranule: 1
- TotalNumVGPRs: 1
- AddressableNumVGPRs: 1
- Printf: [ '1:1:4:%d\n', '2:1:8:%g\n' ]
- Kernels:
- - Name: test_kernel
- Language: OpenCL C
- LanguageVersion: [ 2, 0 ]
- Args:
- - Size: 1
- Align: 1
- Kind: ByValue
- ValueType: I8
- AccQual: Default
- TypeName: char
- - Size: 8
- Align: 8
- Kind: HiddenGlobalOffsetX
- ValueType: I64
- - Size: 8
- Align: 8
- Kind: HiddenGlobalOffsetY
- ValueType: I64
- - Size: 8
- Align: 8
- Kind: HiddenGlobalOffsetZ
- ValueType: I64
- - Size: 8
- Align: 8
- Kind: HiddenPrintfBuffer
- ValueType: I8
- AddrSpaceQual: Global
-.end_amdgpu_code_object_metadata
Modified: llvm/trunk/test/MC/AMDGPU/code-object-metadata-kernel-args.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AMDGPU/code-object-metadata-kernel-args.s?rev=298560&r1=298559&r2=298560&view=diff
==============================================================================
--- llvm/trunk/test/MC/AMDGPU/code-object-metadata-kernel-args.s (original)
+++ llvm/trunk/test/MC/AMDGPU/code-object-metadata-kernel-args.s Wed Mar 22 18:27:09 2017
@@ -4,24 +4,6 @@
// CHECK: .amdgpu_code_object_metadata
// CHECK: Version: [ 1, 0 ]
-// CHECK: Isa:
-// CHECK: WavefrontSize: 64
-// CHECK: LocalMemorySize: 65536
-// CHECK: EUsPerCU: 4
-// CHECK: MaxWavesPerEU: 10
-// CHECK: MaxFlatWorkGroupSize: 2048
-// GFX700: SGPRAllocGranule: 8
-// GFX800: SGPRAllocGranule: 16
-// GFX900: SGPRAllocGranule: 16
-// GFX700: TotalNumSGPRs: 512
-// GFX800: TotalNumSGPRs: 800
-// GFX900: TotalNumSGPRs: 800
-// GFX700: AddressableNumSGPRs: 104
-// GFX800: AddressableNumSGPRs: 96
-// GFX900: AddressableNumSGPRs: 102
-// CHECK: VGPRAllocGranule: 4
-// CHECK: TotalNumVGPRs: 256
-// CHECK: AddressableNumVGPRs: 256
// CHECK: Printf: [ '1:1:4:%d\n', '2:1:8:%g\n' ]
// CHECK: Kernels:
// CHECK: - Name: test_kernel
Modified: llvm/trunk/test/MC/AMDGPU/code-object-metadata-kernel-attrs.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AMDGPU/code-object-metadata-kernel-attrs.s?rev=298560&r1=298559&r2=298560&view=diff
==============================================================================
--- llvm/trunk/test/MC/AMDGPU/code-object-metadata-kernel-attrs.s (original)
+++ llvm/trunk/test/MC/AMDGPU/code-object-metadata-kernel-attrs.s Wed Mar 22 18:27:09 2017
@@ -4,24 +4,6 @@
// CHECK: .amdgpu_code_object_metadata
// CHECK: Version: [ 1, 0 ]
-// CHECK: Isa:
-// CHECK: WavefrontSize: 64
-// CHECK: LocalMemorySize: 65536
-// CHECK: EUsPerCU: 4
-// CHECK: MaxWavesPerEU: 10
-// CHECK: MaxFlatWorkGroupSize: 2048
-// GFX700: SGPRAllocGranule: 8
-// GFX800: SGPRAllocGranule: 16
-// GFX900: SGPRAllocGranule: 16
-// GFX700: TotalNumSGPRs: 512
-// GFX800: TotalNumSGPRs: 800
-// GFX900: TotalNumSGPRs: 800
-// GFX700: AddressableNumSGPRs: 104
-// GFX800: AddressableNumSGPRs: 96
-// GFX900: AddressableNumSGPRs: 102
-// CHECK: VGPRAllocGranule: 4
-// CHECK: TotalNumVGPRs: 256
-// CHECK: AddressableNumVGPRs: 256
// CHECK: Printf: [ '1:1:4:%d\n', '2:1:8:%g\n' ]
// CHECK: Kernels:
// CHECK: - Name: test_kernel
Modified: llvm/trunk/test/MC/AMDGPU/hsa.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AMDGPU/hsa.s?rev=298560&r1=298559&r2=298560&view=diff
==============================================================================
--- llvm/trunk/test/MC/AMDGPU/hsa.s (original)
+++ llvm/trunk/test/MC/AMDGPU/hsa.s Wed Mar 22 18:27:09 2017
@@ -46,18 +46,6 @@
// ASM: .amdgpu_code_object_metadata
// ASM: Version: [ 3, 0 ]
-// ASM: Isa:
-// ASM: WavefrontSize: 64
-// ASM: LocalMemorySize: 65536
-// ASM: EUsPerCU: 4
-// ASM: MaxWavesPerEU: 10
-// ASM: MaxFlatWorkGroupSize: 2048
-// ASM: SGPRAllocGranule: 8
-// ASM: TotalNumSGPRs: 512
-// ASM: AddressableNumSGPRs: 104
-// ASM: VGPRAllocGranule: 4
-// ASM: TotalNumVGPRs: 256
-// ASM: AddressableNumVGPRs: 256
// ASM: Kernels:
// ASM: - Name: amd_kernel_code_t_test_all
// ASM: - Name: amd_kernel_code_t_minimal
More information about the llvm-commits
mailing list