diff --git a/libclc/generic/include/clc/integer/mad_hi.h b/libclc/generic/include/clc/integer/mad_hi.h
index 863ce92d9f2d..c6f1181ecc67 100644
--- a/libclc/generic/include/clc/integer/mad_hi.h
+++ b/libclc/generic/include/clc/integer/mad_hi.h
@@ -1 +1,3 @@
-#define mad_hi(a, b, c) (mul_hi((a),(b))+(c))
+#define __CLC_BODY <clc/integer/mad_hi.inc>
+#include <clc/integer/gentype.inc>
+#undef __CLC_BODY
diff --git a/libclc/generic/include/clc/integer/mad_hi.inc b/libclc/generic/include/clc/integer/mad_hi.inc
new file mode 100644
index 000000000000..0443f1f30157
--- /dev/null
+++ b/libclc/generic/include/clc/integer/mad_hi.inc
@@ -0,0 +1 @@
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE mad_hi(__CLC_GENTYPE x, __CLC_GENTYPE y, __CLC_GENTYPE z);
diff --git a/libclc/generic/lib/SOURCES b/libclc/generic/lib/SOURCES
index f50898828767..32a314f2f99b 100644
--- a/libclc/generic/lib/SOURCES
+++ b/libclc/generic/lib/SOURCES
@@ -71,6 +71,7 @@ integer/ctz.cl
 integer/hadd.cl
 integer/mad24.cl
 integer/mad_sat.cl
+integer/mad_hi.cl
 integer/mul24.cl
 integer/mul_hi.cl
 integer/popcount.cl
diff --git a/libclc/generic/lib/integer/mad_hi.cl b/libclc/generic/lib/integer/mad_hi.cl
new file mode 100644
index 000000000000..475635fda683
--- /dev/null
+++ b/libclc/generic/lib/integer/mad_hi.cl
@@ -0,0 +1,44 @@
+#include <clc/clc.h>
+#include "../clcmacro.h"
+
+_CLC_OVERLOAD _CLC_DEF char mad_hi(char x, char y, char z) {
+    return mul_hi(x, y) + z;
+}
+
+_CLC_OVERLOAD _CLC_DEF uchar mad_hi(uchar x, uchar y, uchar z) {
+    return mul_hi(x, y) + z;
+}
+
+_CLC_OVERLOAD _CLC_DEF short mad_hi(short x, short y, short z) {
+    return mul_hi(x, y) + z;
+}
+
+_CLC_OVERLOAD _CLC_DEF ushort mad_hi(ushort x, ushort y, ushort z) {
+    return mul_hi(x, y) + z;
+}
+
+_CLC_OVERLOAD _CLC_DEF int mad_hi(int x, int y, int z) {
+    return mul_hi(x, y) + z;
+}
+
+_CLC_OVERLOAD _CLC_DEF uint mad_hi(uint x, uint y, uint z) {
+    return mul_hi(x, y) + z;
+}
+
+_CLC_OVERLOAD _CLC_DEF long mad_hi(long x, long y, long z) {
+    return mul_hi(x, y) + z;
+}
+
+_CLC_OVERLOAD _CLC_DEF ulong mad_hi(ulong x, ulong y, ulong z) {
+    return mul_hi(x, y) + z;
+}
+
+
+_CLC_TERNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, char, mad_hi, char, char, char)
+_CLC_TERNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, uchar, mad_hi, uchar, uchar, uchar)
+_CLC_TERNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, short, mad_hi, short, short, short)
+_CLC_TERNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, ushort, mad_hi, ushort, ushort, ushort)
+_CLC_TERNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, int, mad_hi, int, int, int)
+_CLC_TERNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, uint, mad_hi, uint, uint, uint)
+_CLC_TERNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, long, mad_hi, long, long, long)
+_CLC_TERNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, ulong, mad_hi, ulong, ulong, ulong)