This is an archive of the discontinued LLVM Phabricator instance.

Differential D99122

[AMDGPU] Reserve ELF code
ClosedPublic

Authored by t-tye on Mar 22 2021, 3:30 PM.

Details

Reviewers
kzhuravl
Commits
rG1e04706adbb1: [AMDGPU] Reserve ELF code
Summary

Reserve AMD GPU ELF machine code 0x040.

Minor AMDGPUUsage format consistency change.

Diff Detail

Event Timeline

t-tye created this revision.Mar 22 2021, 3:30 PM
Herald added subscribers: kerbowa, tpr, dstuttard and 3 others. · View Herald TranscriptMar 22 2021, 3:30 PM
t-tye requested review of this revision.Mar 22 2021, 3:30 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 22 2021, 3:30 PM
Herald added subscribers: llvm-commits, wdng. · View Herald Transcript
kzhuravl added a comment.Mar 22 2021, 4:14 PM

probably update the title to reflect there is more than one change in the commit?

llvm/include/llvm/BinaryFormat/ELF.h
736

move this to line 736. make line 737 empty.

kzhuravl requested changes to this revision.Mar 22 2021, 4:16 PM

you also should add reserved number to docs.

This revision now requires changes to proceed.Mar 22 2021, 4:16 PM
Harbormaster completed remote builds in B95105: Diff 332449.Mar 22 2021, 4:54 PM
t-tye updated this revision to Diff 332497.Mar 22 2021, 7:00 PM

Address review comments.

Harbormaster completed remote builds in B95140: Diff 332497.Mar 22 2021, 7:37 PM
t-tye updated this revision to Diff 332514.Mar 22 2021, 8:47 PM

Address review comments.

kzhuravl accepted this revision.Mar 22 2021, 8:48 PM

Thanks.

llvm/include/llvm/BinaryFormat/ELF.h
736

move this to line 736. make line 737 empty.

This revision is now accepted and ready to land.Mar 22 2021, 8:48 PM
This revision was landed with ongoing or failed builds.Mar 22 2021, 9:31 PM
Closed by commit rG1e04706adbb1: [AMDGPU] Reserve ELF code (authored by t-tye). · Explain Why
This revision was automatically updated to reflect the committed changes.
t-tye added a commit: rG1e04706adbb1: [AMDGPU] Reserve ELF code.
Harbormaster completed remote builds in B95154: Diff 332514.Mar 22 2021, 9:58 PM

Revision Contents

PathSize
llvm/
docs/
4 lines
include/
llvm/
BinaryFormat/
1 line

Diff 332449

llvm/docs/AMDGPUUsage.rst

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 4,098 Lines • ▼ Show 20 Lines 23:15 9 bits GRANULATED_LDS_SIZE Must be 0.
directly to directly to
``COMPUTE_PGM_RSRC2.LDS_SIZE``. ``COMPUTE_PGM_RSRC2.LDS_SIZE``.
Amount of group segment Amount of group segment
(LDS) to allocate for each (LDS) to allocate for each
work-group. Granularity is work-group. Granularity is
device specific: device specific:
GFX6: GFX6
roundup(lds-size / (64 * 4)) roundup(lds-size / (64 * 4))
GFX7-GFX10: GFX7-GFX10
roundup(lds-size / (128 * 4)) roundup(lds-size / (128 * 4))
24 1 bit ENABLE_EXCEPTION_IEEE_754_FP Wavefront starts execution 24 1 bit ENABLE_EXCEPTION_IEEE_754_FP Wavefront starts execution
_INVALID_OPERATION with specified exceptions _INVALID_OPERATION with specified exceptions
enabled. enabled.
Used by CP to set up Used by CP to set up
``COMPUTE_PGM_RSRC2.EXCP_EN`` ``COMPUTE_PGM_RSRC2.EXCP_EN``
▲ Show 20 Lines • Show All 7,891 Lines • Show Last 20 Lines

llvm/include/llvm/BinaryFormat/ELF.h

//===- llvm/BinaryFormat/ELF.h - ELF constants and structures ---*- C++ -*-===// //===- llvm/BinaryFormat/ELF.h - ELF constants and structures ---*- C++ -*-===//
Lint: Lint
Inline Actions

clang-format not found in user's PATH; not linting file.

