diff options
author | George Kyriazis <george.kyriazis@intel.com> | 2018-03-07 13:33:44 -0600 |
---|---|---|
committer | George Kyriazis <george.kyriazis@intel.com> | 2018-04-18 10:51:38 -0500 |
commit | be6cf0fd7c944aba81256b30212ab3fba309c4d7 (patch) | |
tree | 3707326703f8163c330bcf7d4cf39233c2867da4 /src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h | |
parent | d34edffe48da2a7774303ddf697c42107357a816 (diff) |
swr/rast: Introduce JIT_MEM_CLIENT
Add assert for correct usage of memory accesses
v2: reworded commit message; renamed enum more appropriately
Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
Diffstat (limited to 'src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h')
-rw-r--r-- | src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h | 47 |
1 files changed, 31 insertions, 16 deletions
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h index a50ecc088bc..5a755e63b47 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h +++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h @@ -29,16 +29,32 @@ ******************************************************************************/ #pragma once +public: + +typedef enum _JIT_MEM_CLIENT +{ + MEM_CLIENT_INTERNAL, + GFX_MEM_CLIENT_FETCH, + GFX_MEM_CLIENT_SAMPLER +} JIT_MEM_CLIENT; + +protected: + +virtual Value* OFFSET_TO_NEXT_COMPONENT(Value* base, Constant *offset); +void AssertMemoryUsageParams(Value* ptr, JIT_MEM_CLIENT usage); + +public: + Value *GEP(Value* ptr, const std::initializer_list<Value*> &indexList); 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); -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 = ""); +virtual LoadInst* LOAD(Value *Ptr, const char *Name, JIT_MEM_CLIENT usage = MEM_CLIENT_INTERNAL); +virtual LoadInst* LOAD(Value *Ptr, const Twine &Name = "", JIT_MEM_CLIENT usage = MEM_CLIENT_INTERNAL); +virtual LoadInst* LOAD(Type *Ty, Value *Ptr, const Twine &Name = "", JIT_MEM_CLIENT usage = MEM_CLIENT_INTERNAL); +virtual LoadInst* LOAD(Value *Ptr, bool isVolatile, const Twine &Name = "", JIT_MEM_CLIENT usage = MEM_CLIENT_INTERNAL); +virtual LoadInst* LOAD(Value *BasePtr, const std::initializer_list<uint32_t> &offset, const llvm::Twine& Name = "", JIT_MEM_CLIENT usage = MEM_CLIENT_INTERNAL); 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); @@ -47,22 +63,20 @@ StoreInst *STOREV(Value *Val, Value *BasePtr, const std::initializer_list<Value* Value *MASKLOADD(Value* src, Value* mask); void Gather4(const SWR_FORMAT format, Value* pSrcBase, Value* byteOffsets, - Value* mask, Value* vGatherComponents[], bool bPackedOutput); - -virtual Value* OFFSET_TO_NEXT_COMPONENT(Value* base, Constant *offset); + Value* mask, Value* vGatherComponents[], bool bPackedOutput, JIT_MEM_CLIENT usage = MEM_CLIENT_INTERNAL); -virtual Value *GATHERPS(Value *src, Value *pBase, Value *indices, Value *mask, uint8_t scale = 1); +virtual Value *GATHERPS(Value *src, Value *pBase, Value *indices, Value *mask, uint8_t scale = 1, JIT_MEM_CLIENT usage = MEM_CLIENT_INTERNAL); -Value *GATHERPS_16(Value *src, Value *pBase, Value *indices, Value *mask, uint8_t scale = 1); +Value *GATHERPS_16(Value *src, Value *pBase, Value *indices, Value *mask, uint8_t scale = 1, JIT_MEM_CLIENT usage = MEM_CLIENT_INTERNAL); void GATHER4PS(const SWR_FORMAT_INFO &info, Value* pSrcBase, Value* byteOffsets, - Value* mask, Value* vGatherComponents[], bool bPackedOutput); + Value* mask, Value* vGatherComponents[], bool bPackedOutput, JIT_MEM_CLIENT usage = MEM_CLIENT_INTERNAL); -virtual Value *GATHERDD(Value* src, Value* pBase, Value* indices, Value* mask, uint8_t scale = 1); -Value *GATHERDD_16(Value *src, Value *pBase, Value *indices, Value *mask, uint8_t scale = 1); +virtual Value *GATHERDD(Value* src, Value* pBase, Value* indices, Value* mask, uint8_t scale = 1, JIT_MEM_CLIENT usage = MEM_CLIENT_INTERNAL); +Value *GATHERDD_16(Value *src, Value *pBase, Value *indices, Value *mask, uint8_t scale = 1, JIT_MEM_CLIENT usage = MEM_CLIENT_INTERNAL); -virtual void GATHER4DD(const SWR_FORMAT_INFO &info, Value* pSrcBase, Value* byteOffsets, - Value* mask, Value* vGatherComponents[], bool bPackedOutput); +void GATHER4DD(const SWR_FORMAT_INFO &info, Value* pSrcBase, Value* byteOffsets, + Value* mask, Value* vGatherComponents[], bool bPackedOutput, JIT_MEM_CLIENT usage = MEM_CLIENT_INTERNAL); Value *GATHERPD(Value* src, Value* pBase, Value* indices, Value* mask, uint8_t scale = 1); @@ -81,4 +95,5 @@ Value* pScatterStackSrc{ nullptr }; Value* pScatterStackOffsets{ nullptr }; -virtual Value* TRANSLATE_ADDRESS(Value* address) { return address; } + +//virtual Value* TRANSLATE_ADDRESS(Value* address) { return address; } |