7 files changed, 142 insertions, 0 deletions
diff --git a/libclc/generic/include/clc/clc.h b/libclc/generic/include/clc/clc.h
index 2a72fbe2942..d4ef7a8bd58 100644
--- a/libclc/generic/include/clc/clc.h
+++ b/libclc/generic/include/clc/clc.h
@@ -59,6 +59,7 @@
 #include <clc/math/fract.h>
 #include <clc/math/half_sqrt.h>
 #include <clc/math/hypot.h>
+#include <clc/math/ldexp.h>
 #include <clc/math/log.h>
 #include <clc/math/log10.h>
 #include <clc/math/log1p.h>
diff --git a/libclc/generic/include/clc/math/gentype.inc b/libclc/generic/include/clc/math/gentype.inc
index 9f79f6eb037..c82e8082404 100644
--- a/libclc/generic/include/clc/math/gentype.inc
+++ b/libclc/generic/include/clc/math/gentype.inc
@@ -8,24 +8,34 @@
 #undef __CLC_SCALAR
 
 #define __CLC_GENTYPE float2
+#define __CLC_INTN int2
 #include __CLC_BODY
 #undef __CLC_GENTYPE
+#undef __CLC_INTN
 
 #define __CLC_GENTYPE float3
+#define __CLC_INTN int3
 #include __CLC_BODY
 #undef __CLC_GENTYPE
+#undef __CLC_INTN
 
 #define __CLC_GENTYPE float4
+#define __CLC_INTN int4
 #include __CLC_BODY
 #undef __CLC_GENTYPE
+#undef __CLC_INTN
 
 #define __CLC_GENTYPE float8
+#define __CLC_INTN int8
 #include __CLC_BODY
 #undef __CLC_GENTYPE
+#undef __CLC_INTN
 
 #define __CLC_GENTYPE float16
+#define __CLC_INTN int16
 #include __CLC_BODY
 #undef __CLC_GENTYPE
+#undef __CLC_INTN
 
 #undef __CLC_FPSIZE
 #undef __CLC_SCALAR_GENTYPE
@@ -41,24 +51,34 @@
 #undef __CLC_SCALAR
 
 #define __CLC_GENTYPE double2
+#define __CLC_INTN int2
 #include __CLC_BODY
 #undef __CLC_GENTYPE
+#undef __CLC_INTN
 
 #define __CLC_GENTYPE double3
+#define __CLC_INTN int3
 #include __CLC_BODY
 #undef __CLC_GENTYPE
+#undef __CLC_INTN
 
 #define __CLC_GENTYPE double4
+#define __CLC_INTN int4
 #include __CLC_BODY
 #undef __CLC_GENTYPE
+#undef __CLC_INTN
 
 #define __CLC_GENTYPE double8
+#define __CLC_INTN int8
 #include __CLC_BODY
 #undef __CLC_GENTYPE
+#undef __CLC_INTN
 
 #define __CLC_GENTYPE double16
+#define __CLC_INTN int16
 #include __CLC_BODY
 #undef __CLC_GENTYPE
+#undef __CLC_INTN
 
 #undef __CLC_FPSIZE
 #undef __CLC_SCALAR_GENTYPE
diff --git a/libclc/generic/include/clc/math/ldexp.h b/libclc/generic/include/clc/math/ldexp.h
new file mode 100644
index 00000000000..f87df88bcf0
--- /dev/null
+++ b/libclc/generic/include/clc/math/ldexp.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2014,2015 Advanced Micro Devices, Inc.
+ *
+ * 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, sublicense, 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 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 NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+#define __CLC_BODY <clc/math/ldexp.inc>
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/include/clc/math/ldexp.inc b/libclc/generic/include/clc/math/ldexp.inc
new file mode 100644
index 00000000000..67a22b25243
--- /dev/null
+++ b/libclc/generic/include/clc/math/ldexp.inc
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2014,2015 Advanced Micro Devices, Inc.
+ *
+ * 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, sublicense, 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 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 NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE ldexp(__CLC_GENTYPE x, int n);
+
+#ifndef __CLC_SCALAR
+
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE ldexp(__CLC_GENTYPE x, __CLC_INTN n);
+
+#endif
diff --git a/libclc/r600/lib/SOURCES b/libclc/r600/lib/SOURCES
index ef23d83a545..0f1227e7378 100644
--- a/libclc/r600/lib/SOURCES
+++ b/libclc/r600/lib/SOURCES
@@ -1,4 +1,5 @@
 atomic/atomic.cl
+math/ldexp.cl
 math/nextafter.cl
 workitem/get_num_groups.ll
 workitem/get_group_id.ll
diff --git a/libclc/r600/lib/math/ldexp.cl b/libclc/r600/lib/math/ldexp.cl
new file mode 100644
index 00000000000..6742cb9ad4f
--- /dev/null
+++ b/libclc/r600/lib/math/ldexp.cl
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
+ *
+ * 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, sublicense, 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 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 NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+#include <clc/clc.h>
+
+#include "../../../generic/lib/clcmacro.h"
+
+// This defines all the ldexp(floatN, intN) variants.
+_CLC_DEFINE_BINARY_BUILTIN(float, ldexp, __builtin_amdgpu_ldexpf, float, int);
+
+#ifdef cl_khr_fp64
+  #pragma OPENCL EXTENSION cl_khr_fp64 : enable
+    // This defines all the ldexp(doubleN, intN) variants.
+  _CLC_DEFINE_BINARY_BUILTIN(double, ldexp, __builtin_amdgpu_ldexp, double, int);
+#endif
+
+// This defines all the ldexp(GENTYPE, int);
+#define __CLC_BODY <ldexp.inc>
+#include <clc/math/gentype.inc>
diff --git a/libclc/r600/lib/math/ldexp.inc b/libclc/r600/lib/math/ldexp.inc
new file mode 100644
index 00000000000..6e28fbb94ca
--- /dev/null
+++ b/libclc/r600/lib/math/ldexp.inc
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2014 Advanced Micro Devices, Inc.
+ *
+ * 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, sublicense, 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 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 NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+#ifndef __CLC_SCALAR
+
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE ldexp(__CLC_GENTYPE x, int n) {
+  return ldexp(x, (__CLC_INTN)n);
+}
+
+#endif