[profile] Hide some external symbols in InstrProfData.inc

[vsk]

Summary

Add a new INSTR_PROF_VISIBILITY macro to InstrProfData.inc which can be used to set hidden visibility on functions in the instrprof runtime.

[davidxl]

Since InstrProfData.inc is shared across runtime and LLVM, using COMPILER_RT_VISIBILITY there directly may not be a good idea.

I think we annotate those functions with a macro INSTR_PROF_VISIBILITY which defaults to empty string. In InstrProfilingValue.c where InstrProfData.inc is included with INSTR_PROF_COMMON_API_IMPL defined, also define

#define INSTR_PROF_VISIBILITY COMPILER_RT_VISIBILITY

[silvas]

In D21116#451826, @davidxl wrote:

Since InstrProfData.inc is shared across runtime and LLVM, using COMPILER_RT_VISIBILITY there directly may not be a good idea.

I think we annotate those functions with a macro INSTR_PROF_VISIBILITY which defaults to empty string. In InstrProfilingValue.c where InstrProfData.inc is included with INSTR_PROF_COMMON_API_IMPL defined, also define

#define INSTR_PROF_VISIBILITY COMPILER_RT_VISIBILITY

This sounds like the right approach.

[vsk]

• Adopt David's suggested INSTR_PROF_VISIBILITY macro.

[davidxl]

please also update LLVM copy

lib/profile/InstrProfData.inc

  *
  *
  * The second part of the file includes definitions all other entities that
  * are related to runtime ABI and format. When no field activation macro is
  * defined, this file can be included to introduce the definitions.
  *
 \*===----------------------------------------------------------------------===*/
 
+/* Keep in sync with InstrProfilingPort.h. */
+#ifndef COMPILER_RT_VISIBILITY
+#ifdef _MSC_VER
+#define COMPILER_RT_VISIBILITY
+#elif __GNUC__
+#define COMPILER_RT_VISIBILITY __attribute__((visibility("hidden")))
+#endif
+#endif
+
 /* INSTR_PROF_DATA start. */
 /* Definition of member fields of the per-function control structure. */
 #ifndef INSTR_PROF_DATA
 #define INSTR_PROF_DATA(Type, LLVMType, Name, Initializer)
 #else
 #define INSTR_PROF_DATA_DEFINED
 #endif
 INSTR_PROF_DATA(const uint64_t, llvm::Type::getInt64Ty(Ctx), NameRef, \

    * the method is null, value will be written out untranslated.
    */
   uint64_t (*RemapValueData)(uint32_t, uint64_t Value);
   void (*GetValueForSite)(const void *R, InstrProfValueData *Dst, uint32_t K,
                           uint32_t S);
   ValueProfData *(*AllocValueProfData)(size_t TotalSizeInBytes);
 } ValueProfRecordClosure;
 
-
-ValueProfRecord *getFirstValueProfRecord(ValueProfData *VPD);
-ValueProfRecord *getValueProfRecordNext(ValueProfRecord *VPR);
-InstrProfValueData *getValueProfRecordValueData(ValueProfRecord *VPR);
-uint32_t getValueProfRecordHeaderSize(uint32_t NumValueSites);
+COMPILER_RT_VISIBILITY ValueProfRecord *
+getFirstValueProfRecord(ValueProfData *VPD);
+COMPILER_RT_VISIBILITY ValueProfRecord *
+getValueProfRecordNext(ValueProfRecord *VPR);
+COMPILER_RT_VISIBILITY InstrProfValueData *
+getValueProfRecordValueData(ValueProfRecord *VPR);
+COMPILER_RT_VISIBILITY uint32_t
+getValueProfRecordHeaderSize(uint32_t NumValueSites);
 
 #undef INSTR_PROF_VALUE_PROF_DATA
 #endif  /* INSTR_PROF_VALUE_PROF_DATA */
 
 
 #ifdef INSTR_PROF_COMMON_API_IMPL
 #define INSTR_PROF_DATA_DEFINED
 #ifdef __cplusplus
 #define INSTR_PROF_INLINE inline
 #define INSTR_PROF_NULLPTR nullptr
 #else
 #define INSTR_PROF_INLINE
 #define INSTR_PROF_NULLPTR NULL
 #endif
 
 #ifndef offsetof
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif
 
 /*!
  * \brief Return the \c ValueProfRecord header size including the
  * padding bytes.
  */
-INSTR_PROF_INLINE
+COMPILER_RT_VISIBILITY INSTR_PROF_INLINE
 uint32_t getValueProfRecordHeaderSize(uint32_t NumValueSites) {
   uint32_t Size = offsetof(ValueProfRecord, SiteCountArray) +
                   sizeof(uint8_t) * NumValueSites;
   /* Round the size to multiple of 8 bytes. */
   Size = (Size + 7) & ~7;
   return Size;
 }
 
 /*!
  * \brief Return the total size of the value profile record including the
  * header and the value data.
  */
-INSTR_PROF_INLINE
+COMPILER_RT_VISIBILITY INSTR_PROF_INLINE
 uint32_t getValueProfRecordSize(uint32_t NumValueSites,
                                 uint32_t NumValueData) {
   return getValueProfRecordHeaderSize(NumValueSites) +
          sizeof(InstrProfValueData) * NumValueData;
 }
 
 /*!
  * \brief Return the pointer to the start of value data array.
  */
-INSTR_PROF_INLINE
+COMPILER_RT_VISIBILITY INSTR_PROF_INLINE
 InstrProfValueData *getValueProfRecordValueData(ValueProfRecord *This) {
   return (InstrProfValueData *)((char *)This + getValueProfRecordHeaderSize(
                                                    This->NumValueSites));
 }
 
 /*!
  * \brief Return the total number of value data for \c This record.
  */
