From ce25bc3e82ead9ab7d91b0d42c68f8f43fa75fbc Mon Sep 17 00:00:00 2001 From: Konstantin Zhuravlyov Date: Tue, 12 Jun 2018 18:33:51 +0000 Subject: AMDHSA/NFC: Code object v3 updates (additional): - Move section selection and alignment to AMDGPUAsmPrinter llvm-svn: 334521 --- llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp | 16 ++++++++++++++++ .../Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp | 13 ------------- 2 files changed, 16 insertions(+), 13 deletions(-) (limited to 'llvm/lib/Target') diff --git a/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp b/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp index 8e56ec60eff..5d6e98a1861 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp @@ -220,10 +220,26 @@ void AMDGPUAsmPrinter::EmitFunctionBodyEnd() { TM.getTargetTriple().getOS() != Triple::AMDHSA) return; + auto &Streamer = getTargetStreamer()->getStreamer(); + auto &Context = Streamer.getContext(); + auto &ObjectFileInfo = *Context.getObjectFileInfo(); + auto &ReadOnlySection = *ObjectFileInfo.getReadOnlySection(); + + Streamer.PushSection(); + Streamer.SwitchSection(&ReadOnlySection); + + // CP microcode requires the kernel descriptor to be allocated on 64 byte + // alignment. + Streamer.EmitValueToAlignment(64, 0, 1, 0); + if (ReadOnlySection.getAlignment() < 64) + ReadOnlySection.setAlignment(64); + SmallString<128> KernelName; getNameWithPrefix(KernelName, &MF->getFunction()); getTargetStreamer()->EmitAmdhsaKernelDescriptor( KernelName, getAmdhsaKernelDescriptor(*MF, CurrentProgramInfo)); + + Streamer.PopSection(); } void AMDGPUAsmPrinter::EmitFunctionEntryLabel() { diff --git a/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp index 6a4b2055468..38dd0630159 100644 --- a/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp +++ b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp @@ -374,17 +374,6 @@ void AMDGPUTargetELFStreamer::EmitAmdhsaKernelDescriptor( const amdhsa::kernel_descriptor_t &KernelDescriptor) { auto &Streamer = getStreamer(); auto &Context = Streamer.getContext(); - auto &ObjectFileInfo = *Context.getObjectFileInfo(); - auto &ReadOnlySection = *ObjectFileInfo.getReadOnlySection(); - - Streamer.PushSection(); - Streamer.SwitchSection(&ReadOnlySection); - - // CP microcode requires the kernel descriptor to be allocated on 64 byte - // alignment. - Streamer.EmitValueToAlignment(64, 0, 1, 0); - if (ReadOnlySection.getAlignment() < 64) - ReadOnlySection.setAlignment(64); MCSymbolELF *KernelDescriptorSymbol = cast( Context.getOrCreateSymbol(Twine(KernelName) + Twine(".kd"))); @@ -419,6 +408,4 @@ void AMDGPUTargetELFStreamer::EmitAmdhsaKernelDescriptor( sizeof(KernelDescriptor) - offsetof(amdhsa::kernel_descriptor_t, kernel_code_entry_byte_offset) - sizeof(KernelDescriptor.kernel_code_entry_byte_offset))); - - Streamer.PopSection(); } -- cgit v1.2.3