[compiler-rt] r262644 - [PGO] Add API for profile merge from buffer
Xinliang David Li via llvm-commits
llvm-commits at lists.llvm.org
Sat Mar 26 13:20:45 PDT 2016
I will take care of this.
David
On Sat, Mar 26, 2016 at 11:11 AM, Hal Finkel <hfinkel at anl.gov> wrote:
> ----- Original Message -----
> > From: "Xinliang David Li via llvm-commits" <llvm-commits at lists.llvm.org>
> > To: llvm-commits at lists.llvm.org
> > Sent: Thursday, March 3, 2016 12:54:46 PM
> > Subject: [compiler-rt] r262644 - [PGO] Add API for profile merge from
> buffer
> >
> > Author: davidxl
> > Date: Thu Mar 3 12:54:46 2016
> > New Revision: 262644
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=262644&view=rev
> > Log:
> > [PGO] Add API for profile merge from buffer
> >
> > Differential Revision: http://reviews.llvm.org/D17831
> >
> > Added:
> > compiler-rt/trunk/lib/profile/InstrProfilingMerge.c
> > compiler-rt/trunk/lib/profile/InstrProfilingMergeFile.c
> > compiler-rt/trunk/test/profile/Linux/instrprof-merge-vp.c
> > compiler-rt/trunk/test/profile/instrprof-merge.c
> > Modified:
> > compiler-rt/trunk/lib/profile/CMakeLists.txt
> > compiler-rt/trunk/lib/profile/InstrProfiling.h
> > compiler-rt/trunk/lib/profile/InstrProfilingInternal.h
> > compiler-rt/trunk/make/platform/clang_linux.mk
> > compiler-rt/trunk/test/profile/instrprof-without-libc.c
> >
> > Modified: compiler-rt/trunk/lib/profile/CMakeLists.txt
> > URL:
> >
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/CMakeLists.txt?rev=262644&r1=262643&r2=262644&view=diff
> >
> ==============================================================================
> > --- compiler-rt/trunk/lib/profile/CMakeLists.txt (original)
> > +++ compiler-rt/trunk/lib/profile/CMakeLists.txt Thu Mar 3 12:54:46
> > 2016
> > @@ -30,6 +30,8 @@ set(PROFILE_SOURCES
> > InstrProfilingValue.c
> > InstrProfilingBuffer.c
> > InstrProfilingFile.c
> > + InstrProfilingMerge.c
> > + InstrProfilingMergeFile.c
> > InstrProfilingWriter.c
> > InstrProfilingPlatformDarwin.c
> > InstrProfilingPlatformLinux.c
> >
> > Modified: compiler-rt/trunk/lib/profile/InstrProfiling.h
> > URL:
> >
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/InstrProfiling.h?rev=262644&r1=262643&r2=262644&view=diff
> >
> ==============================================================================
> > --- compiler-rt/trunk/lib/profile/InstrProfiling.h (original)
> > +++ compiler-rt/trunk/lib/profile/InstrProfiling.h Thu Mar 3
> > 12:54:46 2016
> > @@ -63,6 +63,15 @@ uint64_t *__llvm_profile_end_counters(vo
> > void __llvm_profile_reset_counters(void);
> >
> > /*!
> > + * \brief Read profile data form buffer and merge with
> > + * in-process profile counters. The client is expected to
> > + * have checked or already knows the profile data in the
> > + * buffer matches the in-process counter structure before
> > + * calling it.
> > + */
> > +void __llvm_profile_merge_from_buffer(const char *Profile, uint64_t
> > Size);
> > +
> > +/*!
> > * \brief Counts the number of times a target value is seen.
> > *
> > * Records the target value for the CounterIndex if not seen before.
> > Otherwise,
> >
> > Modified: compiler-rt/trunk/lib/profile/InstrProfilingInternal.h
> > URL:
> >
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/InstrProfilingInternal.h?rev=262644&r1=262643&r2=262644&view=diff
> >
> ==============================================================================
> > --- compiler-rt/trunk/lib/profile/InstrProfilingInternal.h (original)
> > +++ compiler-rt/trunk/lib/profile/InstrProfilingInternal.h Thu Mar 3
> > 12:54:46 2016
> > @@ -109,10 +109,15 @@ int llvmWriteProfDataImpl(WriterCallback
> > struct ValueProfData
> > **ValueDataBeginArray,
> > const uint64_t ValueDataSize, const char
> > *NamesBegin,
> > const char *NamesEnd);
> > +/* Merge value profile data pointed to by SrcValueProfData into
> > + * in-memory profile counters pointed by to DstData. */
> > +void mergeValueProfData(struct ValueProfData *SrcValueProfData,
> > + __llvm_profile_data *DstData);
> >
> > extern char *(*GetEnvHook)(const char *);
> > extern void (*FreeHook)(void *);
> > -extern void* (*CallocHook)(size_t, size_t);
> > +extern void *(*CallocHook)(size_t, size_t);
> > +extern void (*VPMergeHook)(struct ValueProfData *,
> > __llvm_profile_data *);
> > extern uint32_t VPBufferSize;
> >
> > #endif
> >
> > Added: compiler-rt/trunk/lib/profile/InstrProfilingMerge.c
> > URL:
> >
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/InstrProfilingMerge.c?rev=262644&view=auto
> >
> ==============================================================================
> > --- compiler-rt/trunk/lib/profile/InstrProfilingMerge.c (added)
> > +++ compiler-rt/trunk/lib/profile/InstrProfilingMerge.c Thu Mar 3
> > 12:54:46 2016
> > @@ -0,0 +1,70 @@
> > +/*===- InstrProfilingMerge.c - Profile in-process Merging
> > ---------------===*\
> > +|*
> > +|* The LLVM Compiler Infrastructure
> > +|*
> > +|* This file is distributed under the University of Illinois Open
> > Source
> > +|* License. See LICENSE.TXT for details.
> > +|*
> >
> +|*===----------------------------------------------------------------------===*
> > +|* This file defines the API needed for in-process merging of
> > profile data
> > +|* stored in memory buffer.
> >
> +\*===---------------------------------------------------------------------===*/
> > +
> > +#include "InstrProfiling.h"
> > +#include "InstrProfilingInternal.h"
> > +#include "InstrProfilingUtil.h"
> > +
> > +#define INSTR_PROF_VALUE_PROF_DATA
> > +#include "InstrProfData.inc"
> > +
> > +COMPILER_RT_WEAK void (*VPMergeHook)(ValueProfData *,
> > + __llvm_profile_data *) = NULL;
> > +
> > +void __llvm_profile_merge_from_buffer(const char *ProfileData,
> > + uint64_t ProfileSize) {
> > + __llvm_profile_data *SrcDataStart, *SrcDataEnd, *SrcData,
> > *DstData;
> > + __llvm_profile_header *Header = (__llvm_profile_header
> > *)ProfileData;
> > + uint64_t *SrcCountersStart;
> > + const char *SrcNameStart;
> > + ValueProfData *SrcValueProfDataStart, *SrcValueProfData;
> > +
> > + SrcDataStart =
> > + (__llvm_profile_data *)(ProfileData +
> > sizeof(__llvm_profile_header));
> > + SrcDataEnd = SrcDataStart + Header->DataSize;
> > + SrcCountersStart = (uint64_t *)SrcDataEnd;
> > + SrcNameStart = (const char *)(SrcCountersStart +
> > Header->CountersSize);
> > + SrcValueProfDataStart =
> > + (ValueProfData *)(SrcNameStart + Header->NamesSize +
> > + __llvm_profile_get_num_padding_bytes(
> > + Header->NamesSize));
> > +
> > + for (SrcData = SrcDataStart,
> > + DstData = (__llvm_profile_data *)__llvm_profile_begin_data(),
> > + SrcValueProfData = SrcValueProfDataStart;
> > + SrcData < SrcDataEnd; ++SrcData, ++DstData) {
> > + uint64_t *SrcCounters;
> > + uint64_t *DstCounters = (uint64_t *)DstData->CounterPtr;
> > + unsigned I, NC, NVK = 0;
> > +
> > + NC = SrcData->NumCounters;
> > + SrcCounters = SrcCountersStart +
> > + ((size_t)SrcData->CounterPtr -
> > Header->CountersDelta) /
> > + sizeof(uint64_t);
> > + for (I = 0; I < NC; I++)
> > + DstCounters[I] += SrcCounters[I];
> > +
> > + /* Now merge value profile data. */
> > + if (!VPMergeHook)
> > + continue;
> > +
> > + for (I = 0; I <= IPVK_Last; I++)
> > + NVK += (SrcData->NumValueSites[I] != 0);
> > +
> > + if (!NVK)
> > + continue;
> > +
> > + VPMergeHook(SrcValueProfData, DstData);
> > + SrcValueProfData = (ValueProfData *)((char *)SrcValueProfData +
> > +
> > SrcValueProfData->TotalSize);
> > + }
> > +}
> >
> > Added: compiler-rt/trunk/lib/profile/InstrProfilingMergeFile.c
> > URL:
> >
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/profile/InstrProfilingMergeFile.c?rev=262644&view=auto
> >
> ==============================================================================
> > --- compiler-rt/trunk/lib/profile/InstrProfilingMergeFile.c (added)
> > +++ compiler-rt/trunk/lib/profile/InstrProfilingMergeFile.c Thu Mar
> > 3 12:54:46 2016
> > @@ -0,0 +1,41 @@
> > +/*===- InstrProfilingMergeFile.c - Profile in-process Merging
> > ------------===*\
> > +|*
> > +|* The LLVM Compiler Infrastructure
> > +|*
> > +|* This file is distributed under the University of Illinois Open
> > Source
> > +|* License. See LICENSE.TXT for details.
> > +|*
> >
> +|*===----------------------------------------------------------------------===
> > +|* This file defines APIs needed to support in-process merging for
> > profile data
> > +|* stored in files.
> >
> +\*===----------------------------------------------------------------------===*/
> > +
> > +#include "InstrProfiling.h"
> > +#include "InstrProfilingInternal.h"
> > +#include "InstrProfilingUtil.h"
> > +
> > +#define INSTR_PROF_VALUE_PROF_DATA
> > +#include "InstrProfData.inc"
> > +
> > +void (*VPMergeHook)(ValueProfData *,
> > + __llvm_profile_data *) = &mergeValueProfData;
> > +
> > +/* Merge value profile data pointed to by SrcValueProfData into
> > + * in-memory profile counters pointed by to DstData. */
> > +void mergeValueProfData(ValueProfData *SrcValueProfData,
> > + __llvm_profile_data *DstData) {
> > + unsigned I, S, V, C;
> > + InstrProfValueData *VData;
> > + ValueProfRecord *VR = getFirstValueProfRecord(SrcValueProfData);
> > + for (I = 0; I < SrcValueProfData->NumValueKinds; I++) {
> > + VData = getValueProfRecordValueData(VR);
> > + for (S = 0; S < VR->NumValueSites; S++) {
> > + uint8_t NV = VR->SiteCountArray[S];
> > + for (V = 0; V < NV; V++) {
> > + for (C = 0; C < VData[V].Count; C++)
> > + __llvm_profile_instrument_target(VData[V].Value, DstData,
> > S);
> > + }
> > + }
> > + VR = getValueProfRecordNext(VR);
> > + }
> > +}
> >
> > Modified: compiler-rt/trunk/make/platform/clang_linux.mk
> > URL:
> >
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/platform/clang_linux.mk?rev=262644&r1=262643&r2=262644&view=diff
> >
> ==============================================================================
> > --- compiler-rt/trunk/make/platform/clang_linux.mk (original)
> > +++ compiler-rt/trunk/make/platform/clang_linux.mk Thu Mar 3
> > 12:54:46 2016
> > @@ -79,7 +79,8 @@ FUNCTIONS.builtins-x86_64 := $(CommonFun
> > FUNCTIONS.profile-i386 := GCDAProfiling InstrProfiling
> > InstrProfilingBuffer \
> > InstrProfilingFile
> > InstrProfilingPlatformOther \
> > InstrProfilingRuntime InstrProfilingUtil \
> > - InstrProfilingWriter InstrProfilingValue
> > + InstrProfilingWriter InstrProfilingValue \
> > + InstrProfilingMerge
> > InstrProfilingMergeFile
> > FUNCTIONS.profile-x86_64 := $(FUNCTIONS.profile-i386)
> >
> > # Always use optimized variants.
> >
> > Added: compiler-rt/trunk/test/profile/Linux/instrprof-merge-vp.c
> > URL:
> >
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/Linux/instrprof-merge-vp.c?rev=262644&view=auto
> >
> ==============================================================================
> > --- compiler-rt/trunk/test/profile/Linux/instrprof-merge-vp.c (added)
> > +++ compiler-rt/trunk/test/profile/Linux/instrprof-merge-vp.c Thu Mar
> > 3 12:54:46 2016
> > @@ -0,0 +1,110 @@
> > +// RUN: %clang_profgen -mllvm --enable-value-profiling=true -O2 -o
> > %t %s
> > +// RUN: %run %t %t.profraw
> > +// RUN: llvm-profdata merge -o %t.profdata %t.profraw
> > +// RUN: llvm-profdata show --all-functions --counts --ic-targets
> > %t.profdata | FileCheck %s
> > +
> > +#include <stdint.h>
> > +#include <stdio.h>
> > +#include <stdlib.h>
> > +#include <sys/types.h>
> > +#include <unistd.h>
> > +
> > +int __llvm_profile_runtime = 0;
> > +int __llvm_profile_write_file();
> > +void __llvm_profile_reset_counters(void);
> > +void __llvm_profile_merge_from_buffer(const char *, uint64_t);
> > +void __llvm_profile_set_filename(const char *);
> > +struct __llvm_profile_data;
> > +struct ValueProfData;
> > +void mergeValueProfData(struct ValueProfData *, struct
> > __llvm_profile_data *);
> > +/* Force the vp merger module to be linked in. */
> > +void *Dummy = &mergeValueProfData;
> > +
> > +void callee1() {}
> > +void callee2() {}
> > +void callee3() {}
> > +
> > +typedef void (*FP)(void);
> > +FP Fps[3] = {callee1, callee2, callee3};
> > +
> > +void foo(int N) {
> > + int I, J;
> > + for (I = 0; I < 3; I++)
> > + for (J = 0; J < I * 2 + 1; J++)
> > + Fps[I]();
> > +
> > + if (N < 2)
> > + return;
> > +
> > + for (I = 0; I < 3; I++)
> > + for (J = 0; J < I * 2 + 1; J++)
> > + Fps[2 - I]();
> > +}
> > +
> > +/* This function is not profiled */
> > +void bar(void) {
> > + int I;
> > + for (I = 0; I < 20; I++)
> > + Fps[I % 3]();
> > +}
> > +
> > +int main(int argc, const char *argv[]) {
> > + int i;
> > + if (argc < 2)
> > + return 1;
> > +
> > + const char *FileN = argv[1];
> > + __llvm_profile_set_filename(FileN);
> > + /* Start profiling. */
> > + __llvm_profile_reset_counters();
> > + foo(1);
> > + /* End profiling by freezing counters and
> > + * dump them to the file. */
> > + if (__llvm_profile_write_file())
> > + return 1;
> > +
> > + /* Read profile data into buffer. */
> > + FILE *File = fopen(FileN, "r");
> > + if (!File)
> > + return 1;
> > + fseek(File, 0, SEEK_END);
> > + uint64_t Size = ftell(File);
> > + fseek(File, 0, SEEK_SET);
> > + char *Buffer = (char *)malloc(Size);
> > + if (Size != fread(Buffer, 1, Size, File))
> > + return 1;
> > + fclose(File);
> > +
> > + /* Its profile will be discarded. */
> > + for (i = 0; i < 10; i++)
> > + bar();
> > +
> > + /* Start profiling again and merge in previously
> > + saved counters in buffer. */
> > + __llvm_profile_reset_counters();
> > + __llvm_profile_merge_from_buffer(Buffer, Size);
> > + foo(2);
> > + /* End profiling. */
> > + truncate(FileN, 0);
> > + if (__llvm_profile_write_file())
> > + return 1;
> > +
> > + /* Its profile will be discarded. */
> > + bar();
> > +
> > + return 0;
> > +}
> > +
> > +// CHECK-LABEL: foo:
> > +// CHECK: Indirect Target Results:
> > +// CHECK-NEXT: [ 0, callee3, 10 ]
> > +// CHECK-NEXT: [ 0, callee2, 6 ]
> > +// CHECK-NEXT: [ 0, callee1, 2 ]
> > +// CHECK-NEXT: [ 1, callee1, 5 ]
> > +// CHECK-NEXT: [ 1, callee2, 3 ]
> > +// CHECK-NEXT: [ 1, callee3, 1 ]
> > +
> > +// CHECK-LABEL: bar:
> > +// CHECK: [ 0, callee1, 0 ]
> > +// CHECK-NEXT: [ 0, callee2, 0 ]
> > +// CHECK-NEXT: [ 0, callee3, 0 ]
>
> This test just failed for me on an x86_64 self host...
>
> FAIL: Profile-x86_64 :: Linux/instrprof-merge-vp.c (26913 of 32924)
> ******************** TEST 'Profile-x86_64 :: Linux/instrprof-merge-vp.c'
> FAILED ********************
> Script:
> --
> /build/llvm-stage1/./bin/clang -m64 -ldl -fprofile-instr-generate -mllvm
> --enable-value-profiling=true -O2 -o
> /build/llvm-stage1/projects/compiler-rt/test/profile/Profile-x86_64/Linux/Output/instrprof-merge-vp.c.tmp
> /src/llvm/projects/compiler-rt/test/profile/Linux/instrprof-merge-vp.c
> /build/llvm-stage1/projects/compiler-rt/test/profile/Profile-x86_64/Linux/Output/instrprof-merge-vp.c.tmp
> /build/llvm-stage1/projects/compiler-rt/test/profile/Profile-x86_64/Linux/Output/instrprof-merge-vp.c.tmp.profraw
> llvm-profdata merge -o
> /build/llvm-stage1/projects/compiler-rt/test/profile/Profile-x86_64/Linux/Output/instrprof-merge-vp.c.tmp.profdata
> /build/llvm-stage1/projects/compiler-rt/test/profile/Profile-x86_64/Linux/Output/instrprof-merge-vp.c.tmp.profraw
> llvm-profdata show --all-functions --counts --ic-targets
> /build/llvm-stage1/projects/compiler-rt/test/profile/Profile-x86_64/Linux/Output/instrprof-merge-vp.c.tmp.profdata
> | FileCheck
> /src/llvm/projects/compiler-rt/test/profile/Linux/instrprof-merge-vp.c
> --
> Exit Code: 1
>
> Command Output (stderr):
> --
> /src/llvm/projects/compiler-rt/test/profile/Linux/instrprof-merge-vp.c:107:17:
> error: expected string not found in input
> // CHECK-LABEL: bar:
> ^
> <stdin>:41:2: note: scanning from here
> Hash: 0x000000000410a104
> ^
> <stdin>:46:11: note: possible intended match here
> Indirect Target Results:
> ^
>
> The full output from llvm-profdata is:
>
> Counters:
> callee1:
> Hash: 0x0000000000000000
> Counters: 1
> Function count: 7
> Indirect Call Site Count: 0
> Block counts: []
> Indirect Target Results:
> callee2:
> Hash: 0x0000000000000000
> Counters: 1
> Function count: 9
> Indirect Call Site Count: 0
> Block counts: []
> Indirect Target Results:
> callee3:
> Hash: 0x0000000000000000
> Counters: 1
> Function count: 11
> Indirect Call Site Count: 0
> Block counts: []
> Indirect Target Results:
> bar:
> Hash: 0x0000000000000004
> Counters: 2
> Function count: 0
> Indirect Call Site Count: 1
> Block counts: [0]
> Indirect Target Results:
> [ 0, callee1, 0 ]
> [ 0, callee2, 0 ]
> [ 0, callee3, 0 ]
> main:
> Hash: 0x000000028a28a10a
> Counters: 7
> Function count: 0
> Indirect Call Site Count: 0
> Block counts: [0, 0, 0, 0, 0, 0]
> Indirect Target Results:
> foo:
> Hash: 0x000000000410a104
> Counters: 6
> Function count: 2
> Indirect Call Site Count: 2
> Block counts: [6, 18, 1, 3, 9]
> Indirect Target Results:
> [ 0, callee3, 10 ]
> [ 0, callee2, 6 ]
> [ 0, callee1, 2 ]
> [ 1, callee1, 5 ]
> [ 1, callee2, 3 ]
> [ 1, callee3, 1 ]
> Functions shown: 6
> Total functions: 6
> Maximum function count: 11
> Maximum internal block count: 18
>
> So it looks like foo and bar occur in an order different from what the
> test checks expect? xfailing this test made it pass both this stage 1 build
> and also my stage 2 -O0 build, so it is deterministic at least in that
> sense.
>
> -Hal
>
> >
> > Added: compiler-rt/trunk/test/profile/instrprof-merge.c
> > URL:
> >
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/instrprof-merge.c?rev=262644&view=auto
> >
> ==============================================================================
> > --- compiler-rt/trunk/test/profile/instrprof-merge.c (added)
> > +++ compiler-rt/trunk/test/profile/instrprof-merge.c Thu Mar 3
> > 12:54:46 2016
> > @@ -0,0 +1,96 @@
> > +// RUN: %clang_profgen -O2 -o %t %s
> > +// RUN: %run %t %t.profraw 1 1
> > +// RUN: llvm-profdata show --all-functions --counts %t.profraw |
> > FileCheck %s
> > +
> > +#include <stdint.h>
> > +#include <stdio.h>
> > +#include <stdlib.h>
> > +
> > +int __llvm_profile_runtime = 0;
> > +uint64_t __llvm_profile_get_size_for_buffer(void);
> > +int __llvm_profile_write_buffer(char *);
> > +void __llvm_profile_reset_counters(void);
> > +void __llvm_profile_merge_from_buffer(const char *, uint64_t);
> > +
> > +int dumpBuffer(const char *FileN, const char *Buffer, uint64_t Size)
> > {
> > + FILE *File = fopen(FileN, "w");
> > + if (!File)
> > + return 1;
> > + if (fwrite(Buffer, 1, Size, File) != Size)
> > + return 1;
> > + return fclose(File);
> > +}
> > +
> > +int g = 0;
> > +void foo(char c) {
> > + if (c == '1')
> > + g++;
> > + else
> > + g--;
> > +}
> > +
> > +/* This function is not profiled */
> > +void bar(int M) { g += M; }
> > +
> > +int main(int argc, const char *argv[]) {
> > + int i;
> > + if (argc < 4)
> > + return 1;
> > +
> > + const uint64_t MaxSize = 10000;
> > + static char Buffer[MaxSize];
> > +
> > + uint64_t Size = __llvm_profile_get_size_for_buffer();
> > + if (Size > MaxSize)
> > + return 1;
> > +
> > + /* Start profiling. */
> > + __llvm_profile_reset_counters();
> > + foo(argv[2][0]);
> > + /* End profiling by freezing counters. */
> > + if (__llvm_profile_write_buffer(Buffer))
> > + return 1;
> > +
> > + /* Its profile will be discarded. */
> > + for (i = 0; i < 10; i++)
> > + bar(1);
> > +
> > + /* Start profiling again and merge in previously
> > + saved counters in buffer. */
> > + __llvm_profile_reset_counters();
> > + __llvm_profile_merge_from_buffer(Buffer, Size);
> > + foo(argv[3][0]);
> > + /* End profiling */
> > + if (__llvm_profile_write_buffer(Buffer))
> > + return 1;
> > +
> > + /* Its profile will be discarded. */
> > + bar(2);
> > +
> > + /* Now it is time to dump the profile to file. */
> > + return dumpBuffer(argv[1], Buffer, Size);
> > +}
> > +
> > +// Not profiled
> > +// CHECK-LABEL: dumpBuffer:
> > +// CHECK: Counters: 3
> > +// CHECK-NEXT: Function count: 0
> > +// CHECK-NEXT: Block counts: [0, 0]
> > +
> > +// Profiled with entry count == 2
> > +// CHECK-LABEL: foo:
> > +// CHECK: Counters: 2
> > +// CHECK-NEXT: Function count: 2
> > +// CHECK-NEXT: Block counts: [2]
> > +
> > +// Not profiled
> > +// CHECK-LABEL: bar:
> > +// CHECK: Counters: 1
> > +// CHECK-NEXT Function count: 0
> > +// CHECK-NEXT Block counts: []
> > +
> > +// Not profiled
> > +// CHECK-LABEL: main:
> > +// CHECK: Counters: 6
> > +// CHECK-NEXT: Function count: 0
> > +// CHECK-NEXT: Block counts: [0, 0, 0, 0, 0]
> >
> > Modified: compiler-rt/trunk/test/profile/instrprof-without-libc.c
> > URL:
> >
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/profile/instrprof-without-libc.c?rev=262644&r1=262643&r2=262644&view=diff
> >
> ==============================================================================
> > --- compiler-rt/trunk/test/profile/instrprof-without-libc.c
> > (original)
> > +++ compiler-rt/trunk/test/profile/instrprof-without-libc.c Thu Mar
> > 3 12:54:46 2016
> > @@ -15,6 +15,8 @@
> > int __llvm_profile_runtime = 0;
> > uint64_t __llvm_profile_get_size_for_buffer(void);
> > int __llvm_profile_write_buffer(char *);
> > +void __llvm_profile_merge_from_buffer(const char *, uint64_t Size);
> > +
> > int write_buffer(uint64_t, const char *);
> > int main(int argc, const char *argv[]) {
> > // CHECK-LABEL: define {{.*}} @main(
> > @@ -35,6 +37,8 @@ int main(int argc, const char *argv[]) {
> > #ifdef CHECK_SYMBOLS
> > // Don't write it out. Since we're checking the symbols, we don't
> > have libc
> > // available.
> > + // Call merge function to make sure it does not bring in libc
> > deps:
> > + __llvm_profile_merge_from_buffer(Buffer, Size);
> > return 0;
> > #else
> > // Actually write it out so we can FileCheck the output.
> >
> >
> > _______________________________________________
> > llvm-commits mailing list
> > llvm-commits at lists.llvm.org
> > http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
> >
>
> --
> Hal Finkel
> Assistant Computational Scientist
> Leadership Computing Facility
> Argonne National Laboratory
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160326/93288a94/attachment.html>
More information about the llvm-commits
mailing list