From 4df2bbdfe6602ce5f141b7b44028b95faa0bd8ef Mon Sep 17 00:00:00 2001 From: buzbee Date: Thu, 11 Oct 2012 14:46:06 -0700 Subject: Enable multi-threaded Quick compilation Reuse thread-local copies of llvm context data for Quick compiler (while continuing to regenerate fresh ones per method for Portable). This is a transitional CL - the upcoming compiler driver change is expected to pass pass a thread context structure to each compiler worker thread rather than use the pthread_key mechanism. Change-Id: I277920a5c2705748c3a9f37ceace53c903747ec2 --- src/compiler/codegen/MethodBitcode.cc | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'src/compiler/codegen') diff --git a/src/compiler/codegen/MethodBitcode.cc b/src/compiler/codegen/MethodBitcode.cc index 58678a0acb..cf07ea45c3 100644 --- a/src/compiler/codegen/MethodBitcode.cc +++ b/src/compiler/codegen/MethodBitcode.cc @@ -170,11 +170,20 @@ void createLocFromValue(CompilationUnit* cUnit, llvm::Value* val) } void initIR(CompilationUnit* cUnit) { - QuickCompiler* quick = cUnit->quick_compiler; - cUnit->context = quick->GetLLVMContext(); - cUnit->module = quick->GetLLVMModule(); - cUnit->intrinsic_helper = quick->GetIntrinsicHelper(); - cUnit->irb = quick->GetIRBuilder(); + LLVMInfo* llvmInfo = cUnit->llvm_info; + if (llvmInfo == NULL) { + CompilerTls* tls = cUnit->compiler->GetTls(); + CHECK(tls != NULL); + llvmInfo = static_cast(tls->GetLLVMInfo()); + if (llvmInfo == NULL) { + llvmInfo = new LLVMInfo(); + tls->SetLLVMInfo(llvmInfo); + } + } + cUnit->context = llvmInfo->GetLLVMContext(); + cUnit->module = llvmInfo->GetLLVMModule(); + cUnit->intrinsic_helper = llvmInfo->GetIntrinsicHelper(); + cUnit->irb = llvmInfo->GetIRBuilder(); } const char* llvmSSAName(CompilationUnit* cUnit, int ssaReg) { -- cgit v1.2.3-59-g8ed1b