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

InstrProf: If libc is available, use it; no functionality change 

It was misguided to plan to rely on __llvm_profile_write_buffer() in
__llvm_profile_write_file().  It's less complex to duplicate the writing
logic than to mmap the file.

Since it's here to stay, move `FILE*`-based writing logic into
InstrProfilingFile.c.

<rdar://problem/15943240>

llvm-svn: 204498
This commit is contained in:
Duncan P. N. Exon Smith 2014-03-21 18:29:19 +00:00
parent be0a5e176b
commit cf4bb960bd
3 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler-rt/lib/profile/InstrProfiling.h
View File

@ -10,8 +10,6 @@
#ifndef PROFILE_INSTRPROFILING_H__
#define PROFILE_INSTRPROFILING_H__
#include <stdio.h>
#define I386_FREEBSD (defined(__FreeBSD__) && defined(__i386__))
#if !I386_FREEBSD
@ -42,16 +40,18 @@ typedef struct __llvm_profile_data {
uint64_t *const Counters;
} __llvm_profile_data;
/* TODO: void __llvm_profile_get_size_for_buffer(void); */
/*!
* \brief Get required size for profile buffer.
*/
uint64_t __llvm_profile_get_size_for_buffer(void);
/*!
* \brief Write instrumentation data to the given buffer.
*
* This function is currently broken: it shouldn't rely on libc, but it does.
* It should be changed to take a char* buffer, and write binary data directly
* to it.
* \pre \c Buffer is the start of a buffer at least as big as \a
* __llvm_profile_get_size_for_buffer().
*/
int __llvm_profile_write_buffer(FILE *OutputFile);
int __llvm_profile_write_buffer(char *Buffer);
const __llvm_profile_data *__llvm_profile_data_begin(void);
const __llvm_profile_data *__llvm_profile_data_end(void);

42
compiler-rt/lib/profile/InstrProfilingBuffer.c
View File

@ -11,44 +11,4 @@
#include <string.h>
/* TODO: uint64_t __llvm_profile_get_size_for_buffer(void) */
int __llvm_profile_write_buffer(FILE *OutputFile) {
const __llvm_profile_data *DataBegin = __llvm_profile_data_begin();
const __llvm_profile_data *DataEnd = __llvm_profile_data_end();
const uint64_t *CountersBegin = __llvm_profile_counters_begin();
const uint64_t *CountersEnd = __llvm_profile_counters_end();
const char *NamesBegin = __llvm_profile_names_begin();
const char *NamesEnd = __llvm_profile_names_end();
/* Calculate size of sections. */
const uint64_t DataSize = DataEnd - DataBegin;
const uint64_t CountersSize = CountersEnd - CountersBegin;
const uint64_t NamesSize = NamesEnd - NamesBegin;
/* Get rest of header data. */
const uint64_t Magic = __llvm_profile_get_magic();
const uint64_t Version = __llvm_profile_get_version();
const uint64_t CountersDelta = (uint64_t)CountersBegin;
const uint64_t NamesDelta = (uint64_t)NamesBegin;
#define CHECK_fwrite(Data, Size, Length, File) \
do { if (fwrite(Data, Size, Length, File) != Length) return -1; } while (0)
/* Write the header. */
CHECK_fwrite(&Magic, sizeof(uint64_t), 1, OutputFile);
CHECK_fwrite(&Version, sizeof(uint64_t), 1, OutputFile);
CHECK_fwrite(&DataSize, sizeof(uint64_t), 1, OutputFile);
CHECK_fwrite(&CountersSize, sizeof(uint64_t), 1, OutputFile);
CHECK_fwrite(&NamesSize, sizeof(uint64_t), 1, OutputFile);
CHECK_fwrite(&CountersDelta, sizeof(uint64_t), 1, OutputFile);
CHECK_fwrite(&NamesDelta, sizeof(uint64_t), 1, OutputFile);
/* Write the data. */
CHECK_fwrite(DataBegin, sizeof(__llvm_profile_data), DataSize, OutputFile);
CHECK_fwrite(CountersBegin, sizeof(uint64_t), CountersSize, OutputFile);
CHECK_fwrite(NamesBegin, sizeof(char), NamesSize, OutputFile);
#undef CHECK_fwrite
return 0;
}
/* TODO: int __llvm_profile_write_buffer(char *Buffer) */

43
compiler-rt/lib/profile/InstrProfilingFile.c
View File

@ -12,6 +12,47 @@
#include <stdlib.h>
#include <string.h>
static int writeFile(FILE *File) {
const __llvm_profile_data *DataBegin = __llvm_profile_data_begin();
const __llvm_profile_data *DataEnd = __llvm_profile_data_end();
const uint64_t *CountersBegin = __llvm_profile_counters_begin();
const uint64_t *CountersEnd = __llvm_profile_counters_end();
const char *NamesBegin = __llvm_profile_names_begin();
const char *NamesEnd = __llvm_profile_names_end();
/* Calculate size of sections. */
const uint64_t DataSize = DataEnd - DataBegin;
const uint64_t CountersSize = CountersEnd - CountersBegin;
const uint64_t NamesSize = NamesEnd - NamesBegin;
/* Get rest of header data. */
const uint64_t Magic = __llvm_profile_get_magic();
const uint64_t Version = __llvm_profile_get_version();
const uint64_t CountersDelta = (uint64_t)CountersBegin;
const uint64_t NamesDelta = (uint64_t)NamesBegin;
#define CHECK_fwrite(Data, Size, Length, File) \
do { if (fwrite(Data, Size, Length, File) != Length) return -1; } while (0)
/* Write the header. */
CHECK_fwrite(&Magic, sizeof(uint64_t), 1, File);
CHECK_fwrite(&Version, sizeof(uint64_t), 1, File);
CHECK_fwrite(&DataSize, sizeof(uint64_t), 1, File);
CHECK_fwrite(&CountersSize, sizeof(uint64_t), 1, File);
CHECK_fwrite(&NamesSize, sizeof(uint64_t), 1, File);
CHECK_fwrite(&CountersDelta, sizeof(uint64_t), 1, File);
CHECK_fwrite(&NamesDelta, sizeof(uint64_t), 1, File);
/* Write the data. */
CHECK_fwrite(DataBegin, sizeof(__llvm_profile_data), DataSize, File);
CHECK_fwrite(CountersBegin, sizeof(uint64_t), CountersSize, File);
CHECK_fwrite(NamesBegin, sizeof(char), NamesSize, File);
#undef CHECK_fwrite
return 0;
}
static int writeFileWithName(const char *OutputName) {
int RetVal;
FILE *OutputFile;
@ -21,7 +62,7 @@ static int writeFileWithName(const char *OutputName) {
if (!OutputFile)
return -1;
RetVal = __llvm_profile_write_buffer(OutputFile);
RetVal = writeFile(OutputFile);
fclose(OutputFile);
return RetVal;