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

Revert "[CMake] Support installation of InstrProfData.inc" 

This reverts commit f11bc1776f since it's
failing to build on some bots.
This commit is contained in:
Petr Hosek 2019-11-22 12:00:23 -08:00
parent f11bc1776f
commit 262b10ba1f
8 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler-rt/include/CMakeLists.txt
View File

@ -28,17 +28,10 @@ if (COMPILER_RT_BUILD_XRAY)
) )
endif(COMPILER_RT_BUILD_XRAY) endif(COMPILER_RT_BUILD_XRAY)
if (COMPILER_RT_BUILD_PROFILE)
set(PROFILE_HEADERS
profile/InstrProfData.inc
)
endif(COMPILER_RT_BUILD_PROFILE)
set(COMPILER_RT_HEADERS set(COMPILER_RT_HEADERS
${SANITIZER_HEADERS} ${SANITIZER_HEADERS}
${FUZZER_HEADERS} ${FUZZER_HEADERS}
${XRAY_HEADERS} ${XRAY_HEADERS})
${PROFILE_HEADERS})
set(output_dir ${COMPILER_RT_OUTPUT_DIR}/include) set(output_dir ${COMPILER_RT_OUTPUT_DIR}/include)
@ -73,11 +66,6 @@ install(FILES ${XRAY_HEADERS}
COMPONENT compiler-rt-headers COMPONENT compiler-rt-headers
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray) DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray)
# Install profile headers.
install(FILES ${PROFILE_HEADERS}
COMPONENT compiler-rt-headers
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/profile)
if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs. if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs.
add_custom_target(install-compiler-rt-headers add_custom_target(install-compiler-rt-headers

0
compiler-rt/include/profile/InstrProfData.inc → compiler-rt/lib/profile/InstrProfData.inc
View File

2
compiler-rt/lib/profile/InstrProfiling.c
View File

@ -15,7 +15,7 @@
#include "InstrProfilingInternal.h" #include "InstrProfilingInternal.h"
#define INSTR_PROF_VALUE_PROF_DATA #define INSTR_PROF_VALUE_PROF_DATA
#include "profile/InstrProfData.inc" #include "InstrProfData.inc"
COMPILER_RT_WEAK uint64_t INSTR_PROF_RAW_VERSION_VAR = INSTR_PROF_RAW_VERSION; COMPILER_RT_WEAK uint64_t INSTR_PROF_RAW_VERSION_VAR = INSTR_PROF_RAW_VERSION;

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

@ -13,29 +13,29 @@
#include <stdio.h> #include <stdio.h>
#define INSTR_PROF_VISIBILITY COMPILER_RT_VISIBILITY #define INSTR_PROF_VISIBILITY COMPILER_RT_VISIBILITY
#include "profile/InstrProfData.inc" #include "InstrProfData.inc"
enum ValueKind { enum ValueKind {
#define VALUE_PROF_KIND(Enumerator, Value, Descr) Enumerator = Value, #define VALUE_PROF_KIND(Enumerator, Value, Descr) Enumerator = Value,
#include "profile/InstrProfData.inc" #include "InstrProfData.inc"
}; };
typedef void *IntPtrT; typedef void *IntPtrT;
typedef struct COMPILER_RT_ALIGNAS(INSTR_PROF_DATA_ALIGNMENT) typedef struct COMPILER_RT_ALIGNAS(INSTR_PROF_DATA_ALIGNMENT)
__llvm_profile_data { __llvm_profile_data {
#define INSTR_PROF_DATA(Type, LLVMType, Name, Initializer) Type Name; #define INSTR_PROF_DATA(Type, LLVMType, Name, Initializer) Type Name;
#include "profile/InstrProfData.inc" #include "InstrProfData.inc"
} __llvm_profile_data; } __llvm_profile_data;
typedef struct __llvm_profile_header { typedef struct __llvm_profile_header {
#define INSTR_PROF_RAW_HEADER(Type, Name, Initializer) Type Name; #define INSTR_PROF_RAW_HEADER(Type, Name, Initializer) Type Name;
#include "profile/InstrProfData.inc" #include "InstrProfData.inc"
} __llvm_profile_header; } __llvm_profile_header;
typedef struct ValueProfNode * PtrToNodeT; typedef struct ValueProfNode * PtrToNodeT;
typedef struct ValueProfNode { typedef struct ValueProfNode {
#define INSTR_PROF_VALUE_NODE(Type, LLVMType, Name, Initializer) Type Name; #define INSTR_PROF_VALUE_NODE(Type, LLVMType, Name, Initializer) Type Name;
#include "profile/InstrProfData.inc" #include "InstrProfData.inc"
} ValueProfNode; } ValueProfNode;
/*! /*!
@ -120,7 +120,7 @@ int __llvm_profile_check_compatibility(const char *Profile,
*/ */
void INSTR_PROF_VALUE_PROF_FUNC( void INSTR_PROF_VALUE_PROF_FUNC(
#define VALUE_PROF_FUNC_PARAM(ArgType, ArgName, ArgLLVMType) ArgType ArgName #define VALUE_PROF_FUNC_PARAM(ArgType, ArgName, ArgLLVMType) ArgType ArgName
#include "profile/InstrProfData.inc" #include "InstrProfData.inc"
); );
void __llvm_profile_instrument_target_value(uint64_t TargetValue, void *Data, void __llvm_profile_instrument_target_value(uint64_t TargetValue, void *Data,

2
compiler-rt/lib/profile/InstrProfilingMerge.c
View File

@ -14,7 +14,7 @@
#include "InstrProfilingUtil.h" #include "InstrProfilingUtil.h"
#define INSTR_PROF_VALUE_PROF_DATA #define INSTR_PROF_VALUE_PROF_DATA
#include "profile/InstrProfData.inc" #include "InstrProfData.inc"
COMPILER_RT_VISIBILITY COMPILER_RT_VISIBILITY
void (*VPMergeHook)(ValueProfData *, __llvm_profile_data *); void (*VPMergeHook)(ValueProfData *, __llvm_profile_data *);

2
compiler-rt/lib/profile/InstrProfilingMergeFile.c
View File

@ -16,7 +16,7 @@
#include "InstrProfilingUtil.h" #include "InstrProfilingUtil.h"
#define INSTR_PROF_VALUE_PROF_DATA #define INSTR_PROF_VALUE_PROF_DATA
#include "profile/InstrProfData.inc" #include "InstrProfData.inc"
/* Merge value profile data pointed to by SrcValueProfData into /* Merge value profile data pointed to by SrcValueProfData into
* in-memory profile counters pointed by to DstData. */ * in-memory profile counters pointed by to DstData. */

2
compiler-rt/lib/profile/InstrProfilingValue.c
View File

@ -17,7 +17,7 @@
#define INSTR_PROF_VALUE_PROF_DATA #define INSTR_PROF_VALUE_PROF_DATA
#define INSTR_PROF_COMMON_API_IMPL #define INSTR_PROF_COMMON_API_IMPL
#include "profile/InstrProfData.inc" #include "InstrProfData.inc"
static int hasStaticCounters = 1; static int hasStaticCounters = 1;
static int OutOfNodesWarnings = 0; static int OutOfNodesWarnings = 0;

4
compiler-rt/lib/profile/InstrProfilingWriter.c
View File

@ -17,7 +17,7 @@
#include "InstrProfilingPort.h" #include "InstrProfilingPort.h"
#define INSTR_PROF_VALUE_PROF_DATA #define INSTR_PROF_VALUE_PROF_DATA
#include "profile/InstrProfData.inc" #include "InstrProfData.inc"
COMPILER_RT_VISIBILITY void (*FreeHook)(void *) = NULL; COMPILER_RT_VISIBILITY void (*FreeHook)(void *) = NULL;
static ProfBufferIO TheBufferIO; static ProfBufferIO TheBufferIO;
@ -280,7 +280,7 @@ lprofWriteDataImpl(ProfDataWriter *Writer, const __llvm_profile_data *DataBegin,
/* Initialize header structure. */ /* Initialize header structure. */
#define INSTR_PROF_RAW_HEADER(Type, Name, Init) Header.Name = Init; #define INSTR_PROF_RAW_HEADER(Type, Name, Init) Header.Name = Init;
#include "profile/InstrProfData.inc" #include "InstrProfData.inc"
/* Write the data. */ /* Write the data. */
ProfDataIOVec IOVec[] = { ProfDataIOVec IOVec[] = {