[compiler-rt] 262b10b - Revert "[CMake] Support installation of InstrProfData.inc"
Petr Hosek via llvm-commits
llvm-commits at lists.llvm.org
Fri Nov 22 12:01:03 PST 2019
Author: Petr Hosek
Date: 2019-11-22T12:00:23-08:00
New Revision: 262b10ba1f9db4d00f43bcb1d8c1e557dced3bcd
URL: https://github.com/llvm/llvm-project/commit/262b10ba1f9db4d00f43bcb1d8c1e557dced3bcd
DIFF: https://github.com/llvm/llvm-project/commit/262b10ba1f9db4d00f43bcb1d8c1e557dced3bcd.diff
LOG: Revert "[CMake] Support installation of InstrProfData.inc"
This reverts commit f11bc1776fd2815b60e0b1ed97be00b517348162 since it's
failing to build on some bots.
Added:
compiler-rt/lib/profile/InstrProfData.inc
Modified:
compiler-rt/include/CMakeLists.txt
compiler-rt/lib/profile/InstrProfiling.c
compiler-rt/lib/profile/InstrProfiling.h
compiler-rt/lib/profile/InstrProfilingMerge.c
compiler-rt/lib/profile/InstrProfilingMergeFile.c
compiler-rt/lib/profile/InstrProfilingValue.c
compiler-rt/lib/profile/InstrProfilingWriter.c
Removed:
compiler-rt/include/profile/InstrProfData.inc
################################################################################
diff --git a/compiler-rt/include/CMakeLists.txt b/compiler-rt/include/CMakeLists.txt
index d47d7baeb118..403ded4ea2ad 100644
--- a/compiler-rt/include/CMakeLists.txt
+++ b/compiler-rt/include/CMakeLists.txt
@@ -28,17 +28,10 @@ if (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
${SANITIZER_HEADERS}
${FUZZER_HEADERS}
- ${XRAY_HEADERS}
- ${PROFILE_HEADERS})
+ ${XRAY_HEADERS})
set(output_dir ${COMPILER_RT_OUTPUT_DIR}/include)
@@ -73,11 +66,6 @@ install(FILES ${XRAY_HEADERS}
COMPONENT compiler-rt-headers
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
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.
add_custom_target(install-compiler-rt-headers
diff --git a/compiler-rt/include/profile/InstrProfData.inc b/compiler-rt/lib/profile/InstrProfData.inc
similarity index 100%
rename from compiler-rt/include/profile/InstrProfData.inc
rename to compiler-rt/lib/profile/InstrProfData.inc
diff --git a/compiler-rt/lib/profile/InstrProfiling.c b/compiler-rt/lib/profile/InstrProfiling.c
index 087d1cdd2efe..f3787715e709 100644
--- a/compiler-rt/lib/profile/InstrProfiling.c
+++ b/compiler-rt/lib/profile/InstrProfiling.c
@@ -15,7 +15,7 @@
#include "InstrProfilingInternal.h"
#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;
diff --git a/compiler-rt/lib/profile/InstrProfiling.h b/compiler-rt/lib/profile/InstrProfiling.h
index 3a3bab3d0b4c..78dfc675efd7 100644
--- a/compiler-rt/lib/profile/InstrProfiling.h
+++ b/compiler-rt/lib/profile/InstrProfiling.h
@@ -13,29 +13,29 @@
#include <stdio.h>
#define INSTR_PROF_VISIBILITY COMPILER_RT_VISIBILITY
-#include "profile/InstrProfData.inc"
+#include "InstrProfData.inc"
enum ValueKind {
#define VALUE_PROF_KIND(Enumerator, Value, Descr) Enumerator = Value,
-#include "profile/InstrProfData.inc"
+#include "InstrProfData.inc"
};
typedef void *IntPtrT;
typedef struct COMPILER_RT_ALIGNAS(INSTR_PROF_DATA_ALIGNMENT)
__llvm_profile_data {
#define INSTR_PROF_DATA(Type, LLVMType, Name, Initializer) Type Name;
-#include "profile/InstrProfData.inc"
+#include "InstrProfData.inc"
} __llvm_profile_data;
typedef struct __llvm_profile_header {
#define INSTR_PROF_RAW_HEADER(Type, Name, Initializer) Type Name;
-#include "profile/InstrProfData.inc"
+#include "InstrProfData.inc"
} __llvm_profile_header;
typedef struct ValueProfNode * PtrToNodeT;
typedef struct ValueProfNode {
#define INSTR_PROF_VALUE_NODE(Type, LLVMType, Name, Initializer) Type Name;
-#include "profile/InstrProfData.inc"
+#include "InstrProfData.inc"
} ValueProfNode;
/*!
@@ -120,7 +120,7 @@ int __llvm_profile_check_compatibility(const char *Profile,
*/
void INSTR_PROF_VALUE_PROF_FUNC(
#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,
diff --git a/compiler-rt/lib/profile/InstrProfilingMerge.c b/compiler-rt/lib/profile/InstrProfilingMerge.c
index 0fd9b2bcd41f..44dce7cc9f62 100644
--- a/compiler-rt/lib/profile/InstrProfilingMerge.c
+++ b/compiler-rt/lib/profile/InstrProfilingMerge.c
@@ -14,7 +14,7 @@
#include "InstrProfilingUtil.h"
#define INSTR_PROF_VALUE_PROF_DATA
-#include "profile/InstrProfData.inc"
+#include "InstrProfData.inc"
COMPILER_RT_VISIBILITY
void (*VPMergeHook)(ValueProfData *, __llvm_profile_data *);
diff --git a/compiler-rt/lib/profile/InstrProfilingMergeFile.c b/compiler-rt/lib/profile/InstrProfilingMergeFile.c
index 8923ba21cc58..b853f15b4737 100644
--- a/compiler-rt/lib/profile/InstrProfilingMergeFile.c
+++ b/compiler-rt/lib/profile/InstrProfilingMergeFile.c
@@ -16,7 +16,7 @@
#include "InstrProfilingUtil.h"
#define INSTR_PROF_VALUE_PROF_DATA
-#include "profile/InstrProfData.inc"
+#include "InstrProfData.inc"
/* Merge value profile data pointed to by SrcValueProfData into
* in-memory profile counters pointed by to DstData. */
diff --git a/compiler-rt/lib/profile/InstrProfilingValue.c b/compiler-rt/lib/profile/InstrProfilingValue.c
index fd53cac3dff3..b7c71768c2c3 100644
--- a/compiler-rt/lib/profile/InstrProfilingValue.c
+++ b/compiler-rt/lib/profile/InstrProfilingValue.c
@@ -17,7 +17,7 @@
#define INSTR_PROF_VALUE_PROF_DATA
#define INSTR_PROF_COMMON_API_IMPL
-#include "profile/InstrProfData.inc"
+#include "InstrProfData.inc"
static int hasStaticCounters = 1;
static int OutOfNodesWarnings = 0;
diff --git a/compiler-rt/lib/profile/InstrProfilingWriter.c b/compiler-rt/lib/profile/InstrProfilingWriter.c
index ac8113e2f05b..0b2e17612ab3 100644
--- a/compiler-rt/lib/profile/InstrProfilingWriter.c
+++ b/compiler-rt/lib/profile/InstrProfilingWriter.c
@@ -17,7 +17,7 @@
#include "InstrProfilingPort.h"
#define INSTR_PROF_VALUE_PROF_DATA
-#include "profile/InstrProfData.inc"
+#include "InstrProfData.inc"
COMPILER_RT_VISIBILITY void (*FreeHook)(void *) = NULL;
static ProfBufferIO TheBufferIO;
@@ -280,7 +280,7 @@ lprofWriteDataImpl(ProfDataWriter *Writer, const __llvm_profile_data *DataBegin,
/* Initialize header structure. */
#define INSTR_PROF_RAW_HEADER(Type, Name, Init) Header.Name = Init;
-#include "profile/InstrProfData.inc"
+#include "InstrProfData.inc"
/* Write the data. */
ProfDataIOVec IOVec[] = {
More information about the llvm-commits
mailing list