From d107b743614fe1e1294e4ad7ab89ee2ddc6a027b Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Mon, 14 Dec 2020 21:59:51 -0500 Subject: [PATCH] Revert "[amdgpu] Default to code object v3" This reverts commit 4b2e7d0215021d0d1df1a6319884b21d33936265. Breaks check-clang, see https://reviews.llvm.org/D93258#2453600 --- docs/AMDGPUUsage.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/AMDGPUUsage.rst b/docs/AMDGPUUsage.rst index 95fb164310c..e5d081a3750 100644 --- a/docs/AMDGPUUsage.rst +++ b/docs/AMDGPUUsage.rst @@ -911,12 +911,12 @@ The AMDGPU backend uses the following ELF header: * ``ELFABIVERSION_AMDGPU_HSA_V3`` is used to specify the version of AMD HSA runtime ABI for code object V3. Specify using the Clang option - ``-mcode-object-version=3``. This is the default code object - version if not specified. + ``-mcode-object-version=3``. * ``ELFABIVERSION_AMDGPU_HSA_V4`` is used to specify the version of AMD HSA runtime ABI for code object V4. Specify using the Clang option - ``-mcode-object-version=4``. + ``-mcode-object-version=4``. This is the default code object + version if not specified. * ``ELFABIVERSION_AMDGPU_PAL`` is used to specify the version of AMD PAL runtime ABI. @@ -2871,6 +2871,10 @@ non-AMD key names should be prefixed by "*vendor-name*.". Code Object V3 Metadata +++++++++++++++++++++++ +.. warning:: + Code object V3 is not the default code object version emitted by this version + of LLVM. + Code object V3 to V4 metadata is specified by the ``NT_AMDGPU_METADATA`` note record (see :ref:`amdgpu-note-records-v3-v4`). @@ -3275,10 +3279,6 @@ same *vendor-name*. Code Object V4 Metadata +++++++++++++++++++++++ -.. warning:: - Code object V4 is not the default code object version emitted by this version - of LLVM. - Code object V4 metadata is the same as :ref:`amdgpu-amdhsa-code-object-metadata-v3` with the changes and additions defined in table :ref:`amdgpu-amdhsa-code-object-metadata-map-table-v3`.