Skip to content

Commit 6d719d9

Browse files
committed
Revert "[SystemZ][XRay] XRay runtime support for SystemZ (#113252)"
for causing: #115129 This reverts commit db1882e.
1 parent 0e907c1 commit 6d719d9

File tree

7 files changed

+1
-302
lines changed

7 files changed

+1
-302
lines changed

compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ if(APPLE)
102102
set(ALL_XRAY_SUPPORTED_ARCH ${X86_64} ${ARM64})
103103
else()
104104
set(ALL_XRAY_SUPPORTED_ARCH ${X86_64} ${ARM32} ${ARM64} ${MIPS32} ${MIPS64}
105-
powerpc64le ${HEXAGON} ${LOONGARCH64} ${S390X})
105+
powerpc64le ${HEXAGON} ${LOONGARCH64})
106106
endif()
107107
set(ALL_XRAY_DSO_SUPPORTED_ARCH ${X86_64})
108108
set(ALL_SHADOWCALLSTACK_SUPPORTED_ARCH ${ARM64})

compiler-rt/lib/xray/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,6 @@ set(hexagon_SOURCES
9292
xray_trampoline_hexagon.S
9393
)
9494

95-
set(s390x_SOURCES
96-
xray_s390x.cpp
97-
xray_trampoline_s390x.S
98-
)
99-
# Enable vector instructions in the assembly file.
100-
set_source_files_properties(xray_trampoline_s390x.S PROPERTIES COMPILE_FLAGS -mvx)
101-
10295
set(XRAY_SOURCE_ARCHS
10396
arm
10497
armhf
@@ -109,7 +102,6 @@ set(XRAY_SOURCE_ARCHS
109102
mips64
110103
mips64el
111104
powerpc64le
112-
s390x
113105
x86_64
114106
)
115107

@@ -160,7 +152,6 @@ set(XRAY_ALL_SOURCE_FILES
160152
${mips64_SOURCES}
161153
${mips64el_SOURCES}
162154
${powerpc64le_SOURCES}
163-
${s390x_SOURCES}
164155
${XRAY_IMPL_HEADERS}
165156
)
166157
list(REMOVE_DUPLICATES XRAY_ALL_SOURCE_FILES)

compiler-rt/lib/xray/xray_interface.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ static const int16_t cSledLength = 64;
5757
static const int16_t cSledLength = 8;
5858
#elif defined(__hexagon__)
5959
static const int16_t cSledLength = 20;
60-
#elif defined(__s390x__)
61-
static const int16_t cSledLength = 18;
6260
#else
6361
#error "Unsupported CPU Architecture"
6462
#endif /* CPU architecture */

compiler-rt/lib/xray/xray_interface_internal.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ extern void __xray_FunctionTailExit();
2929
extern void __xray_ArgLoggerEntry();
3030
extern void __xray_CustomEvent();
3131
extern void __xray_TypedEvent();
32-
#if defined(__s390x__)
33-
extern void __xray_FunctionEntryVec();
34-
extern void __xray_FunctionExitVec();
35-
#endif
3632
}
3733

3834
extern "C" {

compiler-rt/lib/xray/xray_s390x.cpp

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

compiler-rt/lib/xray/xray_trampoline_s390x.S

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

compiler-rt/lib/xray/xray_tsc.h

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -83,28 +83,6 @@ inline uint64_t getTSCFrequency() XRAY_NEVER_INSTRUMENT {
8383

8484
} // namespace __xray
8585

86-
#elif defined(__s390x__)
87-
#include "sanitizer_common/sanitizer_common.h"
88-
#include "sanitizer_common/sanitizer_internal_defs.h"
89-
#include "xray_defs.h"
90-
#include <cerrno>
91-
#include <cstdint>
92-
#include <time.h>
93-
94-
namespace __xray {
95-
96-
inline bool probeRequiredCPUFeatures() XRAY_NEVER_INSTRUMENT { return true; }
97-
98-
ALWAYS_INLINE uint64_t readTSC(uint8_t &CPU) XRAY_NEVER_INSTRUMENT {
99-
return __builtin_readcyclecounter();
100-
}
101-
102-
inline uint64_t getTSCFrequency() XRAY_NEVER_INSTRUMENT {
103-
return NanosecondsPerSecond;
104-
}
105-
106-
} // namespace __xray
107-
10886
#else
10987
#error Target architecture is not supported.
11088
#endif // CPU architecture

0 commit comments

Comments
 (0)