Re: [Mesa-dev] [PATCH] libclc: Add max() builtin function

2013-03-15 Thread Tom Stellard 
On Thu, Mar 14, 2013 at 09:12:57PM -0500, Aaron Watry wrote:
 Adds this function for both int and floating data types.
 ---
  generic/include/clc/clc.h   |2 ++
  generic/include/clc/integer/max.h   |2 ++
  generic/include/clc/integer/max.inc |1 +
  generic/include/clc/math/max.h  |2 ++
  generic/include/clc/math/max.inc|1 +

I think the math/max builtin should be moved to the common directory
(this doesn't exist, you will need to create it) to match the spec.

-Tom

  generic/lib/SOURCES |2 ++
  generic/lib/integer/max.cl  |4 
  generic/lib/integer/max.inc |3 +++
  generic/lib/math/max.cl |8 
  generic/lib/math/max.inc|3 +++
  10 files changed, 28 insertions(+)
  create mode 100644 generic/include/clc/integer/max.h
  create mode 100644 generic/include/clc/integer/max.inc
  create mode 100644 generic/include/clc/math/max.h
  create mode 100644 generic/include/clc/math/max.inc
  create mode 100644 generic/lib/integer/max.cl
  create mode 100644 generic/lib/integer/max.inc
  create mode 100644 generic/lib/math/max.cl
  create mode 100644 generic/lib/math/max.inc
 
 diff --git a/generic/include/clc/clc.h b/generic/include/clc/clc.h
 index 4394c9e..f6668a3 100644
 --- a/generic/include/clc/clc.h
 +++ b/generic/include/clc/clc.h
 @@ -45,6 +45,7 @@
  #include clc/math/log.h
  #include clc/math/log2.h
  #include clc/math/mad.h
 +#include clc/math/max.h
  #include clc/math/pow.h
  #include clc/math/sin.h
  #include clc/math/sqrt.h
 @@ -63,6 +64,7 @@
  #include clc/integer/abs.h
  #include clc/integer/abs_diff.h
  #include clc/integer/add_sat.h
 +#include clc/integer/max.h
  #include clc/integer/sub_sat.h
  
  /* 6.11.5 Geometric Functions */
 diff --git a/generic/include/clc/integer/max.h 
 b/generic/include/clc/integer/max.h
 new file mode 100644
 index 000..e74a459
 --- /dev/null
 +++ b/generic/include/clc/integer/max.h
 @@ -0,0 +1,2 @@
 +#define BODY clc/integer/max.inc
 +#include clc/integer/gentype.inc
 diff --git a/generic/include/clc/integer/max.inc 
 b/generic/include/clc/integer/max.inc
 new file mode 100644
 index 000..ce6c6d0
 --- /dev/null
 +++ b/generic/include/clc/integer/max.inc
 @@ -0,0 +1 @@
 +_CLC_OVERLOAD _CLC_DECL GENTYPE max(GENTYPE a, GENTYPE b);
 diff --git a/generic/include/clc/math/max.h b/generic/include/clc/math/max.h
 new file mode 100644
 index 000..3d158f1
 --- /dev/null
 +++ b/generic/include/clc/math/max.h
 @@ -0,0 +1,2 @@
 +#define BODY clc/math/max.inc
 +#include clc/math/gentype.inc
 diff --git a/generic/include/clc/math/max.inc 
 b/generic/include/clc/math/max.inc
 new file mode 100644
 index 000..ce6c6d0
 --- /dev/null
 +++ b/generic/include/clc/math/max.inc
 @@ -0,0 +1 @@
 +_CLC_OVERLOAD _CLC_DECL GENTYPE max(GENTYPE a, GENTYPE b);
 diff --git a/generic/lib/SOURCES b/generic/lib/SOURCES
 index 86c008b..b593941 100644
 --- a/generic/lib/SOURCES
 +++ b/generic/lib/SOURCES
 @@ -7,6 +7,7 @@ integer/abs.cl
  integer/add_sat.cl
  integer/add_sat.ll
  integer/add_sat_impl.ll
 +integer/max.cl
  integer/sub_sat.cl
  integer/sub_sat.ll
  integer/sub_sat_impl.ll
 @@ -14,6 +15,7 @@ math/fmax.cl
  math/fmin.cl
  math/hypot.cl
  math/mad.cl
 +math/max.cl
  relational/any.cl
  workitem/get_global_id.cl
  workitem/get_global_size.cl
 diff --git a/generic/lib/integer/max.cl b/generic/lib/integer/max.cl
 new file mode 100644
 index 000..89fec7c
 --- /dev/null
 +++ b/generic/lib/integer/max.cl
 @@ -0,0 +1,4 @@
 +#include clc/clc.h
 +
 +#define BODY max.inc
 +#include clc/integer/gentype.inc
 diff --git a/generic/lib/integer/max.inc b/generic/lib/integer/max.inc
 new file mode 100644
 index 000..37409fc
 --- /dev/null
 +++ b/generic/lib/integer/max.inc
 @@ -0,0 +1,3 @@
 +_CLC_OVERLOAD _CLC_DEF GENTYPE max(GENTYPE a, GENTYPE b) {
 +  return (a  b ? a : b);
 +}
 diff --git a/generic/lib/math/max.cl b/generic/lib/math/max.cl
 new file mode 100644
 index 000..d1254a7
 --- /dev/null
 +++ b/generic/lib/math/max.cl
 @@ -0,0 +1,8 @@
 +#include clc/clc.h
 +
 +#ifdef cl_khr_fp64
 +#pragma OPENCL EXTENSION cl_khr_fp64 : enable
 +#endif
 +
 +#define BODY max.inc
 +#include clc/math/gentype.inc
 diff --git a/generic/lib/math/max.inc b/generic/lib/math/max.inc
 new file mode 100644
 index 000..37409fc
 --- /dev/null
 +++ b/generic/lib/math/max.inc
 @@ -0,0 +1,3 @@
 +_CLC_OVERLOAD _CLC_DEF GENTYPE max(GENTYPE a, GENTYPE b) {
 +  return (a  b ? a : b);
 +}
 -- 
 1.7.10.4
 
 ___
 mesa-dev mailing list
 mesa-dev@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] libclc: Add max() builtin function

