[llvm] d3e170c - Revert "[AMDGPU] Don’t marke the .note section as ALLOC"
Mark Searles via llvm-commits
llvm-commits at lists.llvm.org
Fri Feb 21 16:08:49 PST 2020
Author: Mark Searles
Date: 2020-02-21T16:08:30-08:00
New Revision: d3e170c4388693b6628fa91cbf78506a5fb45439
URL: https://github.com/llvm/llvm-project/commit/d3e170c4388693b6628fa91cbf78506a5fb45439
DIFF: https://github.com/llvm/llvm-project/commit/d3e170c4388693b6628fa91cbf78506a5fb45439.diff
LOG: Revert "[AMDGPU] Don’t marke the .note section as ALLOC"
This reverts commit 977cd661cf019039dec7ffdd15bf0ac500828c87.
It breaks OpenCL testing. OpenCL Runtime is using PT_LOAD information
to calculate memory for global variables. This commit should be relanded once
the OpenCL runtime stops relying on PT_LOAD information for calculating global
variable memory size.
Differential Revision: https://reviews.llvm.org/D74995
Added:
Modified:
llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp
llvm/test/CodeGen/AMDGPU/hsa.ll
Removed:
################################################################################
diff --git a/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp
index 3c52de948c5c..c7ccd0aa04ac 100644
--- a/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp
+++ b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUTargetStreamer.cpp
@@ -440,7 +440,7 @@ void AMDGPUTargetELFStreamer::EmitNote(
S.PushSection();
S.SwitchSection(Context.getELFSection(
- ElfNote::SectionName, ELF::SHT_NOTE, 0));
+ ElfNote::SectionName, ELF::SHT_NOTE, ELF::SHF_ALLOC));
S.emitIntValue(NameSZ, 4); // namesz
S.emitValue(DescSZ, 4); // descz
S.emitIntValue(NoteType, 4); // type
diff --git a/llvm/test/CodeGen/AMDGPU/hsa.ll b/llvm/test/CodeGen/AMDGPU/hsa.ll
index c78239e2668a..3462398b5851 100644
--- a/llvm/test/CodeGen/AMDGPU/hsa.ll
+++ b/llvm/test/CodeGen/AMDGPU/hsa.ll
@@ -19,7 +19,8 @@
; ELF: }
; ELF: SHT_NOTE
-; ELF: Flags [ (0x0)
+; ELF: Flags [ (0x2)
+; ELF: SHF_ALLOC (0x2)
; ELF: ]
; ELF: SectionData (
; ELF: 0000: 04000000 08000000 01000000 414D4400
More information about the llvm-commits
mailing list