maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[XRay][Arm] Enable back XRay testing on Arm32 and fix the failing tests 

Summary:
Testing of XRay was occasionally disabled on 32-bit Arm targets (someone assumed that XRay was supported on 64-bit targets only). This patch should fix that problem. Also here the instruction&data cache incoherency problem is fixed, because it may be causing a test to fail.
This patch is one of a series: see also
- https://reviews.llvm.org/D28624

Reviewers: dberris, rengolin

Reviewed By: rengolin

Subscribers: llvm-commits, aemerson, rengolin, dberris, iid_iunknown

Differential Revision: https://reviews.llvm.org/D28623

llvm-svn: 292211
This commit is contained in:
Serge Rogatch 2017-01-17 11:53:38 +00:00
parent 50be6b45a9
commit 1bcd53f0e7
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler-rt/lib/xray/xray_arm.cc
View File

@ -19,6 +19,8 @@
#include <atomic> #include <atomic>
#include <cassert> #include <cassert>
extern "C" void __clear_cache(void* start, void* end);
namespace __xray { namespace __xray {
uint64_t cycleFrequency() XRAY_NEVER_INSTRUMENT { uint64_t cycleFrequency() XRAY_NEVER_INSTRUMENT {
@ -116,8 +118,8 @@ inline static bool patchSled(const bool Enable, const uint32_t FuncId,
// B #20 // B #20
uint32_t *FirstAddress = reinterpret_cast<uint32_t *>(Sled.Address); uint32_t *FirstAddress = reinterpret_cast<uint32_t *>(Sled.Address);
uint32_t *CurAddress = FirstAddress + 1;
if (Enable) { if (Enable) {
uint32_t *CurAddress = FirstAddress + 1;
CurAddress = CurAddress =
Write32bitLoadR0(CurAddress, reinterpret_cast<uint32_t>(FuncId)); Write32bitLoadR0(CurAddress, reinterpret_cast<uint32_t>(FuncId));
CurAddress = CurAddress =
@ -125,6 +127,7 @@ inline static bool patchSled(const bool Enable, const uint32_t FuncId,
*CurAddress = uint32_t(PatchOpcodes::PO_BlxIp); *CurAddress = uint32_t(PatchOpcodes::PO_BlxIp);
CurAddress++; CurAddress++;
*CurAddress = uint32_t(PatchOpcodes::PO_PopR0Lr); *CurAddress = uint32_t(PatchOpcodes::PO_PopR0Lr);
CurAddress++;
std::atomic_store_explicit( std::atomic_store_explicit(
reinterpret_cast<std::atomic<uint32_t> *>(FirstAddress), reinterpret_cast<std::atomic<uint32_t> *>(FirstAddress),
uint32_t(PatchOpcodes::PO_PushR0Lr), std::memory_order_release); uint32_t(PatchOpcodes::PO_PushR0Lr), std::memory_order_release);
@ -133,6 +136,8 @@ inline static bool patchSled(const bool Enable, const uint32_t FuncId,
reinterpret_cast<std::atomic<uint32_t> *>(FirstAddress), reinterpret_cast<std::atomic<uint32_t> *>(FirstAddress),
uint32_t(PatchOpcodes::PO_B20), std::memory_order_release); uint32_t(PatchOpcodes::PO_B20), std::memory_order_release);
} }
__clear_cache(reinterpret_cast<char*>(FirstAddress),
reinterpret_cast<char*>(CurAddress));
return true; return true;
} }

4
compiler-rt/test/xray/lit.cfg
View File

@ -30,7 +30,9 @@ config.substitutions.append(
# Default test suffixes. # Default test suffixes.
config.suffixes = ['.c', '.cc', '.cpp'] config.suffixes = ['.c', '.cc', '.cpp']
if config.host_os not in ['Linux'] or config.host_arch.find('64') == -1: if config.host_os not in ['Linux']:
config.unsupported = True
elif config.host_arch.find('64') == -1 and config.host_arch.find('arm') == -1:
config.unsupported = True config.unsupported = True
# Allow tests to use REQUIRES=stable-runtime. For use when you cannot use XFAIL # Allow tests to use REQUIRES=stable-runtime. For use when you cannot use XFAIL