maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[compiler-rt][profile] Add padding after binary IDs 

Some tests with binary IDs would fail with error: no profile can be merged.
This is because raw profiles could have unaligned headers when emitting binary
IDs. This means padding should be emitted after binary IDs are emitted to
ensure everything else is aligned. This patch accounts for that padding in
__llvm_write_binary_ids.

Differential Revision: https://reviews.llvm.org/D110188
This commit is contained in:
Leonard Chan 2021-09-23 10:29:24 -07:00
parent 4393e3776b
commit 6bc9c8dfe3
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler-rt/lib/profile/InstrProfilingPlatformLinux.c
View File

@ -142,7 +142,9 @@ static int WriteBinaryIdForNote(ProfDataWriter *Writer,
/*
* Helper function that iterates through notes section and find build ids.
* If writer is given, write binary ids into profiles.
* If writer is given, write binary ids into profiles. This also takes into
* account padding which may need to be added after the binary IDs to ensure
* 8-byte alignment.
* If an error happens while writing, return -1.
*/
static int WriteBinaryIds(ProfDataWriter *Writer, const ElfW(Nhdr) * Note,
@ -160,7 +162,17 @@ static int WriteBinaryIds(ProfDataWriter *Writer, const ElfW(Nhdr) * Note,
Note = (const ElfW(Nhdr) *)((const char *)(Note) + NoteOffset);
}
return TotalBinaryIdsSize;
uint8_t BinaryIdsPadding =
__llvm_profile_get_num_padding_bytes(TotalBinaryIdsSize);
if (Writer) {
ProfDataIOVec BinaryIdIOVec[] = {
{NULL, sizeof(uint8_t), BinaryIdsPadding, 1}};
if (Writer->Write(Writer, BinaryIdIOVec,
sizeof(BinaryIdIOVec) / sizeof(*BinaryIdIOVec)))
return -1;
}
return TotalBinaryIdsSize + BinaryIdsPadding;
}
/*