-INSTR_PROF_INLINE
+COMPILER_RT_VISIBILITY INSTR_PROF_INLINE
 uint32_t getValueProfRecordNumValueData(ValueProfRecord *This) {
   uint32_t NumValueData = 0;
   uint32_t I;
   for (I = 0; I < This->NumValueSites; I++)
     NumValueData += This->SiteCountArray[I];
   return NumValueData;
 }
 
 /*!
  * \brief Use this method to advance to the next \c This \c ValueProfRecord.
  */
-INSTR_PROF_INLINE
+COMPILER_RT_VISIBILITY INSTR_PROF_INLINE
 ValueProfRecord *getValueProfRecordNext(ValueProfRecord *This) {
   uint32_t NumValueData = getValueProfRecordNumValueData(This);
   return (ValueProfRecord *)((char *)This +
                              getValueProfRecordSize(This->NumValueSites,
                                                     NumValueData));
 }
 
 /*!
  * \brief Return the first \c ValueProfRecord instance.
  */
-INSTR_PROF_INLINE
+COMPILER_RT_VISIBILITY INSTR_PROF_INLINE
 ValueProfRecord *getFirstValueProfRecord(ValueProfData *This) {
   return (ValueProfRecord *)((char *)This + sizeof(ValueProfData));
 }
 
 /* Closure based interfaces.  */
 
 /*!
  * Return the total size in bytes of the on-disk value profile data
  * given the data stored in Record.
  */
-uint32_t getValueProfDataSize(ValueProfRecordClosure *Closure) {
+COMPILER_RT_VISIBILITY uint32_t
+getValueProfDataSize(ValueProfRecordClosure *Closure) {
   uint32_t Kind;
   uint32_t TotalSize = sizeof(ValueProfData);
   const void *Record = Closure->Record;
 
   for (Kind = IPVK_First; Kind <= IPVK_Last; Kind++) {
     uint32_t NumValueSites = Closure->GetNumValueSites(Record, Kind);
     if (!NumValueSites)
       continue;
     TotalSize += getValueProfRecordSize(NumValueSites,
                                         Closure->GetNumValueData(Record, Kind));
   }
   return TotalSize;
 }
 
 /*!
  * Extract value profile data of a function for the profile kind \c ValueKind
  * from the \c Closure and serialize the data into \c This record instance.
  */
+COMPILER_RT_VISIBILITY
 void serializeValueProfRecordFrom(ValueProfRecord *This,
                                   ValueProfRecordClosure *Closure,
                                   uint32_t ValueKind, uint32_t NumValueSites) {
   uint32_t S;
   const void *Record = Closure->Record;
   This->Kind = ValueKind;
   This->NumValueSites = NumValueSites;
   InstrProfValueData *DstVD = getValueProfRecordValueData(This);
 
   for (S = 0; S < NumValueSites; S++) {
     uint32_t ND = Closure->GetNumValueDataForSite(Record, ValueKind, S);
     This->SiteCountArray[S] = ND;
     Closure->GetValueForSite(Record, DstVD, ValueKind, S);
     DstVD += ND;
   }
 }
 
 /*!
  * Extract value profile data of a function  from the \c Closure
  * and serialize the data into \c DstData if it is not NULL or heap
  * memory allocated by the \c Closure's allocator method. If \c
  * DstData is not null, the caller is expected to set the TotalSize
  * in DstData.
  */
-ValueProfData *serializeValueProfDataFrom(ValueProfRecordClosure *Closure,
-                                          ValueProfData *DstData) {
+COMPILER_RT_VISIBILITY ValueProfData *
+serializeValueProfDataFrom(ValueProfRecordClosure *Closure,
+                           ValueProfData *DstData) {
   uint32_t Kind;
   uint32_t TotalSize =
       DstData ? DstData->TotalSize : getValueProfDataSize(Closure);
 
   ValueProfData *VPD =
       DstData ? DstData : Closure->AllocValueProfData(TotalSize);
 
   VPD->TotalSize = TotalSize;

lib/profile/InstrProfilingPort.h

 /*===- InstrProfilingPort.h- Support library for PGO instrumentation ------===*\
 |*
 |*                     The LLVM Compiler Infrastructure
 |*
 |* This file is distributed under the University of Illinois Open Source
 |* License. See LICENSE.TXT for details.
 |*
 \*===----------------------------------------------------------------------===*/
 
 #ifndef PROFILE_INSTRPROFILING_PORT_H_
 #define PROFILE_INSTRPROFILING_PORT_H_
 
+/* Keep in sync with InstrProfData.inc. */
+#ifndef COMPILER_RT_VISIBILITY
 #ifdef _MSC_VER
-#define COMPILER_RT_ALIGNAS(x) __declspec(align(x))
 #define COMPILER_RT_VISIBILITY
+#elif __GNUC__
+#define COMPILER_RT_VISIBILITY __attribute__((visibility("hidden")))
+#endif
+#endif
+
+#ifdef _MSC_VER
+#define COMPILER_RT_ALIGNAS(x) __declspec(align(x))
 #define COMPILER_RT_WEAK __declspec(selectany)
 #define COMPILER_RT_ALLOCA _alloca
 #elif __GNUC__
 #define COMPILER_RT_ALIGNAS(x) __attribute__((aligned(x)))
-#define COMPILER_RT_VISIBILITY __attribute__((visibility("hidden")))
 #define COMPILER_RT_WEAK __attribute__((weak))
 #define COMPILER_RT_ALLOCA __builtin_alloca
 #endif
 
 #if defined(__APPLE__)
 #define COMPILER_RT_SEG "__DATA,"
 #else
 #define COMPILER_RT_SEG ""