[llvm] r364296 - AMDGPU/MC: Add .amdgpu_lds directive
Mikael Holmén via llvm-commits
llvm-commits at lists.llvm.org
Wed Jun 26 22:40:09 PDT 2019
On 2019-06-26 21:17, Nicolai Hähnle-Montoro wrote:
> Hi Mikael,
>
> On Wed, Jun 26, 2019 at 8:15 AM Mikael Holmén
> <mikael.holmen at ericsson.com> wrote:
>> I get warnings from gcc (7.4.0) on this patch since conditions in the
>> assert compare values of different enums:
>
> Thanks for pointing it out. r364460 should hopefully silence those warnings.
>
Yep, thanks!
/Mikael
> Cheers,
> Nicolai
>
>
>
>>
>>
>> ../tools/llvm-objcopy/ELF/Object.cpp: In member function 'uint16_t
>> llvm::objcopy::elf::Symbol::getShndx() const':
>> ../tools/llvm-objcopy/ELF/Object.cpp:634:29: error: comparison between
>> 'const enum llvm::objcopy::elf::SymbolShndxType' and 'enum
>> llvm::ELF::<unnamed>' [-Werror=enum-compare]
>> (ShndxType >= ELF::SHN_LOPROC && ShndxType <= ELF::SHN_HIPROC) ||
>> ^
>> ../tools/llvm-objcopy/ELF/Object.cpp:634:61: error: comparison between
>> 'const enum llvm::objcopy::elf::SymbolShndxType' and 'enum
>> llvm::ELF::<unnamed>' [-Werror=enum-compare]
>> (ShndxType >= ELF::SHN_LOPROC && ShndxType <= ELF::SHN_HIPROC) ||
>> ^
>> ../tools/llvm-objcopy/ELF/Object.cpp:635:29: error: comparison between
>> 'const enum llvm::objcopy::elf::SymbolShndxType' and 'enum
>> llvm::ELF::<unnamed>' [-Werror=enum-compare]
>> (ShndxType >= ELF::SHN_LOOS && ShndxType <= ELF::SHN_HIOS));
>> ^
>> ../tools/llvm-objcopy/ELF/Object.cpp:635:59: error: comparison between
>> 'const enum llvm::objcopy::elf::SymbolShndxType' and 'enum
>> llvm::ELF::<unnamed>' [-Werror=enum-compare]
>> (ShndxType >= ELF::SHN_LOOS && ShndxType <= ELF::SHN_HIOS));
>> ^
>> cc1plus: all warnings being treated as errors
>>
>>
>> Should ELF::SHN_LOPROC, ELF::SHN_HIPROC, ELF::SHN_LOOS and ELF::SHN_HIOS
>> also be added to SymbolShndxType or should we just "hack" the conditions
>> by converting the values to int, or should we do something else?
>>
>> Regards,
>> Mikael
>>
>> On 2019-06-25 13:51, Nicolai Haehnle via llvm-commits wrote:
>>> Author: nha
>>> Date: Tue Jun 25 04:51:35 2019
>>> New Revision: 364296
>>>
>>> URL: https://protect2.fireeye.com/url?k=a297730c-fe437f52-a2973397-8691959ed9b7-166bd3bc1fe65a87&q=1&u=http%3A%2F%2Fllvm.org%2Fviewvc%2Fllvm-project%3Frev%3D364296%26view%3Drev
>>> Log:
>>> AMDGPU/MC: Add .amdgpu_lds directive
>>>
>>> Summary:
>>> The directive defines a symbol as an group/local memory (LDS) symbol.
>>> LDS symbols behave similar to common symbols for the purposes of ELF,
>>> using the processor-specific SHN_AMDGPU_LDS as section index.
>>>
>>> It is the linker and/or runtime loader's job to "instantiate" LDS symbols
>>> and resolve relocations that reference them.
>>>
>>> It is not possible to initialize LDS memory (not even zero-initialize
>>> as for .bss).
>>>
>>> We want to be able to link together objects -- starting with relocatable
>>> objects, but possible expanding to shared objects in the future -- that
>>> access LDS memory in a flexible way.
>>>
>>> LDS memory is in an address space that is entirely separate from the
>>> address space that contains the program image (code and normal data),
>>> so having program segments for it doesn't really make sense.
>>>
>>> Furthermore, we want to be able to compile multiple kernels in a
>>> compilation unit which have disjoint use of LDS memory. In that case,
>>> we may want to place LDS symbols differently for different kernels
>>> to save memory (LDS memory is very limited and physically private to
>>> each kernel invocation), so we can't simply place LDS symbols in a
>>> .lds section.
>>>
>>> Hence this solution where LDS symbols always stay undefined.
>>>
>>> Change-Id: I08cbc37a7c0c32f53f7b6123aa0afc91dbc1748f
>>>
>>> Reviewers: arsenm, rampitec, t-tye, b-sumner, jsjodin
>>>
>>> Subscribers: kzhuravl, jvesely, wdng, yaxunl, dstuttard, tpr, rupprecht, llvm-commits
>>>
>>> Tags: #llvm
>>>
>>> Differential Revision: https://protect2.fireeye.com/url?k=be5307c0-e2870b9e-be53475b-8691959ed9b7-fa28ce21f1794043&q=1&u=https%3A%2F%2Freviews.llvm.org%2FD61493
>>>
>>> Added:
>>> llvm/trunk/test/MC/AMDGPU/elf-lds-error.s
>>> llvm/trunk/test/MC/AMDGPU/elf-lds.s
>>> Modified:
>>> llvm/trunk/docs/AMDGPUUsage.rst
>>> llvm/trunk/include/llvm/BinaryFormat/ELF.h
>>> llvm/trunk/include/llvm/MC/MCSymbol.h
>>> llvm/trunk/lib/MC/ELFObjectWriter.cpp
>>> llvm/trunk/lib/ObjectYAML/ELFYAML.cpp
>>> llvm/trunk/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp
>>> llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp
>>> llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h
>>> llvm/trunk/tools/llvm-objcopy/ELF/Object.cpp
>>> llvm/trunk/tools/llvm-objcopy/ELF/Object.h
>>>
>>> Modified: llvm/trunk/docs/AMDGPUUsage.rst
>>> URL: https://protect2.fireeye.com/url?k=cce4546e-90305830-cce414f5-8691959ed9b7-57b80eb850346d59&q=1&u=http%3A%2F%2Fllvm.org%2Fviewvc%2Fllvm-project%2Fllvm%2Ftrunk%2Fdocs%2FAMDGPUUsage.rst%3Frev%3D364296%26r1%3D364295%26r2%3D364296%26view%3Ddiff
>>> ==============================================================================
>>> --- llvm/trunk/docs/AMDGPUUsage.rst (original)
>>> +++ llvm/trunk/docs/AMDGPUUsage.rst Tue Jun 25 04:51:35 2019
>>> @@ -851,15 +851,16 @@ Symbols include the following:
>>> .. table:: AMDGPU ELF Symbols
>>> :name: amdgpu-elf-symbols-table
>>>
>>> - ===================== ============== ============= ==================
>>> - Name Type Section Description
>>> - ===================== ============== ============= ==================
>>> - *link-name* ``STT_OBJECT`` - ``.data`` Global variable
>>> - - ``.rodata``
>>> - - ``.bss``
>>> - *link-name*\ ``.kd`` ``STT_OBJECT`` - ``.rodata`` Kernel descriptor
>>> - *link-name* ``STT_FUNC`` - ``.text`` Kernel entry point
>>> - ===================== ============== ============= ==================
>>> + ===================== ================== ================ ==================
>>> + Name Type Section Description
>>> + ===================== ================== ================ ==================
>>> + *link-name* ``STT_OBJECT`` - ``.data`` Global variable
>>> + - ``.rodata``
>>> + - ``.bss``
>>> + *link-name*\ ``.kd`` ``STT_OBJECT`` - ``.rodata`` Kernel descriptor
>>> + *link-name* ``STT_FUNC`` - ``.text`` Kernel entry point
>>> + *link-name* ``STT_OBJECT`` - SHN_AMDGPU_LDS Global variable in LDS
>>> + ===================== ================== ================ ==================
>>>
>>> Global variable
>>> Global variables both used and defined by the compilation unit.
>>> @@ -871,10 +872,10 @@ Global variable
>>> will resolve relocations using the definition provided by another code object
>>> or explicitly defined by the runtime.
>>>
>>> - All global symbols, whether defined in the compilation unit or external, are
>>> - accessed by the machine code indirectly through a GOT table entry. This
>>> - allows them to be preemptable. The GOT table is only supported when the target
>>> - triple OS is ``amdhsa`` (see :ref:`amdgpu-target-triples`).
>>> + If the symbol resides in local/group memory (LDS) then its section is the
>>> + special processor-specific section name ``SHN_AMDGPU_LDS``, and the
>>> + ``st_value`` field describes alignment requirements as it does for common
>>> + symbols.
>>>
>>> .. TODO
>>> Add description of linked shared object symbols. Seems undefined symbols
>>>
>>> Modified: llvm/trunk/include/llvm/BinaryFormat/ELF.h
>>> URL: https://protect2.fireeye.com/url?k=7598e8b3-294ce4ed-7598a828-8691959ed9b7-97868bdaefa1d143&q=1&u=http%3A%2F%2Fllvm.org%2Fviewvc%2Fllvm-project%2Fllvm%2Ftrunk%2Finclude%2Fllvm%2FBinaryFormat%2FELF.h%3Frev%3D364296%26r1%3D364295%26r2%3D364296%26view%3Ddiff
>>> ==============================================================================
>>> --- llvm/trunk/include/llvm/BinaryFormat/ELF.h (original)
>>> +++ llvm/trunk/include/llvm/BinaryFormat/ELF.h Tue Jun 25 04:51:35 2019
>>> @@ -1424,6 +1424,11 @@ enum : unsigned {
>>> GNU_PROPERTY_X86_FEATURE_2_XSAVEC = 1 << 9,
>>> };
>>>
>>> +// AMDGPU-specific section indices.
>>> +enum {
>>> + SHN_AMDGPU_LDS = 0xff00, // Variable in LDS; symbol encoded like SHN_COMMON
>>> +};
>>> +
>>> // AMD specific notes. (Code Object V2)
>>> enum {
>>> // Note types with values between 0 and 9 (inclusive) are reserved.
>>>
>>> Modified: llvm/trunk/include/llvm/MC/MCSymbol.h
>>> URL: https://protect2.fireeye.com/url?k=5fc16668-03156a36-5fc126f3-8691959ed9b7-9945d33bb156cf46&q=1&u=http%3A%2F%2Fllvm.org%2Fviewvc%2Fllvm-project%2Fllvm%2Ftrunk%2Finclude%2Fllvm%2FMC%2FMCSymbol.h%3Frev%3D364296%26r1%3D364295%26r2%3D364296%26view%3Ddiff
>>> ==============================================================================
>>> --- llvm/trunk/include/llvm/MC/MCSymbol.h (original)
>>> +++ llvm/trunk/include/llvm/MC/MCSymbol.h Tue Jun 25 04:51:35 2019
>>> @@ -58,6 +58,7 @@ protected:
>>> SymContentsOffset,
>>> SymContentsVariable,
>>> SymContentsCommon,
>>> + SymContentsTargetCommon, // Index stores the section index
>>> };
>>>
>>> // Special sentinal value for the absolute pseudo fragment.
>>> @@ -108,7 +109,7 @@ protected:
>>>
>>> /// This is actually a Contents enumerator, but is unsigned to avoid sign
>>> /// extension and achieve better bitpacking with MSVC.
>>> - unsigned SymbolContents : 2;
>>> + unsigned SymbolContents : 3;
>>>
>>> /// The alignment of the symbol, if it is 'common', or -1.
>>> ///
>>> @@ -344,10 +345,11 @@ public:
>>> ///
>>> /// \param Size - The size of the symbol.
>>> /// \param Align - The alignment of the symbol.
>>> - void setCommon(uint64_t Size, unsigned Align) {
>>> + /// \param Target - Is the symbol a target-specific common-like symbol.
>>> + void setCommon(uint64_t Size, unsigned Align, bool Target = false) {
>>> assert(getOffset() == 0);
>>> CommonSize = Size;
>>> - SymbolContents = SymContentsCommon;
>>> + SymbolContents = Target ? SymContentsTargetCommon : SymContentsCommon;
>>>
>>> assert((!Align || isPowerOf2_32(Align)) &&
>>> "Alignment must be a power of 2");
>>> @@ -367,20 +369,28 @@ public:
>>> ///
>>> /// \param Size - The size of the symbol.
>>> /// \param Align - The alignment of the symbol.
>>> + /// \param Target - Is the symbol a target-specific common-like symbol.
>>> /// \return True if symbol was already declared as a different type
>>> - bool declareCommon(uint64_t Size, unsigned Align) {
>>> + bool declareCommon(uint64_t Size, unsigned Align, bool Target = false) {
>>> assert(isCommon() || getOffset() == 0);
>>> if(isCommon()) {
>>> - if(CommonSize != Size || getCommonAlignment() != Align)
>>> - return true;
>>> + if (CommonSize != Size || getCommonAlignment() != Align ||
>>> + isTargetCommon() != Target)
>>> + return true;
>>> } else
>>> - setCommon(Size, Align);
>>> + setCommon(Size, Align, Target);
>>> return false;
>>> }
>>>
>>> /// Is this a 'common' symbol.
>>> bool isCommon() const {
>>> - return SymbolContents == SymContentsCommon;
>>> + return SymbolContents == SymContentsCommon ||
>>> + SymbolContents == SymContentsTargetCommon;
>>> + }
>>> +
>>> + /// Is this a target-specific common-like symbol.
>>> + bool isTargetCommon() const {
>>> + return SymbolContents == SymContentsTargetCommon;
>>> }
>>>
>>> MCFragment *getFragment(bool SetUsed = true) const {
>>>
>>> Modified: llvm/trunk/lib/MC/ELFObjectWriter.cpp
>>> URL: https://protect2.fireeye.com/url?k=57411243-0b951e1d-574152d8-8691959ed9b7-5f13e9abf6d055f1&q=1&u=http%3A%2F%2Fllvm.org%2Fviewvc%2Fllvm-project%2Fllvm%2Ftrunk%2Flib%2FMC%2FELFObjectWriter.cpp%3Frev%3D364296%26r1%3D364295%26r2%3D364296%26view%3Ddiff
>>> ==============================================================================
>>> --- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original)
>>> +++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Tue Jun 25 04:51:35 2019
>>> @@ -463,7 +463,7 @@ void ELFWriter::writeHeader(const MCAsse
>>>
>>> uint64_t ELFWriter::SymbolValue(const MCSymbol &Sym,
>>> const MCAsmLayout &Layout) {
>>> - if (Sym.isCommon() && Sym.isExternal())
>>> + if (Sym.isCommon() && (Sym.isTargetCommon() || Sym.isExternal()))
>>> return Sym.getCommonAlignment();
>>>
>>> uint64_t Res;
>>> @@ -660,8 +660,12 @@ void ELFWriter::computeSymbolTable(
>>> if (Symbol.isAbsolute()) {
>>> MSD.SectionIndex = ELF::SHN_ABS;
>>> } else if (Symbol.isCommon()) {
>>> - assert(!Local);
>>> - MSD.SectionIndex = ELF::SHN_COMMON;
>>> + if (Symbol.isTargetCommon()) {
>>> + MSD.SectionIndex = Symbol.getIndex();
>>> + } else {
>>> + assert(!Local);
>>> + MSD.SectionIndex = ELF::SHN_COMMON;
>>> + }
>>> } else if (Symbol.isUndefined()) {
>>> if (isSignature && !Used) {
>>> MSD.SectionIndex = RevGroupMap.lookup(&Symbol);
>>>
>>> Modified: llvm/trunk/lib/ObjectYAML/ELFYAML.cpp
>>> URL: https://protect2.fireeye.com/url?k=4a5559f8-168155a6-4a551963-8691959ed9b7-f8150570a137538f&q=1&u=http%3A%2F%2Fllvm.org%2Fviewvc%2Fllvm-project%2Fllvm%2Ftrunk%2Flib%2FObjectYAML%2FELFYAML.cpp%3Frev%3D364296%26r1%3D364295%26r2%3D364296%26view%3Ddiff
>>> ==============================================================================
>>> --- llvm/trunk/lib/ObjectYAML/ELFYAML.cpp (original)
>>> +++ llvm/trunk/lib/ObjectYAML/ELFYAML.cpp Tue Jun 25 04:51:35 2019
>>> @@ -555,6 +555,7 @@ void ScalarEnumerationTraits<ELFYAML::EL
>>> ECase(SHN_COMMON);
>>> ECase(SHN_XINDEX);
>>> ECase(SHN_HIRESERVE);
>>> + ECase(SHN_AMDGPU_LDS);
>>> ECase(SHN_HEXAGON_SCOMMON);
>>> ECase(SHN_HEXAGON_SCOMMON_1);
>>> ECase(SHN_HEXAGON_SCOMMON_2);
>>>
>>> Modified: llvm/trunk/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp
>>> URL: https://protect2.fireeye.com/url?k=7bfecd45-272ac11b-7bfe8dde-8691959ed9b7-3ba3945bfa7976fe&q=1&u=http%3A%2F%2Fllvm.org%2Fviewvc%2Fllvm-project%2Fllvm%2Ftrunk%2Flib%2FTarget%2FAMDGPU%2FAsmParser%2FAMDGPUAsmParser.cpp%3Frev%3D364296%26r1%3D364295%26r2%3D364296%26view%3Ddiff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp (original)
>>> +++ llvm/trunk/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp Tue Jun 25 04:51:35 2019
>>> @@ -915,6 +915,7 @@ private:
>>> bool ParseDirectiveHSAMetadata();
>>> bool ParseDirectivePALMetadataBegin();
>>> bool ParseDirectivePALMetadata();
>>> + bool ParseDirectiveAMDGPULDS();
>>>
>>> /// Common code to parse out a block of text (typically YAML) between start and
>>> /// end directives.
>>> @@ -3918,6 +3919,60 @@ bool AMDGPUAsmParser::ParseDirectivePALM
>>> return false;
>>> }
>>>
>>> +/// ParseDirectiveAMDGPULDS
>>> +/// ::= .amdgpu_lds identifier ',' size_expression [',' align_expression]
>>> +bool AMDGPUAsmParser::ParseDirectiveAMDGPULDS() {
>>> + if (getParser().checkForValidSection())
>>> + return true;
>>> +
>>> + StringRef Name;
>>> + SMLoc NameLoc = getLexer().getLoc();
>>> + if (getParser().parseIdentifier(Name))
>>> + return TokError("expected identifier in directive");
>>> +
>>> + MCSymbol *Symbol = getContext().getOrCreateSymbol(Name);
>>> + if (parseToken(AsmToken::Comma, "expected ','"))
>>> + return true;
>>> +
>>> + unsigned LocalMemorySize = AMDGPU::IsaInfo::getLocalMemorySize(&getSTI());
>>> +
>>> + int64_t Size;
>>> + SMLoc SizeLoc = getLexer().getLoc();
>>> + if (getParser().parseAbsoluteExpression(Size))
>>> + return true;
>>> + if (Size < 0)
>>> + return Error(SizeLoc, "size must be non-negative");
>>> + if (Size > LocalMemorySize)
>>> + return Error(SizeLoc, "size is too large");
>>> +
>>> + int64_t Align = 4;
>>> + if (getLexer().is(AsmToken::Comma)) {
>>> + Lex();
>>> + SMLoc AlignLoc = getLexer().getLoc();
>>> + if (getParser().parseAbsoluteExpression(Align))
>>> + return true;
>>> + if (Align < 0 || !isPowerOf2_64(Align))
>>> + return Error(AlignLoc, "alignment must be a power of two");
>>> +
>>> + // Alignment larger than the size of LDS is possible in theory, as long
>>> + // as the linker manages to place to symbol at address 0, but we do want
>>> + // to make sure the alignment fits nicely into a 32-bit integer.
>>> + if (Align >= 1u << 31)
>>> + return Error(AlignLoc, "alignment is too large");
>>> + }
>>> +
>>> + if (parseToken(AsmToken::EndOfStatement,
>>> + "unexpected token in '.amdgpu_lds' directive"))
>>> + return true;
>>> +
>>> + Symbol->redefineIfPossible();
>>> + if (!Symbol->isUndefined())
>>> + return Error(NameLoc, "invalid symbol redefinition");
>>> +
>>> + getTargetStreamer().emitAMDGPULDS(Symbol, Size, Align);
>>> + return false;
>>> +}
>>> +
>>> bool AMDGPUAsmParser::ParseDirective(AsmToken DirectiveID) {
>>> StringRef IDVal = DirectiveID.getString();
>>>
>>> @@ -3951,6 +4006,9 @@ bool AMDGPUAsmParser::ParseDirective(Asm
>>> return ParseDirectiveHSAMetadata();
>>> }
>>>
>>> + if (IDVal == ".amdgpu_lds")
>>> + return ParseDirectiveAMDGPULDS();
>>> +
>>> if (IDVal == PALMD::AssemblerDirectiveBegin)
>>> return ParseDirectivePALMetadataBegin();
>>>
>>>
>>> Modified: llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp
>>> URL: https://protect2.fireeye.com/url?k=b8501418-e4841846-b8505483-8691959ed9b7-2214d366c5ffb2aa&q=1&u=http%3A%2F%2Fllvm.org%2Fviewvc%2Fllvm-project%2Fllvm%2Ftrunk%2Flib%2FTarget%2FAMDGPU%2FMCTargetDesc%2FAMDGPUTargetStreamer.cpp%3Frev%3D364296%26r1%3D364295%26r2%3D364296%26view%3Ddiff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp (original)
>>> +++ llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp Tue Jun 25 04:51:35 2019
>>> @@ -206,6 +206,12 @@ void AMDGPUTargetAsmStreamer::EmitAMDGPU
>>> }
>>> }
>>>
>>> +void AMDGPUTargetAsmStreamer::emitAMDGPULDS(MCSymbol *Symbol, unsigned Size,
>>> + unsigned Align) {
>>> + OS << "\t.amdgpu_lds " << Symbol->getName() << ", " << Size << ", " << Align
>>> + << '\n';
>>> +}
>>> +
>>> bool AMDGPUTargetAsmStreamer::EmitISAVersion(StringRef IsaVersionString) {
>>> OS << "\t.amd_amdgpu_isa \"" << IsaVersionString << "\"\n";
>>> return true;
>>> @@ -497,6 +503,27 @@ void AMDGPUTargetELFStreamer::EmitAMDGPU
>>> Symbol->setType(Type);
>>> }
>>>
>>> +void AMDGPUTargetELFStreamer::emitAMDGPULDS(MCSymbol *Symbol, unsigned Size,
>>> + unsigned Align) {
>>> + assert(isPowerOf2_32(Align));
>>> +
>>> + MCSymbolELF *SymbolELF = cast<MCSymbolELF>(Symbol);
>>> + SymbolELF->setType(ELF::STT_OBJECT);
>>> +
>>> + if (!SymbolELF->isBindingSet()) {
>>> + SymbolELF->setBinding(ELF::STB_GLOBAL);
>>> + SymbolELF->setExternal(true);
>>> + }
>>> +
>>> + if (SymbolELF->declareCommon(Size, Align, true)) {
>>> + report_fatal_error("Symbol: " + Symbol->getName() +
>>> + " redeclared as different type");
>>> + }
>>> +
>>> + SymbolELF->setIndex(ELF::SHN_AMDGPU_LDS);
>>> + SymbolELF->setSize(MCConstantExpr::create(Size, getContext()));
>>> +}
>>> +
>>> bool AMDGPUTargetELFStreamer::EmitISAVersion(StringRef IsaVersionString) {
>>> // Create two labels to mark the beginning and end of the desc field
>>> // and a MCExpr to calculate the size of the desc field.
>>>
>>> Modified: llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h
>>> URL: https://protect2.fireeye.com/url?k=c1388c2a-9dec8074-c138ccb1-8691959ed9b7-c51dc2c6fb00f40e&q=1&u=http%3A%2F%2Fllvm.org%2Fviewvc%2Fllvm-project%2Fllvm%2Ftrunk%2Flib%2FTarget%2FAMDGPU%2FMCTargetDesc%2FAMDGPUTargetStreamer.h%3Frev%3D364296%26r1%3D364295%26r2%3D364296%26view%3Ddiff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h (original)
>>> +++ llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.h Tue Jun 25 04:51:35 2019
>>> @@ -53,6 +53,9 @@ public:
>>>
>>> virtual void EmitAMDGPUSymbolType(StringRef SymbolName, unsigned Type) = 0;
>>>
>>> + virtual void emitAMDGPULDS(MCSymbol *Symbol, unsigned Size,
>>> + unsigned Align) = 0;
>>> +
>>> /// \returns True on success, false on failure.
>>> virtual bool EmitISAVersion(StringRef IsaVersionString) = 0;
>>>
>>> @@ -107,6 +110,8 @@ public:
>>>
>>> void EmitAMDGPUSymbolType(StringRef SymbolName, unsigned Type) override;
>>>
>>> + void emitAMDGPULDS(MCSymbol *Sym, unsigned Size, unsigned Align) override;
>>> +
>>> /// \returns True on success, false on failure.
>>> bool EmitISAVersion(StringRef IsaVersionString) override;
>>>
>>> @@ -152,6 +157,8 @@ public:
>>>
>>> void EmitAMDGPUSymbolType(StringRef SymbolName, unsigned Type) override;
>>>
>>> + void emitAMDGPULDS(MCSymbol *Sym, unsigned Size, unsigned Align) override;
>>> +
>>> /// \returns True on success, false on failure.
>>> bool EmitISAVersion(StringRef IsaVersionString) override;
>>>
>>>
>>> Added: llvm/trunk/test/MC/AMDGPU/elf-lds-error.s
>>> URL: https://protect2.fireeye.com/url?k=64fc67be-38286be0-64fc2725-8691959ed9b7-c303f2c2312c24e1&q=1&u=http%3A%2F%2Fllvm.org%2Fviewvc%2Fllvm-project%2Fllvm%2Ftrunk%2Ftest%2FMC%2FAMDGPU%2Felf-lds-error.s%3Frev%3D364296%26view%3Dauto
>>> ==============================================================================
>>> --- llvm/trunk/test/MC/AMDGPU/elf-lds-error.s (added)
>>> +++ llvm/trunk/test/MC/AMDGPU/elf-lds-error.s Tue Jun 25 04:51:35 2019
>>> @@ -0,0 +1,19 @@
>>> +// RUN: not llvm-mc -triple amdgcn-- -mcpu gfx900 %s -o - 2>&1 | FileCheck %s
>>> +
>>> +// CHECK: :[[@LINE+1]]:27: error: size is too large
>>> + .amdgpu_lds huge, 200000
>>> +
>>> +// CHECK: :[[@LINE+1]]:30: error: size must be non-negative
>>> + .amdgpu_lds negsize, -4
>>> +
>>> +// CHECK: :[[@LINE+1]]:36: error: alignment must be a power of two
>>> + .amdgpu_lds zero_align, 5, 0
>>> +
>>> +// CHECK: :[[@LINE+1]]:39: error: alignment must be a power of two
>>> + .amdgpu_lds non_pot_align, 0, 12
>>> +
>>> +// CHECK: :[[@LINE+1]]:36: error: alignment is too large
>>> + .amdgpu_lds huge_align, 0, 1099511627776
>>> +
>>> +// CHECK: :[[@LINE+1]]:9: error: unknown directive
>>> + .amdgpu_ldsnowhitespace, 8
>>>
>>> Added: llvm/trunk/test/MC/AMDGPU/elf-lds.s
>>> URL: https://protect2.fireeye.com/url?k=a6f7bdec-fa23b1b2-a6f7fd77-8691959ed9b7-6707205280bc4e09&q=1&u=http%3A%2F%2Fllvm.org%2Fviewvc%2Fllvm-project%2Fllvm%2Ftrunk%2Ftest%2FMC%2FAMDGPU%2Felf-lds.s%3Frev%3D364296%26view%3Dauto
>>> ==============================================================================
>>> --- llvm/trunk/test/MC/AMDGPU/elf-lds.s (added)
>>> +++ llvm/trunk/test/MC/AMDGPU/elf-lds.s Tue Jun 25 04:51:35 2019
>>> @@ -0,0 +1,82 @@
>>> +// RUN: llvm-mc -filetype=obj -triple amdgcn-- -mcpu gfx900 %s -o - | llvm-readobj -t -r | FileCheck %s
>>> +
>>> + .text
>>> + .globl test_kernel
>>> + .p2align 8
>>> + .type test_kernel, at function
>>> +test_kernel:
>>> + s_mov_b32 s0, lds0 at abs32@lo
>>> + v_lshl_add_u32 v3, v0, 2, s0
>>> + ds_read2_b32 v[1:2], v3 offset1:1
>>> +
>>> + s_mov_b32 s0, lds4 at abs32@lo
>>> + v_lshl_add_u32 v3, v0, 2, s0
>>> + ds_write_b32 v3, v1
>>> + s_endpgm
>>> +.Lfunc_end:
>>> + .size test_kernel, .Lfunc_end-test_kernel
>>> +
>>> + .globl lds0
>>> + .amdgpu_lds lds0, 192, 16
>>> +
>>> + .globl lds1
>>> + .amdgpu_lds lds1,387,8
>>> +
>>> + ; Weird whitespace cases
>>> + .globl lds2
>>> + .amdgpu_lds lds2, 12
>>> +
>>> + ; No alignment or .globl directive, not mentioned anywhere
>>> + .amdgpu_lds lds3, 16
>>> +
>>> + ; No alignment or .globl directive, size 0, but mentioned in .text
>>> + .amdgpu_lds lds4, 0
>>> +
>>> +// CHECK: Relocations [
>>> +// CHECK: Section (3) .rel.text {
>>> +// CHECK-NEXT: 0x4 R_AMDGPU_ABS32 lds0 0x0
>>> +// CHECK-NEXT: 0x1C R_AMDGPU_ABS32 lds4 0x0
>>> +// CHECK-NEXT: }
>>> +// CHECK: ]
>>> +
>>> +// CHECK: Symbol {
>>> +// CHECK: Name: lds0 (54)
>>> +// CHECK-NEXT: Value: 0x10
>>> +// CHECK-NEXT: Size: 192
>>> +// CHECK-NEXT: Binding: Global (0x1)
>>> +// CHECK-NEXT: Type: Object (0x1)
>>> +// CHECK-NEXT: Other: 0
>>> +// CHECK-NEXT: Section: Processor Specific (0xFF00)
>>> +// CHECK-NEXT: }
>>> +
>>> +// CHECK: Symbol {
>>> +// CHECK: Name: lds1 (49)
>>> +// CHECK-NEXT: Value: 0x8
>>> +// CHECK-NEXT: Size: 387
>>> +// CHECK-NEXT: Binding: Global (0x1)
>>> +// CHECK-NEXT: Type: Object (0x1)
>>> +// CHECK-NEXT: Other: 0
>>> +// CHECK-NEXT: Section: Processor Specific (0xFF00)
>>> +// CHECK-NEXT: }
>>> +
>>> +// CHECK: Symbol {
>>> +// CHECK: Name: lds2 (44)
>>> +// CHECK-NEXT: Value: 0x4
>>> +// CHECK-NEXT: Size: 12
>>> +// CHECK-NEXT: Binding: Global (0x1)
>>> +// CHECK-NEXT: Type: Object (0x1)
>>> +// CHECK-NEXT: Other: 0
>>> +// CHECK-NEXT: Section: Processor Specific (0xFF00)
>>> +// CHECK-NEXT: }
>>> +
>>> +// CHECK-NOT: Name: lds3
>>> +
>>> +// CHECK: Symbol {
>>> +// CHECK: Name: lds4 (39)
>>> +// CHECK-NEXT: Value: 0x4
>>> +// CHECK-NEXT: Size: 0
>>> +// CHECK-NEXT: Binding: Global (0x1)
>>> +// CHECK-NEXT: Type: Object (0x1)
>>> +// CHECK-NEXT: Other: 0
>>> +// CHECK-NEXT: Section: Processor Specific (0xFF00)
>>> +// CHECK-NEXT: }
>>>
>>> Modified: llvm/trunk/tools/llvm-objcopy/ELF/Object.cpp
>>> URL: https://protect2.fireeye.com/url?k=48291f01-14fd135f-48295f9a-8691959ed9b7-228fb500df9af48c&q=1&u=http%3A%2F%2Fllvm.org%2Fviewvc%2Fllvm-project%2Fllvm%2Ftrunk%2Ftools%2Fllvm-objcopy%2FELF%2FObject.cpp%3Frev%3D364296%26r1%3D364295%26r2%3D364296%26view%3Ddiff
>>> ==============================================================================
>>> --- llvm/trunk/tools/llvm-objcopy/ELF/Object.cpp (original)
>>> +++ llvm/trunk/tools/llvm-objcopy/ELF/Object.cpp Tue Jun 25 04:51:35 2019
>>> @@ -597,6 +597,11 @@ static bool isValidReservedSectionIndex(
>>> case SHN_COMMON:
>>> return true;
>>> }
>>> +
>>> + if (Machine == EM_AMDGPU) {
>>> + return Index == SHN_AMDGPU_LDS;
>>> + }
>>> +
>>> if (Machine == EM_HEXAGON) {
>>> switch (Index) {
>>> case SHN_HEXAGON_SCOMMON:
>>> @@ -618,21 +623,17 @@ uint16_t Symbol::getShndx() const {
>>> return SHN_XINDEX;
>>> return DefinedIn->Index;
>>> }
>>> - switch (ShndxType) {
>>> - // This means that we don't have a defined section but we do need to
>>> - // output a legitimate section index.
>>> - case SYMBOL_SIMPLE_INDEX:
>>> +
>>> + if (ShndxType == SYMBOL_SIMPLE_INDEX) {
>>> + // This means that we don't have a defined section but we do need to
>>> + // output a legitimate section index.
>>> return SHN_UNDEF;
>>> - case SYMBOL_ABS:
>>> - case SYMBOL_COMMON:
>>> - case SYMBOL_HEXAGON_SCOMMON:
>>> - case SYMBOL_HEXAGON_SCOMMON_2:
>>> - case SYMBOL_HEXAGON_SCOMMON_4:
>>> - case SYMBOL_HEXAGON_SCOMMON_8:
>>> - case SYMBOL_XINDEX:
>>> - return static_cast<uint16_t>(ShndxType);
>>> }
>>> - llvm_unreachable("Symbol with invalid ShndxType encountered");
>>> +
>>> + assert(ShndxType == SYMBOL_ABS || ShndxType == SYMBOL_COMMON ||
>>> + (ShndxType >= ELF::SHN_LOPROC && ShndxType <= ELF::SHN_HIPROC) ||
>>> + (ShndxType >= ELF::SHN_LOOS && ShndxType <= ELF::SHN_HIOS));
>>> + return static_cast<uint16_t>(ShndxType);
>>> }
>>>
>>> bool Symbol::isCommon() const { return getShndx() == SHN_COMMON; }
>>>
>>> Modified: llvm/trunk/tools/llvm-objcopy/ELF/Object.h
>>> URL: https://protect2.fireeye.com/url?k=7161b5e0-2db5b9be-7161f57b-8691959ed9b7-3327539d20aa9ebc&q=1&u=http%3A%2F%2Fllvm.org%2Fviewvc%2Fllvm-project%2Fllvm%2Ftrunk%2Ftools%2Fllvm-objcopy%2FELF%2FObject.h%3Frev%3D364296%26r1%3D364295%26r2%3D364296%26view%3Ddiff
>>> ==============================================================================
>>> --- llvm/trunk/tools/llvm-objcopy/ELF/Object.h (original)
>>> +++ llvm/trunk/tools/llvm-objcopy/ELF/Object.h Tue Jun 25 04:51:35 2019
>>> @@ -591,6 +591,7 @@ enum SymbolShndxType {
>>> SYMBOL_SIMPLE_INDEX = 0,
>>> SYMBOL_ABS = ELF::SHN_ABS,
>>> SYMBOL_COMMON = ELF::SHN_COMMON,
>>> + SYMBOL_AMDGPU_LDS = ELF::SHN_AMDGPU_LDS,
>>> SYMBOL_HEXAGON_SCOMMON = ELF::SHN_HEXAGON_SCOMMON,
>>> SYMBOL_HEXAGON_SCOMMON_2 = ELF::SHN_HEXAGON_SCOMMON_2,
>>> SYMBOL_HEXAGON_SCOMMON_4 = ELF::SHN_HEXAGON_SCOMMON_4,
>>>
>>>
>>> _______________________________________________
>>> llvm-commits mailing list
>>> llvm-commits at lists.llvm.org
>>> https://protect2.fireeye.com/url?k=305f17d6-6c8b1b88-305f574d-8691959ed9b7-cdad22a715fc0baf&q=1&u=https%3A%2F%2Flists.llvm.org%2Fcgi-bin%2Fmailman%2Flistinfo%2Fllvm-commits
>>>
>
>
>
More information about the llvm-commits
mailing list