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

swr/rast: Consolidate TRANSLATE_ADDRESS 

Translate is now part of an overloaded LOAD call which required a change to
the code gen to skip the load functions in order to handle them manually
to make them virtual.

Reviewed-By: Bruce Cherniak <bruce.cherniak@intel.com>
This commit is contained in:
George Kyriazis 2018-02-14 01:13:13 -06:00
parent e2a4fd0761
commit 1c73f42e6e
4 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py
View File

@ -152,7 +152,8 @@ def parse_ir_builder(input_file):
# The following functions need to be ignored.
if (func_name == 'CreateInsertNUWNSWBinOp' or
func_name == 'CreateMaskedIntrinsic' or
func_name == 'CreateAlignmentAssumptionHelper'):
func_name == 'CreateAlignmentAssumptionHelper' or
func_name == 'CreateLoad'):
ignore = True
# Convert CamelCase to CAMEL_CASE

20
src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
View File

@ -69,6 +69,26 @@ namespace SwrJit
return IN_BOUNDS_GEP(ptr, indices);
}
LoadInst* Builder::LOAD(Value *Ptr, const char *Name)
{
return IRB()->CreateLoad(Ptr, Name);
}
LoadInst* Builder::LOAD(Value *Ptr, const Twine &Name)
{
return IRB()->CreateLoad(Ptr, Name);
}
LoadInst* Builder::LOAD(Type *Ty, Value *Ptr, const Twine &Name)
{
return IRB()->CreateLoad(Ty, Ptr, Name);
}
LoadInst* Builder::LOAD(Value *Ptr, bool isVolatile, const Twine &Name)
{
return IRB()->CreateLoad(Ptr, isVolatile, Name);
}
LoadInst *Builder::LOAD(Value *basePtr, const std::initializer_list<uint32_t> &indices, const llvm::Twine& name)
{
std::vector<Value*> valIndices;

7
src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h
View File

@ -34,7 +34,12 @@ Value *GEP(Value* ptr, const std::initializer_list<uint32_t> &indexList);
Value *IN_BOUNDS_GEP(Value* ptr, const std::initializer_list<Value*> &indexList);
Value *IN_BOUNDS_GEP(Value* ptr, const std::initializer_list<uint32_t> &indexList);
LoadInst *LOAD(Value *BasePtr, const std::initializer_list<uint32_t> &offset, const llvm::Twine& name = "");
virtual LoadInst* LOAD(Value *Ptr, const char *Name);
virtual LoadInst* LOAD(Value *Ptr, const Twine &Name = "");
virtual LoadInst* LOAD(Type *Ty, Value *Ptr, const Twine &Name = "");
virtual LoadInst* LOAD(Value *Ptr, bool isVolatile, const Twine &Name = "");
virtual LoadInst* LOAD(Value *BasePtr, const std::initializer_list<uint32_t> &offset, const llvm::Twine& Name = "");
LoadInst *LOADV(Value *BasePtr, const std::initializer_list<Value*> &offset, const llvm::Twine& name = "");
StoreInst *STORE(Value *Val, Value *BasePtr, const std::initializer_list<uint32_t> &offset);
StoreInst *STOREV(Value *Val, Value *BasePtr, const std::initializer_list<Value*> &offset);

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

@ -1830,16 +1830,12 @@ Value* FetchJit::GetSimdValid16bitIndices(Value* pIndices, Value* pLastIndex)
Value* pZeroIndex = ALLOCA(mInt16Ty);
STORE(C((uint16_t)0), pZeroIndex);
pLastIndex = TRANSLATE_ADDRESS(pLastIndex);
// Load a SIMD of index pointers
for(int64_t lane = 0; lane < mVWidth; lane++)
{
// Calculate the address of the requested index
Value *pIndex = GEP(pIndices, C(lane));
pIndex = TRANSLATE_ADDRESS(pIndex);
// check if the address is less than the max index,
Value* mask = ICMP_ULT(pIndex, pLastIndex);