<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Nov 18, 2015 at 11:21 PM, Xinliang David Li via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: davidxl<br>
Date: Thu Nov 19 01:21:47 2015<br>
New Revision: 253545<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=253545&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=253545&view=rev</a><br>
Log:<br>
[PGO] Minor cleanups (from review feedback)<br>
<br>
1. fix naming problem of file/buffer writer<br>
2. change BufferOrFile to WriterCtx<br>
3. move writer and writerctx together<br>
<br>
Modified:<br>
compiler-rt/trunk/lib/profile/InstrProfilingBuffer.c<br>
compiler-rt/trunk/lib/profile/InstrProfilingFile.c<br>
compiler-rt/trunk/lib/profile/InstrProfilingInternal.h<br>
compiler-rt/trunk/lib/profile/InstrProfilingWriter.c<br>
<br>
Modified: compiler-rt/trunk/lib/profile/InstrProfilingBuffer.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/InstrProfilingBuffer.c?rev=253545&r1=253544&r2=253545&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/InstrProfilingBuffer.c?rev=253545&r1=253544&r2=253545&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/profile/InstrProfilingBuffer.c (original)<br>
+++ compiler-rt/trunk/lib/profile/InstrProfilingBuffer.c Thu Nov 19 01:21:47 2015<br>
@@ -41,7 +41,7 @@ uint64_t __llvm_profile_get_size_for_buf<br>
PROFILE_RANGE_SIZE(Counters) * sizeof(uint64_t) + NamesSize + Padding;<br>
}<br>
<br>
-static size_t BufferWriter(const void *Data, size_t ElmSize, size_t NumElm,<br>
+static size_t bufferWriter(const void *Data, size_t ElmSize, size_t NumElm,<br>
void **Buffer) {<br>
size_t Length = ElmSize * NumElm;<br>
memcpy(*Buffer, Data, Length);<br>
@@ -51,14 +51,14 @@ static size_t BufferWriter(const void *D<br>
<br>
__attribute__((visibility("hidden"))) int<br>
__llvm_profile_write_buffer(char *Buffer) {<br>
- return llvmWriteProfData(Buffer, 0, 0, BufferWriter);<br>
+ return llvmWriteProfData(Buffer, bufferWriter, 0, 0);<br>
}<br>
<br>
__attribute__((visibility("hidden"))) int __llvm_profile_write_buffer_internal(<br>
char *Buffer, const __llvm_profile_data *DataBegin,<br>
const __llvm_profile_data *DataEnd, const uint64_t *CountersBegin,<br>
const uint64_t *CountersEnd, const char *NamesBegin, const char *NamesEnd) {<br>
- return llvmWriteProfDataImpl(Buffer, BufferWriter, DataBegin, DataEnd,<br>
+ return llvmWriteProfDataImpl(Buffer, bufferWriter, DataBegin, DataEnd,<br>
CountersBegin, CountersEnd, 0, 0, NamesBegin,<br>
NamesEnd);<br>
}<br>
<br>
Modified: compiler-rt/trunk/lib/profile/InstrProfilingFile.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/InstrProfilingFile.c?rev=253545&r1=253544&r2=253545&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/InstrProfilingFile.c?rev=253545&r1=253544&r2=253545&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/profile/InstrProfilingFile.c (original)<br>
+++ compiler-rt/trunk/lib/profile/InstrProfilingFile.c Thu Nov 19 01:21:47 2015<br>
@@ -17,7 +17,7 @@<br>
<br>
#define UNCONST(ptr) ((void *)(uintptr_t)(ptr))<br>
<br>
-static size_t FileWriter(const void *Data, size_t ElmSize, size_t NumElm,<br>
+static size_t fileWriter(const void *Data, size_t ElmSize, size_t NumElm,<br>
void **File) {<br>
return fwrite(Data, ElmSize, NumElm, (FILE *)*File);<br>
}<br>
@@ -27,7 +27,7 @@ static int writeFile(FILE *File) {<br>
uint8_t *ValueDataBegin = NULL;<br>
const uint64_t ValueDataSize =<br>
__llvm_profile_gather_value_data(&ValueDataBegin);<br>
- int r = llvmWriteProfData(File, ValueDataBegin, ValueDataSize, FileWriter);<br>
+ int r = llvmWriteProfData(File, fileWriter, ValueDataBegin, ValueDataSize);<br>
free(ValueDataBegin);<br>
return r;<br>
}<br>
<br>
Modified: compiler-rt/trunk/lib/profile/InstrProfilingInternal.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/InstrProfilingInternal.h?rev=253545&r1=253544&r2=253545&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/InstrProfilingInternal.h?rev=253545&r1=253544&r2=253545&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/profile/InstrProfilingInternal.h (original)<br>
+++ compiler-rt/trunk/lib/profile/InstrProfilingInternal.h Thu Nov 19 01:21:47 2015<br>
@@ -43,9 +43,10 @@ int __llvm_profile_write_buffer_internal<br>
*/<br>
typedef size_t (*WriterCallback)(const void *Data, size_t ElmS, size_t NumElm,<br>
void **BufferOrFile);<br>
-int llvmWriteProfData(void *BufferOrFile, const uint8_t *ValueDataBegin,<br>
- const uint64_t ValueDataSize, WriterCallback Writer);<br>
-int llvmWriteProfDataImpl(void *BufferOrFile, WriterCallback Writer,<br>
+int llvmWriteProfData(void *WriterCtx, WriterCallback Writer,<br>
+ const uint8_t *ValueDataBegin,<br>
+ const uint64_t ValueDataSize);<br>
+int llvmWriteProfDataImpl(void *WriterCtx, WriterCallback Writer,<br>
const __llvm_profile_data *DataBegin,<br>
const __llvm_profile_data *DataEnd,<br>
const uint64_t *CountersBegin,<br>
<br>
Modified: compiler-rt/trunk/lib/profile/InstrProfilingWriter.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/InstrProfilingWriter.c?rev=253545&r1=253544&r2=253545&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/InstrProfilingWriter.c?rev=253545&r1=253544&r2=253545&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/profile/InstrProfilingWriter.c (original)<br>
+++ compiler-rt/trunk/lib/profile/InstrProfilingWriter.c Thu Nov 19 01:21:47 2015<br>
@@ -11,8 +11,8 @@<br>
#include "InstrProfilingInternal.h"<br>
<br>
__attribute__((visibility("hidden"))) int<br>
-llvmWriteProfData(void *BufferOrFile, const uint8_t *ValueDataBegin,<br>
- const uint64_t ValueDataSize, WriterCallback Writer) {<br>
+llvmWriteProfData(void *WriterCtx, WriterCallback Writer,<br>
+ const uint8_t *ValueDataBegin, const uint64_t ValueDataSize) {<br>
/* Match logic in __llvm_profile_write_buffer(). */<br>
const __llvm_profile_data *DataBegin = __llvm_profile_begin_data();<br>
const __llvm_profile_data *DataEnd = __llvm_profile_end_data();<br>
@@ -20,13 +20,13 @@ llvmWriteProfData(void *BufferOrFile, co<br>
const uint64_t *CountersEnd = __llvm_profile_end_counters();<br>
const char *NamesBegin = __llvm_profile_begin_names();<br>
const char *NamesEnd = __llvm_profile_end_names();<br>
- return llvmWriteProfDataImpl(BufferOrFile, Writer, DataBegin, DataEnd,<br>
+ return llvmWriteProfDataImpl(WriterCtx, Writer, DataBegin, DataEnd,<br>
CountersBegin, CountersEnd, ValueDataBegin,<br>
ValueDataSize, NamesBegin, NamesEnd);<br>
}<br>
<br>
__attribute__((visibility("hidden"))) int llvmWriteProfDataImpl(<br>
- void *BufferOrFile, WriterCallback Writer,<br>
+ void *WriterCtx, WriterCallback Writer,<br></blockquote><div><br></div><div>The Ctx usually goes after. See llvm/include/llvm-c/ headers for examples.</div><div><br></div><div>-- Sean Silva</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
const __llvm_profile_data *DataBegin, const __llvm_profile_data *DataEnd,<br>
const uint64_t *CountersBegin, const uint64_t *CountersEnd,<br>
const uint8_t *ValueDataBegin, const uint64_t ValueDataSize,<br>
@@ -64,13 +64,13 @@ __attribute__((visibility("hidden"))) in<br>
if (Writer(Data, Size, Length, &BuffOrFile) != Length) \<br>
return -1; \<br>
} while (0)<br>
- CHECK_write(&Header, sizeof(__llvm_profile_header), 1, BufferOrFile);<br>
- CHECK_write(DataBegin, sizeof(__llvm_profile_data), DataSize, BufferOrFile);<br>
- CHECK_write(CountersBegin, sizeof(uint64_t), CountersSize, BufferOrFile);<br>
- CHECK_write(NamesBegin, sizeof(char), NamesSize, BufferOrFile);<br>
- CHECK_write(Zeroes, sizeof(char), Padding, BufferOrFile);<br>
+ CHECK_write(&Header, sizeof(__llvm_profile_header), 1, WriterCtx);<br>
+ CHECK_write(DataBegin, sizeof(__llvm_profile_data), DataSize, WriterCtx);<br>
+ CHECK_write(CountersBegin, sizeof(uint64_t), CountersSize, WriterCtx);<br>
+ CHECK_write(NamesBegin, sizeof(char), NamesSize, WriterCtx);<br>
+ CHECK_write(Zeroes, sizeof(char), Padding, WriterCtx);<br>
if (ValueDataBegin)<br>
- CHECK_write(ValueDataBegin, sizeof(char), ValueDataSize, BufferOrFile);<br>
+ CHECK_write(ValueDataBegin, sizeof(char), ValueDataSize, WriterCtx);<br>
#undef CHECK_write<br>
return 0;<br>
}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>