From bf1efe642111043eeb7ccaf3da759f4d2d1e4647 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 15 Apr 2013 17:51:30 +0000 Subject: [PATCH] R600/SI: Emit configuration value in the .AMDGPU.config ELF section git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179545 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/R600/AMDGPUAsmPrinter.cpp | 10 +++++++++- test/CodeGen/R600/elf.ll | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/Target/R600/AMDGPUAsmPrinter.cpp b/lib/Target/R600/AMDGPUAsmPrinter.cpp index dacb03325bc..72f98ee0b00 100644 --- a/lib/Target/R600/AMDGPUAsmPrinter.cpp +++ b/lib/Target/R600/AMDGPUAsmPrinter.cpp @@ -21,7 +21,10 @@ #include "AMDGPU.h" #include "SIMachineFunctionInfo.h" #include "SIRegisterInfo.h" +#include "llvm/MC/MCContext.h" +#include "llvm/MC/MCSectionELF.h" #include "llvm/MC/MCStreamer.h" +#include "llvm/Support/ELF.h" #include "llvm/Support/TargetRegistry.h" #include "llvm/Target/TargetLoweringObjectFile.h" @@ -50,10 +53,15 @@ bool AMDGPUAsmPrinter::runOnMachineFunction(MachineFunction &MF) { if (OutStreamer.hasRawTextSupport()) { OutStreamer.EmitRawText("@" + MF.getName() + ":"); } - OutStreamer.SwitchSection(getObjFileLowering().getTextSection()); if (STM.device()->getGeneration() > AMDGPUDeviceInfo::HD6XXX) { + const MCSectionELF *ConfigSection = getObjFileLowering().getContext() + .getELFSection(".AMDGPU.config", + ELF::SHT_NULL, 0, + SectionKind::getReadOnly()); + OutStreamer.SwitchSection(ConfigSection); EmitProgramInfo(MF); } + OutStreamer.SwitchSection(getObjFileLowering().getTextSection()); EmitFunctionBody(); return false; } diff --git a/test/CodeGen/R600/elf.ll b/test/CodeGen/R600/elf.ll index 470e4cac0fb..2383148c533 100644 --- a/test/CodeGen/R600/elf.ll +++ b/test/CodeGen/R600/elf.ll @@ -1,6 +1,7 @@ ; RUN: llc < %s -march=r600 -mcpu=SI -filetype=obj | llvm-readobj -s - | FileCheck %s ; CHECK: Format: ELF32 +; CHECK: Name: .AMDGPU.config define void @test(i32 %p) { %i = add i32 %p, 2 %r = bitcast i32 %i to float