From: Aaron Watry <awatry@gmail.com>
Date: Thu, 15 Aug 2013 19:21:10 +0000 (+0000)
Subject: Add rhadd builtin
X-Git-Tag: llvmorg-3.4.0-rc1~6348
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8548725f290ddae3feef2a15fc672010087c939b;p=platform%2Fupstream%2Fllvm.git

Add rhadd builtin

rhadd = (x+y+1)>>1

Implemented as:
(x>>1) + (y>>1) + ((x&1)|(y&1))

This prevents us having to do assembly addition and overflow detection

Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
llvm-svn: 188477
---

diff --git a/libclc/generic/include/clc/clc.h b/libclc/generic/include/clc/clc.h
index 38f71dbdee0c..ae212eddef53 100644
--- a/libclc/generic/include/clc/clc.h
+++ b/libclc/generic/include/clc/clc.h
@@ -68,6 +68,7 @@
 #include <clc/integer/hadd.h>
 #include <clc/integer/mad24.h>
 #include <clc/integer/mul24.h>
+#include <clc/integer/rhadd.h>
 #include <clc/integer/rotate.h>
 #include <clc/integer/sub_sat.h>
 #include <clc/integer/upsample.h>
diff --git a/libclc/generic/include/clc/integer/rhadd.h b/libclc/generic/include/clc/integer/rhadd.h
new file mode 100644
index 000000000000..69b43faeebd2
--- /dev/null
+++ b/libclc/generic/include/clc/integer/rhadd.h
@@ -0,0 +1,2 @@
+#define __CLC_BODY <clc/integer/rhadd.inc>
+#include <clc/integer/gentype.inc>
diff --git a/libclc/generic/include/clc/integer/rhadd.inc b/libclc/generic/include/clc/integer/rhadd.inc
new file mode 100644
index 000000000000..88ccaf09fd5e
--- /dev/null
+++ b/libclc/generic/include/clc/integer/rhadd.inc
@@ -0,0 +1 @@
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE rhadd(__CLC_GENTYPE x, __CLC_GENTYPE y);
diff --git a/libclc/generic/lib/SOURCES b/libclc/generic/lib/SOURCES
index e936fbc6d94b..5a68d07a402c 100644
--- a/libclc/generic/lib/SOURCES
+++ b/libclc/generic/lib/SOURCES
@@ -14,6 +14,7 @@ integer/clz_impl.ll
 integer/hadd.cl
 integer/mad24.cl
 integer/mul24.cl
+integer/rhadd.cl
 integer/rotate.cl
 integer/sub_sat.cl
 integer/sub_sat_if.ll
diff --git a/libclc/generic/lib/integer/rhadd.cl b/libclc/generic/lib/integer/rhadd.cl
new file mode 100644
index 000000000000..c985870f7c7a
--- /dev/null
+++ b/libclc/generic/lib/integer/rhadd.cl
@@ -0,0 +1,4 @@
+#include <clc/clc.h>
+
+#define __CLC_BODY <rhadd.inc>
+#include <clc/integer/gentype.inc>
diff --git a/libclc/generic/lib/integer/rhadd.inc b/libclc/generic/lib/integer/rhadd.inc
new file mode 100644
index 000000000000..3d6076874808
--- /dev/null
+++ b/libclc/generic/lib/integer/rhadd.inc
@@ -0,0 +1,6 @@
+//rhadd = (x+y+1)>>1
+//This can be simplified to x>>1 + y>>1 + (1 if either x or y have the 1s bit set)
+//This saves us having to do any checks for overflow in the addition sums
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE rhadd(__CLC_GENTYPE x, __CLC_GENTYPE y) {
+    return (x>>(__CLC_GENTYPE)1)+(y>>(__CLC_GENTYPE)1)+((x&(__CLC_GENTYPE)1)|(y&(__CLC_GENTYPE)1));
+}