2013-03-14 Thread Aaron Watry 
Adds this function for both int and floating data types.
---
 generic/include/clc/clc.h   |2 ++
 generic/include/clc/integer/max.h   |2 ++
 generic/include/clc/integer/max.inc |1 +
 generic/include/clc/math/max.h  |2 ++
 generic/include/clc/math/max.inc|1 +
 generic/lib/SOURCES |2 ++
 generic/lib/integer/max.cl  |4 
 generic/lib/integer/max.inc |3 +++
 generic/lib/math/max.cl |8 
 generic/lib/math/max.inc|3 +++
 10 files changed, 28 insertions(+)
 create mode 100644 generic/include/clc/integer/max.h
 create mode 100644 generic/include/clc/integer/max.inc
 create mode 100644 generic/include/clc/math/max.h
 create mode 100644 generic/include/clc/math/max.inc
 create mode 100644 generic/lib/integer/max.cl
 create mode 100644 generic/lib/integer/max.inc
 create mode 100644 generic/lib/math/max.cl
 create mode 100644 generic/lib/math/max.inc

diff --git a/generic/include/clc/clc.h b/generic/include/clc/clc.h
index 4394c9e..f6668a3 100644
--- a/generic/include/clc/clc.h
+++ b/generic/include/clc/clc.h
@@ -45,6 +45,7 @@
 #include clc/math/log.h
 #include clc/math/log2.h
 #include clc/math/mad.h
+#include clc/math/max.h
 #include clc/math/pow.h
 #include clc/math/sin.h
 #include clc/math/sqrt.h
@@ -63,6 +64,7 @@
 #include clc/integer/abs.h
 #include clc/integer/abs_diff.h
 #include clc/integer/add_sat.h
