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@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
index ae67d6bddec9854e110af62ef41b717544c69529..149ddbd53428fcc1afba3796069cb5aad5a18439 100644 (file)
--- 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 1a4a3a2e36b074f2bd496d1f4e5811216770cceb..756ce9c7cd33b6857062d1eb48575971798e28c0 100644 (file)
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -1094,6 +1094,21 @@ enum ir_expression_operation {
    ir_binop_mul,
    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:
     *

diff --git a/src/glsl/ir_builder.cpp b/src/glsl/ir_builder.cpp
index 98b43229508521efef0301ac0f6a77d6c7eeaa67..b6ce889834c46c49d9bc709d995476fef9853a5d 100644 (file)
--- 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 6a5f771193b7d50ea7d1fd23596828e07aac1215..1345788ab13f456956dfa425369c03022b83f2d4 100644 (file)
--- 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 2c64f4e582a283107a350031acc8d411de9dead3..38db8c20677c192f191b00bc59bd6c2f8d585d40 100644 (file)
--- 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 6b22b5074154e13c8453d84dd56322d15c21192b..2f87cfd65c441776277e211a404b02792c003c8d 100644 (file)
--- 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 f11305b590a46991e5dc81bf8e6bebd5140d5b27..f33bea6eb0278d6c4edc71c0a0f2ea28c60b2a27 100644 (file)
--- 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()");