Skip to content

Commit 8b2ba6a

Browse files
authored
Revert "[compiler-rt][ctx_instr] Add ctx_profile component" (llvm#89625)
Reverts llvm#89304 Some build bot failures - will fix and reland. Example: https://lab.llvm.org/buildbot/#/builders/165/builds/52789
1 parent 832d3a4 commit 8b2ba6a

10 files changed

+0
-247
lines changed

compiler-rt/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ option(COMPILER_RT_BUILD_LIBFUZZER "Build libFuzzer" ON)
5050
mark_as_advanced(COMPILER_RT_BUILD_LIBFUZZER)
5151
option(COMPILER_RT_BUILD_PROFILE "Build profile runtime" ON)
5252
mark_as_advanced(COMPILER_RT_BUILD_PROFILE)
53-
option(COMPILER_RT_BUILD_CTX_PROFILE "Build ctx profile runtime" ON)
54-
mark_as_advanced(COMPILER_RT_BUILD_CTX_PROFILE)
5553
option(COMPILER_RT_BUILD_MEMPROF "Build memory profiling runtime" ON)
5654
mark_as_advanced(COMPILER_RT_BUILD_MEMPROF)
5755
option(COMPILER_RT_BUILD_XRAY_NO_PREINIT "Build xray with no preinit patching" OFF)

compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ set(ALL_MEMPROF_SUPPORTED_ARCH ${X86_64})
6666
set(ALL_PROFILE_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${PPC32} ${PPC64}
6767
${MIPS32} ${MIPS64} ${S390X} ${SPARC} ${SPARCV9} ${HEXAGON}
6868
${RISCV32} ${RISCV64} ${LOONGARCH64})
69-
set(ALL_CTX_PROFILE_SUPPORTED_ARCH ${X86_64})
7069
set(ALL_TSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64} ${PPC64} ${S390X}
7170
${LOONGARCH64} ${RISCV64})
7271
set(ALL_UBSAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${RISCV64}

compiler-rt/cmake/config-ix.cmake

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -632,9 +632,6 @@ if(APPLE)
632632
list_intersect(PROFILE_SUPPORTED_ARCH
633633
ALL_PROFILE_SUPPORTED_ARCH
634634
SANITIZER_COMMON_SUPPORTED_ARCH)
635-
list_intersect(CTX_PROFILE_SUPPORTED_ARCH
636-
ALL_CTX_PROFILE_SUPPORTED_ARCH
637-
SANITIZER_COMMON_SUPPORTED_ARCH)
638635
list_intersect(TSAN_SUPPORTED_ARCH
639636
ALL_TSAN_SUPPORTED_ARCH
640637
SANITIZER_COMMON_SUPPORTED_ARCH)
@@ -681,7 +678,6 @@ else()
681678
filter_available_targets(HWASAN_SUPPORTED_ARCH ${ALL_HWASAN_SUPPORTED_ARCH})
682679
filter_available_targets(MEMPROF_SUPPORTED_ARCH ${ALL_MEMPROF_SUPPORTED_ARCH})
683680
filter_available_targets(PROFILE_SUPPORTED_ARCH ${ALL_PROFILE_SUPPORTED_ARCH})
684-
filter_available_targets(CTX_PROFILE_SUPPORTED_ARCH ${ALL_CTX_PROFILE_SUPPORTED_ARCH})
685681
filter_available_targets(TSAN_SUPPORTED_ARCH ${ALL_TSAN_SUPPORTED_ARCH})
686682
filter_available_targets(UBSAN_SUPPORTED_ARCH ${ALL_UBSAN_SUPPORTED_ARCH})
687683
filter_available_targets(SAFESTACK_SUPPORTED_ARCH
@@ -807,13 +803,6 @@ else()
807803
set(COMPILER_RT_HAS_PROFILE FALSE)
808804
endif()
809805

810-
if (COMPILER_RT_HAS_SANITIZER_COMMON AND CTX_PROFILE_SUPPORTED_ARCH AND
811-
OS_NAME MATCHES "Linux")
812-
set(COMPILER_RT_HAS_CTX_PROFILE TRUE)
813-
else()
814-
set(COMPILER_RT_HAS_CTX_PROFILE FALSE)
815-
endif()
816-
817806
if (COMPILER_RT_HAS_SANITIZER_COMMON AND TSAN_SUPPORTED_ARCH)
818807
if (OS_NAME MATCHES "Linux|Darwin|FreeBSD|NetBSD")
819808
set(COMPILER_RT_HAS_TSAN TRUE)

compiler-rt/lib/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ if(COMPILER_RT_BUILD_PROFILE AND COMPILER_RT_HAS_PROFILE)
5151
compiler_rt_build_runtime(profile)
5252
endif()
5353

54-
if(COMPILER_RT_BUILD_CTX_PROFILE AND COMPILER_RT_HAS_CTX_PROFILE)
55-
compiler_rt_build_runtime(ctx_profile)
56-
endif()
57-
5854
if(COMPILER_RT_BUILD_XRAY)
5955
compiler_rt_build_runtime(xray)
6056
endif()

compiler-rt/lib/ctx_profile/CMakeLists.txt

Lines changed: 0 additions & 28 deletions
This file was deleted.

compiler-rt/lib/ctx_profile/CtxInstrProfiling.cpp

Lines changed: 0 additions & 40 deletions
This file was deleted.

compiler-rt/lib/ctx_profile/CtxInstrProfiling.h

Lines changed: 0 additions & 55 deletions
This file was deleted.

compiler-rt/lib/ctx_profile/tests/CMakeLists.txt

Lines changed: 0 additions & 70 deletions
This file was deleted.

compiler-rt/lib/ctx_profile/tests/CtxInstrProfilingTest.cpp

Lines changed: 0 additions & 22 deletions
This file was deleted.

compiler-rt/lib/ctx_profile/tests/driver.cpp

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)