b850251d3e
Compiler-rt miscalculates the number of entries in the __llvm_prf_data section on i386 Darwin. This results in a number of test failures (which we started catching after r261344). The fix we attempted earlier is insufficient (r261683). It caused some tests to start passing again, but that hid the fact that we drop some data entries. This patch should fix the real problem. It fixes the way we compute DataSize by taking into account the way the Darwin linker lays out __llvm_prf_data. Differential Revision: http://reviews.llvm.org/D17623 llvm-svn: 261957
60 lines
2.6 KiB
C
60 lines
2.6 KiB
C
/*===- InstrProfilingBuffer.c - Write instrumentation to a memory buffer --===*\
|
|
|*
|
|
|* The LLVM Compiler Infrastructure
|
|
|*
|
|
|* This file is distributed under the University of Illinois Open Source
|
|
|* License. See LICENSE.TXT for details.
|
|
|*
|
|
\*===----------------------------------------------------------------------===*/
|
|
|
|
#include "InstrProfiling.h"
|
|
#include "InstrProfilingInternal.h"
|
|
|
|
COMPILER_RT_VISIBILITY
|
|
uint64_t __llvm_profile_get_size_for_buffer(void) {
|
|
const __llvm_profile_data *DataBegin = __llvm_profile_begin_data();
|
|
const __llvm_profile_data *DataEnd = __llvm_profile_end_data();
|
|
const uint64_t *CountersBegin = __llvm_profile_begin_counters();
|
|
const uint64_t *CountersEnd = __llvm_profile_end_counters();
|
|
const char *NamesBegin = __llvm_profile_begin_names();
|
|
const char *NamesEnd = __llvm_profile_end_names();
|
|
|
|
return __llvm_profile_get_size_for_buffer_internal(
|
|
DataBegin, DataEnd, CountersBegin, CountersEnd, NamesBegin, NamesEnd);
|
|
}
|
|
|
|
COMPILER_RT_VISIBILITY
|
|
uint64_t __llvm_profile_get_data_size(const __llvm_profile_data *Begin,
|
|
const __llvm_profile_data *End) {
|
|
intptr_t BeginI = (intptr_t)Begin, EndI = (intptr_t)End;
|
|
return ((EndI + sizeof(__llvm_profile_data) - 1) - BeginI) /
|
|
sizeof(__llvm_profile_data);
|
|
}
|
|
|
|
COMPILER_RT_VISIBILITY
|
|
uint64_t __llvm_profile_get_size_for_buffer_internal(
|
|
const __llvm_profile_data *DataBegin, const __llvm_profile_data *DataEnd,
|
|
const uint64_t *CountersBegin, const uint64_t *CountersEnd,
|
|
const char *NamesBegin, const char *NamesEnd) {
|
|
/* Match logic in __llvm_profile_write_buffer(). */
|
|
const uint64_t NamesSize = (NamesEnd - NamesBegin) * sizeof(char);
|
|
const uint8_t Padding = __llvm_profile_get_num_padding_bytes(NamesSize);
|
|
return sizeof(__llvm_profile_header) +
|
|
(__llvm_profile_get_data_size(DataBegin, DataEnd) *
|
|
sizeof(__llvm_profile_data)) +
|
|
(CountersEnd - CountersBegin) * sizeof(uint64_t) + NamesSize + Padding;
|
|
}
|
|
|
|
COMPILER_RT_VISIBILITY int __llvm_profile_write_buffer(char *Buffer) {
|
|
return llvmWriteProfData(llvmBufferWriter, Buffer, 0, 0);
|
|
}
|
|
|
|
COMPILER_RT_VISIBILITY int __llvm_profile_write_buffer_internal(
|
|
char *Buffer, const __llvm_profile_data *DataBegin,
|
|
const __llvm_profile_data *DataEnd, const uint64_t *CountersBegin,
|
|
const uint64_t *CountersEnd, const char *NamesBegin, const char *NamesEnd) {
|
|
return llvmWriteProfDataImpl(llvmBufferWriter, Buffer, DataBegin, DataEnd,
|
|
CountersBegin, CountersEnd, 0, 0, NamesBegin,
|
|
NamesEnd);
|
|
}
|