KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swr/rast: New execution engine per JIT 

Fixes relocation errors with LLVM 7.0.0
This commit is contained in:
Alok Hota 2018-09-19 21:15:51 -05:00
parent b135db5d58
commit bb98be61f4
2 changed files with 65 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
View File

@ -63,39 +63,29 @@ JitManager::JitManager(uint32_t simdWidth, const char* arch, const char* core) :
mContext(), mBuilder(mContext), mIsModuleFinalized(true), mJitNumber(0), mVWidth(simdWidth),
mArch(arch)
{
mpCurrentModule = nullptr;
mpExec = nullptr;
InitializeNativeTarget();
InitializeNativeTargetAsmPrinter();
InitializeNativeTargetDisassembler();
TargetOptions tOpts;
tOpts.AllowFPOpFusion = FPOpFusion::Fast;
tOpts.NoInfsFPMath = false;
tOpts.NoNaNsFPMath = false;
tOpts.UnsafeFPMath = false;
// tOpts.PrintMachineCode = true;
std::unique_ptr<Module> newModule(new Module("", mContext));
mpCurrentModule = newModule.get();
StringRef hostCPUName;
// force JIT to use the same CPU arch as the rest of swr
if (mArch.AVX512F())
{
#if USE_SIMD16_SHADERS
if (mArch.AVX512ER())
{
hostCPUName = StringRef("knl");
mHostCpuName = StringRef("knl");
}
else
{
hostCPUName = StringRef("skylake-avx512");
mHostCpuName = StringRef("skylake-avx512");
}
mUsingAVX512 = true;
#else
hostCPUName = StringRef("core-avx2");
mHostCpuName = StringRef("core-avx2");
#endif
if (mVWidth == 0)
{
@ -104,7 +94,7 @@ JitManager::JitManager(uint32_t simdWidth, const char* arch, const char* core) :
}
else if (mArch.AVX2())
{
hostCPUName = StringRef("core-avx2");
mHostCpuName = StringRef("core-avx2");
if (mVWidth == 0)
{
mVWidth = 8;
@ -114,11 +104,11 @@ JitManager::JitManager(uint32_t simdWidth, const char* arch, const char* core) :
{
if (mArch.F16C())
{
hostCPUName = StringRef("core-avx-i");
mHostCpuName = StringRef("core-avx-i");
}
else
{
hostCPUName = StringRef("corei7-avx");
mHostCpuName = StringRef("corei7-avx");
}
if (mVWidth == 0)
{
@ -131,31 +121,21 @@ JitManager::JitManager(uint32_t simdWidth, const char* arch, const char* core) :
}
auto optLevel = CodeGenOpt::Aggressive;
mOptLevel = CodeGenOpt::Aggressive;
if (KNOB_JIT_OPTIMIZATION_LEVEL >= CodeGenOpt::None &&
KNOB_JIT_OPTIMIZATION_LEVEL <= CodeGenOpt::Aggressive)
{
optLevel = CodeGenOpt::Level(KNOB_JIT_OPTIMIZATION_LEVEL);
mOptLevel = CodeGenOpt::Level(KNOB_JIT_OPTIMIZATION_LEVEL);
}
mpCurrentModule->setTargetTriple(sys::getProcessTriple());
mpExec = EngineBuilder(std::move(newModule))
.setTargetOptions(tOpts)
.setOptLevel(optLevel)
.setMCPU(hostCPUName)
.create();
if (KNOB_JIT_ENABLE_CACHE)
{
mCache.Init(this, hostCPUName, optLevel);
mpExec->setObjectCache(&mCache);
mCache.Init(this, mHostCpuName, mOptLevel);
}
#if LLVM_USE_INTEL_JITEVENTS
JITEventListener* vTune = JITEventListener::createIntelJITEventListener();
mpExec->RegisterJITEventListener(vTune);
#endif
SetupNewModule();
mIsModuleFinalized = true;
// fetch function signature
#if USE_SIMD16_SHADERS
@ -198,6 +178,35 @@ JitManager::JitManager(uint32_t simdWidth, const char* arch, const char* core) :
#endif
}
void JitManager::CreateExecEngine(std::unique_ptr<Module> pModule)
{
TargetOptions tOpts;
tOpts.AllowFPOpFusion = FPOpFusion::Fast;
tOpts.NoInfsFPMath = false;
tOpts.NoNaNsFPMath = false;
tOpts.UnsafeFPMath = false;
// tOpts.PrintMachineCode = true;
mpExec = EngineBuilder(std::move(pModule))
.setTargetOptions(tOpts)
.setOptLevel(mOptLevel)
.setMCPU(mHostCpuName)
.create();
if (KNOB_JIT_ENABLE_CACHE)
{
mpExec->setObjectCache(&mCache);
}
#if LLVM_USE_INTEL_JITEVENTS
JITEventListener* vTune = JITEventListener::createIntelJITEventListener();
mpExec->RegisterJITEventListener(vTune);
#endif
mvExecEngines.push_back(mpExec);
}
//////////////////////////////////////////////////////////////////////////
/// @brief Create new LLVM module.
void JitManager::SetupNewModule()
@ -207,7 +216,7 @@ void JitManager::SetupNewModule()
std::unique_ptr<Module> newModule(new Module("", mContext));
mpCurrentModule = newModule.get();
mpCurrentModule->setTargetTriple(sys::getProcessTriple());
mpExec->addModule(std::move(newModule));
CreateExecEngine(std::move(newModule));
mIsModuleFinalized = false;
}

28
src/gallium/drivers/swr/rasterizer/jitter/JitManager.h
View File

@ -124,12 +124,21 @@ private:
struct JitManager
{
JitManager(uint32_t w, const char* arch, const char* core);
~JitManager(){};
~JitManager()
{
for (auto* pExec : mvExecEngines)
{
delete pExec;
}
}
JitLLVMContext mContext; ///< LLVM compiler
llvm::IRBuilder<> mBuilder; ///< LLVM IR Builder
llvm::ExecutionEngine* mpExec;
JitCache mCache;
JitLLVMContext mContext; ///< LLVM compiler
llvm::IRBuilder<> mBuilder; ///< LLVM IR Builder
llvm::ExecutionEngine* mpExec;
std::vector<llvm::ExecutionEngine*> mvExecEngines;
JitCache mCache;
llvm::StringRef mHostCpuName;
llvm::CodeGenOpt::Level mOptLevel;
// Need to be rebuilt after a JIT and before building new IR
llvm::Module* mpCurrentModule;
@ -148,11 +157,14 @@ struct JitManager
// Debugging support
std::unordered_map<llvm::StructType*, llvm::DIType*> mDebugStructMap;
void CreateExecEngine(std::unique_ptr<llvm::Module> M);
void SetupNewModule();
void DumpAsm(llvm::Function* pFunction, const char* fileName);
static void DumpToFile(llvm::Function* f, const char* fileName);
static void DumpToFile(llvm::Module* M, const char* fileName, llvm::AssemblyAnnotationWriter* annotater = nullptr);
static void DumpToFile(llvm::Module* M,
const char* fileName,
llvm::AssemblyAnnotationWriter* annotater = nullptr);
static std::string GetOutputDir();
// Debugging support methods
@ -183,8 +195,10 @@ struct JitManager
class InterleaveAssemblyAnnotater : public llvm::AssemblyAnnotationWriter
{
public:
void emitInstructionAnnot(const llvm::Instruction *pInst, llvm::formatted_raw_ostream &OS) override;
void emitInstructionAnnot(const llvm::Instruction* pInst,
llvm::formatted_raw_ostream& OS) override;
std::vector<std::string> mAssembly;
private:
uint32_t mCurrentLineNo = 0;
};