Mesa (master): gallivm: Start collecting bitwise arithmetic helpers in a new module.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Sep 16 19:21:04 UTC 2010
Module: Mesa
Branch: master
Commit: 795eb3d64a001a65d677e3168bdd056cc5385b7e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=795eb3d64a001a65d677e3168bdd056cc5385b7e
Author: José Fonseca <jfonseca at vmware.com>
Date: Thu Sep 16 11:44:01 2010 +0100
gallivm: Start collecting bitwise arithmetic helpers in a new module.
---
src/gallium/auxiliary/Makefile | 1 +
src/gallium/auxiliary/SConscript | 1 +
src/gallium/auxiliary/gallivm/lp_bld_bitarit.c | 187 +++++++++++++++++++++
src/gallium/auxiliary/gallivm/lp_bld_bitarit.h | 69 ++++++++
src/gallium/auxiliary/gallivm/lp_bld_logic.c | 25 ---
src/gallium/auxiliary/gallivm/lp_bld_logic.h | 4 -
src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c | 3 +-
src/gallium/drivers/llvmpipe/lp_bld_depth.c | 5 +-
8 files changed, 263 insertions(+), 32 deletions(-)
diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
index 2a69294..2de764c 100644
--- a/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@ -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 \
diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
index cea2d7d..294df30 100644
--- a/src/gallium/auxiliary/SConscript
+++ b/src/gallium/auxiliary/SConscript
@@ -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',
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_bitarit.c b/src/gallium/auxiliary/gallivm/lp_bld_bitarit.c
new file mode 100644
index 0000000..55513c4
--- /dev/null
+++ b/src/gallium/auxiliary/gallivm/lp_bld_bitarit.c
@@ -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);
+}
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_bitarit.h b/src/gallium/auxiliary/gallivm/lp_bld_bitarit.h
new file mode 100644
index 0000000..5c5b981
--- /dev/null
+++ b/src/gallium/auxiliary/gallivm/lp_bld_bitarit.h
@@ -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 at 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 */
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_logic.c b/src/gallium/auxiliary/gallivm/lp_bld_logic.c
index a959bd4..d5c62a3 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_logic.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_logic.c
@@ -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;
-}
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_logic.h b/src/gallium/auxiliary/gallivm/lp_bld_logic.h
index 111daad..141fb92 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_logic.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_logic.h
@@ -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 */
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
index 69753d0..2d80db6 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
@@ -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,
diff --git a/src/gallium/drivers/llvmpipe/lp_bld_depth.c b/src/gallium/drivers/llvmpipe/lp_bld_depth.c
index 99a768a..7561899 100644
--- a/src/gallium/drivers/llvmpipe/lp_bld_depth.c
+++ b/src/gallium/drivers/llvmpipe/lp_bld_depth.c
@@ -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);
More information about the mesa-commit
mailing list