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

swr/rast: Removed superfluous JitManager argument from passes 

Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
This commit is contained in:
Alok Hota 2018-05-25 10:19:47 -05:00 committed by Tim Rowley
parent 98d0201577
commit b6b114c1ae
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp
View File

@ -819,7 +819,7 @@ struct BlendJit : public Builder
passes.add(createSCCPPass()); passes.add(createSCCPPass());
passes.add(createAggressiveDCEPass()); passes.add(createAggressiveDCEPass());
passes.add(createLowerX86Pass(JM(), this)); passes.add(createLowerX86Pass(this));
passes.run(*blendFunc); passes.run(*blendFunc);

2
src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp
View File

@ -269,7 +269,7 @@ Function* FetchJit::Create(const FETCH_COMPILE_STATE& fetchState)
optPasses.run(*fetch); optPasses.run(*fetch);
optPasses.add(createLowerX86Pass(JM(), this)); optPasses.add(createLowerX86Pass(this));
optPasses.run(*fetch); optPasses.run(*fetch);
JitManager::DumpToFile(fetch, "opt"); JitManager::DumpToFile(fetch, "opt");

17
src/gallium/drivers/swr/rasterizer/jitter/functionpasses/lower_x86.cpp
View File

@ -136,21 +136,21 @@ namespace SwrJit
struct LowerX86 : public FunctionPass struct LowerX86 : public FunctionPass
{ {
LowerX86(JitManager* pJitMgr = nullptr, Builder* b = nullptr) LowerX86(Builder* b = nullptr)
: FunctionPass(ID), mpJitMgr(pJitMgr), B(b) : FunctionPass(ID), B(b)
{ {
initializeLowerX86Pass(*PassRegistry::getPassRegistry()); initializeLowerX86Pass(*PassRegistry::getPassRegistry());
// Determine target arch // Determine target arch
if (mpJitMgr->mArch.AVX512F()) if (JM()->mArch.AVX512F())
{ {
mTarget = AVX512; mTarget = AVX512;
} }
else if (mpJitMgr->mArch.AVX2()) else if (JM()->mArch.AVX2())
{ {
mTarget = AVX2; mTarget = AVX2;
} }
else if (mpJitMgr->mArch.AVX()) else if (JM()->mArch.AVX())
{ {
mTarget = AVX; mTarget = AVX;
@ -356,9 +356,8 @@ namespace SwrJit
{ {
} }
JitManager* JM() { return mpJitMgr; } JitManager* JM() { return B->JM(); }
JitManager* mpJitMgr;
Builder* B; Builder* B;
TargetArch mTarget; TargetArch mTarget;
@ -368,9 +367,9 @@ namespace SwrJit
char LowerX86::ID = 0; // LLVM uses address of ID as the actual ID. char LowerX86::ID = 0; // LLVM uses address of ID as the actual ID.
FunctionPass* createLowerX86Pass(JitManager* pJitMgr, Builder* b) FunctionPass* createLowerX86Pass(Builder* b)
{ {
return new LowerX86(pJitMgr, b); return new LowerX86(b);
} }
Instruction* NO_EMU(LowerX86* pThis, TargetArch arch, TargetWidth width, CallInst* pCallInst) Instruction* NO_EMU(LowerX86* pThis, TargetArch arch, TargetWidth width, CallInst* pCallInst)

2
src/gallium/drivers/swr/rasterizer/jitter/functionpasses/passes.h
View File

@ -33,5 +33,5 @@ namespace SwrJit
{ {
using namespace llvm; using namespace llvm;
FunctionPass* createLowerX86Pass(JitManager* pJitMgr, Builder* b); FunctionPass* createLowerX86Pass(Builder* b);
} }

2
src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp
View File

@ -307,7 +307,7 @@ struct StreamOutJit : public Builder
passes.add(createSCCPPass()); passes.add(createSCCPPass());
passes.add(createAggressiveDCEPass()); passes.add(createAggressiveDCEPass());
passes.add(createLowerX86Pass(JM(), this)); passes.add(createLowerX86Pass(this));
passes.run(*soFunc); passes.run(*soFunc);

2
src/gallium/drivers/swr/swr_shader.cpp
View File

@ -1402,7 +1402,7 @@ BuilderSWR::CompileFS(struct swr_context *ctx, swr_jit_fs_key &key)
// after the gallivm passes, we have to lower the core's intrinsics // after the gallivm passes, we have to lower the core's intrinsics
llvm::legacy::FunctionPassManager lowerPass(JM()->mpCurrentModule); llvm::legacy::FunctionPassManager lowerPass(JM()->mpCurrentModule);
lowerPass.add(createLowerX86Pass(mpJitMgr, this)); lowerPass.add(createLowerX86Pass(this));
lowerPass.run(*pFunction); lowerPass.run(*pFunction);
PFN_PIXEL_KERNEL kernel = PFN_PIXEL_KERNEL kernel =