---
.../drivers/swr/rasterizer/jitter/JitManager.cpp | 1 -
.../swr/rasterizer/jitter/builder_gfx_mem.cpp | 27 ++++++++++++----------
.../swr/rasterizer/jitter/builder_gfx_mem.h | 2 +-
.../drivers/swr/rasterizer/jitter/builder_mem.cpp | 1 -
.../rasterizer/jitter/functionpasses/lower_x86.cpp | 4 ++--
5 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
index efb747a..e9412b1 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
@@ -580,7 +580,6 @@ int ExecUnhookedProcess(const std::string& CmdLine,
std::string* pStdOut, std::s
return ExecCmd(CmdLine, "", pStdOut, pStdErr);
}
-
/// notifyObjectCompiled - Provides a pointer to compiled code for Module M.
void JitCache::notifyObjectCompiled(const llvm::Module *M,
llvm::MemoryBufferRef Obj)
{
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.cpp
b/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.cpp
index c6d0619..3013bc5 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.cpp
@@ -57,14 +57,15 @@ namespace SwrJit
//////////////////////////////////////////////////////////////////////////
- /// @brief Generate a masked gather operation in LLVM IR. If not
+ /// @brief Generate a masked gather operation in LLVM IR. If not
/// supported on the underlying platform, emulate it with loads
/// @param vSrc - SIMD wide value that will be loaded if mask is invalid
/// @param pBase - Int8* base VB address pointer value
/// @param vIndices - SIMD wide value of VB byte offsets
/// @param vMask - SIMD wide mask that controls whether to access memory
or the src values
/// @param scale - value to scale indices by
- Value* BuilderGfxMem::GATHERPS(Value* vSrc, Value* pBase, Value* vIndices,
Value* vMask, uint8_t scale, JIT_MEM_CLIENT usage)
+ Value* BuilderGfxMem::GATHERPS(Value* vSrc, Value* pBase, Value* vIndices,
Value* vMask,
+ uint8_t scale, JIT_MEM_CLIENT usage)
{
// address may be coming in as 64bit int now so get the pointer
if (pBase->getType() == mInt64Ty)
@@ -77,14 +78,15 @@ namespace SwrJit
}
//////////////////////////////////////////////////////////////////////////
- /// @brief Generate a masked gather operation in LLVM IR. If not
+ /// @brief Generate a masked gather operation in LLVM IR. If not
/// supported on the underlying platform, emulate it with loads
/// @param vSrc - SIMD wide value that will be loaded if mask is invalid
/// @param pBase - Int8* base VB address pointer value
/// @param vIndices - SIMD wide value of VB byte offsets
/// @param vMask - SIMD wide mask that controls whether to access memory
or the src values
/// @param scale - value to scale indices by
- Value* BuilderGfxMem::GATHERDD(Value* vSrc, Value* pBase, Value* vIndices,
Value* vMask, uint8_t scale, JIT_MEM_CLIENT usage)
+ Value* BuilderGfxMem::GATHERDD(Value* vSrc, Value* pBase, Value* vIndices,
Value* vMask,
+ uint8_t scale, JIT_MEM_CLIENT usage)
{
// address may be coming in as 64bit int now so get the pointer
@@ -98,38 +100,39 @@ namespace SwrJit
}
- Value* BuilderGfxMem::OFFSET_TO_NEXT_COMPONENT(Value* base, Constant
*offset)
+ Value* BuilderGfxMem::OFFSET_TO_NEXT_COMPONENT(Value* base, Constant*
offset)
{
return ADD(base, offset);
}
-
- Value* BuilderGfxMem::GEP(Value* Ptr, Value* Idx, Type *Ty, const Twine
&Name)
+
+ Value* BuilderGfxMem::GEP(Value* Ptr, Value* Idx, Type* Ty, const Twine&
Name)
{
Ptr = TranslationHelper(Ptr, Ty);
return Builder::GEP(Ptr, Idx, nullptr, Name);
}
- Value* BuilderGfxMem::GEP(Type *Ty, Value* Ptr, Value* Idx, const Twine
&Name)
+ Value* BuilderGfxMem::GEP(Type* Ty, Value* Ptr, Value* Idx, const Twine&
Name)
{
Ptr = TranslationHelper(Ptr, Ty);
return Builder::GEP(Ty, Ptr, Idx, Name);
}
- Value* BuilderGfxMem::GEP(Value* Ptr, const std::initializer_list<Value*>
&indexList, Type *Ty)
+ Value* BuilderGfxMem::GEP(Value* Ptr, const std::initializer_list<Value*>&
indexList, Type* Ty)
{
Ptr = TranslationHelper(Ptr, Ty);
return Builder::GEP(Ptr, indexList);
}
- Value* BuilderGfxMem::GEP(Value* Ptr, const
std::initializer_list<uint32_t> &indexList, Type *Ty)
+ Value* BuilderGfxMem::GEP(Value* Ptr, const
std::initializer_list<uint32_t>& indexList, Type* Ty)
{
Ptr = TranslationHelper(Ptr, Ty);
return Builder::GEP(Ptr, indexList);
}
- Value* BuilderGfxMem::TranslationHelper(Value* Ptr, Type *Ty)
+ Value* BuilderGfxMem::TranslationHelper(Value* Ptr, Type* Ty)
{
- SWR_ASSERT(!(Ptr->getType() == mInt64Ty && Ty == nullptr), "Access of
GFX pointers must have non-null type specified.");
+ SWR_ASSERT(!(Ptr->getType() == mInt64Ty && Ty == nullptr),
+ "Access of GFX pointers must have non-null type
specified.");
// address may be coming in as 64bit int now so get the pointer
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h
b/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h
index b4d4726..00817b2 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h
+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h
@@ -54,9 +54,9 @@ namespace SwrJit
virtual CallInst* MASKED_LOAD(Value *Ptr, unsigned Align, Value *Mask,
Value *PassThru = nullptr, const Twine &Name = "", Type *Ty = nullptr,
JIT_MEM_CLIENT usage = MEM_CLIENT_INTERNAL);
virtual Value *GATHERPS(Value *src, Value *pBase, Value *indices,
Value *mask, uint8_t scale = 1, JIT_MEM_CLIENT usage = MEM_CLIENT_INTERNAL);
-
virtual Value *GATHERDD(Value* src, Value* pBase, Value* indices,
Value* mask, uint8_t scale = 1, JIT_MEM_CLIENT usage = MEM_CLIENT_INTERNAL);
+
Value* TranslateGfxAddress(Value* xpGfxAddress, Type* PtrTy = nullptr,
const Twine &Name = "", JIT_MEM_CLIENT usage = MEM_CLIENT_INTERNAL);
template <typename T>
Value* TranslateGfxAddress(Value* xpGfxBaseAddress, const
std::initializer_list<T> &offset, Type* PtrTy = nullptr, const Twine &Name =
"", JIT_MEM_CLIENT usage = GFX_MEM_CLIENT_SHADER)
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
index 5b70b29..6e17888 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp
@@ -33,7 +33,6 @@
#include <cstdarg>
-
namespace SwrJit
{
void Builder::AssertMemoryUsageParams(Value* ptr, JIT_MEM_CLIENT usage)
diff --git
a/src/gallium/drivers/swr/rasterizer/jitter/functionpasses/lower_x86.cpp
b/src/gallium/drivers/swr/rasterizer/jitter/functionpasses/lower_x86.cpp
index e0296f6..5a69eae 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/functionpasses/lower_x86.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/functionpasses/lower_x86.cpp
@@ -209,7 +209,7 @@ namespace SwrJit
{
case W256: numElem = 8; break;
case W512: numElem = 16; break;
- default: SWR_ASSERT(false, "Unhandled vector width type %d\n",
width);
+ default: SWR_ASSERT(false, "Unhandled vector width type %d\n",
width);
}
return ConstantVector::getNullValue(VectorType::get(pTy, numElem));
@@ -222,7 +222,7 @@ namespace SwrJit
{
case W256: mask = B->C((uint8_t)-1); break;
case W512: mask = B->C((uint16_t)-1); break;
- default: SWR_ASSERT(false, "Unhandled vector width type %d\n",
width);
+ default: SWR_ASSERT(false, "Unhandled vector width type %d\n",
width);
}
return mask;
}
--
2.7.4
_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