+#include clc/integer/max.h
 #include clc/integer/sub_sat.h
 
 /* 6.11.5 Geometric Functions */
diff --git a/generic/include/clc/integer/max.h 
b/generic/include/clc/integer/max.h
new file mode 100644
index 000..e74a459
--- /dev/null
+++ b/generic/include/clc/integer/max.h
@@ -0,0 +1,2 @@
+#define BODY clc/integer/max.inc
+#include clc/integer/gentype.inc
diff --git a/generic/include/clc/integer/max.inc 
b/generic/include/clc/integer/max.inc
new file mode 100644
index 000..ce6c6d0
--- /dev/null
+++ b/generic/include/clc/integer/max.inc
@@ -0,0 +1 @@
+_CLC_OVERLOAD _CLC_DECL GENTYPE max(GENTYPE a, GENTYPE b);
diff --git a/generic/include/clc/math/max.h b/generic/include/clc/math/max.h
new file mode 100644
index 000..3d158f1
--- /dev/null
+++ b/generic/include/clc/math/max.h
@@ -0,0 +1,2 @@
+#define BODY clc/math/max.inc
+#include clc/math/gentype.inc
diff --git a/generic/include/clc/math/max.inc b/generic/include/clc/math/max.inc
new file mode 100644
index 000..ce6c6d0
--- /dev/null
+++ b/generic/include/clc/math/max.inc
@@ -0,0 +1 @@
+_CLC_OVERLOAD _CLC_DECL GENTYPE max(GENTYPE a, GENTYPE b);
diff --git a/generic/lib/SOURCES b/generic/lib/SOURCES
index 86c008b..b593941 100644
--- a/generic/lib/SOURCES
+++ b/generic/lib/SOURCES
@@ -7,6 +7,7 @@ integer/abs.cl
 integer/add_sat.cl
 integer/add_sat.ll
 integer/add_sat_impl.ll
+integer/max.cl
 integer/sub_sat.cl
 integer/sub_sat.ll
 integer/sub_sat_impl.ll
@@ -14,6 +15,7 @@ math/fmax.cl
 math/fmin.cl
 math/hypot.cl
 math/mad.cl
+math/max.cl
 relational/any.cl
 workitem/get_global_id.cl
 workitem/get_global_size.cl
diff --git a/generic/lib/integer/max.cl b/generic/lib/integer/max.cl
new file mode 100644
index 000..89fec7c
--- /dev/null
+++ b/generic/lib/integer/max.cl
@@ -0,0 +1,4 @@
+#include clc/clc.h
+
+#define BODY max.inc
+#include clc/integer/gentype.inc
diff --git a/generic/lib/integer/max.inc b/generic/lib/integer/max.inc
new file mode 100644
index 000..37409fc
--- /dev/null
+++ b/generic/lib/integer/max.inc
@@ -0,0 +1,3 @@
+_CLC_OVERLOAD _CLC_DEF GENTYPE max(GENTYPE a, GENTYPE b) {
+  return (a  b ? a : b);
+}
diff --git a/generic/lib/math/max.cl b/generic/lib/math/max.cl
new file mode 100644
index 000..d1254a7
--- /dev/null
+++ b/generic/lib/math/max.cl
@@ -0,0 +1,8 @@
+#include clc/clc.h
+
+#ifdef cl_khr_fp64
+#pragma OPENCL EXTENSION cl_khr_fp64 : enable
+#endif
+
+#define BODY max.inc
+#include clc/math/gentype.inc
diff --git a/generic/lib/math/max.inc b/generic/lib/math/max.inc
new file mode 100644
index 000..37409fc
--- /dev/null
+++ b/generic/lib/math/max.inc
@@ -0,0 +1,3 @@
+_CLC_OVERLOAD _CLC_DEF GENTYPE max(GENTYPE a, GENTYPE b) {
+  return (a  b ? a : b);
+}
-- 
1.7.10.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev