Mesa (master): glsl: Add ir_binop_carry and ir_binop_borrow.

[Matt Turner]

Module: Mesa
Branch: master
Commit: 499d7a7f6e47403a4a3da448eddaf15bdf56395c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=499d7a7f6e47403a4a3da448eddaf15bdf56395c

Author: Matt Turner <mattst88 at gmail.com>
Date:   Thu Sep 19 12:56:10 2013 -0700

glsl: Add ir_binop_carry and ir_binop_borrow.

Calculates the carry out of the addition of two values and the
borrow from subtraction respectively. Will be used in uaddCarry() and
usubBorrow() built-in implementations.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/glsl/ir.cpp                            |    4 ++++
 src/glsl/ir.h                              |   15 +++++++++++++++
 src/glsl/ir_builder.cpp                    |   10 ++++++++++
 src/glsl/ir_builder.h                      |    2 ++
 src/glsl/ir_validate.cpp                   |    7 +++++++
 src/mesa/program/ir_to_mesa.cpp            |    2 ++
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp |    2 ++
 7 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
index ae67d6b..149ddbd 100644
--- a/src/glsl/ir.cpp
+++ b/src/glsl/ir.cpp
@@ -398,6 +398,8 @@ ir_expression::ir_expression(int op, ir_rvalue *op0, ir_rvalue *op1)
       this->type = glsl_type::uint_type;
       break;
 
+   case ir_binop_carry:
+   case ir_binop_borrow:
    case ir_binop_lshift:
    case ir_binop_rshift:
    case ir_binop_bfm:
@@ -528,6 +530,8 @@ static const char *const operator_strs[] = {
    "-",
    "*",
    "/",
+   "carry",
+   "borrow",
    "%",
    "<",
    ">",
diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index 1a4a3a2..756ce9c 100644
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -1095,6 +1095,21 @@ enum ir_expression_operation {
    ir_binop_div,
 
    /**
+    * Returns the carry resulting from the addition of the two arguments.
+    */
+   /*@{*/
+   ir_binop_carry,
+   /*@}*/
+
+   /**
+    * Returns the borrow resulting from the subtraction of the second argument
+    * from the first argument.
+    */
+   /*@{*/
+   ir_binop_borrow,
+   /*@}*/
+
+   /**
     * Takes one of two combinations of arguments:
     *
     * - mod(vecN, vecN)
diff --git a/src/glsl/ir_builder.cpp b/src/glsl/ir_builder.cpp
index 98b4322..b6ce889 100644
--- a/src/glsl/ir_builder.cpp
+++ b/src/glsl/ir_builder.cpp
@@ -221,6 +221,16 @@ ir_expression *div(operand a, operand b)
    return expr(ir_binop_div, a, b);
 }
 
+ir_expression *carry(operand a, operand b)
+{
+   return expr(ir_binop_carry, a, b);
+}
+
+ir_expression *borrow(operand a, operand b)
+{
+   return expr(ir_binop_borrow, a, b);
+}
+
 ir_expression *round_even(operand a)
 {
    return expr(ir_unop_round_even, a);
diff --git a/src/glsl/ir_builder.h b/src/glsl/ir_builder.h
index 6a5f771..1345788 100644
--- a/src/glsl/ir_builder.h
+++ b/src/glsl/ir_builder.h
@@ -134,6 +134,8 @@ ir_expression *add(operand a, operand b);
 ir_expression *sub(operand a, operand b);
 ir_expression *mul(operand a, operand b);
 ir_expression *div(operand a, operand b);
+ir_expression *carry(operand a, operand b);
+ir_expression *borrow(operand a, operand b);
 ir_expression *round_even(operand a);
 ir_expression *dot(operand a, operand b);
 ir_expression *dotlike(operand a, operand b);
diff --git a/src/glsl/ir_validate.cpp b/src/glsl/ir_validate.cpp
index 2c64f4e..38db8c2 100644
--- a/src/glsl/ir_validate.cpp
+++ b/src/glsl/ir_validate.cpp
@@ -429,6 +429,13 @@ ir_validate::visit_leave(ir_expression *ir)
       }
       break;
 
+   case ir_binop_carry:
+   case ir_binop_borrow:
+      assert(ir->type == ir->operands[0]->type);
+      assert(ir->type == ir->operands[1]->type);
+      assert(ir->type->base_type == GLSL_TYPE_UINT);
+      break;
+
    case ir_binop_less:
    case ir_binop_greater:
    case ir_binop_lequal:
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 6b22b50..2f87cfd 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -1497,6 +1497,8 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
    case ir_quadop_bitfield_insert:
    case ir_binop_ldexp:
    case ir_triop_csel:
+   case ir_binop_carry:
+   case ir_binop_borrow:
       assert(!"not supported");
       break;
 
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index f11305b..f33bea6 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -1978,6 +1978,8 @@ glsl_to_tgsi_visitor::visit(ir_expression *ir)
    case ir_binop_vector_extract:
    case ir_triop_vector_insert:
    case ir_binop_ldexp:
+   case ir_binop_carry:
+   case ir_binop_borrow:
       /* This operation is not supported, or should have already been handled.
        */
       assert(!"Invalid ir opcode in glsl_to_tgsi_visitor::visit()");