Lint: Lint: clang-format not found in user's PATH; not linting file.
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
▲ Show 20 Lines • Show All 687 Lines • ▼ Show 20 Linesenum : unsigned {
EF_AMDGPU_MACH_R600_RESERVED_FIRST = 0x011, EF_AMDGPU_MACH_R600_RESERVED_FIRST = 0x011,
EF_AMDGPU_MACH_R600_RESERVED_LAST = 0x01f, EF_AMDGPU_MACH_R600_RESERVED_LAST = 0x01f,
// First/last R600-based processors. // First/last R600-based processors.
EF_AMDGPU_MACH_R600_FIRST = EF_AMDGPU_MACH_R600_R600, EF_AMDGPU_MACH_R600_FIRST = EF_AMDGPU_MACH_R600_R600,
EF_AMDGPU_MACH_R600_LAST = EF_AMDGPU_MACH_R600_TURKS, EF_AMDGPU_MACH_R600_LAST = EF_AMDGPU_MACH_R600_TURKS,
// AMDGCN-based processors. // AMDGCN-based processors.
EF_AMDGPU_MACH_AMDGCN_GFX600 = 0x020, EF_AMDGPU_MACH_AMDGCN_GFX600 = 0x020,
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-  EF_AMDGPU_MACH_AMDGCN_GFX600        = 0x020,
-  EF_AMDGPU_MACH_AMDGCN_GFX601        = 0x021,
-  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_GFX600 = 0x020,
+  EF_AMDGPU_MACH_AMDGCN_GFX601 = 0x021,
+  EF_AMDGPU_MACH_AMDGCN_GFX700 = 0x022,

4 diff lines are omitted. See full path.

Lint: Pre-merge checks: clang-format: please reformat the code ``` - EF_AMDGPU_MACH_AMDGCN_GFX600 = 0x020…
EF_AMDGPU_MACH_AMDGCN_GFX601 = 0x021, EF_AMDGPU_MACH_AMDGCN_GFX601 = 0x021,
EF_AMDGPU_MACH_AMDGCN_GFX700 = 0x022, EF_AMDGPU_MACH_AMDGCN_GFX700 = 0x022,
EF_AMDGPU_MACH_AMDGCN_GFX701 = 0x023, EF_AMDGPU_MACH_AMDGCN_GFX701 = 0x023,
EF_AMDGPU_MACH_AMDGCN_GFX702 = 0x024, EF_AMDGPU_MACH_AMDGCN_GFX702 = 0x024,
EF_AMDGPU_MACH_AMDGCN_GFX703 = 0x025, EF_AMDGPU_MACH_AMDGCN_GFX703 = 0x025,
EF_AMDGPU_MACH_AMDGCN_GFX704 = 0x026, EF_AMDGPU_MACH_AMDGCN_GFX704 = 0x026,
EF_AMDGPU_MACH_AMDGCN_RESERVED_0X27 = 0x027, EF_AMDGPU_MACH_AMDGCN_RESERVED_0X27 = 0x027,
EF_AMDGPU_MACH_AMDGCN_GFX801 = 0x028, EF_AMDGPU_MACH_AMDGCN_GFX801 = 0x028,
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-  EF_AMDGPU_MACH_AMDGCN_GFX801        = 0x028,
-  EF_AMDGPU_MACH_AMDGCN_GFX802        = 0x029,
-  EF_AMDGPU_MACH_AMDGCN_GFX803        = 0x02a,
-  EF_AMDGPU_MACH_AMDGCN_GFX810        = 0x02b,
-  EF_AMDGPU_MACH_AMDGCN_GFX900        = 0x02c,
-  EF_AMDGPU_MACH_AMDGCN_GFX902        = 0x02d,
-  EF_AMDGPU_MACH_AMDGCN_GFX904        = 0x02e,
-  EF_AMDGPU_MACH_AMDGCN_GFX906        = 0x02f,
-  EF_AMDGPU_MACH_AMDGCN_GFX908        = 0x030,
-  EF_AMDGPU_MACH_AMDGCN_GFX909        = 0x031,

32 diff lines are omitted. See full path.

Lint: Pre-merge checks: clang-format: please reformat the code ``` - EF_AMDGPU_MACH_AMDGCN_GFX801 = 0x028…
EF_AMDGPU_MACH_AMDGCN_GFX802 = 0x029, EF_AMDGPU_MACH_AMDGCN_GFX802 = 0x029,
EF_AMDGPU_MACH_AMDGCN_GFX803 = 0x02a, EF_AMDGPU_MACH_AMDGCN_GFX803 = 0x02a,
EF_AMDGPU_MACH_AMDGCN_GFX810 = 0x02b, EF_AMDGPU_MACH_AMDGCN_GFX810 = 0x02b,
EF_AMDGPU_MACH_AMDGCN_GFX900 = 0x02c, EF_AMDGPU_MACH_AMDGCN_GFX900 = 0x02c,
EF_AMDGPU_MACH_AMDGCN_GFX902 = 0x02d, EF_AMDGPU_MACH_AMDGCN_GFX902 = 0x02d,
EF_AMDGPU_MACH_AMDGCN_GFX904 = 0x02e, EF_AMDGPU_MACH_AMDGCN_GFX904 = 0x02e,
EF_AMDGPU_MACH_AMDGCN_GFX906 = 0x02f, EF_AMDGPU_MACH_AMDGCN_GFX906 = 0x02f,
EF_AMDGPU_MACH_AMDGCN_GFX908 = 0x030, EF_AMDGPU_MACH_AMDGCN_GFX908 = 0x030,
EF_AMDGPU_MACH_AMDGCN_GFX909 = 0x031, EF_AMDGPU_MACH_AMDGCN_GFX909 = 0x031,
EF_AMDGPU_MACH_AMDGCN_GFX90C = 0x032, EF_AMDGPU_MACH_AMDGCN_GFX90C = 0x032,
EF_AMDGPU_MACH_AMDGCN_GFX1010 = 0x033, EF_AMDGPU_MACH_AMDGCN_GFX1010 = 0x033,
EF_AMDGPU_MACH_AMDGCN_GFX1011 = 0x034, EF_AMDGPU_MACH_AMDGCN_GFX1011 = 0x034,
EF_AMDGPU_MACH_AMDGCN_GFX1012 = 0x035, EF_AMDGPU_MACH_AMDGCN_GFX1012 = 0x035,
EF_AMDGPU_MACH_AMDGCN_GFX1030 = 0x036, EF_AMDGPU_MACH_AMDGCN_GFX1030 = 0x036,
EF_AMDGPU_MACH_AMDGCN_GFX1031 = 0x037, EF_AMDGPU_MACH_AMDGCN_GFX1031 = 0x037,
EF_AMDGPU_MACH_AMDGCN_GFX1032 = 0x038, EF_AMDGPU_MACH_AMDGCN_GFX1032 = 0x038,
EF_AMDGPU_MACH_AMDGCN_GFX1033 = 0x039, EF_AMDGPU_MACH_AMDGCN_GFX1033 = 0x039,
EF_AMDGPU_MACH_AMDGCN_GFX602 = 0x03a, EF_AMDGPU_MACH_AMDGCN_GFX602 = 0x03a,
EF_AMDGPU_MACH_AMDGCN_GFX705 = 0x03b, EF_AMDGPU_MACH_AMDGCN_GFX705 = 0x03b,
EF_AMDGPU_MACH_AMDGCN_GFX805 = 0x03c, EF_AMDGPU_MACH_AMDGCN_GFX805 = 0x03c,
EF_AMDGPU_MACH_AMDGCN_RESERVED_0X3D = 0x03d, EF_AMDGPU_MACH_AMDGCN_RESERVED_0X3D = 0x03d,
EF_AMDGPU_MACH_AMDGCN_RESERVED_0X3E = 0x03e, EF_AMDGPU_MACH_AMDGCN_RESERVED_0X3E = 0x03e,
EF_AMDGPU_MACH_AMDGCN_GFX90A = 0x03f, EF_AMDGPU_MACH_AMDGCN_GFX90A = 0x03f,
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-  EF_AMDGPU_MACH_AMDGCN_GFX90A        = 0x03f,
+  EF_AMDGPU_MACH_AMDGCN_GFX90A = 0x03f,
Lint: Pre-merge checks: clang-format: please reformat the code ``` - EF_AMDGPU_MACH_AMDGCN_GFX90A = 0x03f, +…
kzhuravlUnsubmitted
Not Done
ReplyInline Actions

move this to line 736. make line 737 empty.

kzhuravl: move this to line 736. make line 737 empty.
kzhuravlUnsubmitted
Not Done
ReplyInline Actions

move this to line 736. make line 737 empty.

kzhuravl: > move this to line 736. make line 737 empty.
EF_AMDGPU_MACH_AMDGCN_RESERVED_0X40 = 0x040,
// First/last AMDGCN-based processors. // First/last AMDGCN-based processors.
EF_AMDGPU_MACH_AMDGCN_FIRST = EF_AMDGPU_MACH_AMDGCN_GFX600, EF_AMDGPU_MACH_AMDGCN_FIRST = EF_AMDGPU_MACH_AMDGCN_GFX600,
EF_AMDGPU_MACH_AMDGCN_LAST = EF_AMDGPU_MACH_AMDGCN_GFX90A, EF_AMDGPU_MACH_AMDGCN_LAST = EF_AMDGPU_MACH_AMDGCN_GFX90A,
// Indicates if the "xnack" target feature is enabled for all code contained // Indicates if the "xnack" target feature is enabled for all code contained
// in the object. // in the object.
EF_AMDGPU_XNACK = 0x100, EF_AMDGPU_XNACK = 0x100,
// Indicates if the "sram-ecc" target feature is enabled for all code // Indicates if the "sram-ecc" target feature is enabled for all code
▲ Show 20 Lines • Show All 879 Lines • Show Last 20 Lines