Revert "[SystemZ][XRay] XRay runtime support for SystemZ (#113252)"

for causing: #115129 This reverts commit db1882e.
llvm · Nov 6, 2024 · 6d719d9 · 6d719d9
1 parent 0e907c1
commit 6d719d9
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 302 deletions.
diff --git a/compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake b/compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake
@@ -102,7 +102,7 @@ if(APPLE)
 set(ALL_XRAY_SUPPORTED_ARCH ${X86_64} ${ARM64})
 else()
 set(ALL_XRAY_SUPPORTED_ARCH ${X86_64} ${ARM32} ${ARM64} ${MIPS32} ${MIPS64}
-		powerpc64le ${HEXAGON} ${LOONGARCH64} ${S390X})
+		powerpc64le ${HEXAGON} ${LOONGARCH64})
 endif()
 set(ALL_XRAY_DSO_SUPPORTED_ARCH ${X86_64})
 set(ALL_SHADOWCALLSTACK_SUPPORTED_ARCH ${ARM64})

diff --git a/compiler-rt/lib/xray/CMakeLists.txt b/compiler-rt/lib/xray/CMakeLists.txt
@@ -92,13 +92,6 @@ set(hexagon_SOURCES
   xray_trampoline_hexagon.S
   )
 
-set(s390x_SOURCES
-  xray_s390x.cpp
-  xray_trampoline_s390x.S
-  )
-# Enable vector instructions in the assembly file.
-set_source_files_properties(xray_trampoline_s390x.S PROPERTIES COMPILE_FLAGS -mvx)
-
 set(XRAY_SOURCE_ARCHS
   arm
   armhf
@@ -109,7 +102,6 @@ set(XRAY_SOURCE_ARCHS
   mips64
   mips64el
   powerpc64le
-  s390x
   x86_64
   )
 
@@ -160,7 +152,6 @@ set(XRAY_ALL_SOURCE_FILES
   ${mips64_SOURCES}
   ${mips64el_SOURCES}
   ${powerpc64le_SOURCES}
-  ${s390x_SOURCES}
   ${XRAY_IMPL_HEADERS}
   )
 list(REMOVE_DUPLICATES XRAY_ALL_SOURCE_FILES)

diff --git a/compiler-rt/lib/xray/xray_interface.cpp b/compiler-rt/lib/xray/xray_interface.cpp
@@ -57,8 +57,6 @@ static const int16_t cSledLength = 64;
 static const int16_t cSledLength = 8;
 #elif defined(__hexagon__)
 static const int16_t cSledLength = 20;
-#elif defined(__s390x__)
-static const int16_t cSledLength = 18;
 #else
 #error "Unsupported CPU Architecture"
 #endif /* CPU architecture */

diff --git a/compiler-rt/lib/xray/xray_interface_internal.h b/compiler-rt/lib/xray/xray_interface_internal.h
@@ -29,10 +29,6 @@ extern void __xray_FunctionTailExit();
 extern void __xray_ArgLoggerEntry();
 extern void __xray_CustomEvent();
 extern void __xray_TypedEvent();
-#if defined(__s390x__)
-extern void __xray_FunctionEntryVec();
-extern void __xray_FunctionExitVec();
-#endif
 }
 
 extern "C" {

diff --git a/compiler-rt/lib/xray/xray_s390x.cpp b/compiler-rt/lib/xray/xray_s390x.cpp
diff --git a/compiler-rt/lib/xray/xray_trampoline_s390x.S b/compiler-rt/lib/xray/xray_trampoline_s390x.S
diff --git a/compiler-rt/lib/xray/xray_tsc.h b/compiler-rt/lib/xray/xray_tsc.h
@@ -83,28 +83,6 @@ inline uint64_t getTSCFrequency() XRAY_NEVER_INSTRUMENT {
 
 } // namespace __xray
 
-#elif defined(__s390x__)
-#include "sanitizer_common/sanitizer_common.h"
-#include "sanitizer_common/sanitizer_internal_defs.h"
-#include "xray_defs.h"
-#include <cerrno>
-#include <cstdint>
-#include <time.h>
-
-namespace __xray {
-
-inline bool probeRequiredCPUFeatures() XRAY_NEVER_INSTRUMENT { return true; }
-
-ALWAYS_INLINE uint64_t readTSC(uint8_t &CPU) XRAY_NEVER_INSTRUMENT {
-  return __builtin_readcyclecounter();
-}
-
-inline uint64_t getTSCFrequency() XRAY_NEVER_INSTRUMENT {
-  return NanosecondsPerSecond;
-}
-
-} // namespace __xray
-
 #else
 #error Target architecture is not supported.
 #endif // CPU architecture