This is an archive of the discontinued LLVM Phabricator instance.

Differential D10390

R600: Use EM_AMDGPU for the ELF Machine type
ClosedPublic

Authored by • tstellarAMD on Jun 11 2015, 8:28 AM.

Details

Reviewers
• rafael
arsenm
Commits
rG3aed34e94705: R600: Use EM_AMDGPU for the ELF Machine type
rL240330: R600: Use EM_AMDGPU for the ELF Machine type

Diff Detail

Event Timeline

• tstellarAMD updated this revision to Diff 27508.Jun 11 2015, 8:28 AM
• tstellarAMD retitled this revision from to R600: Use EM_AMDGPU for the ELF Machine type.
• tstellarAMD updated this object.
• tstellarAMD edited the test plan for this revision. (Show Details)
• tstellarAMD added reviewers: arsenm, • rafael.
• tstellarAMD added a subscriber: Unknown Object (MLST).
• tstellarAMD added a parent revision: D10389: Support/ELF: Add EM_AMDGPU.Jun 11 2015, 8:29 AM
• tstellarAMD set the repository for this revision to rL LLVM.
• rafael accepted this revision.Jun 17 2015, 7:08 AM
• rafael edited edge metadata.

LGTM

This revision is now accepted and ready to land.Jun 17 2015, 7:08 AM
Closed by commit rL240330: R600: Use EM_AMDGPU for the ELF Machine type (authored by tstellar). · Explain WhyJun 22 2015, 2:08 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Target/
R600/
MCTargetDesc/
2 lines
test/
CodeGen/
R600/
9 lines

Diff 27508

lib/Target/R600/MCTargetDesc/AMDGPUELFObjectWriter.cpp

Show All 25 Linesprotected:
} }
}; };
} // End anonymous namespace } // End anonymous namespace
AMDGPUELFObjectWriter::AMDGPUELFObjectWriter() AMDGPUELFObjectWriter::AMDGPUELFObjectWriter()
: MCELFObjectTargetWriter(false, 0, 0, false) { } : MCELFObjectTargetWriter(false, 0, ELF::EM_AMDGPU, false) { }
MCObjectWriter *llvm::createAMDGPUELFObjectWriter(raw_pwrite_stream &OS) { MCObjectWriter *llvm::createAMDGPUELFObjectWriter(raw_pwrite_stream &OS) {
MCELFObjectTargetWriter *MOTW = new AMDGPUELFObjectWriter(); MCELFObjectTargetWriter *MOTW = new AMDGPUELFObjectWriter();
return createELFObjectWriter(MOTW, OS, true); return createELFObjectWriter(MOTW, OS, true);
} }

test/CodeGen/R600/elf.ll

; RUN: llc < %s -march=amdgcn -mcpu=SI -verify-machineinstrs -filetype=obj | llvm-readobj -s -symbols - | FileCheck --check-prefix=ELF %s ; RUN: llc < %s -march=amdgcn -mcpu=SI -verify-machineinstrs -filetype=obj | llvm-readobj -s -symbols -file-headers - | FileCheck --check-prefix=ELF %s
; RUN: llc < %s -march=amdgcn -mcpu=SI -verify-machineinstrs -o - | FileCheck --check-prefix=CONFIG --check-prefix=TYPICAL %s ; RUN: llc < %s -march=amdgcn -mcpu=SI -verify-machineinstrs -o - | FileCheck --check-prefix=CONFIG --check-prefix=TYPICAL %s
; RUN: llc < %s -march=amdgcn -mcpu=tonga -verify-machineinstrs -filetype=obj | llvm-readobj -s -symbols - | FileCheck --check-prefix=ELF %s ; RUN: llc < %s -march=amdgcn -mcpu=tonga -verify-machineinstrs -filetype=obj | llvm-readobj -s -symbols -file-headers - | FileCheck --check-prefix=ELF %s
; RUN: llc < %s -march=amdgcn -mcpu=tonga -verify-machineinstrs -o - | FileCheck --check-prefix=CONFIG --check-prefix=TONGA %s ; RUN: llc < %s -march=amdgcn -mcpu=tonga -verify-machineinstrs -o - | FileCheck --check-prefix=CONFIG --check-prefix=TONGA %s
; RUN: llc < %s -march=amdgcn -mcpu=carrizo -verify-machineinstrs -filetype=obj | llvm-readobj -s -symbols - | FileCheck --check-prefix=ELF %s ; RUN: llc < %s -march=amdgcn -mcpu=carrizo -verify-machineinstrs -filetype=obj | llvm-readobj -s -symbols -file-headers - | FileCheck --check-prefix=ELF %s
; RUN: llc < %s -march=amdgcn -mcpu=carrizo -verify-machineinstrs -o - | FileCheck --check-prefix=CONFIG --check-prefix=TYPICAL %s ; RUN: llc < %s -march=amdgcn -mcpu=carrizo -verify-machineinstrs -o - | FileCheck --check-prefix=CONFIG --check-prefix=TYPICAL %s
; Test that we don't try to produce a COFF file on windows ; Test that we don't try to produce a COFF file on windows
; RUN: llc < %s -mtriple=amdgcn-pc-mingw -mcpu=SI -verify-machineinstrs -filetype=obj | llvm-readobj -s -symbols - | FileCheck --check-prefix=ELF %s ; RUN: llc < %s -mtriple=amdgcn-pc-mingw -mcpu=SI -verify-machineinstrs -filetype=obj | llvm-readobj -s -symbols -file-headers - | FileCheck --check-prefix=ELF %s
; ELF: Format: ELF32 ; ELF: Format: ELF32
; ELF: Machine: EM_AMDGPU (0xE0)
; ELF: Name: .AMDGPU.config ; ELF: Name: .AMDGPU.config
; ELF: Type: SHT_PROGBITS ; ELF: Type: SHT_PROGBITS
; ELF: Symbol { ; ELF: Symbol {
; ELF: Name: test ; ELF: Name: test
; ELF: Binding: Global ; ELF: Binding: Global
; CONFIG: .section .AMDGPU.config ; CONFIG: .section .AMDGPU.config
Show All 15 Lines