6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-25 13:24:46 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Replace Execution Engine's mutex with std::recursive_mutex."

Browse Source 
This reverts commit 1f502bd9d7, due to
GCC / MinGW's lack of support for C++11 threading.

It's possible this will go back in after we come up with a
reasonable solution.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211401 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Zachary Turner
2014-06-20 21:07:14 +00:00
parent 5b8e73ef81
commit 91e18f7639
7 changed files with 71 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/ExecutionEngine/JIT/JIT.cpp
View File

@@ -96,18 +96,18 @@ namespace {
/// bugpoint or gdb users to search for a function by name without any context.
class JitPool {
SmallPtrSet<JIT*, 1> JITs; // Optimize for process containing just 1 JIT.
mutable std::recursive_mutex Lock;
mutable sys::Mutex Lock;
public:
void Add(JIT *jit) {
std::lock_guard<std::recursive_mutex> guard(Lock);
MutexGuard guard(Lock);
JITs.insert(jit);
}
void Remove(JIT *jit) {
std::lock_guard<std::recursive_mutex> guard(Lock);
MutexGuard guard(Lock);
JITs.erase(jit);
}
void *getPointerToNamedFunction(const char *Name) const {
std::lock_guard<std::recursive_mutex> guard(Lock);
MutexGuard guard(Lock);
assert(JITs.size() != 0 && "No Jit registered");
//search function in every instance of JIT
for (SmallPtrSet<JIT*, 1>::const_iterator Jit = JITs.begin(),
@@ -150,7 +150,7 @@ JIT::JIT(Module *M, TargetMachine &tm, TargetJITInfo &tji,
AllJits->Add(this);
// Add target data
std::lock_guard<std::recursive_mutex> locked(lock);
MutexGuard locked(lock);
FunctionPassManager &PM = jitstate->getPM();
M->setDataLayout(TM.getDataLayout());
PM.add(new DataLayoutPass(M));
@@ -177,7 +177,7 @@ JIT::~JIT() {
/// addModule - Add a new Module to the JIT. If we previously removed the last
/// Module, we need re-initialize jitstate with a valid Module.
void JIT::addModule(Module *M) {
std::lock_guard<std::recursive_mutex> locked(lock);
MutexGuard locked(lock);
if (Modules.empty()) {
assert(!jitstate && "jitstate should be NULL if Modules vector is empty!");
@@ -206,7 +206,7 @@ void JIT::addModule(Module *M) {
bool JIT::removeModule(Module *M) {
bool result = ExecutionEngine::removeModule(M);
std::lock_guard<std::recursive_mutex> locked(lock);
MutexGuard locked(lock);
if (jitstate && jitstate->getModule() == M) {
delete jitstate;
@@ -408,13 +408,13 @@ GenericValue JIT::runFunction(Function *F,
void JIT::RegisterJITEventListener(JITEventListener *L) {
if (!L)
return;
std::lock_guard<std::recursive_mutex> locked(lock);
MutexGuard locked(lock);
EventListeners.push_back(L);
}
void JIT::UnregisterJITEventListener(JITEventListener *L) {
if (!L)
return;
std::lock_guard<std::recursive_mutex> locked(lock);
MutexGuard locked(lock);
std::vector<JITEventListener*>::reverse_iterator I=
std::find(EventListeners.rbegin(), EventListeners.rend(), L);
if (I != EventListeners.rend()) {
@@ -426,14 +426,14 @@ void JIT::NotifyFunctionEmitted(
const Function &F,
void *Code, size_t Size,
const JITEvent_EmittedFunctionDetails &Details) {
std::lock_guard<std::recursive_mutex> locked(lock);
MutexGuard locked(lock);
for (unsigned I = 0, S = EventListeners.size(); I < S; ++I) {
EventListeners[I]->NotifyFunctionEmitted(F, Code, Size, Details);
}
}
void JIT::NotifyFreeingMachineCode(void *OldPtr) {
std::lock_guard<std::recursive_mutex> locked(lock);
MutexGuard locked(lock);
for (unsigned I = 0, S = EventListeners.size(); I < S; ++I) {
EventListeners[I]->NotifyFreeingMachineCode(OldPtr);
}
@@ -444,7 +444,7 @@ void JIT::NotifyFreeingMachineCode(void *OldPtr) {
/// GlobalAddress[F] with the address of F's machine code.
///
void JIT::runJITOnFunction(Function *F, MachineCodeInfo *MCI) {
std::lock_guard<std::recursive_mutex> locked(lock);
MutexGuard locked(lock);
class MCIListener : public JITEventListener {
MachineCodeInfo *const MCI;
@@ -505,7 +505,7 @@ void *JIT::getPointerToFunction(Function *F) {
if (void *Addr = getPointerToGlobalIfAvailable(F))
return Addr; // Check if function already code gen'd
std::lock_guard<std::recursive_mutex> locked(lock);
MutexGuard locked(lock);
// Now that this thread owns the lock, make sure we read in the function if it
// exists in this Module.
@@ -534,7 +534,7 @@ void *JIT::getPointerToFunction(Function *F) {
}
void JIT::addPointerToBasicBlock(const BasicBlock *BB, void *Addr) {
std::lock_guard<std::recursive_mutex> locked(lock);
MutexGuard locked(lock);
BasicBlockAddressMapTy::iterator I =
getBasicBlockAddressMap().find(BB);
@@ -546,7 +546,7 @@ void JIT::addPointerToBasicBlock(const BasicBlock *BB, void *Addr) {
}
void JIT::clearPointerToBasicBlock(const BasicBlock *BB) {
std::lock_guard<std::recursive_mutex> locked(lock);
MutexGuard locked(lock);
getBasicBlockAddressMap().erase(BB);
}
@@ -555,7 +555,7 @@ void *JIT::getPointerToBasicBlock(BasicBlock *BB) {
(void)getPointerToFunction(BB->getParent());
// resolve basic block address
std::lock_guard<std::recursive_mutex> locked(lock);
MutexGuard locked(lock);
BasicBlockAddressMapTy::iterator I =
getBasicBlockAddressMap().find(BB);
@@ -592,7 +592,7 @@ void *JIT::getPointerToNamedFunction(const std::string &Name,
/// variable, possibly emitting it to memory if needed. This is used by the
/// Emitter.
void *JIT::getOrEmitGlobalVariable(const GlobalVariable *GV) {
std::lock_guard<std::recursive_mutex> locked(lock);
MutexGuard locked(lock);
void *Ptr = getPointerToGlobalIfAvailable(GV);
if (Ptr) return Ptr;
@@ -666,7 +666,7 @@ char* JIT::getMemoryForGV(const GlobalVariable* GV) {
size_t S = getDataLayout()->getTypeAllocSize(GlobalType);
size_t A = getDataLayout()->getPreferredAlignment(GV);
if (GV->isThreadLocal()) {
std::lock_guard<std::recursive_mutex> locked(lock);
MutexGuard locked(lock);
Ptr = TJI.allocateThreadLocalMemory(S);
} else if (TJI.allocateSeparateGVMemory()) {
if (A <= 8) {
@@ -687,7 +687,7 @@ char* JIT::getMemoryForGV(const GlobalVariable* GV) {
}
void JIT::addPendingFunction(Function *F) {
std::lock_guard<std::recursive_mutex> locked(lock);
MutexGuard locked(lock);
jitstate->getPendingFunctions().push_back(F);
}

22
lib/ExecutionEngine/JIT/JITEmitter.cpp
View File

@@ -40,6 +40,7 @@
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/Memory.h"
#include "llvm/Support/MutexGuard.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetInstrInfo.h"
#include "llvm/Target/TargetJITInfo.h"
@@ -49,7 +50,6 @@
#ifndef NDEBUG
#include <iomanip>
#endif
#include <mutex>
using namespace llvm;
#define DEBUG_TYPE "jit"
@@ -230,22 +230,22 @@ namespace {
std::map<void*, JITResolver*> Map;
/// Guards Map from concurrent accesses.
mutable std::recursive_mutex Lock;
mutable sys::Mutex Lock;
public:
/// Registers a Stub to be resolved by Resolver.
void RegisterStubResolver(void *Stub, JITResolver *Resolver) {
std::lock_guard<std::recursive_mutex> guard(Lock);
MutexGuard guard(Lock);
Map.insert(std::make_pair(Stub, Resolver));
}
/// Unregisters the Stub when it's invalidated.
void UnregisterStubResolver(void *Stub) {
std::lock_guard<std::recursive_mutex> guard(Lock);
MutexGuard guard(Lock);
Map.erase(Stub);
}
/// Returns the JITResolver instance that owns the Stub.
JITResolver *getResolverFromStub(void *Stub) const {
std::lock_guard<std::recursive_mutex> guard(Lock);
MutexGuard guard(Lock);
// The address given to us for the stub may not be exactly right, it might
// be a little bit after the stub. As such, use upper_bound to find it.
// This is the same trick as in LookupFunctionFromCallSite from
@@ -258,7 +258,7 @@ namespace {
/// True if any stubs refer to the given resolver. Only used in an assert().
/// O(N)
bool ResolverHasStubs(JITResolver* Resolver) const {
std::lock_guard<std::recursive_mutex> guard(Lock);
MutexGuard guard(Lock);
for (std::map<void*, JITResolver*>::const_iterator I = Map.begin(),
E = Map.end(); I != E; ++I) {
if (I->second == Resolver)
@@ -494,7 +494,7 @@ JITResolver::~JITResolver() {
/// getLazyFunctionStubIfAvailable - This returns a pointer to a function stub
/// if it has already been created.
void *JITResolver::getLazyFunctionStubIfAvailable(Function *F) {
std::lock_guard<std::recursive_mutex> guard(TheJIT->lock);
MutexGuard locked(TheJIT->lock);
// If we already have a stub for this function, recycle it.
return state.getFunctionToLazyStubMap().lookup(F);
@@ -503,7 +503,7 @@ void *JITResolver::getLazyFunctionStubIfAvailable(Function *F) {
/// getFunctionStub - This returns a pointer to a function stub, creating
/// one on demand as needed.
void *JITResolver::getLazyFunctionStub(Function *F) {
std::lock_guard<std::recursive_mutex> guard(TheJIT->lock);
MutexGuard locked(TheJIT->lock);
// If we already have a lazy stub for this function, recycle it.
void *&Stub = state.getFunctionToLazyStubMap()[F];
@@ -564,7 +564,7 @@ void *JITResolver::getLazyFunctionStub(Function *F) {
/// getGlobalValueIndirectSym - Return a lazy pointer containing the specified
/// GV address.
void *JITResolver::getGlobalValueIndirectSym(GlobalValue *GV, void *GVAddress) {
std::lock_guard<std::recursive_mutex> guard(TheJIT->lock);
MutexGuard locked(TheJIT->lock);
// If we already have a stub for this global variable, recycle it.
void *&IndirectSym = state.getGlobalToIndirectSymMap()[GV];
@@ -622,7 +622,7 @@ void *JITResolver::JITCompilerFn(void *Stub) {
// Only lock for getting the Function. The call getPointerToFunction made
// in this function might trigger function materializing, which requires
// JIT lock to be unlocked.
std::lock_guard<std::recursive_mutex> guard(JR->TheJIT->lock);
MutexGuard locked(JR->TheJIT->lock);
// The address given to us for the stub may not be exactly right, it might
// be a little bit after the stub. As such, use upper_bound to find it.
@@ -654,7 +654,7 @@ void *JITResolver::JITCompilerFn(void *Stub) {
}
// Reacquire the lock to update the GOT map.
std::lock_guard<std::recursive_mutex> locked(JR->TheJIT->lock);
MutexGuard locked(JR->TheJIT->lock);
// We might like to remove the call site from the CallSiteToFunction map, but
// we can't do that! Multiple threads could be stuck, waiting to acquire the