diff --git a/llvm/docs/AMDGPUUsage.rst b/llvm/docs/AMDGPUUsage.rst --- a/llvm/docs/AMDGPUUsage.rst +++ b/llvm/docs/AMDGPUUsage.rst @@ -805,7 +805,7 @@ ``EF_AMDGPU_MACH_AMDGCN_GFX702`` 0x024 ``gfx702`` ``EF_AMDGPU_MACH_AMDGCN_GFX703`` 0x025 ``gfx703`` ``EF_AMDGPU_MACH_AMDGCN_GFX704`` 0x026 ``gfx704`` - *reserved* 0x027 Reserved. + ``EF_AMDGPU_MACH_AMDGCN_GFX705`` 0x027 ``gfx705`` ``EF_AMDGPU_MACH_AMDGCN_GFX801`` 0x028 ``gfx801`` ``EF_AMDGPU_MACH_AMDGCN_GFX802`` 0x029 ``gfx802`` ``EF_AMDGPU_MACH_AMDGCN_GFX803`` 0x02a ``gfx803`` @@ -823,10 +823,8 @@ ``EF_AMDGPU_MACH_AMDGCN_GFX1030`` 0x036 ``gfx1030`` ``EF_AMDGPU_MACH_AMDGCN_GFX1031`` 0x037 ``gfx1031`` *reserved* 0x038 Reserved. - *reserved* 0x039 Reserved. - ``EF_AMDGPU_MACH_AMDGCN_GFX602`` 0x03a ``gfx602`` - ``EF_AMDGPU_MACH_AMDGCN_GFX705`` 0x03b ``gfx705`` - ``EF_AMDGPU_MACH_AMDGCN_GFX805`` 0x03c ``gfx805`` + ``EF_AMDGPU_MACH_AMDGCN_GFX602`` 0x039 ``gfx602`` + ``EF_AMDGPU_MACH_AMDGCN_GFX805`` 0x03a ``gfx805`` ================================= ========== ============================= Sections diff --git a/llvm/include/llvm/BinaryFormat/ELF.h b/llvm/include/llvm/BinaryFormat/ELF.h --- a/llvm/include/llvm/BinaryFormat/ELF.h +++ b/llvm/include/llvm/BinaryFormat/ELF.h @@ -699,19 +699,19 @@ // AMDGCN GFX6. EF_AMDGPU_MACH_AMDGCN_GFX600 = 0x020, EF_AMDGPU_MACH_AMDGCN_GFX601 = 0x021, - EF_AMDGPU_MACH_AMDGCN_GFX602 = 0x03a, + EF_AMDGPU_MACH_AMDGCN_GFX602 = 0x039, // AMDGCN GFX7. EF_AMDGPU_MACH_AMDGCN_GFX700 = 0x022, EF_AMDGPU_MACH_AMDGCN_GFX701 = 0x023, EF_AMDGPU_MACH_AMDGCN_GFX702 = 0x024, EF_AMDGPU_MACH_AMDGCN_GFX703 = 0x025, EF_AMDGPU_MACH_AMDGCN_GFX704 = 0x026, - EF_AMDGPU_MACH_AMDGCN_GFX705 = 0x03b, + EF_AMDGPU_MACH_AMDGCN_GFX705 = 0x027, // AMDGCN GFX8. EF_AMDGPU_MACH_AMDGCN_GFX801 = 0x028, EF_AMDGPU_MACH_AMDGCN_GFX802 = 0x029, EF_AMDGPU_MACH_AMDGCN_GFX803 = 0x02a, - EF_AMDGPU_MACH_AMDGCN_GFX805 = 0x03c, + EF_AMDGPU_MACH_AMDGCN_GFX805 = 0x03a, EF_AMDGPU_MACH_AMDGCN_GFX810 = 0x02b, // AMDGCN GFX9. EF_AMDGPU_MACH_AMDGCN_GFX900 = 0x02c, @@ -728,7 +728,6 @@ EF_AMDGPU_MACH_AMDGCN_GFX1031 = 0x037, // Reserved for AMDGCN-based processors. - EF_AMDGPU_MACH_AMDGCN_RESERVED0 = 0x027, EF_AMDGPU_MACH_AMDGCN_RESERVED1 = 0x032, // First/last AMDGCN-based processors. diff --git a/llvm/test/CodeGen/AMDGPU/elf-header-flags-mach.ll b/llvm/test/CodeGen/AMDGPU/elf-header-flags-mach.ll --- a/llvm/test/CodeGen/AMDGPU/elf-header-flags-mach.ll +++ b/llvm/test/CodeGen/AMDGPU/elf-header-flags-mach.ll @@ -80,18 +80,18 @@ ; TURKS: EF_AMDGPU_MACH_R600_TURKS (0x10) ; GFX600: EF_AMDGPU_MACH_AMDGCN_GFX600 (0x20) ; GFX601: EF_AMDGPU_MACH_AMDGCN_GFX601 (0x21) -; GFX602: EF_AMDGPU_MACH_AMDGCN_GFX602 (0x3A) +; GFX602: EF_AMDGPU_MACH_AMDGCN_GFX602 (0x39) ; GFX700: EF_AMDGPU_MACH_AMDGCN_GFX700 (0x22) ; GFX701: EF_AMDGPU_MACH_AMDGCN_GFX701 (0x23) ; GFX702: EF_AMDGPU_MACH_AMDGCN_GFX702 (0x24) ; GFX703: EF_AMDGPU_MACH_AMDGCN_GFX703 (0x25) ; GFX704: EF_AMDGPU_MACH_AMDGCN_GFX704 (0x26) -; GFX705: EF_AMDGPU_MACH_AMDGCN_GFX705 (0x3B) +; GFX705: EF_AMDGPU_MACH_AMDGCN_GFX705 (0x27) ; GFX801: EF_AMDGPU_MACH_AMDGCN_GFX801 (0x28) ; GFX801-NEXT: EF_AMDGPU_XNACK (0x100) ; GFX802: EF_AMDGPU_MACH_AMDGCN_GFX802 (0x29) ; GFX803: EF_AMDGPU_MACH_AMDGCN_GFX803 (0x2A) -; GFX805: EF_AMDGPU_MACH_AMDGCN_GFX805 (0x3C) +; GFX805: EF_AMDGPU_MACH_AMDGCN_GFX805 (0x3A) ; GFX810: EF_AMDGPU_MACH_AMDGCN_GFX810 (0x2B) ; GFX810-NEXT: EF_AMDGPU_XNACK (0x100) ; GFX900: EF_AMDGPU_MACH_AMDGCN_GFX900 (0x2C) diff --git a/llvm/test/Object/AMDGPU/elf-header-flags-mach.yaml b/llvm/test/Object/AMDGPU/elf-header-flags-mach.yaml --- a/llvm/test/Object/AMDGPU/elf-header-flags-mach.yaml +++ b/llvm/test/Object/AMDGPU/elf-header-flags-mach.yaml @@ -145,9 +145,9 @@ # ELF-GFX908: EF_AMDGPU_MACH_AMDGCN_GFX908 (0x30) # ELF-GFX909: EF_AMDGPU_MACH_AMDGCN_GFX909 (0x31) # ELF-GFX1010: EF_AMDGPU_MACH_AMDGCN_GFX1010 (0x33) -# ELF-GFX602: EF_AMDGPU_MACH_AMDGCN_GFX602 (0x3A) -# ELF-GFX705: EF_AMDGPU_MACH_AMDGCN_GFX705 (0x3B) -# ELF-GFX805: EF_AMDGPU_MACH_AMDGCN_GFX805 (0x3C) +# ELF-GFX602: EF_AMDGPU_MACH_AMDGCN_GFX602 (0x39) +# ELF-GFX705: EF_AMDGPU_MACH_AMDGCN_GFX705 (0x27) +# ELF-GFX805: EF_AMDGPU_MACH_AMDGCN_GFX805 (0x3A) # ELF-ALL: ] # YAML-R600: Flags: [ EF_AMDGPU_MACH_R600_R600 ] diff --git a/llvm/test/tools/llvm-readobj/ELF/amdgpu-elf-headers.test b/llvm/test/tools/llvm-readobj/ELF/amdgpu-elf-headers.test --- a/llvm/test/tools/llvm-readobj/ELF/amdgpu-elf-headers.test +++ b/llvm/test/tools/llvm-readobj/ELF/amdgpu-elf-headers.test @@ -5,7 +5,7 @@ # RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t -DCPU=GFX601 -DFLAGS=0x21 # RUN: yaml2obj %s -o %t -DCPU=GFX602 -# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t -DCPU=GFX602 -DFLAGS=0x3A +# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t -DCPU=GFX602 -DFLAGS=0x39 # RUN: yaml2obj %s -o %t -DCPU=GFX700 # RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t -DCPU=GFX700 -DFLAGS=0x22 @@ -23,7 +23,7 @@ # RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t -DCPU=GFX704 -DFLAGS=0x26 # RUN: yaml2obj %s -o %t -DCPU=GFX705 -# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t -DCPU=GFX705 -DFLAGS=0x3B +# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t -DCPU=GFX705 -DFLAGS=0x27 # RUN: yaml2obj %s -o %t -DCPU=GFX801 # RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t -DCPU=GFX801 -DFLAGS=0x28 @@ -35,7 +35,7 @@ # RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t -DCPU=GFX803 -DFLAGS=0x2A # RUN: yaml2obj %s -o %t -DCPU=GFX805 -# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t -DCPU=GFX805 -DFLAGS=0x3C +# RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t -DCPU=GFX805 -DFLAGS=0x3A # RUN: yaml2obj %s -o %t -DCPU=GFX810 # RUN: llvm-readobj -h %t | FileCheck %s --match-full-lines -DFILE=%t -DCPU=GFX810 -DFLAGS=0x2B