gallivm: Move gather functions to its own module.
They need to grow, and they provide basic functionality which is not specific to sampling.
This commit is contained in:
parent
e29ef44cf1
commit
bb1546f55b
|
@ -155,6 +155,7 @@ GALLIVM_SOURCES = \
|
||||||
gallivm/lp_bld_format_aos.c \
|
gallivm/lp_bld_format_aos.c \
|
||||||
gallivm/lp_bld_format_soa.c \
|
gallivm/lp_bld_format_soa.c \
|
||||||
gallivm/lp_bld_format_yuv.c \
|
gallivm/lp_bld_format_yuv.c \
|
||||||
|
gallivm/lp_bld_gather.c \
|
||||||
gallivm/lp_bld_init.c \
|
gallivm/lp_bld_init.c \
|
||||||
gallivm/lp_bld_intr.c \
|
gallivm/lp_bld_intr.c \
|
||||||
gallivm/lp_bld_logic.c \
|
gallivm/lp_bld_logic.c \
|
||||||
|
|
|
@ -204,6 +204,7 @@ if env['llvm']:
|
||||||
'gallivm/lp_bld_format_aos.c',
|
'gallivm/lp_bld_format_aos.c',
|
||||||
'gallivm/lp_bld_format_soa.c',
|
'gallivm/lp_bld_format_soa.c',
|
||||||
'gallivm/lp_bld_format_yuv.c',
|
'gallivm/lp_bld_format_yuv.c',
|
||||||
|
'gallivm/lp_bld_gather.c',
|
||||||
'gallivm/lp_bld_intr.c',
|
'gallivm/lp_bld_intr.c',
|
||||||
'gallivm/lp_bld_logic.c',
|
'gallivm/lp_bld_logic.c',
|
||||||
'gallivm/lp_bld_init.c',
|
'gallivm/lp_bld_init.c',
|
||||||
|
|
|
@ -45,6 +45,7 @@
|
||||||
#include "lp_bld_const.h"
|
#include "lp_bld_const.h"
|
||||||
#include "lp_bld_conv.h"
|
#include "lp_bld_conv.h"
|
||||||
#include "lp_bld_swizzle.h"
|
#include "lp_bld_swizzle.h"
|
||||||
|
#include "lp_bld_gather.h"
|
||||||
#include "lp_bld_format.h"
|
#include "lp_bld_format.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#include "lp_bld_const.h"
|
#include "lp_bld_const.h"
|
||||||
#include "lp_bld_conv.h"
|
#include "lp_bld_conv.h"
|
||||||
#include "lp_bld_swizzle.h"
|
#include "lp_bld_swizzle.h"
|
||||||
#include "lp_bld_sample.h" /* for lp_build_gather */
|
#include "lp_bld_gather.h"
|
||||||
#include "lp_bld_format.h"
|
#include "lp_bld_format.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
#include "lp_bld_type.h"
|
#include "lp_bld_type.h"
|
||||||
#include "lp_bld_const.h"
|
#include "lp_bld_const.h"
|
||||||
#include "lp_bld_conv.h"
|
#include "lp_bld_conv.h"
|
||||||
|
#include "lp_bld_gather.h"
|
||||||
#include "lp_bld_format.h"
|
#include "lp_bld_format.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,148 @@
|
||||||
|
/**************************************************************************
|
||||||
|
*
|
||||||
|
* Copyright 2010 VMware, Inc.
|
||||||
|
* All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
|
* copy of this software and associated documentation files (the
|
||||||
|
* "Software"), to deal in the Software without restriction, including
|
||||||
|
* without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
* distribute, sub license, and/or sell copies of the Software, and to
|
||||||
|
* permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
* the following conditions:
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
|
||||||
|
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
||||||
|
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||||
|
* USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice (including the
|
||||||
|
* next paragraph) shall be included in all copies or substantial portions
|
||||||
|
* of the Software.
|
||||||
|
*
|
||||||
|
**************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
|
#include "util/u_debug.h"
|
||||||
|
#include "lp_bld_debug.h"
|
||||||
|
#include "lp_bld_const.h"
|
||||||
|
#include "lp_bld_format.h"
|
||||||
|
#include "lp_bld_gather.h"
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the pointer to one element from scatter positions in memory.
|
||||||
|
*
|
||||||
|
* @sa lp_build_gather()
|
||||||
|
*/
|
||||||
|
LLVMValueRef
|
||||||
|
lp_build_gather_elem_ptr(LLVMBuilderRef builder,
|
||||||
|
unsigned length,
|
||||||
|
LLVMValueRef base_ptr,
|
||||||
|
LLVMValueRef offsets,
|
||||||
|
unsigned i)
|
||||||
|
{
|
||||||
|
LLVMValueRef offset;
|
||||||
|
LLVMValueRef ptr;
|
||||||
|
|
||||||
|
assert(LLVMTypeOf(base_ptr) == LLVMPointerType(LLVMInt8Type(), 0));
|
||||||
|
|
||||||
|
if (length == 1) {
|
||||||
|
assert(i == 0);
|
||||||
|
offset = offsets;
|
||||||
|
} else {
|
||||||
|
LLVMValueRef index = LLVMConstInt(LLVMInt32Type(), i, 0);
|
||||||
|
offset = LLVMBuildExtractElement(builder, offsets, index, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
ptr = LLVMBuildGEP(builder, base_ptr, &offset, 1, "");
|
||||||
|
|
||||||
|
return ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gather one element from scatter positions in memory.
|
||||||
|
*
|
||||||
|
* @sa lp_build_gather()
|
||||||
|
*/
|
||||||
|
LLVMValueRef
|
||||||
|
lp_build_gather_elem(LLVMBuilderRef builder,
|
||||||
|
unsigned length,
|
||||||
|
unsigned src_width,
|
||||||
|
unsigned dst_width,
|
||||||
|
LLVMValueRef base_ptr,
|
||||||
|
LLVMValueRef offsets,
|
||||||
|
unsigned i)
|
||||||
|
{
|
||||||
|
LLVMTypeRef src_type = LLVMIntType(src_width);
|
||||||
|
LLVMTypeRef src_ptr_type = LLVMPointerType(src_type, 0);
|
||||||
|
LLVMTypeRef dst_elem_type = LLVMIntType(dst_width);
|
||||||
|
LLVMValueRef ptr;
|
||||||
|
LLVMValueRef res;
|
||||||
|
|
||||||
|
assert(LLVMTypeOf(base_ptr) == LLVMPointerType(LLVMInt8Type(), 0));
|
||||||
|
|
||||||
|
ptr = lp_build_gather_elem_ptr(builder, length, base_ptr, offsets, i);
|
||||||
|
ptr = LLVMBuildBitCast(builder, ptr, src_ptr_type, "");
|
||||||
|
res = LLVMBuildLoad(builder, ptr, "");
|
||||||
|
|
||||||
|
assert(src_width <= dst_width);
|
||||||
|
if (src_width > dst_width)
|
||||||
|
res = LLVMBuildTrunc(builder, res, dst_elem_type, "");
|
||||||
|
if (src_width < dst_width)
|
||||||
|
res = LLVMBuildZExt(builder, res, dst_elem_type, "");
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gather elements from scatter positions in memory into a single vector.
|
||||||
|
* Use for fetching texels from a texture.
|
||||||
|
* For SSE, typical values are length=4, src_width=32, dst_width=32.
|
||||||
|
*
|
||||||
|
* @param length length of the offsets
|
||||||
|
* @param src_width src element width in bits
|
||||||
|
* @param dst_width result element width in bits (src will be expanded to fit)
|
||||||
|
* @param base_ptr base pointer, should be a i8 pointer type.
|
||||||
|
* @param offsets vector with offsets
|
||||||
|
*/
|
||||||
|
LLVMValueRef
|
||||||
|
lp_build_gather(LLVMBuilderRef builder,
|
||||||
|
unsigned length,
|
||||||
|
unsigned src_width,
|
||||||
|
unsigned dst_width,
|
||||||
|
LLVMValueRef base_ptr,
|
||||||
|
LLVMValueRef offsets)
|
||||||
|
{
|
||||||
|
LLVMValueRef res;
|
||||||
|
|
||||||
|
if (length == 1) {
|
||||||
|
/* Scalar */
|
||||||
|
return lp_build_gather_elem(builder, length,
|
||||||
|
src_width, dst_width,
|
||||||
|
base_ptr, offsets, 0);
|
||||||
|
} else {
|
||||||
|
/* Vector */
|
||||||
|
|
||||||
|
LLVMTypeRef dst_elem_type = LLVMIntType(dst_width);
|
||||||
|
LLVMTypeRef dst_vec_type = LLVMVectorType(dst_elem_type, length);
|
||||||
|
unsigned i;
|
||||||
|
|
||||||
|
res = LLVMGetUndef(dst_vec_type);
|
||||||
|
for (i = 0; i < length; ++i) {
|
||||||
|
LLVMValueRef index = LLVMConstInt(LLVMInt32Type(), i, 0);
|
||||||
|
LLVMValueRef elem;
|
||||||
|
elem = lp_build_gather_elem(builder, length,
|
||||||
|
src_width, dst_width,
|
||||||
|
base_ptr, offsets, i);
|
||||||
|
res = LLVMBuildInsertElement(builder, res, elem, index, "");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
|
@ -0,0 +1,61 @@
|
||||||
|
/**************************************************************************
|
||||||
|
*
|
||||||
|
* Copyright 2010 VMware, Inc.
|
||||||
|
* All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
|
* copy of this software and associated documentation files (the
|
||||||
|
* "Software"), to deal in the Software without restriction, including
|
||||||
|
* without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
* distribute, sub license, and/or sell copies of the Software, and to
|
||||||
|
* permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
* the following conditions:
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
|
||||||
|
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
||||||
|
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||||
|
* USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice (including the
|
||||||
|
* next paragraph) shall be included in all copies or substantial portions
|
||||||
|
* of the Software.
|
||||||
|
*
|
||||||
|
**************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef LP_BLD_GATHER_H_
|
||||||
|
#define LP_BLD_GATHER_H_
|
||||||
|
|
||||||
|
|
||||||
|
#include "gallivm/lp_bld.h"
|
||||||
|
|
||||||
|
|
||||||
|
LLVMValueRef
|
||||||
|
lp_build_gather_elem_ptr(LLVMBuilderRef builder,
|
||||||
|
unsigned length,
|
||||||
|
LLVMValueRef base_ptr,
|
||||||
|
LLVMValueRef offsets,
|
||||||
|
unsigned i);
|
||||||
|
|
||||||
|
LLVMValueRef
|
||||||
|
lp_build_gather_elem(LLVMBuilderRef builder,
|
||||||
|
unsigned length,
|
||||||
|
unsigned src_width,
|
||||||
|
unsigned dst_width,
|
||||||
|
LLVMValueRef base_ptr,
|
||||||
|
LLVMValueRef offsets,
|
||||||
|
unsigned i);
|
||||||
|
|
||||||
|
LLVMValueRef
|
||||||
|
lp_build_gather(LLVMBuilderRef builder,
|
||||||
|
unsigned length,
|
||||||
|
unsigned src_width,
|
||||||
|
unsigned dst_width,
|
||||||
|
LLVMValueRef base_ptr,
|
||||||
|
LLVMValueRef offsets);
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* LP_BLD_GATHER_H_ */
|
|
@ -124,57 +124,6 @@ lp_sampler_static_state(struct lp_sampler_static_state *state,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gather elements from scatter positions in memory into a single vector.
|
|
||||||
* Use for fetching texels from a texture.
|
|
||||||
* For SSE, typical values are length=4, src_width=32, dst_width=32.
|
|
||||||
*
|
|
||||||
* @param length length of the offsets
|
|
||||||
* @param src_width src element width in bits
|
|
||||||
* @param dst_width result element width in bits (src will be expanded to fit)
|
|
||||||
* @param base_ptr base pointer, should be a i8 pointer type.
|
|
||||||
* @param offsets vector with offsets
|
|
||||||
*/
|
|
||||||
LLVMValueRef
|
|
||||||
lp_build_gather(LLVMBuilderRef builder,
|
|
||||||
unsigned length,
|
|
||||||
unsigned src_width,
|
|
||||||
unsigned dst_width,
|
|
||||||
LLVMValueRef base_ptr,
|
|
||||||
LLVMValueRef offsets)
|
|
||||||
{
|
|
||||||
LLVMTypeRef src_type = LLVMIntType(src_width);
|
|
||||||
LLVMTypeRef src_ptr_type = LLVMPointerType(src_type, 0);
|
|
||||||
LLVMTypeRef dst_elem_type = LLVMIntType(dst_width);
|
|
||||||
LLVMTypeRef dst_vec_type = LLVMVectorType(dst_elem_type, length);
|
|
||||||
LLVMValueRef res;
|
|
||||||
unsigned i;
|
|
||||||
|
|
||||||
res = LLVMGetUndef(dst_vec_type);
|
|
||||||
for(i = 0; i < length; ++i) {
|
|
||||||
LLVMValueRef index = LLVMConstInt(LLVMInt32Type(), i, 0);
|
|
||||||
LLVMValueRef elem_offset;
|
|
||||||
LLVMValueRef elem_ptr;
|
|
||||||
LLVMValueRef elem;
|
|
||||||
|
|
||||||
elem_offset = LLVMBuildExtractElement(builder, offsets, index, "");
|
|
||||||
elem_ptr = LLVMBuildGEP(builder, base_ptr, &elem_offset, 1, "");
|
|
||||||
elem_ptr = LLVMBuildBitCast(builder, elem_ptr, src_ptr_type, "");
|
|
||||||
elem = LLVMBuildLoad(builder, elem_ptr, "");
|
|
||||||
|
|
||||||
assert(src_width <= dst_width);
|
|
||||||
if(src_width > dst_width)
|
|
||||||
elem = LLVMBuildTrunc(builder, elem, dst_elem_type, "");
|
|
||||||
if(src_width < dst_width)
|
|
||||||
elem = LLVMBuildZExt(builder, elem, dst_elem_type, "");
|
|
||||||
|
|
||||||
res = LLVMBuildInsertElement(builder, res, elem, index, "");
|
|
||||||
}
|
|
||||||
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Compute the offset of a pixel block.
|
* Compute the offset of a pixel block.
|
||||||
*
|
*
|
||||||
|
|
|
@ -146,15 +146,6 @@ lp_sampler_static_state(struct lp_sampler_static_state *state,
|
||||||
const struct pipe_sampler_state *sampler);
|
const struct pipe_sampler_state *sampler);
|
||||||
|
|
||||||
|
|
||||||
LLVMValueRef
|
|
||||||
lp_build_gather(LLVMBuilderRef builder,
|
|
||||||
unsigned length,
|
|
||||||
unsigned src_width,
|
|
||||||
unsigned dst_width,
|
|
||||||
LLVMValueRef base_ptr,
|
|
||||||
LLVMValueRef offsets);
|
|
||||||
|
|
||||||
|
|
||||||
LLVMValueRef
|
LLVMValueRef
|
||||||
lp_build_sample_offset(struct lp_build_context *bld,
|
lp_build_sample_offset(struct lp_build_context *bld,
|
||||||
const struct util_format_description *format_desc,
|
const struct util_format_description *format_desc,
|
||||||
|
|
|
@ -50,6 +50,7 @@
|
||||||
#include "lp_bld_swizzle.h"
|
#include "lp_bld_swizzle.h"
|
||||||
#include "lp_bld_pack.h"
|
#include "lp_bld_pack.h"
|
||||||
#include "lp_bld_flow.h"
|
#include "lp_bld_flow.h"
|
||||||
|
#include "lp_bld_gather.h"
|
||||||
#include "lp_bld_format.h"
|
#include "lp_bld_format.h"
|
||||||
#include "lp_bld_sample.h"
|
#include "lp_bld_sample.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue