gallivm: Start collecting bitwise arithmetic helpers in a new module.

This commit is contained in:
José Fonseca 2010-09-16 11:44:01 +01:00
parent 3d5b9c1f2d
commit 795eb3d64a
8 changed files with 263 additions and 32 deletions

View File

@ -153,6 +153,7 @@ C_SOURCES = \
GALLIVM_SOURCES = \
gallivm/lp_bld_arit.c \
gallivm/lp_bld_assert.c \
gallivm/lp_bld_bitarit.c \
gallivm/lp_bld_const.c \
gallivm/lp_bld_conv.c \
gallivm/lp_bld_debug.c \

View File

@ -203,6 +203,7 @@ if env['llvm']:
source += [
'gallivm/lp_bld_arit.c',
'gallivm/lp_bld_assert.c',
'gallivm/lp_bld_bitarit.c',
'gallivm/lp_bld_const.c',
'gallivm/lp_bld_conv.c',
'gallivm/lp_bld_debug.c',

View File

@ -0,0 +1,187 @@
/**************************************************************************
*
* 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_type.h"
#include "lp_bld_debug.h"
#include "lp_bld_const.h"
#include "lp_bld_bitarit.h"
/**
* Return (a | b)
*/
LLVMValueRef
lp_build_or(struct lp_build_context *bld, LLVMValueRef a, LLVMValueRef b)
{
const struct lp_type type = bld->type;
LLVMValueRef res;
assert(lp_check_value(type, a));
assert(lp_check_value(type, b));
/* can't do bitwise ops on floating-point values */
if (type.floating) {
a = LLVMBuildBitCast(bld->builder, a, bld->int_vec_type, "");
b = LLVMBuildBitCast(bld->builder, b, bld->int_vec_type, "");
}
res = LLVMBuildOr(bld->builder, a, b, "");
if (type.floating) {
res = LLVMBuildBitCast(bld->builder, res, bld->vec_type, "");
}
return b;
}
/**
* Return (a & b)
*/
LLVMValueRef
lp_build_and(struct lp_build_context *bld, LLVMValueRef a, LLVMValueRef b)
{
const struct lp_type type = bld->type;
LLVMValueRef res;
assert(lp_check_value(type, a));
assert(lp_check_value(type, b));
/* can't do bitwise ops on floating-point values */
if (type.floating) {
a = LLVMBuildBitCast(bld->builder, a, bld->int_vec_type, "");
b = LLVMBuildBitCast(bld->builder, b, bld->int_vec_type, "");
}
res = LLVMBuildAnd(bld->builder, a, b, "");
if (type.floating) {
res = LLVMBuildBitCast(bld->builder, res, bld->vec_type, "");
}
return b;
}
/**
* Return (a & ~b)
*/
LLVMValueRef
lp_build_andnot(struct lp_build_context *bld, LLVMValueRef a, LLVMValueRef b)
{
const struct lp_type type = bld->type;
LLVMValueRef res;
assert(lp_check_value(type, a));
assert(lp_check_value(type, b));
/* can't do bitwise ops on floating-point values */
if (type.floating) {
a = LLVMBuildBitCast(bld->builder, a, bld->int_vec_type, "");
b = LLVMBuildBitCast(bld->builder, b, bld->int_vec_type, "");
}
res = LLVMBuildNot(bld->builder, b, "");
res = LLVMBuildAnd(bld->builder, a, res, "");
if (type.floating) {
res = LLVMBuildBitCast(bld->builder, res, bld->vec_type, "");
}
return b;
}
/**
* Shift left.
*/
LLVMValueRef
lp_build_shl(struct lp_build_context *bld, LLVMValueRef a, LLVMValueRef b)
{
const struct lp_type type = bld->type;
LLVMValueRef res;
assert(!type.floating);
assert(lp_check_value(type, a));
assert(lp_check_value(type, b));
res = LLVMBuildShl(bld->builder, a, b, "");
return res;
}
/**
* Shift right.
*/
LLVMValueRef
lp_build_shr(struct lp_build_context *bld, LLVMValueRef a, LLVMValueRef b)
{
const struct lp_type type = bld->type;
LLVMValueRef res;
assert(!type.floating);
assert(lp_check_value(type, a));
assert(lp_check_value(type, b));
if (type.sign) {
res = LLVMBuildAShr(bld->builder, a, b, "");
} else {
res = LLVMBuildLShr(bld->builder, a, b, "");
}
return res;
}
/**
* Shift left with immediate.
*/
LLVMValueRef
lp_build_shl_imm(struct lp_build_context *bld, LLVMValueRef a, unsigned imm)
{
LLVMValueRef b = lp_build_const_int_vec(bld->type, imm);
assert(imm <= bld->type.width);
return lp_build_shl(bld, a, b);
}
/**
* Shift right with immediate.
*/
LLVMValueRef
lp_build_shr_imm(struct lp_build_context *bld, LLVMValueRef a, unsigned imm)
{
LLVMValueRef b = lp_build_const_int_vec(bld->type, imm);
assert(imm <= bld->type.width);
return lp_build_shr(bld, a, b);
}

View File

@ -0,0 +1,69 @@
/**************************************************************************
*
* Copyright 2009 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 above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* 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 VMWARE 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.
*
**************************************************************************/
/**
* @file
* Helper bitwise arithmetic functions.
*
* @author Jose Fonseca <jfonseca@vmware.com>
*/
#ifndef LP_BLD_BITARIT_H
#define LP_BLD_BITARIT_H
#include "gallivm/lp_bld.h"
struct lp_type;
struct lp_build_context;
LLVMValueRef
lp_build_or(struct lp_build_context *bld, LLVMValueRef a, LLVMValueRef b);
LLVMValueRef
lp_build_and(struct lp_build_context *bld, LLVMValueRef a, LLVMValueRef b);
LLVMValueRef
lp_build_andnot(struct lp_build_context *bld, LLVMValueRef a, LLVMValueRef b);
LLVMValueRef
lp_build_shl(struct lp_build_context *bld, LLVMValueRef a, LLVMValueRef b);
LLVMValueRef
lp_build_shr(struct lp_build_context *bld, LLVMValueRef a, LLVMValueRef b);
LLVMValueRef
lp_build_shl_imm(struct lp_build_context *bld, LLVMValueRef a, unsigned imm);
LLVMValueRef
lp_build_shr_imm(struct lp_build_context *bld, LLVMValueRef a, unsigned imm);
#endif /* !LP_BLD_ARIT_H */

View File

@ -556,28 +556,3 @@ lp_build_select_aos(struct lp_build_context *bld,
#endif
}
}
/** Return (a & ~b) */
LLVMValueRef
lp_build_andc(struct lp_build_context *bld, LLVMValueRef a, LLVMValueRef b)
{
const struct lp_type type = bld->type;
assert(lp_check_value(type, a));
assert(lp_check_value(type, b));
/* can't do bitwise ops on floating-point values */
if(type.floating) {
a = LLVMBuildBitCast(bld->builder, a, bld->int_vec_type, "");
b = LLVMBuildBitCast(bld->builder, b, bld->int_vec_type, "");
}
b = LLVMBuildNot(bld->builder, b, "");
b = LLVMBuildAnd(bld->builder, a, b, "");
if(type.floating) {
b = LLVMBuildBitCast(bld->builder, b, bld->vec_type, "");
}
return b;
}

View File

@ -82,8 +82,4 @@ lp_build_select_aos(struct lp_build_context *bld,
LLVMValueRef b);
LLVMValueRef
lp_build_andc(struct lp_build_context *bld, LLVMValueRef a, LLVMValueRef b);
#endif /* !LP_BLD_LOGIC_H */

View File

@ -45,6 +45,7 @@
#include "lp_bld_const.h"
#include "lp_bld_conv.h"
#include "lp_bld_arit.h"
#include "lp_bld_bitarit.h"
#include "lp_bld_logic.h"
#include "lp_bld_swizzle.h"
#include "lp_bld_flow.h"
@ -157,7 +158,7 @@ lp_build_sample_texel_soa(struct lp_build_sample_context *bld,
* coords which are out of bounds to become zero. Zero's guaranteed
* to be inside the texture image.
*/
offset = lp_build_andc(&bld->uint_coord_bld, offset, use_border);
offset = lp_build_andnot(&bld->uint_coord_bld, offset, use_border);
}
lp_build_fetch_rgba_soa(bld->builder,

View File

@ -69,6 +69,7 @@
#include "gallivm/lp_bld_type.h"
#include "gallivm/lp_bld_arit.h"
#include "gallivm/lp_bld_bitarit.h"
#include "gallivm/lp_bld_const.h"
#include "gallivm/lp_bld_logic.h"
#include "gallivm/lp_bld_flow.h"
@ -626,7 +627,7 @@ lp_build_depth_stencil_test(LLVMBuilderRef builder,
/* apply stencil-fail operator */
{
LLVMValueRef s_fail_mask = lp_build_andc(&bld, orig_mask, s_pass_mask);
LLVMValueRef s_fail_mask = lp_build_andnot(&bld, orig_mask, s_pass_mask);
stencil_vals = lp_build_stencil_op(&sbld, stencil, S_FAIL_OP,
stencil_refs, stencil_vals,
s_fail_mask, face);
@ -672,7 +673,7 @@ lp_build_depth_stencil_test(LLVMBuilderRef builder,
LLVMValueRef z_fail_mask, z_pass_mask;
/* apply Z-fail operator */
z_fail_mask = lp_build_andc(&bld, orig_mask, z_pass);
z_fail_mask = lp_build_andnot(&bld, orig_mask, z_pass);
stencil_vals = lp_build_stencil_op(&sbld, stencil, Z_FAIL_OP,
stencil_refs, stencil_vals,
z_fail_mask, face);