[compiler-rt] r292356 - Revert "[XRay][Arm] Enable back XRay testing on Arm32 and fix the failing tests"

[Renato Golin via llvm-commits]

Author: rengolin
Date: Wed Jan 18 03:07:35 2017
New Revision: 292356

URL: http://llvm.org/viewvc/llvm-project?rev=292356&view=rev
Log:
Revert "[XRay][Arm] Enable back XRay testing on Arm32 and fix the failing tests"

This reverts commit r292211, as it broke the Thumb buldbot with:

clang-5.0: error: the clang compiler does not support '-fxray-instrument
on thumbv7-unknown-linux-gnueabihf'

Modified:
    compiler-rt/trunk/lib/xray/xray_arm.cc
    compiler-rt/trunk/test/xray/lit.cfg

Modified: compiler-rt/trunk/lib/xray/xray_arm.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/xray/xray_arm.cc?rev=292356&r1=292355&r2=292356&view=diff
==============================================================================
--- compiler-rt/trunk/lib/xray/xray_arm.cc (original)
+++ compiler-rt/trunk/lib/xray/xray_arm.cc Wed Jan 18 03:07:35 2017
@@ -19,8 +19,6 @@
 #include <atomic>
 #include <cassert>
 
-extern "C" void __clear_cache(void* start, void* end);
-
 namespace __xray {
 
 uint64_t cycleFrequency() XRAY_NEVER_INSTRUMENT {
@@ -118,8 +116,8 @@ inline static bool patchSled(const bool
   //   B #20
 
   uint32_t *FirstAddress = reinterpret_cast<uint32_t *>(Sled.Address);
-  uint32_t *CurAddress = FirstAddress + 1;
   if (Enable) {
+    uint32_t *CurAddress = FirstAddress + 1;
     CurAddress =
         Write32bitLoadR0(CurAddress, reinterpret_cast<uint32_t>(FuncId));
     CurAddress =
@@ -127,7 +125,6 @@ inline static bool patchSled(const bool
     *CurAddress = uint32_t(PatchOpcodes::PO_BlxIp);
     CurAddress++;
     *CurAddress = uint32_t(PatchOpcodes::PO_PopR0Lr);
-    CurAddress++;
     std::atomic_store_explicit(
         reinterpret_cast<std::atomic<uint32_t> *>(FirstAddress),
         uint32_t(PatchOpcodes::PO_PushR0Lr), std::memory_order_release);
@@ -136,8 +133,6 @@ inline static bool patchSled(const bool
         reinterpret_cast<std::atomic<uint32_t> *>(FirstAddress),
         uint32_t(PatchOpcodes::PO_B20), std::memory_order_release);
   }
-  __clear_cache(reinterpret_cast<char*>(FirstAddress),
-      reinterpret_cast<char*>(CurAddress));
   return true;
 }
 

Modified: compiler-rt/trunk/test/xray/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/lit.cfg?rev=292356&r1=292355&r2=292356&view=diff
==============================================================================
--- compiler-rt/trunk/test/xray/lit.cfg (original)
+++ compiler-rt/trunk/test/xray/lit.cfg Wed Jan 18 03:07:35 2017
@@ -30,9 +30,7 @@ config.substitutions.append(
 # Default test suffixes.
 config.suffixes = ['.c', '.cc', '.cpp']
 
-if config.host_os not in ['Linux']:
-  config.unsupported = True
-elif config.host_arch.find('64') == -1 and config.host_arch.find('arm') == -1:
+if config.host_os not in ['Linux'] or config.host_arch.find('64') == -1:
   config.unsupported = True
 
 # Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL