diff --git a/clang/lib/Sema/SPIRVBuiltins.td b/clang/lib/Sema/SPIRVBuiltins.td
index e226e3b223e17..e5019b5202a43 100644
--- a/clang/lib/Sema/SPIRVBuiltins.td
+++ b/clang/lib/Sema/SPIRVBuiltins.td
@@ -803,7 +803,7 @@ foreach rnd = ["", "_rte", "_rtn", "_rtp", "_rtz"] in {
 }
 
 foreach sat = ["", "_sat"] in {
-  foreach InType = TLAllInts.List in {
+  foreach InType = TLUnsignedInts.List in {
     foreach OutType = TLUnsignedInts.List in {
       if !ne(OutType.ElementSize, InType.ElementSize) then {
         def : SPVBuiltin<"UConvert_R" # OutType.Name # sat, [OutType, InType], Attr.Const>;
@@ -814,6 +814,8 @@ foreach sat = ["", "_sat"] in {
         }
       }
     }
+  }
+  foreach InType = TLSignedInts.List in {
     foreach OutType = TLSignedInts.List in {
       if !ne(OutType.ElementSize, InType.ElementSize) then {
         def : SPVBuiltin<"SConvert_R" # OutType.Name # sat, [OutType, InType], Attr.Const>;
diff --git a/clang/test/CodeGenSPIRV/spirv-builtin-lookup-convert.cpp b/clang/test/CodeGenSPIRV/spirv-builtin-lookup-convert.cpp
new file mode 100644
index 0000000000000..48e053318a69f
--- /dev/null
+++ b/clang/test/CodeGenSPIRV/spirv-builtin-lookup-convert.cpp
@@ -0,0 +1,232 @@
+// RUN: %clang_cc1 -triple=spirv64 -fdeclare-spirv-builtins -emit-llvm %s -o - | FileCheck %s
+
+template <bool, typename If, typename Else> struct conditional_t {
+  using T = If;
+};
+
+template <typename If, typename Else> struct conditional_t<false, If, Else> {
+  using T = Else;
+};
+
+#define DEFINE_TEST_CONVERT_N(Op, N, DstTy, DstTyName, SrcTy, SrcTyName)       \
+  namespace Op##DstTyName##SrcTyName {                                         \
+    using DTy##N =                                                             \
+        conditional_t<N == 1, DstTy,                                           \
+                      DstTy __attribute__((ext_vector_type(N)))>::T;           \
+    using STy##N =                                                             \
+        conditional_t<N == 1, SrcTy,                                           \
+                      SrcTy __attribute__((ext_vector_type(N)))>::T;           \
+    DTy##N test_##Name##DstTyName(STy##N v) {                                  \
+      return __spirv_##Op##Convert_R##DstTyName(v);                            \
+    }                                                                          \
+    STy##N test_##Name##SrcTyName(DTy##N v) {                                  \
+      return __spirv_##Op##Convert_R##SrcTyName(v);                            \
+    }                                                                          \
+  }
+
+#define DEFINE_TEST_CONVERT(Op, DstTy, DstTySpvName, SrcTy, SrcTySpvName)      \
+  DEFINE_TEST_CONVERT_N(Op, 1, DstTy, DstTySpvName, SrcTy, SrcTySpvName)       \
+  DEFINE_TEST_CONVERT_N(Op, 2, DstTy, DstTySpvName##2, SrcTy, SrcTySpvName##2) \
+  DEFINE_TEST_CONVERT_N(Op, 3, DstTy, DstTySpvName##3, SrcTy, SrcTySpvName##3) \
+  DEFINE_TEST_CONVERT_N(Op, 4, DstTy, DstTySpvName##4, SrcTy, SrcTySpvName##4) \
+  DEFINE_TEST_CONVERT_N(Op, 8, DstTy, DstTySpvName##8, SrcTy, SrcTySpvName##8) \
+  DEFINE_TEST_CONVERT_N(Op, 16, DstTy, DstTySpvName##16, SrcTy,                \
+                        SrcTySpvName##16)
+
+DEFINE_TEST_CONVERT(S, char, char, short, short)
+DEFINE_TEST_CONVERT(S, char, char, int, int)
+DEFINE_TEST_CONVERT(S, char, char, long, long)
+DEFINE_TEST_CONVERT(S, signed char, schar, int, int)
+DEFINE_TEST_CONVERT(S, signed char, schar, short, short)
+DEFINE_TEST_CONVERT(S, signed char, schar, long, long)
+DEFINE_TEST_CONVERT(S, short, short, int, int)
+DEFINE_TEST_CONVERT(S, short, short, long, long)
+DEFINE_TEST_CONVERT(S, int, int, long, long)
+
+DEFINE_TEST_CONVERT(U, unsigned char, uchar, unsigned short, ushort)
+DEFINE_TEST_CONVERT(U, unsigned char, uchar, unsigned int, uint)
+DEFINE_TEST_CONVERT(U, unsigned char, uchar, unsigned long, ulong)
+DEFINE_TEST_CONVERT(U, unsigned short, ushort, unsigned int, uint)
+DEFINE_TEST_CONVERT(U, unsigned short, ushort, unsigned long, ulong)
+DEFINE_TEST_CONVERT(U, unsigned int, uint, unsigned long, ulong)
+
+// CHECK: call {{.*}} signext i8 @_Z22__spirv_SConvert_Rchars
+// CHECK: call {{.*}} signext i16 @_Z23__spirv_SConvert_Rshortc
+// CHECK: call {{.*}} <2 x i8> @_Z23__spirv_SConvert_Rchar2Dv2_s
+// CHECK: call {{.*}} <2 x i16> @_Z24__spirv_SConvert_Rshort2Dv2_c
+// CHECK: call {{.*}} <3 x i8> @_Z23__spirv_SConvert_Rchar3Dv3_s
+// CHECK: call {{.*}} <3 x i16> @_Z24__spirv_SConvert_Rshort3Dv3_c
+// CHECK: call {{.*}} <4 x i8> @_Z23__spirv_SConvert_Rchar4Dv4_s
+// CHECK: call {{.*}} <4 x i16> @_Z24__spirv_SConvert_Rshort4Dv4_c
+// CHECK: call {{.*}} <8 x i8> @_Z23__spirv_SConvert_Rchar8Dv8_s
+// CHECK: call {{.*}} <8 x i16> @_Z24__spirv_SConvert_Rshort8Dv8_c
+// CHECK: call {{.*}} <16 x i8> @_Z24__spirv_SConvert_Rchar16Dv16_s
+// CHECK: call {{.*}} <16 x i16> @_Z25__spirv_SConvert_Rshort16Dv16_c
+// CHECK: call {{.*}} signext i8 @_Z22__spirv_SConvert_Rchari
+// CHECK: call {{.*}} i32 @_Z21__spirv_SConvert_Rintc
+// CHECK: call {{.*}} <2 x i8> @_Z23__spirv_SConvert_Rchar2Dv2_i
+// CHECK: call {{.*}} <2 x i32> @_Z22__spirv_SConvert_Rint2Dv2_c
+// CHECK: call {{.*}} <3 x i8> @_Z23__spirv_SConvert_Rchar3Dv3_i
+// CHECK: call {{.*}} <3 x i32> @_Z22__spirv_SConvert_Rint3Dv3_c
+// CHECK: call {{.*}} <4 x i8> @_Z23__spirv_SConvert_Rchar4Dv4_i
+// CHECK: call {{.*}} <4 x i32> @_Z22__spirv_SConvert_Rint4Dv4_c
+// CHECK: call {{.*}} <8 x i8> @_Z23__spirv_SConvert_Rchar8Dv8_i
+// CHECK: call {{.*}} <8 x i32> @_Z22__spirv_SConvert_Rint8Dv8_c
+// CHECK: call {{.*}} <16 x i8> @_Z24__spirv_SConvert_Rchar16Dv16_i
+// CHECK: call {{.*}} <16 x i32> @_Z23__spirv_SConvert_Rint16Dv16_c
+// CHECK: call {{.*}} signext i8 @_Z22__spirv_SConvert_Rcharl
+// CHECK: call {{.*}} i64 @_Z22__spirv_SConvert_Rlongc
+// CHECK: call {{.*}} <2 x i8> @_Z23__spirv_SConvert_Rchar2Dv2_l
+// CHECK: call {{.*}} <2 x i64> @_Z23__spirv_SConvert_Rlong2Dv2_c
+// CHECK: call {{.*}} <3 x i8> @_Z23__spirv_SConvert_Rchar3Dv3_l
+// CHECK: call {{.*}} <3 x i64> @_Z23__spirv_SConvert_Rlong3Dv3_c
+// CHECK: call {{.*}} <4 x i8> @_Z23__spirv_SConvert_Rchar4Dv4_l
+// CHECK: call {{.*}} <4 x i64> @_Z23__spirv_SConvert_Rlong4Dv4_c
+// CHECK: call {{.*}} <8 x i8> @_Z23__spirv_SConvert_Rchar8Dv8_l
+// CHECK: call {{.*}} <8 x i64> @_Z23__spirv_SConvert_Rlong8Dv8_c
+// CHECK: call {{.*}} <16 x i8> @_Z24__spirv_SConvert_Rchar16Dv16_l
+// CHECK: call {{.*}} <16 x i64> @_Z24__spirv_SConvert_Rlong16Dv16_c
+// CHECK: call {{.*}} signext i8 @_Z23__spirv_SConvert_Rschari
+// CHECK: call {{.*}} i32 @_Z21__spirv_SConvert_Rinta
+// CHECK: call {{.*}} <2 x i8> @_Z24__spirv_SConvert_Rschar2Dv2_i
+// CHECK: call {{.*}} <2 x i32> @_Z22__spirv_SConvert_Rint2Dv2_a
+// CHECK: call {{.*}} <3 x i8> @_Z24__spirv_SConvert_Rschar3Dv3_i
+// CHECK: call {{.*}} <3 x i32> @_Z22__spirv_SConvert_Rint3Dv3_a
+// CHECK: call {{.*}} <4 x i8> @_Z24__spirv_SConvert_Rschar4Dv4_i
+// CHECK: call {{.*}} <4 x i32> @_Z22__spirv_SConvert_Rint4Dv4_a
+// CHECK: call {{.*}} <8 x i8> @_Z24__spirv_SConvert_Rschar8Dv8_i
+// CHECK: call {{.*}} <8 x i32> @_Z22__spirv_SConvert_Rint8Dv8_a
+// CHECK: call {{.*}} <16 x i8> @_Z25__spirv_SConvert_Rschar16Dv16_i
+// CHECK: call {{.*}} <16 x i32> @_Z23__spirv_SConvert_Rint16Dv16_a
+// CHECK: call {{.*}} signext i8 @_Z23__spirv_SConvert_Rschars
+// CHECK: call {{.*}} signext i16 @_Z23__spirv_SConvert_Rshorta
+// CHECK: call {{.*}} <2 x i8> @_Z24__spirv_SConvert_Rschar2Dv2_s
+// CHECK: call {{.*}} <2 x i16> @_Z24__spirv_SConvert_Rshort2Dv2_a
+// CHECK: call {{.*}} <3 x i8> @_Z24__spirv_SConvert_Rschar3Dv3_s
+// CHECK: call {{.*}} <3 x i16> @_Z24__spirv_SConvert_Rshort3Dv3_a
+// CHECK: call {{.*}} <4 x i8> @_Z24__spirv_SConvert_Rschar4Dv4_s
+// CHECK: call {{.*}} <4 x i16> @_Z24__spirv_SConvert_Rshort4Dv4_a
+// CHECK: call {{.*}} <8 x i8> @_Z24__spirv_SConvert_Rschar8Dv8_s
+// CHECK: call {{.*}} <8 x i16> @_Z24__spirv_SConvert_Rshort8Dv8_a
+// CHECK: call {{.*}} <16 x i8> @_Z25__spirv_SConvert_Rschar16Dv16_s
+// CHECK: call {{.*}} <16 x i16> @_Z25__spirv_SConvert_Rshort16Dv16_a
+// CHECK: call {{.*}} signext i8 @_Z23__spirv_SConvert_Rscharl
+// CHECK: call {{.*}} i64 @_Z22__spirv_SConvert_Rlonga
+// CHECK: call {{.*}} <2 x i8> @_Z24__spirv_SConvert_Rschar2Dv2_l
+// CHECK: call {{.*}} <2 x i64> @_Z23__spirv_SConvert_Rlong2Dv2_a
+// CHECK: call {{.*}} <3 x i8> @_Z24__spirv_SConvert_Rschar3Dv3_l
+// CHECK: call {{.*}} <3 x i64> @_Z23__spirv_SConvert_Rlong3Dv3_a
+// CHECK: call {{.*}} <4 x i8> @_Z24__spirv_SConvert_Rschar4Dv4_l
+// CHECK: call {{.*}} <4 x i64> @_Z23__spirv_SConvert_Rlong4Dv4_a
+// CHECK: call {{.*}} <8 x i8> @_Z24__spirv_SConvert_Rschar8Dv8_l
+// CHECK: call {{.*}} <8 x i64> @_Z23__spirv_SConvert_Rlong8Dv8_a
+// CHECK: call {{.*}} <16 x i8> @_Z25__spirv_SConvert_Rschar16Dv16_l
+// CHECK: call {{.*}} <16 x i64> @_Z24__spirv_SConvert_Rlong16Dv16_a
+// CHECK: call {{.*}} signext i16 @_Z23__spirv_SConvert_Rshorti
+// CHECK: call {{.*}} i32 @_Z21__spirv_SConvert_Rints
+// CHECK: call {{.*}} <2 x i16> @_Z24__spirv_SConvert_Rshort2Dv2_i
+// CHECK: call {{.*}} <2 x i32> @_Z22__spirv_SConvert_Rint2Dv2_s
+// CHECK: call {{.*}} <3 x i16> @_Z24__spirv_SConvert_Rshort3Dv3_i
+// CHECK: call {{.*}} <3 x i32> @_Z22__spirv_SConvert_Rint3Dv3_s
+// CHECK: call {{.*}} <4 x i16> @_Z24__spirv_SConvert_Rshort4Dv4_i
+// CHECK: call {{.*}} <4 x i32> @_Z22__spirv_SConvert_Rint4Dv4_s
+// CHECK: call {{.*}} <8 x i16> @_Z24__spirv_SConvert_Rshort8Dv8_i
+// CHECK: call {{.*}} <8 x i32> @_Z22__spirv_SConvert_Rint8Dv8_s
+// CHECK: call {{.*}} <16 x i16> @_Z25__spirv_SConvert_Rshort16Dv16_i
+// CHECK: call {{.*}} <16 x i32> @_Z23__spirv_SConvert_Rint16Dv16_s
+// CHECK: call {{.*}} signext i16 @_Z23__spirv_SConvert_Rshortl
+// CHECK: call {{.*}} i64 @_Z22__spirv_SConvert_Rlongs
+// CHECK: call {{.*}} <2 x i16> @_Z24__spirv_SConvert_Rshort2Dv2_l
+// CHECK: call {{.*}} <2 x i64> @_Z23__spirv_SConvert_Rlong2Dv2_s
+// CHECK: call {{.*}} <3 x i16> @_Z24__spirv_SConvert_Rshort3Dv3_l
+// CHECK: call {{.*}} <3 x i64> @_Z23__spirv_SConvert_Rlong3Dv3_s
+// CHECK: call {{.*}} <4 x i16> @_Z24__spirv_SConvert_Rshort4Dv4_l
+// CHECK: call {{.*}} <4 x i64> @_Z23__spirv_SConvert_Rlong4Dv4_s
+// CHECK: call {{.*}} <8 x i16> @_Z24__spirv_SConvert_Rshort8Dv8_l
+// CHECK: call {{.*}} <8 x i64> @_Z23__spirv_SConvert_Rlong8Dv8_s
+// CHECK: call {{.*}} <16 x i16> @_Z25__spirv_SConvert_Rshort16Dv16_l
+// CHECK: call {{.*}} <16 x i64> @_Z24__spirv_SConvert_Rlong16Dv16_s
+// CHECK: call {{.*}} i32 @_Z21__spirv_SConvert_Rintl
+// CHECK: call {{.*}} i64 @_Z22__spirv_SConvert_Rlongi
+// CHECK: call {{.*}} <2 x i32> @_Z22__spirv_SConvert_Rint2Dv2_l
+// CHECK: call {{.*}} <2 x i64> @_Z23__spirv_SConvert_Rlong2Dv2_i
+// CHECK: call {{.*}} <3 x i32> @_Z22__spirv_SConvert_Rint3Dv3_l
+// CHECK: call {{.*}} <3 x i64> @_Z23__spirv_SConvert_Rlong3Dv3_i
+// CHECK: call {{.*}} <4 x i32> @_Z22__spirv_SConvert_Rint4Dv4_l
+// CHECK: call {{.*}} <4 x i64> @_Z23__spirv_SConvert_Rlong4Dv4_i
+// CHECK: call {{.*}} <8 x i32> @_Z22__spirv_SConvert_Rint8Dv8_l
+// CHECK: call {{.*}} <8 x i64> @_Z23__spirv_SConvert_Rlong8Dv8_i
+// CHECK: call {{.*}} <16 x i32> @_Z23__spirv_SConvert_Rint16Dv16_l
+// CHECK: call {{.*}} <16 x i64> @_Z24__spirv_SConvert_Rlong16Dv16_i
+// CHECK: call {{.*}} zeroext i8 @_Z23__spirv_UConvert_Ruchart
+// CHECK: call {{.*}} zeroext i16 @_Z24__spirv_UConvert_Rushorth
+// CHECK: call {{.*}} <2 x i8> @_Z24__spirv_UConvert_Ruchar2Dv2_t
+// CHECK: call {{.*}} <2 x i16> @_Z25__spirv_UConvert_Rushort2Dv2_h
+// CHECK: call {{.*}} <3 x i8> @_Z24__spirv_UConvert_Ruchar3Dv3_t
+// CHECK: call {{.*}} <3 x i16> @_Z25__spirv_UConvert_Rushort3Dv3_h
+// CHECK: call {{.*}} <4 x i8> @_Z24__spirv_UConvert_Ruchar4Dv4_t
+// CHECK: call {{.*}} <4 x i16> @_Z25__spirv_UConvert_Rushort4Dv4_h
+// CHECK: call {{.*}} <8 x i8> @_Z24__spirv_UConvert_Ruchar8Dv8_t
+// CHECK: call {{.*}} <8 x i16> @_Z25__spirv_UConvert_Rushort8Dv8_h
+// CHECK: call {{.*}} <16 x i8> @_Z25__spirv_UConvert_Ruchar16Dv16_t
+// CHECK: call {{.*}} <16 x i16> @_Z26__spirv_UConvert_Rushort16Dv16_h
+// CHECK: call {{.*}} zeroext i8 @_Z23__spirv_UConvert_Rucharj
+// CHECK: call {{.*}} i32 @_Z22__spirv_UConvert_Ruinth
+// CHECK: call {{.*}} <2 x i8> @_Z24__spirv_UConvert_Ruchar2Dv2_j
+// CHECK: call {{.*}} <2 x i32> @_Z23__spirv_UConvert_Ruint2Dv2_h
+// CHECK: call {{.*}} <3 x i8> @_Z24__spirv_UConvert_Ruchar3Dv3_j
+// CHECK: call {{.*}} <3 x i32> @_Z23__spirv_UConvert_Ruint3Dv3_h
+// CHECK: call {{.*}} <4 x i8> @_Z24__spirv_UConvert_Ruchar4Dv4_j
+// CHECK: call {{.*}} <4 x i32> @_Z23__spirv_UConvert_Ruint4Dv4_h
+// CHECK: call {{.*}} <8 x i8> @_Z24__spirv_UConvert_Ruchar8Dv8_j
+// CHECK: call {{.*}} <8 x i32> @_Z23__spirv_UConvert_Ruint8Dv8_h
+// CHECK: call {{.*}} <16 x i8> @_Z25__spirv_UConvert_Ruchar16Dv16_j
+// CHECK: call {{.*}} <16 x i32> @_Z24__spirv_UConvert_Ruint16Dv16_h
+// CHECK: call {{.*}} zeroext i8 @_Z23__spirv_UConvert_Rucharm
+// CHECK: call {{.*}} i64 @_Z23__spirv_UConvert_Rulongh
+// CHECK: call {{.*}} <2 x i8> @_Z24__spirv_UConvert_Ruchar2Dv2_m
+// CHECK: call {{.*}} <2 x i64> @_Z24__spirv_UConvert_Rulong2Dv2_h
+// CHECK: call {{.*}} <3 x i8> @_Z24__spirv_UConvert_Ruchar3Dv3_m
+// CHECK: call {{.*}} <3 x i64> @_Z24__spirv_UConvert_Rulong3Dv3_h
+// CHECK: call {{.*}} <4 x i8> @_Z24__spirv_UConvert_Ruchar4Dv4_m
+// CHECK: call {{.*}} <4 x i64> @_Z24__spirv_UConvert_Rulong4Dv4_h
+// CHECK: call {{.*}} <8 x i8> @_Z24__spirv_UConvert_Ruchar8Dv8_m
+// CHECK: call {{.*}} <8 x i64> @_Z24__spirv_UConvert_Rulong8Dv8_h
+// CHECK: call {{.*}} <16 x i8> @_Z25__spirv_UConvert_Ruchar16Dv16_m
+// CHECK: call {{.*}} <16 x i64> @_Z25__spirv_UConvert_Rulong16Dv16_h
+// CHECK: call {{.*}} zeroext i16 @_Z24__spirv_UConvert_Rushortj
+// CHECK: call {{.*}} i32 @_Z22__spirv_UConvert_Ruintt
+// CHECK: call {{.*}} <2 x i16> @_Z25__spirv_UConvert_Rushort2Dv2_j
+// CHECK: call {{.*}} <2 x i32> @_Z23__spirv_UConvert_Ruint2Dv2_t
+// CHECK: call {{.*}} <3 x i16> @_Z25__spirv_UConvert_Rushort3Dv3_j
+// CHECK: call {{.*}} <3 x i32> @_Z23__spirv_UConvert_Ruint3Dv3_t
+// CHECK: call {{.*}} <4 x i16> @_Z25__spirv_UConvert_Rushort4Dv4_j
+// CHECK: call {{.*}} <4 x i32> @_Z23__spirv_UConvert_Ruint4Dv4_t
+// CHECK: call {{.*}} <8 x i16> @_Z25__spirv_UConvert_Rushort8Dv8_j
+// CHECK: call {{.*}} <8 x i32> @_Z23__spirv_UConvert_Ruint8Dv8_t
+// CHECK: call {{.*}} <16 x i16> @_Z26__spirv_UConvert_Rushort16Dv16_j
+// CHECK: call {{.*}} <16 x i32> @_Z24__spirv_UConvert_Ruint16Dv16_t
+// CHECK: call {{.*}} zeroext i16 @_Z24__spirv_UConvert_Rushortm
+// CHECK: call {{.*}} i64 @_Z23__spirv_UConvert_Rulongt
+// CHECK: call {{.*}} <2 x i16> @_Z25__spirv_UConvert_Rushort2Dv2_m
+// CHECK: call {{.*}} <2 x i64> @_Z24__spirv_UConvert_Rulong2Dv2_t
+// CHECK: call {{.*}} <3 x i16> @_Z25__spirv_UConvert_Rushort3Dv3_m
+// CHECK: call {{.*}} <3 x i64> @_Z24__spirv_UConvert_Rulong3Dv3_t
+// CHECK: call {{.*}} <4 x i16> @_Z25__spirv_UConvert_Rushort4Dv4_m
+// CHECK: call {{.*}} <4 x i64> @_Z24__spirv_UConvert_Rulong4Dv4_t
+// CHECK: call {{.*}} <8 x i16> @_Z25__spirv_UConvert_Rushort8Dv8_m
+// CHECK: call {{.*}} <8 x i64> @_Z24__spirv_UConvert_Rulong8Dv8_t
+// CHECK: call {{.*}} <16 x i16> @_Z26__spirv_UConvert_Rushort16Dv16_m
+// CHECK: call {{.*}} <16 x i64> @_Z25__spirv_UConvert_Rulong16Dv16_t
+// CHECK: call {{.*}} i32 @_Z22__spirv_UConvert_Ruintm
+// CHECK: call {{.*}} i64 @_Z23__spirv_UConvert_Rulongj
+// CHECK: call {{.*}} <2 x i32> @_Z23__spirv_UConvert_Ruint2Dv2_m
+// CHECK: call {{.*}} <2 x i64> @_Z24__spirv_UConvert_Rulong2Dv2_j
+// CHECK: call {{.*}} <3 x i32> @_Z23__spirv_UConvert_Ruint3Dv3_m
+// CHECK: call {{.*}} <3 x i64> @_Z24__spirv_UConvert_Rulong3Dv3_j
+// CHECK: call {{.*}} <4 x i32> @_Z23__spirv_UConvert_Ruint4Dv4_m
+// CHECK: call {{.*}} <4 x i64> @_Z24__spirv_UConvert_Rulong4Dv4_j
+// CHECK: call {{.*}} <8 x i32> @_Z23__spirv_UConvert_Ruint8Dv8_m
+// CHECK: call {{.*}} <8 x i64> @_Z24__spirv_UConvert_Rulong8Dv8_j
+// CHECK: call {{.*}} <16 x i32> @_Z24__spirv_UConvert_Ruint16Dv16_m
+// CHECK: call {{.*}} <16 x i64> @_Z25__spirv_UConvert_Rulong16Dv16_j
diff --git a/libclc/test/binding/core/SConvert_Rchar.cl b/libclc/test/binding/core/SConvert_Rchar.cl
index 1d0335f3c8770..f543785653b90 100644
--- a/libclc/test/binding/core/SConvert_Rchar.cl
+++ b/libclc/test/binding/core/SConvert_Rchar.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rchar(__clc_int16_t args_0) {
   return __spirv_SConvert_Rchar(args_0);
 }
 
-__attribute__((overloadable)) __clc_int8_t
-test___spirv_SConvert_Rchar(__clc_uint16_t args_0) {
-  return __spirv_SConvert_Rchar(args_0);
-}
-
 __attribute__((overloadable)) __clc_int8_t
 test___spirv_SConvert_Rchar(__clc_int32_t args_0) {
   return __spirv_SConvert_Rchar(args_0);
 }
 
-__attribute__((overloadable)) __clc_int8_t
-test___spirv_SConvert_Rchar(__clc_uint32_t args_0) {
-  return __spirv_SConvert_Rchar(args_0);
-}
-
 __attribute__((overloadable)) __clc_int8_t
 test___spirv_SConvert_Rchar(__clc_int64_t args_0) {
   return __spirv_SConvert_Rchar(args_0);
 }
-
-__attribute__((overloadable)) __clc_int8_t
-test___spirv_SConvert_Rchar(__clc_uint64_t args_0) {
-  return __spirv_SConvert_Rchar(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rchar16.cl b/libclc/test/binding/core/SConvert_Rchar16.cl
index f555bce4634f2..e386c2ce2acef 100644
--- a/libclc/test/binding/core/SConvert_Rchar16.cl
+++ b/libclc/test/binding/core/SConvert_Rchar16.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rchar16(__clc_vec16_int16_t args_0) {
   return __spirv_SConvert_Rchar16(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_int8_t
-test___spirv_SConvert_Rchar16(__clc_vec16_uint16_t args_0) {
-  return __spirv_SConvert_Rchar16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_int8_t
 test___spirv_SConvert_Rchar16(__clc_vec16_int32_t args_0) {
   return __spirv_SConvert_Rchar16(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_int8_t
-test___spirv_SConvert_Rchar16(__clc_vec16_uint32_t args_0) {
-  return __spirv_SConvert_Rchar16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_int8_t
 test___spirv_SConvert_Rchar16(__clc_vec16_int64_t args_0) {
   return __spirv_SConvert_Rchar16(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec16_int8_t
-test___spirv_SConvert_Rchar16(__clc_vec16_uint64_t args_0) {
-  return __spirv_SConvert_Rchar16(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rchar16_sat.cl b/libclc/test/binding/core/SConvert_Rchar16_sat.cl
index 10aa6353b6b0c..1b4c7862a5670 100644
--- a/libclc/test/binding/core/SConvert_Rchar16_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rchar16_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rchar16_sat(__clc_vec16_int16_t args_0) {
   return __spirv_SConvert_Rchar16_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_int8_t
-test___spirv_SConvert_Rchar16_sat(__clc_vec16_uint16_t args_0) {
-  return __spirv_SConvert_Rchar16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_int8_t
 test___spirv_SConvert_Rchar16_sat(__clc_vec16_int32_t args_0) {
   return __spirv_SConvert_Rchar16_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_int8_t
-test___spirv_SConvert_Rchar16_sat(__clc_vec16_uint32_t args_0) {
-  return __spirv_SConvert_Rchar16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_int8_t
 test___spirv_SConvert_Rchar16_sat(__clc_vec16_int64_t args_0) {
   return __spirv_SConvert_Rchar16_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec16_int8_t
-test___spirv_SConvert_Rchar16_sat(__clc_vec16_uint64_t args_0) {
-  return __spirv_SConvert_Rchar16_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rchar2.cl b/libclc/test/binding/core/SConvert_Rchar2.cl
index de89f03f9f9b4..a131483b00e51 100644
--- a/libclc/test/binding/core/SConvert_Rchar2.cl
+++ b/libclc/test/binding/core/SConvert_Rchar2.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rchar2(__clc_vec2_int16_t args_0) {
   return __spirv_SConvert_Rchar2(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_int8_t
-test___spirv_SConvert_Rchar2(__clc_vec2_uint16_t args_0) {
-  return __spirv_SConvert_Rchar2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_int8_t
 test___spirv_SConvert_Rchar2(__clc_vec2_int32_t args_0) {
   return __spirv_SConvert_Rchar2(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_int8_t
-test___spirv_SConvert_Rchar2(__clc_vec2_uint32_t args_0) {
-  return __spirv_SConvert_Rchar2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_int8_t
 test___spirv_SConvert_Rchar2(__clc_vec2_int64_t args_0) {
   return __spirv_SConvert_Rchar2(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec2_int8_t
-test___spirv_SConvert_Rchar2(__clc_vec2_uint64_t args_0) {
-  return __spirv_SConvert_Rchar2(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rchar2_sat.cl b/libclc/test/binding/core/SConvert_Rchar2_sat.cl
index 6434dc7f9f393..ac80b8e579bc9 100644
--- a/libclc/test/binding/core/SConvert_Rchar2_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rchar2_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rchar2_sat(__clc_vec2_int16_t args_0) {
   return __spirv_SConvert_Rchar2_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_int8_t
-test___spirv_SConvert_Rchar2_sat(__clc_vec2_uint16_t args_0) {
-  return __spirv_SConvert_Rchar2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_int8_t
 test___spirv_SConvert_Rchar2_sat(__clc_vec2_int32_t args_0) {
   return __spirv_SConvert_Rchar2_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_int8_t
-test___spirv_SConvert_Rchar2_sat(__clc_vec2_uint32_t args_0) {
-  return __spirv_SConvert_Rchar2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_int8_t
 test___spirv_SConvert_Rchar2_sat(__clc_vec2_int64_t args_0) {
   return __spirv_SConvert_Rchar2_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec2_int8_t
-test___spirv_SConvert_Rchar2_sat(__clc_vec2_uint64_t args_0) {
-  return __spirv_SConvert_Rchar2_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rchar3.cl b/libclc/test/binding/core/SConvert_Rchar3.cl
index 4750ce91ecbac..2e9074722d145 100644
--- a/libclc/test/binding/core/SConvert_Rchar3.cl
+++ b/libclc/test/binding/core/SConvert_Rchar3.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rchar3(__clc_vec3_int16_t args_0) {
   return __spirv_SConvert_Rchar3(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_int8_t
-test___spirv_SConvert_Rchar3(__clc_vec3_uint16_t args_0) {
-  return __spirv_SConvert_Rchar3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_int8_t
 test___spirv_SConvert_Rchar3(__clc_vec3_int32_t args_0) {
   return __spirv_SConvert_Rchar3(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_int8_t
-test___spirv_SConvert_Rchar3(__clc_vec3_uint32_t args_0) {
-  return __spirv_SConvert_Rchar3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_int8_t
 test___spirv_SConvert_Rchar3(__clc_vec3_int64_t args_0) {
   return __spirv_SConvert_Rchar3(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec3_int8_t
-test___spirv_SConvert_Rchar3(__clc_vec3_uint64_t args_0) {
-  return __spirv_SConvert_Rchar3(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rchar3_sat.cl b/libclc/test/binding/core/SConvert_Rchar3_sat.cl
index 53924549a36b0..1fae9aa669687 100644
--- a/libclc/test/binding/core/SConvert_Rchar3_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rchar3_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rchar3_sat(__clc_vec3_int16_t args_0) {
   return __spirv_SConvert_Rchar3_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_int8_t
-test___spirv_SConvert_Rchar3_sat(__clc_vec3_uint16_t args_0) {
-  return __spirv_SConvert_Rchar3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_int8_t
 test___spirv_SConvert_Rchar3_sat(__clc_vec3_int32_t args_0) {
   return __spirv_SConvert_Rchar3_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_int8_t
-test___spirv_SConvert_Rchar3_sat(__clc_vec3_uint32_t args_0) {
-  return __spirv_SConvert_Rchar3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_int8_t
 test___spirv_SConvert_Rchar3_sat(__clc_vec3_int64_t args_0) {
   return __spirv_SConvert_Rchar3_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec3_int8_t
-test___spirv_SConvert_Rchar3_sat(__clc_vec3_uint64_t args_0) {
-  return __spirv_SConvert_Rchar3_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rchar4.cl b/libclc/test/binding/core/SConvert_Rchar4.cl
index b0b9a116a1b30..d611bf0f94993 100644
--- a/libclc/test/binding/core/SConvert_Rchar4.cl
+++ b/libclc/test/binding/core/SConvert_Rchar4.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rchar4(__clc_vec4_int16_t args_0) {
   return __spirv_SConvert_Rchar4(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_int8_t
-test___spirv_SConvert_Rchar4(__clc_vec4_uint16_t args_0) {
-  return __spirv_SConvert_Rchar4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_int8_t
 test___spirv_SConvert_Rchar4(__clc_vec4_int32_t args_0) {
   return __spirv_SConvert_Rchar4(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_int8_t
-test___spirv_SConvert_Rchar4(__clc_vec4_uint32_t args_0) {
-  return __spirv_SConvert_Rchar4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_int8_t
 test___spirv_SConvert_Rchar4(__clc_vec4_int64_t args_0) {
   return __spirv_SConvert_Rchar4(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec4_int8_t
-test___spirv_SConvert_Rchar4(__clc_vec4_uint64_t args_0) {
-  return __spirv_SConvert_Rchar4(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rchar4_sat.cl b/libclc/test/binding/core/SConvert_Rchar4_sat.cl
index 3543744078086..4e4e6ca0cd2d8 100644
--- a/libclc/test/binding/core/SConvert_Rchar4_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rchar4_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rchar4_sat(__clc_vec4_int16_t args_0) {
   return __spirv_SConvert_Rchar4_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_int8_t
-test___spirv_SConvert_Rchar4_sat(__clc_vec4_uint16_t args_0) {
-  return __spirv_SConvert_Rchar4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_int8_t
 test___spirv_SConvert_Rchar4_sat(__clc_vec4_int32_t args_0) {
   return __spirv_SConvert_Rchar4_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_int8_t
-test___spirv_SConvert_Rchar4_sat(__clc_vec4_uint32_t args_0) {
-  return __spirv_SConvert_Rchar4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_int8_t
 test___spirv_SConvert_Rchar4_sat(__clc_vec4_int64_t args_0) {
   return __spirv_SConvert_Rchar4_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec4_int8_t
-test___spirv_SConvert_Rchar4_sat(__clc_vec4_uint64_t args_0) {
-  return __spirv_SConvert_Rchar4_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rchar8.cl b/libclc/test/binding/core/SConvert_Rchar8.cl
index 726f78ab63428..0fd794ba26871 100644
--- a/libclc/test/binding/core/SConvert_Rchar8.cl
+++ b/libclc/test/binding/core/SConvert_Rchar8.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rchar8(__clc_vec8_int16_t args_0) {
   return __spirv_SConvert_Rchar8(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_int8_t
-test___spirv_SConvert_Rchar8(__clc_vec8_uint16_t args_0) {
-  return __spirv_SConvert_Rchar8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_int8_t
 test___spirv_SConvert_Rchar8(__clc_vec8_int32_t args_0) {
   return __spirv_SConvert_Rchar8(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_int8_t
-test___spirv_SConvert_Rchar8(__clc_vec8_uint32_t args_0) {
-  return __spirv_SConvert_Rchar8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_int8_t
 test___spirv_SConvert_Rchar8(__clc_vec8_int64_t args_0) {
   return __spirv_SConvert_Rchar8(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec8_int8_t
-test___spirv_SConvert_Rchar8(__clc_vec8_uint64_t args_0) {
-  return __spirv_SConvert_Rchar8(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rchar8_sat.cl b/libclc/test/binding/core/SConvert_Rchar8_sat.cl
index 25c080d5ebdbd..40a888e084a34 100644
--- a/libclc/test/binding/core/SConvert_Rchar8_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rchar8_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rchar8_sat(__clc_vec8_int16_t args_0) {
   return __spirv_SConvert_Rchar8_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_int8_t
-test___spirv_SConvert_Rchar8_sat(__clc_vec8_uint16_t args_0) {
-  return __spirv_SConvert_Rchar8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_int8_t
 test___spirv_SConvert_Rchar8_sat(__clc_vec8_int32_t args_0) {
   return __spirv_SConvert_Rchar8_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_int8_t
-test___spirv_SConvert_Rchar8_sat(__clc_vec8_uint32_t args_0) {
-  return __spirv_SConvert_Rchar8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_int8_t
 test___spirv_SConvert_Rchar8_sat(__clc_vec8_int64_t args_0) {
   return __spirv_SConvert_Rchar8_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec8_int8_t
-test___spirv_SConvert_Rchar8_sat(__clc_vec8_uint64_t args_0) {
-  return __spirv_SConvert_Rchar8_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rchar_sat.cl b/libclc/test/binding/core/SConvert_Rchar_sat.cl
index df7a87eb5379b..d8001fc42b817 100644
--- a/libclc/test/binding/core/SConvert_Rchar_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rchar_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rchar_sat(__clc_int16_t args_0) {
   return __spirv_SConvert_Rchar_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_int8_t
-test___spirv_SConvert_Rchar_sat(__clc_uint16_t args_0) {
-  return __spirv_SConvert_Rchar_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_int8_t
 test___spirv_SConvert_Rchar_sat(__clc_int32_t args_0) {
   return __spirv_SConvert_Rchar_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_int8_t
-test___spirv_SConvert_Rchar_sat(__clc_uint32_t args_0) {
-  return __spirv_SConvert_Rchar_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_int8_t
 test___spirv_SConvert_Rchar_sat(__clc_int64_t args_0) {
   return __spirv_SConvert_Rchar_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_int8_t
-test___spirv_SConvert_Rchar_sat(__clc_uint64_t args_0) {
-  return __spirv_SConvert_Rchar_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rint.cl b/libclc/test/binding/core/SConvert_Rint.cl
index 513a2be992ac8..e05de9622c544 100644
--- a/libclc/test/binding/core/SConvert_Rint.cl
+++ b/libclc/test/binding/core/SConvert_Rint.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rint(__clc_int8_t args_0) {
   return __spirv_SConvert_Rint(args_0);
 }
 
-__attribute__((overloadable)) __clc_int32_t
-test___spirv_SConvert_Rint(__clc_uint8_t args_0) {
-  return __spirv_SConvert_Rint(args_0);
-}
-
 __attribute__((overloadable)) __clc_int32_t
 test___spirv_SConvert_Rint(__clc_int16_t args_0) {
   return __spirv_SConvert_Rint(args_0);
 }
 
-__attribute__((overloadable)) __clc_int32_t
-test___spirv_SConvert_Rint(__clc_uint16_t args_0) {
-  return __spirv_SConvert_Rint(args_0);
-}
-
 __attribute__((overloadable)) __clc_int32_t
 test___spirv_SConvert_Rint(__clc_int64_t args_0) {
   return __spirv_SConvert_Rint(args_0);
 }
-
-__attribute__((overloadable)) __clc_int32_t
-test___spirv_SConvert_Rint(__clc_uint64_t args_0) {
-  return __spirv_SConvert_Rint(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rint16.cl b/libclc/test/binding/core/SConvert_Rint16.cl
index 51c1b653aa0e4..1850596258482 100644
--- a/libclc/test/binding/core/SConvert_Rint16.cl
+++ b/libclc/test/binding/core/SConvert_Rint16.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rint16(__clc_vec16_int8_t args_0) {
   return __spirv_SConvert_Rint16(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_int32_t
-test___spirv_SConvert_Rint16(__clc_vec16_uint8_t args_0) {
-  return __spirv_SConvert_Rint16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_int32_t
 test___spirv_SConvert_Rint16(__clc_vec16_int16_t args_0) {
   return __spirv_SConvert_Rint16(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_int32_t
-test___spirv_SConvert_Rint16(__clc_vec16_uint16_t args_0) {
-  return __spirv_SConvert_Rint16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_int32_t
 test___spirv_SConvert_Rint16(__clc_vec16_int64_t args_0) {
   return __spirv_SConvert_Rint16(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec16_int32_t
-test___spirv_SConvert_Rint16(__clc_vec16_uint64_t args_0) {
-  return __spirv_SConvert_Rint16(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rint16_sat.cl b/libclc/test/binding/core/SConvert_Rint16_sat.cl
index 5b8a60945c901..63f160275b28a 100644
--- a/libclc/test/binding/core/SConvert_Rint16_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rint16_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rint16_sat(__clc_vec16_int8_t args_0) {
   return __spirv_SConvert_Rint16_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_int32_t
-test___spirv_SConvert_Rint16_sat(__clc_vec16_uint8_t args_0) {
-  return __spirv_SConvert_Rint16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_int32_t
 test___spirv_SConvert_Rint16_sat(__clc_vec16_int16_t args_0) {
   return __spirv_SConvert_Rint16_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_int32_t
-test___spirv_SConvert_Rint16_sat(__clc_vec16_uint16_t args_0) {
-  return __spirv_SConvert_Rint16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_int32_t
 test___spirv_SConvert_Rint16_sat(__clc_vec16_int64_t args_0) {
   return __spirv_SConvert_Rint16_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec16_int32_t
-test___spirv_SConvert_Rint16_sat(__clc_vec16_uint64_t args_0) {
-  return __spirv_SConvert_Rint16_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rint2.cl b/libclc/test/binding/core/SConvert_Rint2.cl
index 0ad887ba0f7a5..27b5eda64f64b 100644
--- a/libclc/test/binding/core/SConvert_Rint2.cl
+++ b/libclc/test/binding/core/SConvert_Rint2.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rint2(__clc_vec2_int8_t args_0) {
   return __spirv_SConvert_Rint2(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_int32_t
-test___spirv_SConvert_Rint2(__clc_vec2_uint8_t args_0) {
-  return __spirv_SConvert_Rint2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_int32_t
 test___spirv_SConvert_Rint2(__clc_vec2_int16_t args_0) {
   return __spirv_SConvert_Rint2(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_int32_t
-test___spirv_SConvert_Rint2(__clc_vec2_uint16_t args_0) {
-  return __spirv_SConvert_Rint2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_int32_t
 test___spirv_SConvert_Rint2(__clc_vec2_int64_t args_0) {
   return __spirv_SConvert_Rint2(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec2_int32_t
-test___spirv_SConvert_Rint2(__clc_vec2_uint64_t args_0) {
-  return __spirv_SConvert_Rint2(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rint2_sat.cl b/libclc/test/binding/core/SConvert_Rint2_sat.cl
index 954a2e069a0b4..afdb051bd9368 100644
--- a/libclc/test/binding/core/SConvert_Rint2_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rint2_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rint2_sat(__clc_vec2_int8_t args_0) {
   return __spirv_SConvert_Rint2_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_int32_t
-test___spirv_SConvert_Rint2_sat(__clc_vec2_uint8_t args_0) {
-  return __spirv_SConvert_Rint2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_int32_t
 test___spirv_SConvert_Rint2_sat(__clc_vec2_int16_t args_0) {
   return __spirv_SConvert_Rint2_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_int32_t
-test___spirv_SConvert_Rint2_sat(__clc_vec2_uint16_t args_0) {
-  return __spirv_SConvert_Rint2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_int32_t
 test___spirv_SConvert_Rint2_sat(__clc_vec2_int64_t args_0) {
   return __spirv_SConvert_Rint2_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec2_int32_t
-test___spirv_SConvert_Rint2_sat(__clc_vec2_uint64_t args_0) {
-  return __spirv_SConvert_Rint2_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rint3.cl b/libclc/test/binding/core/SConvert_Rint3.cl
index d397afbb9c08b..a4fc6a73d6deb 100644
--- a/libclc/test/binding/core/SConvert_Rint3.cl
+++ b/libclc/test/binding/core/SConvert_Rint3.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rint3(__clc_vec3_int8_t args_0) {
   return __spirv_SConvert_Rint3(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_int32_t
-test___spirv_SConvert_Rint3(__clc_vec3_uint8_t args_0) {
-  return __spirv_SConvert_Rint3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_int32_t
 test___spirv_SConvert_Rint3(__clc_vec3_int16_t args_0) {
   return __spirv_SConvert_Rint3(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_int32_t
-test___spirv_SConvert_Rint3(__clc_vec3_uint16_t args_0) {
-  return __spirv_SConvert_Rint3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_int32_t
 test___spirv_SConvert_Rint3(__clc_vec3_int64_t args_0) {
   return __spirv_SConvert_Rint3(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec3_int32_t
-test___spirv_SConvert_Rint3(__clc_vec3_uint64_t args_0) {
-  return __spirv_SConvert_Rint3(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rint3_sat.cl b/libclc/test/binding/core/SConvert_Rint3_sat.cl
index 890b49b722f82..72189ea1ee55c 100644
--- a/libclc/test/binding/core/SConvert_Rint3_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rint3_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rint3_sat(__clc_vec3_int8_t args_0) {
   return __spirv_SConvert_Rint3_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_int32_t
-test___spirv_SConvert_Rint3_sat(__clc_vec3_uint8_t args_0) {
-  return __spirv_SConvert_Rint3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_int32_t
 test___spirv_SConvert_Rint3_sat(__clc_vec3_int16_t args_0) {
   return __spirv_SConvert_Rint3_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_int32_t
-test___spirv_SConvert_Rint3_sat(__clc_vec3_uint16_t args_0) {
-  return __spirv_SConvert_Rint3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_int32_t
 test___spirv_SConvert_Rint3_sat(__clc_vec3_int64_t args_0) {
   return __spirv_SConvert_Rint3_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec3_int32_t
-test___spirv_SConvert_Rint3_sat(__clc_vec3_uint64_t args_0) {
-  return __spirv_SConvert_Rint3_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rint4.cl b/libclc/test/binding/core/SConvert_Rint4.cl
index 39364261baefb..a88749c820af9 100644
--- a/libclc/test/binding/core/SConvert_Rint4.cl
+++ b/libclc/test/binding/core/SConvert_Rint4.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rint4(__clc_vec4_int8_t args_0) {
   return __spirv_SConvert_Rint4(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_int32_t
-test___spirv_SConvert_Rint4(__clc_vec4_uint8_t args_0) {
-  return __spirv_SConvert_Rint4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_int32_t
 test___spirv_SConvert_Rint4(__clc_vec4_int16_t args_0) {
   return __spirv_SConvert_Rint4(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_int32_t
-test___spirv_SConvert_Rint4(__clc_vec4_uint16_t args_0) {
-  return __spirv_SConvert_Rint4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_int32_t
 test___spirv_SConvert_Rint4(__clc_vec4_int64_t args_0) {
   return __spirv_SConvert_Rint4(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec4_int32_t
-test___spirv_SConvert_Rint4(__clc_vec4_uint64_t args_0) {
-  return __spirv_SConvert_Rint4(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rint4_sat.cl b/libclc/test/binding/core/SConvert_Rint4_sat.cl
index a8f2403af3830..b27abb51a0885 100644
--- a/libclc/test/binding/core/SConvert_Rint4_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rint4_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rint4_sat(__clc_vec4_int8_t args_0) {
   return __spirv_SConvert_Rint4_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_int32_t
-test___spirv_SConvert_Rint4_sat(__clc_vec4_uint8_t args_0) {
-  return __spirv_SConvert_Rint4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_int32_t
 test___spirv_SConvert_Rint4_sat(__clc_vec4_int16_t args_0) {
   return __spirv_SConvert_Rint4_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_int32_t
-test___spirv_SConvert_Rint4_sat(__clc_vec4_uint16_t args_0) {
-  return __spirv_SConvert_Rint4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_int32_t
 test___spirv_SConvert_Rint4_sat(__clc_vec4_int64_t args_0) {
   return __spirv_SConvert_Rint4_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec4_int32_t
-test___spirv_SConvert_Rint4_sat(__clc_vec4_uint64_t args_0) {
-  return __spirv_SConvert_Rint4_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rint8.cl b/libclc/test/binding/core/SConvert_Rint8.cl
index d1fa1faa1887e..88f28e656c511 100644
--- a/libclc/test/binding/core/SConvert_Rint8.cl
+++ b/libclc/test/binding/core/SConvert_Rint8.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rint8(__clc_vec8_int8_t args_0) {
   return __spirv_SConvert_Rint8(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_int32_t
-test___spirv_SConvert_Rint8(__clc_vec8_uint8_t args_0) {
-  return __spirv_SConvert_Rint8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_int32_t
 test___spirv_SConvert_Rint8(__clc_vec8_int16_t args_0) {
   return __spirv_SConvert_Rint8(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_int32_t
-test___spirv_SConvert_Rint8(__clc_vec8_uint16_t args_0) {
-  return __spirv_SConvert_Rint8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_int32_t
 test___spirv_SConvert_Rint8(__clc_vec8_int64_t args_0) {
   return __spirv_SConvert_Rint8(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec8_int32_t
-test___spirv_SConvert_Rint8(__clc_vec8_uint64_t args_0) {
-  return __spirv_SConvert_Rint8(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rint8_sat.cl b/libclc/test/binding/core/SConvert_Rint8_sat.cl
index afce11024d42f..b481e1f220d9b 100644
--- a/libclc/test/binding/core/SConvert_Rint8_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rint8_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rint8_sat(__clc_vec8_int8_t args_0) {
   return __spirv_SConvert_Rint8_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_int32_t
-test___spirv_SConvert_Rint8_sat(__clc_vec8_uint8_t args_0) {
-  return __spirv_SConvert_Rint8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_int32_t
 test___spirv_SConvert_Rint8_sat(__clc_vec8_int16_t args_0) {
   return __spirv_SConvert_Rint8_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_int32_t
-test___spirv_SConvert_Rint8_sat(__clc_vec8_uint16_t args_0) {
-  return __spirv_SConvert_Rint8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_int32_t
 test___spirv_SConvert_Rint8_sat(__clc_vec8_int64_t args_0) {
   return __spirv_SConvert_Rint8_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec8_int32_t
-test___spirv_SConvert_Rint8_sat(__clc_vec8_uint64_t args_0) {
-  return __spirv_SConvert_Rint8_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rint_sat.cl b/libclc/test/binding/core/SConvert_Rint_sat.cl
index c49d6b9636ac4..7e27164c89054 100644
--- a/libclc/test/binding/core/SConvert_Rint_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rint_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rint_sat(__clc_int8_t args_0) {
   return __spirv_SConvert_Rint_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_int32_t
-test___spirv_SConvert_Rint_sat(__clc_uint8_t args_0) {
-  return __spirv_SConvert_Rint_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_int32_t
 test___spirv_SConvert_Rint_sat(__clc_int16_t args_0) {
   return __spirv_SConvert_Rint_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_int32_t
-test___spirv_SConvert_Rint_sat(__clc_uint16_t args_0) {
-  return __spirv_SConvert_Rint_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_int32_t
 test___spirv_SConvert_Rint_sat(__clc_int64_t args_0) {
   return __spirv_SConvert_Rint_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_int32_t
-test___spirv_SConvert_Rint_sat(__clc_uint64_t args_0) {
-  return __spirv_SConvert_Rint_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rlong.cl b/libclc/test/binding/core/SConvert_Rlong.cl
index d408bed90a40c..65dd7277965a9 100644
--- a/libclc/test/binding/core/SConvert_Rlong.cl
+++ b/libclc/test/binding/core/SConvert_Rlong.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rlong(__clc_int8_t args_0) {
   return __spirv_SConvert_Rlong(args_0);
 }
 
-__attribute__((overloadable)) __clc_int64_t
-test___spirv_SConvert_Rlong(__clc_uint8_t args_0) {
-  return __spirv_SConvert_Rlong(args_0);
-}
-
 __attribute__((overloadable)) __clc_int64_t
 test___spirv_SConvert_Rlong(__clc_int16_t args_0) {
   return __spirv_SConvert_Rlong(args_0);
 }
 
-__attribute__((overloadable)) __clc_int64_t
-test___spirv_SConvert_Rlong(__clc_uint16_t args_0) {
-  return __spirv_SConvert_Rlong(args_0);
-}
-
 __attribute__((overloadable)) __clc_int64_t
 test___spirv_SConvert_Rlong(__clc_int32_t args_0) {
   return __spirv_SConvert_Rlong(args_0);
 }
-
-__attribute__((overloadable)) __clc_int64_t
-test___spirv_SConvert_Rlong(__clc_uint32_t args_0) {
-  return __spirv_SConvert_Rlong(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rlong16.cl b/libclc/test/binding/core/SConvert_Rlong16.cl
index aa824aeb508a7..4658795322859 100644
--- a/libclc/test/binding/core/SConvert_Rlong16.cl
+++ b/libclc/test/binding/core/SConvert_Rlong16.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rlong16(__clc_vec16_int8_t args_0) {
   return __spirv_SConvert_Rlong16(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_int64_t
-test___spirv_SConvert_Rlong16(__clc_vec16_uint8_t args_0) {
-  return __spirv_SConvert_Rlong16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_int64_t
 test___spirv_SConvert_Rlong16(__clc_vec16_int16_t args_0) {
   return __spirv_SConvert_Rlong16(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_int64_t
-test___spirv_SConvert_Rlong16(__clc_vec16_uint16_t args_0) {
-  return __spirv_SConvert_Rlong16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_int64_t
 test___spirv_SConvert_Rlong16(__clc_vec16_int32_t args_0) {
   return __spirv_SConvert_Rlong16(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec16_int64_t
-test___spirv_SConvert_Rlong16(__clc_vec16_uint32_t args_0) {
-  return __spirv_SConvert_Rlong16(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rlong16_sat.cl b/libclc/test/binding/core/SConvert_Rlong16_sat.cl
index 61ba7123ac189..a77d106c63648 100644
--- a/libclc/test/binding/core/SConvert_Rlong16_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rlong16_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rlong16_sat(__clc_vec16_int8_t args_0) {
   return __spirv_SConvert_Rlong16_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_int64_t
-test___spirv_SConvert_Rlong16_sat(__clc_vec16_uint8_t args_0) {
-  return __spirv_SConvert_Rlong16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_int64_t
 test___spirv_SConvert_Rlong16_sat(__clc_vec16_int16_t args_0) {
   return __spirv_SConvert_Rlong16_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_int64_t
-test___spirv_SConvert_Rlong16_sat(__clc_vec16_uint16_t args_0) {
-  return __spirv_SConvert_Rlong16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_int64_t
 test___spirv_SConvert_Rlong16_sat(__clc_vec16_int32_t args_0) {
   return __spirv_SConvert_Rlong16_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec16_int64_t
-test___spirv_SConvert_Rlong16_sat(__clc_vec16_uint32_t args_0) {
-  return __spirv_SConvert_Rlong16_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rlong2.cl b/libclc/test/binding/core/SConvert_Rlong2.cl
index 6a88381d9b732..362765b9ae21d 100644
--- a/libclc/test/binding/core/SConvert_Rlong2.cl
+++ b/libclc/test/binding/core/SConvert_Rlong2.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rlong2(__clc_vec2_int8_t args_0) {
   return __spirv_SConvert_Rlong2(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_int64_t
-test___spirv_SConvert_Rlong2(__clc_vec2_uint8_t args_0) {
-  return __spirv_SConvert_Rlong2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_int64_t
 test___spirv_SConvert_Rlong2(__clc_vec2_int16_t args_0) {
   return __spirv_SConvert_Rlong2(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_int64_t
-test___spirv_SConvert_Rlong2(__clc_vec2_uint16_t args_0) {
-  return __spirv_SConvert_Rlong2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_int64_t
 test___spirv_SConvert_Rlong2(__clc_vec2_int32_t args_0) {
   return __spirv_SConvert_Rlong2(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec2_int64_t
-test___spirv_SConvert_Rlong2(__clc_vec2_uint32_t args_0) {
-  return __spirv_SConvert_Rlong2(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rlong2_sat.cl b/libclc/test/binding/core/SConvert_Rlong2_sat.cl
index 66dfa5004b021..0873a00471cc8 100644
--- a/libclc/test/binding/core/SConvert_Rlong2_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rlong2_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rlong2_sat(__clc_vec2_int8_t args_0) {
   return __spirv_SConvert_Rlong2_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_int64_t
-test___spirv_SConvert_Rlong2_sat(__clc_vec2_uint8_t args_0) {
-  return __spirv_SConvert_Rlong2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_int64_t
 test___spirv_SConvert_Rlong2_sat(__clc_vec2_int16_t args_0) {
   return __spirv_SConvert_Rlong2_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_int64_t
-test___spirv_SConvert_Rlong2_sat(__clc_vec2_uint16_t args_0) {
-  return __spirv_SConvert_Rlong2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_int64_t
 test___spirv_SConvert_Rlong2_sat(__clc_vec2_int32_t args_0) {
   return __spirv_SConvert_Rlong2_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec2_int64_t
-test___spirv_SConvert_Rlong2_sat(__clc_vec2_uint32_t args_0) {
-  return __spirv_SConvert_Rlong2_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rlong3.cl b/libclc/test/binding/core/SConvert_Rlong3.cl
index 245be22561990..85a98b955759b 100644
--- a/libclc/test/binding/core/SConvert_Rlong3.cl
+++ b/libclc/test/binding/core/SConvert_Rlong3.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rlong3(__clc_vec3_int8_t args_0) {
   return __spirv_SConvert_Rlong3(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_int64_t
-test___spirv_SConvert_Rlong3(__clc_vec3_uint8_t args_0) {
-  return __spirv_SConvert_Rlong3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_int64_t
 test___spirv_SConvert_Rlong3(__clc_vec3_int16_t args_0) {
   return __spirv_SConvert_Rlong3(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_int64_t
-test___spirv_SConvert_Rlong3(__clc_vec3_uint16_t args_0) {
-  return __spirv_SConvert_Rlong3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_int64_t
 test___spirv_SConvert_Rlong3(__clc_vec3_int32_t args_0) {
   return __spirv_SConvert_Rlong3(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec3_int64_t
-test___spirv_SConvert_Rlong3(__clc_vec3_uint32_t args_0) {
-  return __spirv_SConvert_Rlong3(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rlong3_sat.cl b/libclc/test/binding/core/SConvert_Rlong3_sat.cl
index cf150aef8a2aa..2d85b02436942 100644
--- a/libclc/test/binding/core/SConvert_Rlong3_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rlong3_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rlong3_sat(__clc_vec3_int8_t args_0) {
   return __spirv_SConvert_Rlong3_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_int64_t
-test___spirv_SConvert_Rlong3_sat(__clc_vec3_uint8_t args_0) {
-  return __spirv_SConvert_Rlong3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_int64_t
 test___spirv_SConvert_Rlong3_sat(__clc_vec3_int16_t args_0) {
   return __spirv_SConvert_Rlong3_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_int64_t
-test___spirv_SConvert_Rlong3_sat(__clc_vec3_uint16_t args_0) {
-  return __spirv_SConvert_Rlong3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_int64_t
 test___spirv_SConvert_Rlong3_sat(__clc_vec3_int32_t args_0) {
   return __spirv_SConvert_Rlong3_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec3_int64_t
-test___spirv_SConvert_Rlong3_sat(__clc_vec3_uint32_t args_0) {
-  return __spirv_SConvert_Rlong3_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rlong4.cl b/libclc/test/binding/core/SConvert_Rlong4.cl
index ace6e0e4e5b35..2fde9723f311d 100644
--- a/libclc/test/binding/core/SConvert_Rlong4.cl
+++ b/libclc/test/binding/core/SConvert_Rlong4.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rlong4(__clc_vec4_int8_t args_0) {
   return __spirv_SConvert_Rlong4(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_int64_t
-test___spirv_SConvert_Rlong4(__clc_vec4_uint8_t args_0) {
-  return __spirv_SConvert_Rlong4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_int64_t
 test___spirv_SConvert_Rlong4(__clc_vec4_int16_t args_0) {
   return __spirv_SConvert_Rlong4(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_int64_t
-test___spirv_SConvert_Rlong4(__clc_vec4_uint16_t args_0) {
-  return __spirv_SConvert_Rlong4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_int64_t
 test___spirv_SConvert_Rlong4(__clc_vec4_int32_t args_0) {
   return __spirv_SConvert_Rlong4(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec4_int64_t
-test___spirv_SConvert_Rlong4(__clc_vec4_uint32_t args_0) {
-  return __spirv_SConvert_Rlong4(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rlong4_sat.cl b/libclc/test/binding/core/SConvert_Rlong4_sat.cl
index 83262c2ecf2fa..9df2c3963d76c 100644
--- a/libclc/test/binding/core/SConvert_Rlong4_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rlong4_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rlong4_sat(__clc_vec4_int8_t args_0) {
   return __spirv_SConvert_Rlong4_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_int64_t
-test___spirv_SConvert_Rlong4_sat(__clc_vec4_uint8_t args_0) {
-  return __spirv_SConvert_Rlong4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_int64_t
 test___spirv_SConvert_Rlong4_sat(__clc_vec4_int16_t args_0) {
   return __spirv_SConvert_Rlong4_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_int64_t
-test___spirv_SConvert_Rlong4_sat(__clc_vec4_uint16_t args_0) {
-  return __spirv_SConvert_Rlong4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_int64_t
 test___spirv_SConvert_Rlong4_sat(__clc_vec4_int32_t args_0) {
   return __spirv_SConvert_Rlong4_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec4_int64_t
-test___spirv_SConvert_Rlong4_sat(__clc_vec4_uint32_t args_0) {
-  return __spirv_SConvert_Rlong4_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rlong8.cl b/libclc/test/binding/core/SConvert_Rlong8.cl
index 59b55924a2a32..b76137bd4e14c 100644
--- a/libclc/test/binding/core/SConvert_Rlong8.cl
+++ b/libclc/test/binding/core/SConvert_Rlong8.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rlong8(__clc_vec8_int8_t args_0) {
   return __spirv_SConvert_Rlong8(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_int64_t
-test___spirv_SConvert_Rlong8(__clc_vec8_uint8_t args_0) {
-  return __spirv_SConvert_Rlong8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_int64_t
 test___spirv_SConvert_Rlong8(__clc_vec8_int16_t args_0) {
   return __spirv_SConvert_Rlong8(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_int64_t
-test___spirv_SConvert_Rlong8(__clc_vec8_uint16_t args_0) {
-  return __spirv_SConvert_Rlong8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_int64_t
 test___spirv_SConvert_Rlong8(__clc_vec8_int32_t args_0) {
   return __spirv_SConvert_Rlong8(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec8_int64_t
-test___spirv_SConvert_Rlong8(__clc_vec8_uint32_t args_0) {
-  return __spirv_SConvert_Rlong8(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rlong8_sat.cl b/libclc/test/binding/core/SConvert_Rlong8_sat.cl
index d1d35ee1fc89f..86f6326bdfd67 100644
--- a/libclc/test/binding/core/SConvert_Rlong8_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rlong8_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rlong8_sat(__clc_vec8_int8_t args_0) {
   return __spirv_SConvert_Rlong8_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_int64_t
-test___spirv_SConvert_Rlong8_sat(__clc_vec8_uint8_t args_0) {
-  return __spirv_SConvert_Rlong8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_int64_t
 test___spirv_SConvert_Rlong8_sat(__clc_vec8_int16_t args_0) {
   return __spirv_SConvert_Rlong8_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_int64_t
-test___spirv_SConvert_Rlong8_sat(__clc_vec8_uint16_t args_0) {
-  return __spirv_SConvert_Rlong8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_int64_t
 test___spirv_SConvert_Rlong8_sat(__clc_vec8_int32_t args_0) {
   return __spirv_SConvert_Rlong8_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec8_int64_t
-test___spirv_SConvert_Rlong8_sat(__clc_vec8_uint32_t args_0) {
-  return __spirv_SConvert_Rlong8_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rlong_sat.cl b/libclc/test/binding/core/SConvert_Rlong_sat.cl
index 25cea660fa426..125859c25122e 100644
--- a/libclc/test/binding/core/SConvert_Rlong_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rlong_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rlong_sat(__clc_int8_t args_0) {
   return __spirv_SConvert_Rlong_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_int64_t
-test___spirv_SConvert_Rlong_sat(__clc_uint8_t args_0) {
-  return __spirv_SConvert_Rlong_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_int64_t
 test___spirv_SConvert_Rlong_sat(__clc_int16_t args_0) {
   return __spirv_SConvert_Rlong_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_int64_t
-test___spirv_SConvert_Rlong_sat(__clc_uint16_t args_0) {
-  return __spirv_SConvert_Rlong_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_int64_t
 test___spirv_SConvert_Rlong_sat(__clc_int32_t args_0) {
   return __spirv_SConvert_Rlong_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_int64_t
-test___spirv_SConvert_Rlong_sat(__clc_uint32_t args_0) {
-  return __spirv_SConvert_Rlong_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rshort.cl b/libclc/test/binding/core/SConvert_Rshort.cl
index f2d1db1bffca2..1baaf2e9e9ef1 100644
--- a/libclc/test/binding/core/SConvert_Rshort.cl
+++ b/libclc/test/binding/core/SConvert_Rshort.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rshort(__clc_int8_t args_0) {
   return __spirv_SConvert_Rshort(args_0);
 }
 
-__attribute__((overloadable)) __clc_int16_t
-test___spirv_SConvert_Rshort(__clc_uint8_t args_0) {
-  return __spirv_SConvert_Rshort(args_0);
-}
-
 __attribute__((overloadable)) __clc_int16_t
 test___spirv_SConvert_Rshort(__clc_int32_t args_0) {
   return __spirv_SConvert_Rshort(args_0);
 }
 
-__attribute__((overloadable)) __clc_int16_t
-test___spirv_SConvert_Rshort(__clc_uint32_t args_0) {
-  return __spirv_SConvert_Rshort(args_0);
-}
-
 __attribute__((overloadable)) __clc_int16_t
 test___spirv_SConvert_Rshort(__clc_int64_t args_0) {
   return __spirv_SConvert_Rshort(args_0);
 }
-
-__attribute__((overloadable)) __clc_int16_t
-test___spirv_SConvert_Rshort(__clc_uint64_t args_0) {
-  return __spirv_SConvert_Rshort(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rshort16.cl b/libclc/test/binding/core/SConvert_Rshort16.cl
index 7430a99185746..e79d8357efbf8 100644
--- a/libclc/test/binding/core/SConvert_Rshort16.cl
+++ b/libclc/test/binding/core/SConvert_Rshort16.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rshort16(__clc_vec16_int8_t args_0) {
   return __spirv_SConvert_Rshort16(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_int16_t
-test___spirv_SConvert_Rshort16(__clc_vec16_uint8_t args_0) {
-  return __spirv_SConvert_Rshort16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_int16_t
 test___spirv_SConvert_Rshort16(__clc_vec16_int32_t args_0) {
   return __spirv_SConvert_Rshort16(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_int16_t
-test___spirv_SConvert_Rshort16(__clc_vec16_uint32_t args_0) {
-  return __spirv_SConvert_Rshort16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_int16_t
 test___spirv_SConvert_Rshort16(__clc_vec16_int64_t args_0) {
   return __spirv_SConvert_Rshort16(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec16_int16_t
-test___spirv_SConvert_Rshort16(__clc_vec16_uint64_t args_0) {
-  return __spirv_SConvert_Rshort16(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rshort16_sat.cl b/libclc/test/binding/core/SConvert_Rshort16_sat.cl
index 10e351d6878b5..e856cc7177a11 100644
--- a/libclc/test/binding/core/SConvert_Rshort16_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rshort16_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rshort16_sat(__clc_vec16_int8_t args_0) {
   return __spirv_SConvert_Rshort16_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_int16_t
-test___spirv_SConvert_Rshort16_sat(__clc_vec16_uint8_t args_0) {
-  return __spirv_SConvert_Rshort16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_int16_t
 test___spirv_SConvert_Rshort16_sat(__clc_vec16_int32_t args_0) {
   return __spirv_SConvert_Rshort16_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_int16_t
-test___spirv_SConvert_Rshort16_sat(__clc_vec16_uint32_t args_0) {
-  return __spirv_SConvert_Rshort16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_int16_t
 test___spirv_SConvert_Rshort16_sat(__clc_vec16_int64_t args_0) {
   return __spirv_SConvert_Rshort16_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec16_int16_t
-test___spirv_SConvert_Rshort16_sat(__clc_vec16_uint64_t args_0) {
-  return __spirv_SConvert_Rshort16_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rshort2.cl b/libclc/test/binding/core/SConvert_Rshort2.cl
index 3953754fbe237..8376255609bba 100644
--- a/libclc/test/binding/core/SConvert_Rshort2.cl
+++ b/libclc/test/binding/core/SConvert_Rshort2.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rshort2(__clc_vec2_int8_t args_0) {
   return __spirv_SConvert_Rshort2(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_int16_t
-test___spirv_SConvert_Rshort2(__clc_vec2_uint8_t args_0) {
-  return __spirv_SConvert_Rshort2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_int16_t
 test___spirv_SConvert_Rshort2(__clc_vec2_int32_t args_0) {
   return __spirv_SConvert_Rshort2(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_int16_t
-test___spirv_SConvert_Rshort2(__clc_vec2_uint32_t args_0) {
-  return __spirv_SConvert_Rshort2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_int16_t
 test___spirv_SConvert_Rshort2(__clc_vec2_int64_t args_0) {
   return __spirv_SConvert_Rshort2(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec2_int16_t
-test___spirv_SConvert_Rshort2(__clc_vec2_uint64_t args_0) {
-  return __spirv_SConvert_Rshort2(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rshort2_sat.cl b/libclc/test/binding/core/SConvert_Rshort2_sat.cl
index c78eb950396f2..374a369dec5fe 100644
--- a/libclc/test/binding/core/SConvert_Rshort2_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rshort2_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rshort2_sat(__clc_vec2_int8_t args_0) {
   return __spirv_SConvert_Rshort2_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_int16_t
-test___spirv_SConvert_Rshort2_sat(__clc_vec2_uint8_t args_0) {
-  return __spirv_SConvert_Rshort2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_int16_t
 test___spirv_SConvert_Rshort2_sat(__clc_vec2_int32_t args_0) {
   return __spirv_SConvert_Rshort2_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_int16_t
-test___spirv_SConvert_Rshort2_sat(__clc_vec2_uint32_t args_0) {
-  return __spirv_SConvert_Rshort2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_int16_t
 test___spirv_SConvert_Rshort2_sat(__clc_vec2_int64_t args_0) {
   return __spirv_SConvert_Rshort2_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec2_int16_t
-test___spirv_SConvert_Rshort2_sat(__clc_vec2_uint64_t args_0) {
-  return __spirv_SConvert_Rshort2_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rshort3.cl b/libclc/test/binding/core/SConvert_Rshort3.cl
index 74434a0646bbf..d1149445908d7 100644
--- a/libclc/test/binding/core/SConvert_Rshort3.cl
+++ b/libclc/test/binding/core/SConvert_Rshort3.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rshort3(__clc_vec3_int8_t args_0) {
   return __spirv_SConvert_Rshort3(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_int16_t
-test___spirv_SConvert_Rshort3(__clc_vec3_uint8_t args_0) {
-  return __spirv_SConvert_Rshort3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_int16_t
 test___spirv_SConvert_Rshort3(__clc_vec3_int32_t args_0) {
   return __spirv_SConvert_Rshort3(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_int16_t
-test___spirv_SConvert_Rshort3(__clc_vec3_uint32_t args_0) {
-  return __spirv_SConvert_Rshort3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_int16_t
 test___spirv_SConvert_Rshort3(__clc_vec3_int64_t args_0) {
   return __spirv_SConvert_Rshort3(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec3_int16_t
-test___spirv_SConvert_Rshort3(__clc_vec3_uint64_t args_0) {
-  return __spirv_SConvert_Rshort3(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rshort3_sat.cl b/libclc/test/binding/core/SConvert_Rshort3_sat.cl
index 777f829cdde25..8e578be2575cb 100644
--- a/libclc/test/binding/core/SConvert_Rshort3_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rshort3_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rshort3_sat(__clc_vec3_int8_t args_0) {
   return __spirv_SConvert_Rshort3_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_int16_t
-test___spirv_SConvert_Rshort3_sat(__clc_vec3_uint8_t args_0) {
-  return __spirv_SConvert_Rshort3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_int16_t
 test___spirv_SConvert_Rshort3_sat(__clc_vec3_int32_t args_0) {
   return __spirv_SConvert_Rshort3_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_int16_t
-test___spirv_SConvert_Rshort3_sat(__clc_vec3_uint32_t args_0) {
-  return __spirv_SConvert_Rshort3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_int16_t
 test___spirv_SConvert_Rshort3_sat(__clc_vec3_int64_t args_0) {
   return __spirv_SConvert_Rshort3_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec3_int16_t
-test___spirv_SConvert_Rshort3_sat(__clc_vec3_uint64_t args_0) {
-  return __spirv_SConvert_Rshort3_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rshort4.cl b/libclc/test/binding/core/SConvert_Rshort4.cl
index a25edf38d15f9..21ed598dc7868 100644
--- a/libclc/test/binding/core/SConvert_Rshort4.cl
+++ b/libclc/test/binding/core/SConvert_Rshort4.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rshort4(__clc_vec4_int8_t args_0) {
   return __spirv_SConvert_Rshort4(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_int16_t
-test___spirv_SConvert_Rshort4(__clc_vec4_uint8_t args_0) {
-  return __spirv_SConvert_Rshort4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_int16_t
 test___spirv_SConvert_Rshort4(__clc_vec4_int32_t args_0) {
   return __spirv_SConvert_Rshort4(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_int16_t
-test___spirv_SConvert_Rshort4(__clc_vec4_uint32_t args_0) {
-  return __spirv_SConvert_Rshort4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_int16_t
 test___spirv_SConvert_Rshort4(__clc_vec4_int64_t args_0) {
   return __spirv_SConvert_Rshort4(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec4_int16_t
-test___spirv_SConvert_Rshort4(__clc_vec4_uint64_t args_0) {
-  return __spirv_SConvert_Rshort4(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rshort4_sat.cl b/libclc/test/binding/core/SConvert_Rshort4_sat.cl
index 2f3d90b908a25..49b21eff09cc5 100644
--- a/libclc/test/binding/core/SConvert_Rshort4_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rshort4_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rshort4_sat(__clc_vec4_int8_t args_0) {
   return __spirv_SConvert_Rshort4_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_int16_t
-test___spirv_SConvert_Rshort4_sat(__clc_vec4_uint8_t args_0) {
-  return __spirv_SConvert_Rshort4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_int16_t
 test___spirv_SConvert_Rshort4_sat(__clc_vec4_int32_t args_0) {
   return __spirv_SConvert_Rshort4_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_int16_t
-test___spirv_SConvert_Rshort4_sat(__clc_vec4_uint32_t args_0) {
-  return __spirv_SConvert_Rshort4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_int16_t
 test___spirv_SConvert_Rshort4_sat(__clc_vec4_int64_t args_0) {
   return __spirv_SConvert_Rshort4_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec4_int16_t
-test___spirv_SConvert_Rshort4_sat(__clc_vec4_uint64_t args_0) {
-  return __spirv_SConvert_Rshort4_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rshort8.cl b/libclc/test/binding/core/SConvert_Rshort8.cl
index 9ff8e41a7e7c3..c592d8a9979e9 100644
--- a/libclc/test/binding/core/SConvert_Rshort8.cl
+++ b/libclc/test/binding/core/SConvert_Rshort8.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rshort8(__clc_vec8_int8_t args_0) {
   return __spirv_SConvert_Rshort8(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_int16_t
-test___spirv_SConvert_Rshort8(__clc_vec8_uint8_t args_0) {
-  return __spirv_SConvert_Rshort8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_int16_t
 test___spirv_SConvert_Rshort8(__clc_vec8_int32_t args_0) {
   return __spirv_SConvert_Rshort8(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_int16_t
-test___spirv_SConvert_Rshort8(__clc_vec8_uint32_t args_0) {
-  return __spirv_SConvert_Rshort8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_int16_t
 test___spirv_SConvert_Rshort8(__clc_vec8_int64_t args_0) {
   return __spirv_SConvert_Rshort8(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec8_int16_t
-test___spirv_SConvert_Rshort8(__clc_vec8_uint64_t args_0) {
-  return __spirv_SConvert_Rshort8(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rshort8_sat.cl b/libclc/test/binding/core/SConvert_Rshort8_sat.cl
index eeedbbcf341ae..7eced4114bc57 100644
--- a/libclc/test/binding/core/SConvert_Rshort8_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rshort8_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rshort8_sat(__clc_vec8_int8_t args_0) {
   return __spirv_SConvert_Rshort8_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_int16_t
-test___spirv_SConvert_Rshort8_sat(__clc_vec8_uint8_t args_0) {
-  return __spirv_SConvert_Rshort8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_int16_t
 test___spirv_SConvert_Rshort8_sat(__clc_vec8_int32_t args_0) {
   return __spirv_SConvert_Rshort8_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_int16_t
-test___spirv_SConvert_Rshort8_sat(__clc_vec8_uint32_t args_0) {
-  return __spirv_SConvert_Rshort8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_int16_t
 test___spirv_SConvert_Rshort8_sat(__clc_vec8_int64_t args_0) {
   return __spirv_SConvert_Rshort8_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_vec8_int16_t
-test___spirv_SConvert_Rshort8_sat(__clc_vec8_uint64_t args_0) {
-  return __spirv_SConvert_Rshort8_sat(args_0);
-}
diff --git a/libclc/test/binding/core/SConvert_Rshort_sat.cl b/libclc/test/binding/core/SConvert_Rshort_sat.cl
index 15d34b3aec218..48d83cf5049c9 100644
--- a/libclc/test/binding/core/SConvert_Rshort_sat.cl
+++ b/libclc/test/binding/core/SConvert_Rshort_sat.cl
@@ -20,27 +20,12 @@ test___spirv_SConvert_Rshort_sat(__clc_int8_t args_0) {
   return __spirv_SConvert_Rshort_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_int16_t
-test___spirv_SConvert_Rshort_sat(__clc_uint8_t args_0) {
-  return __spirv_SConvert_Rshort_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_int16_t
 test___spirv_SConvert_Rshort_sat(__clc_int32_t args_0) {
   return __spirv_SConvert_Rshort_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_int16_t
-test___spirv_SConvert_Rshort_sat(__clc_uint32_t args_0) {
-  return __spirv_SConvert_Rshort_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_int16_t
 test___spirv_SConvert_Rshort_sat(__clc_int64_t args_0) {
   return __spirv_SConvert_Rshort_sat(args_0);
 }
-
-__attribute__((overloadable)) __clc_int16_t
-test___spirv_SConvert_Rshort_sat(__clc_uint64_t args_0) {
-  return __spirv_SConvert_Rshort_sat(args_0);
-}
diff --git a/libclc/test/binding/core/UConvert_Ruchar.cl b/libclc/test/binding/core/UConvert_Ruchar.cl
index 30a94e7c307ed..6afde55c5b815 100644
--- a/libclc/test/binding/core/UConvert_Ruchar.cl
+++ b/libclc/test/binding/core/UConvert_Ruchar.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_uint8_t
-test___spirv_UConvert_Ruchar(__clc_int16_t args_0) {
-  return __spirv_UConvert_Ruchar(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint8_t
 test___spirv_UConvert_Ruchar(__clc_uint16_t args_0) {
   return __spirv_UConvert_Ruchar(args_0);
 }
 
-__attribute__((overloadable)) __clc_uint8_t
-test___spirv_UConvert_Ruchar(__clc_int32_t args_0) {
-  return __spirv_UConvert_Ruchar(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint8_t
 test___spirv_UConvert_Ruchar(__clc_uint32_t args_0) {
   return __spirv_UConvert_Ruchar(args_0);
 }
 
-__attribute__((overloadable)) __clc_uint8_t
-test___spirv_UConvert_Ruchar(__clc_int64_t args_0) {
-  return __spirv_UConvert_Ruchar(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint8_t
 test___spirv_UConvert_Ruchar(__clc_uint64_t args_0) {
   return __spirv_UConvert_Ruchar(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruchar16.cl b/libclc/test/binding/core/UConvert_Ruchar16.cl
index 45c64b762b96c..26270fb564a68 100644
--- a/libclc/test/binding/core/UConvert_Ruchar16.cl
+++ b/libclc/test/binding/core/UConvert_Ruchar16.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec16_uint8_t
-test___spirv_UConvert_Ruchar16(__clc_vec16_int16_t args_0) {
-  return __spirv_UConvert_Ruchar16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint8_t
 test___spirv_UConvert_Ruchar16(__clc_vec16_uint16_t args_0) {
   return __spirv_UConvert_Ruchar16(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_uint8_t
-test___spirv_UConvert_Ruchar16(__clc_vec16_int32_t args_0) {
-  return __spirv_UConvert_Ruchar16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint8_t
 test___spirv_UConvert_Ruchar16(__clc_vec16_uint32_t args_0) {
   return __spirv_UConvert_Ruchar16(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_uint8_t
-test___spirv_UConvert_Ruchar16(__clc_vec16_int64_t args_0) {
-  return __spirv_UConvert_Ruchar16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint8_t
 test___spirv_UConvert_Ruchar16(__clc_vec16_uint64_t args_0) {
   return __spirv_UConvert_Ruchar16(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruchar16_sat.cl b/libclc/test/binding/core/UConvert_Ruchar16_sat.cl
index 421102a4e3ab7..9d75bb414e124 100644
--- a/libclc/test/binding/core/UConvert_Ruchar16_sat.cl
+++ b/libclc/test/binding/core/UConvert_Ruchar16_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec16_uint8_t
-test___spirv_UConvert_Ruchar16_sat(__clc_vec16_int16_t args_0) {
-  return __spirv_UConvert_Ruchar16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint8_t
 test___spirv_UConvert_Ruchar16_sat(__clc_vec16_uint16_t args_0) {
   return __spirv_UConvert_Ruchar16_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_uint8_t
-test___spirv_UConvert_Ruchar16_sat(__clc_vec16_int32_t args_0) {
-  return __spirv_UConvert_Ruchar16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint8_t
 test___spirv_UConvert_Ruchar16_sat(__clc_vec16_uint32_t args_0) {
   return __spirv_UConvert_Ruchar16_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_uint8_t
-test___spirv_UConvert_Ruchar16_sat(__clc_vec16_int64_t args_0) {
-  return __spirv_UConvert_Ruchar16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint8_t
 test___spirv_UConvert_Ruchar16_sat(__clc_vec16_uint64_t args_0) {
   return __spirv_UConvert_Ruchar16_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruchar2.cl b/libclc/test/binding/core/UConvert_Ruchar2.cl
index 9b6804c51a4aa..e68867addd14b 100644
--- a/libclc/test/binding/core/UConvert_Ruchar2.cl
+++ b/libclc/test/binding/core/UConvert_Ruchar2.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec2_uint8_t
-test___spirv_UConvert_Ruchar2(__clc_vec2_int16_t args_0) {
-  return __spirv_UConvert_Ruchar2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint8_t
 test___spirv_UConvert_Ruchar2(__clc_vec2_uint16_t args_0) {
   return __spirv_UConvert_Ruchar2(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_uint8_t
-test___spirv_UConvert_Ruchar2(__clc_vec2_int32_t args_0) {
-  return __spirv_UConvert_Ruchar2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint8_t
 test___spirv_UConvert_Ruchar2(__clc_vec2_uint32_t args_0) {
   return __spirv_UConvert_Ruchar2(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_uint8_t
-test___spirv_UConvert_Ruchar2(__clc_vec2_int64_t args_0) {
-  return __spirv_UConvert_Ruchar2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint8_t
 test___spirv_UConvert_Ruchar2(__clc_vec2_uint64_t args_0) {
   return __spirv_UConvert_Ruchar2(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruchar2_sat.cl b/libclc/test/binding/core/UConvert_Ruchar2_sat.cl
index 30130495b4c8a..5d19324bc0660 100644
--- a/libclc/test/binding/core/UConvert_Ruchar2_sat.cl
+++ b/libclc/test/binding/core/UConvert_Ruchar2_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec2_uint8_t
-test___spirv_UConvert_Ruchar2_sat(__clc_vec2_int16_t args_0) {
-  return __spirv_UConvert_Ruchar2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint8_t
 test___spirv_UConvert_Ruchar2_sat(__clc_vec2_uint16_t args_0) {
   return __spirv_UConvert_Ruchar2_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_uint8_t
-test___spirv_UConvert_Ruchar2_sat(__clc_vec2_int32_t args_0) {
-  return __spirv_UConvert_Ruchar2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint8_t
 test___spirv_UConvert_Ruchar2_sat(__clc_vec2_uint32_t args_0) {
   return __spirv_UConvert_Ruchar2_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_uint8_t
-test___spirv_UConvert_Ruchar2_sat(__clc_vec2_int64_t args_0) {
-  return __spirv_UConvert_Ruchar2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint8_t
 test___spirv_UConvert_Ruchar2_sat(__clc_vec2_uint64_t args_0) {
   return __spirv_UConvert_Ruchar2_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruchar3.cl b/libclc/test/binding/core/UConvert_Ruchar3.cl
index 69e709b8397b3..0f9e8e08890f6 100644
--- a/libclc/test/binding/core/UConvert_Ruchar3.cl
+++ b/libclc/test/binding/core/UConvert_Ruchar3.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec3_uint8_t
-test___spirv_UConvert_Ruchar3(__clc_vec3_int16_t args_0) {
-  return __spirv_UConvert_Ruchar3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint8_t
 test___spirv_UConvert_Ruchar3(__clc_vec3_uint16_t args_0) {
   return __spirv_UConvert_Ruchar3(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_uint8_t
-test___spirv_UConvert_Ruchar3(__clc_vec3_int32_t args_0) {
-  return __spirv_UConvert_Ruchar3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint8_t
 test___spirv_UConvert_Ruchar3(__clc_vec3_uint32_t args_0) {
   return __spirv_UConvert_Ruchar3(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_uint8_t
-test___spirv_UConvert_Ruchar3(__clc_vec3_int64_t args_0) {
-  return __spirv_UConvert_Ruchar3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint8_t
 test___spirv_UConvert_Ruchar3(__clc_vec3_uint64_t args_0) {
   return __spirv_UConvert_Ruchar3(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruchar3_sat.cl b/libclc/test/binding/core/UConvert_Ruchar3_sat.cl
index 1479a08925cad..24b47feea3b64 100644
--- a/libclc/test/binding/core/UConvert_Ruchar3_sat.cl
+++ b/libclc/test/binding/core/UConvert_Ruchar3_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec3_uint8_t
-test___spirv_UConvert_Ruchar3_sat(__clc_vec3_int16_t args_0) {
-  return __spirv_UConvert_Ruchar3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint8_t
 test___spirv_UConvert_Ruchar3_sat(__clc_vec3_uint16_t args_0) {
   return __spirv_UConvert_Ruchar3_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_uint8_t
-test___spirv_UConvert_Ruchar3_sat(__clc_vec3_int32_t args_0) {
-  return __spirv_UConvert_Ruchar3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint8_t
 test___spirv_UConvert_Ruchar3_sat(__clc_vec3_uint32_t args_0) {
   return __spirv_UConvert_Ruchar3_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_uint8_t
-test___spirv_UConvert_Ruchar3_sat(__clc_vec3_int64_t args_0) {
-  return __spirv_UConvert_Ruchar3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint8_t
 test___spirv_UConvert_Ruchar3_sat(__clc_vec3_uint64_t args_0) {
   return __spirv_UConvert_Ruchar3_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruchar4.cl b/libclc/test/binding/core/UConvert_Ruchar4.cl
index b0c6dcd1c4e57..4e007caaaa598 100644
--- a/libclc/test/binding/core/UConvert_Ruchar4.cl
+++ b/libclc/test/binding/core/UConvert_Ruchar4.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec4_uint8_t
-test___spirv_UConvert_Ruchar4(__clc_vec4_int16_t args_0) {
-  return __spirv_UConvert_Ruchar4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint8_t
 test___spirv_UConvert_Ruchar4(__clc_vec4_uint16_t args_0) {
   return __spirv_UConvert_Ruchar4(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_uint8_t
-test___spirv_UConvert_Ruchar4(__clc_vec4_int32_t args_0) {
-  return __spirv_UConvert_Ruchar4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint8_t
 test___spirv_UConvert_Ruchar4(__clc_vec4_uint32_t args_0) {
   return __spirv_UConvert_Ruchar4(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_uint8_t
-test___spirv_UConvert_Ruchar4(__clc_vec4_int64_t args_0) {
-  return __spirv_UConvert_Ruchar4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint8_t
 test___spirv_UConvert_Ruchar4(__clc_vec4_uint64_t args_0) {
   return __spirv_UConvert_Ruchar4(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruchar4_sat.cl b/libclc/test/binding/core/UConvert_Ruchar4_sat.cl
index 569e9bb17f109..4b2fb67764ade 100644
--- a/libclc/test/binding/core/UConvert_Ruchar4_sat.cl
+++ b/libclc/test/binding/core/UConvert_Ruchar4_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec4_uint8_t
-test___spirv_UConvert_Ruchar4_sat(__clc_vec4_int16_t args_0) {
-  return __spirv_UConvert_Ruchar4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint8_t
 test___spirv_UConvert_Ruchar4_sat(__clc_vec4_uint16_t args_0) {
   return __spirv_UConvert_Ruchar4_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_uint8_t
-test___spirv_UConvert_Ruchar4_sat(__clc_vec4_int32_t args_0) {
-  return __spirv_UConvert_Ruchar4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint8_t
 test___spirv_UConvert_Ruchar4_sat(__clc_vec4_uint32_t args_0) {
   return __spirv_UConvert_Ruchar4_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_uint8_t
-test___spirv_UConvert_Ruchar4_sat(__clc_vec4_int64_t args_0) {
-  return __spirv_UConvert_Ruchar4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint8_t
 test___spirv_UConvert_Ruchar4_sat(__clc_vec4_uint64_t args_0) {
   return __spirv_UConvert_Ruchar4_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruchar8.cl b/libclc/test/binding/core/UConvert_Ruchar8.cl
index 1dabf0d1d69ef..f0275132b6ad3 100644
--- a/libclc/test/binding/core/UConvert_Ruchar8.cl
+++ b/libclc/test/binding/core/UConvert_Ruchar8.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec8_uint8_t
-test___spirv_UConvert_Ruchar8(__clc_vec8_int16_t args_0) {
-  return __spirv_UConvert_Ruchar8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint8_t
 test___spirv_UConvert_Ruchar8(__clc_vec8_uint16_t args_0) {
   return __spirv_UConvert_Ruchar8(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_uint8_t
-test___spirv_UConvert_Ruchar8(__clc_vec8_int32_t args_0) {
-  return __spirv_UConvert_Ruchar8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint8_t
 test___spirv_UConvert_Ruchar8(__clc_vec8_uint32_t args_0) {
   return __spirv_UConvert_Ruchar8(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_uint8_t
-test___spirv_UConvert_Ruchar8(__clc_vec8_int64_t args_0) {
-  return __spirv_UConvert_Ruchar8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint8_t
 test___spirv_UConvert_Ruchar8(__clc_vec8_uint64_t args_0) {
   return __spirv_UConvert_Ruchar8(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruchar8_sat.cl b/libclc/test/binding/core/UConvert_Ruchar8_sat.cl
index 029b4a446354a..1a6235c8a79ed 100644
--- a/libclc/test/binding/core/UConvert_Ruchar8_sat.cl
+++ b/libclc/test/binding/core/UConvert_Ruchar8_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec8_uint8_t
-test___spirv_UConvert_Ruchar8_sat(__clc_vec8_int16_t args_0) {
-  return __spirv_UConvert_Ruchar8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint8_t
 test___spirv_UConvert_Ruchar8_sat(__clc_vec8_uint16_t args_0) {
   return __spirv_UConvert_Ruchar8_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_uint8_t
-test___spirv_UConvert_Ruchar8_sat(__clc_vec8_int32_t args_0) {
-  return __spirv_UConvert_Ruchar8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint8_t
 test___spirv_UConvert_Ruchar8_sat(__clc_vec8_uint32_t args_0) {
   return __spirv_UConvert_Ruchar8_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_uint8_t
-test___spirv_UConvert_Ruchar8_sat(__clc_vec8_int64_t args_0) {
-  return __spirv_UConvert_Ruchar8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint8_t
 test___spirv_UConvert_Ruchar8_sat(__clc_vec8_uint64_t args_0) {
   return __spirv_UConvert_Ruchar8_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruchar_sat.cl b/libclc/test/binding/core/UConvert_Ruchar_sat.cl
index 90496d6631ca6..e8bf919b2a94f 100644
--- a/libclc/test/binding/core/UConvert_Ruchar_sat.cl
+++ b/libclc/test/binding/core/UConvert_Ruchar_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_uint8_t
-test___spirv_UConvert_Ruchar_sat(__clc_int16_t args_0) {
-  return __spirv_UConvert_Ruchar_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint8_t
 test___spirv_UConvert_Ruchar_sat(__clc_uint16_t args_0) {
   return __spirv_UConvert_Ruchar_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_uint8_t
-test___spirv_UConvert_Ruchar_sat(__clc_int32_t args_0) {
-  return __spirv_UConvert_Ruchar_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint8_t
 test___spirv_UConvert_Ruchar_sat(__clc_uint32_t args_0) {
   return __spirv_UConvert_Ruchar_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_uint8_t
-test___spirv_UConvert_Ruchar_sat(__clc_int64_t args_0) {
-  return __spirv_UConvert_Ruchar_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint8_t
 test___spirv_UConvert_Ruchar_sat(__clc_uint64_t args_0) {
   return __spirv_UConvert_Ruchar_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruint.cl b/libclc/test/binding/core/UConvert_Ruint.cl
index 4634e45775ee1..426528a6bfabc 100644
--- a/libclc/test/binding/core/UConvert_Ruint.cl
+++ b/libclc/test/binding/core/UConvert_Ruint.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_uint32_t
-test___spirv_UConvert_Ruint(__clc_int8_t args_0) {
-  return __spirv_UConvert_Ruint(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint32_t
 test___spirv_UConvert_Ruint(__clc_uint8_t args_0) {
   return __spirv_UConvert_Ruint(args_0);
 }
 
-__attribute__((overloadable)) __clc_uint32_t
-test___spirv_UConvert_Ruint(__clc_int16_t args_0) {
-  return __spirv_UConvert_Ruint(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint32_t
 test___spirv_UConvert_Ruint(__clc_uint16_t args_0) {
   return __spirv_UConvert_Ruint(args_0);
 }
 
-__attribute__((overloadable)) __clc_uint32_t
-test___spirv_UConvert_Ruint(__clc_int64_t args_0) {
-  return __spirv_UConvert_Ruint(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint32_t
 test___spirv_UConvert_Ruint(__clc_uint64_t args_0) {
   return __spirv_UConvert_Ruint(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruint16.cl b/libclc/test/binding/core/UConvert_Ruint16.cl
index 1b64ed77ad9e1..4a26348cba0a2 100644
--- a/libclc/test/binding/core/UConvert_Ruint16.cl
+++ b/libclc/test/binding/core/UConvert_Ruint16.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec16_uint32_t
-test___spirv_UConvert_Ruint16(__clc_vec16_int8_t args_0) {
-  return __spirv_UConvert_Ruint16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint32_t
 test___spirv_UConvert_Ruint16(__clc_vec16_uint8_t args_0) {
   return __spirv_UConvert_Ruint16(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_uint32_t
-test___spirv_UConvert_Ruint16(__clc_vec16_int16_t args_0) {
-  return __spirv_UConvert_Ruint16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint32_t
 test___spirv_UConvert_Ruint16(__clc_vec16_uint16_t args_0) {
   return __spirv_UConvert_Ruint16(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_uint32_t
-test___spirv_UConvert_Ruint16(__clc_vec16_int64_t args_0) {
-  return __spirv_UConvert_Ruint16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint32_t
 test___spirv_UConvert_Ruint16(__clc_vec16_uint64_t args_0) {
   return __spirv_UConvert_Ruint16(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruint16_sat.cl b/libclc/test/binding/core/UConvert_Ruint16_sat.cl
index caf32fe57d1af..e726cf4a149a0 100644
--- a/libclc/test/binding/core/UConvert_Ruint16_sat.cl
+++ b/libclc/test/binding/core/UConvert_Ruint16_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec16_uint32_t
-test___spirv_UConvert_Ruint16_sat(__clc_vec16_int8_t args_0) {
-  return __spirv_UConvert_Ruint16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint32_t
 test___spirv_UConvert_Ruint16_sat(__clc_vec16_uint8_t args_0) {
   return __spirv_UConvert_Ruint16_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_uint32_t
-test___spirv_UConvert_Ruint16_sat(__clc_vec16_int16_t args_0) {
-  return __spirv_UConvert_Ruint16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint32_t
 test___spirv_UConvert_Ruint16_sat(__clc_vec16_uint16_t args_0) {
   return __spirv_UConvert_Ruint16_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_uint32_t
-test___spirv_UConvert_Ruint16_sat(__clc_vec16_int64_t args_0) {
-  return __spirv_UConvert_Ruint16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint32_t
 test___spirv_UConvert_Ruint16_sat(__clc_vec16_uint64_t args_0) {
   return __spirv_UConvert_Ruint16_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruint2.cl b/libclc/test/binding/core/UConvert_Ruint2.cl
index 948755ca4d71a..9c1a878886ed9 100644
--- a/libclc/test/binding/core/UConvert_Ruint2.cl
+++ b/libclc/test/binding/core/UConvert_Ruint2.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec2_uint32_t
-test___spirv_UConvert_Ruint2(__clc_vec2_int8_t args_0) {
-  return __spirv_UConvert_Ruint2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint32_t
 test___spirv_UConvert_Ruint2(__clc_vec2_uint8_t args_0) {
   return __spirv_UConvert_Ruint2(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_uint32_t
-test___spirv_UConvert_Ruint2(__clc_vec2_int16_t args_0) {
-  return __spirv_UConvert_Ruint2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint32_t
 test___spirv_UConvert_Ruint2(__clc_vec2_uint16_t args_0) {
   return __spirv_UConvert_Ruint2(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_uint32_t
-test___spirv_UConvert_Ruint2(__clc_vec2_int64_t args_0) {
-  return __spirv_UConvert_Ruint2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint32_t
 test___spirv_UConvert_Ruint2(__clc_vec2_uint64_t args_0) {
   return __spirv_UConvert_Ruint2(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruint2_sat.cl b/libclc/test/binding/core/UConvert_Ruint2_sat.cl
index 8acdbc81c8dd0..94154d523ad8f 100644
--- a/libclc/test/binding/core/UConvert_Ruint2_sat.cl
+++ b/libclc/test/binding/core/UConvert_Ruint2_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec2_uint32_t
-test___spirv_UConvert_Ruint2_sat(__clc_vec2_int8_t args_0) {
-  return __spirv_UConvert_Ruint2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint32_t
 test___spirv_UConvert_Ruint2_sat(__clc_vec2_uint8_t args_0) {
   return __spirv_UConvert_Ruint2_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_uint32_t
-test___spirv_UConvert_Ruint2_sat(__clc_vec2_int16_t args_0) {
-  return __spirv_UConvert_Ruint2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint32_t
 test___spirv_UConvert_Ruint2_sat(__clc_vec2_uint16_t args_0) {
   return __spirv_UConvert_Ruint2_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_uint32_t
-test___spirv_UConvert_Ruint2_sat(__clc_vec2_int64_t args_0) {
-  return __spirv_UConvert_Ruint2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint32_t
 test___spirv_UConvert_Ruint2_sat(__clc_vec2_uint64_t args_0) {
   return __spirv_UConvert_Ruint2_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruint3.cl b/libclc/test/binding/core/UConvert_Ruint3.cl
index c640d35a5b41b..409d364105fb8 100644
--- a/libclc/test/binding/core/UConvert_Ruint3.cl
+++ b/libclc/test/binding/core/UConvert_Ruint3.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec3_uint32_t
-test___spirv_UConvert_Ruint3(__clc_vec3_int8_t args_0) {
-  return __spirv_UConvert_Ruint3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint32_t
 test___spirv_UConvert_Ruint3(__clc_vec3_uint8_t args_0) {
   return __spirv_UConvert_Ruint3(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_uint32_t
-test___spirv_UConvert_Ruint3(__clc_vec3_int16_t args_0) {
-  return __spirv_UConvert_Ruint3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint32_t
 test___spirv_UConvert_Ruint3(__clc_vec3_uint16_t args_0) {
   return __spirv_UConvert_Ruint3(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_uint32_t
-test___spirv_UConvert_Ruint3(__clc_vec3_int64_t args_0) {
-  return __spirv_UConvert_Ruint3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint32_t
 test___spirv_UConvert_Ruint3(__clc_vec3_uint64_t args_0) {
   return __spirv_UConvert_Ruint3(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruint3_sat.cl b/libclc/test/binding/core/UConvert_Ruint3_sat.cl
index 954ee258d3fcd..2fb2964672359 100644
--- a/libclc/test/binding/core/UConvert_Ruint3_sat.cl
+++ b/libclc/test/binding/core/UConvert_Ruint3_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec3_uint32_t
-test___spirv_UConvert_Ruint3_sat(__clc_vec3_int8_t args_0) {
-  return __spirv_UConvert_Ruint3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint32_t
 test___spirv_UConvert_Ruint3_sat(__clc_vec3_uint8_t args_0) {
   return __spirv_UConvert_Ruint3_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_uint32_t
-test___spirv_UConvert_Ruint3_sat(__clc_vec3_int16_t args_0) {
-  return __spirv_UConvert_Ruint3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint32_t
 test___spirv_UConvert_Ruint3_sat(__clc_vec3_uint16_t args_0) {
   return __spirv_UConvert_Ruint3_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_uint32_t
-test___spirv_UConvert_Ruint3_sat(__clc_vec3_int64_t args_0) {
-  return __spirv_UConvert_Ruint3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint32_t
 test___spirv_UConvert_Ruint3_sat(__clc_vec3_uint64_t args_0) {
   return __spirv_UConvert_Ruint3_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruint4.cl b/libclc/test/binding/core/UConvert_Ruint4.cl
index 1230800b6b501..2ed5c33fb491b 100644
--- a/libclc/test/binding/core/UConvert_Ruint4.cl
+++ b/libclc/test/binding/core/UConvert_Ruint4.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec4_uint32_t
-test___spirv_UConvert_Ruint4(__clc_vec4_int8_t args_0) {
-  return __spirv_UConvert_Ruint4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint32_t
 test___spirv_UConvert_Ruint4(__clc_vec4_uint8_t args_0) {
   return __spirv_UConvert_Ruint4(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_uint32_t
-test___spirv_UConvert_Ruint4(__clc_vec4_int16_t args_0) {
-  return __spirv_UConvert_Ruint4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint32_t
 test___spirv_UConvert_Ruint4(__clc_vec4_uint16_t args_0) {
   return __spirv_UConvert_Ruint4(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_uint32_t
-test___spirv_UConvert_Ruint4(__clc_vec4_int64_t args_0) {
-  return __spirv_UConvert_Ruint4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint32_t
 test___spirv_UConvert_Ruint4(__clc_vec4_uint64_t args_0) {
   return __spirv_UConvert_Ruint4(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruint4_sat.cl b/libclc/test/binding/core/UConvert_Ruint4_sat.cl
index f2a19d2f0fedc..5fd5f41934b7e 100644
--- a/libclc/test/binding/core/UConvert_Ruint4_sat.cl
+++ b/libclc/test/binding/core/UConvert_Ruint4_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec4_uint32_t
-test___spirv_UConvert_Ruint4_sat(__clc_vec4_int8_t args_0) {
-  return __spirv_UConvert_Ruint4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint32_t
 test___spirv_UConvert_Ruint4_sat(__clc_vec4_uint8_t args_0) {
   return __spirv_UConvert_Ruint4_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_uint32_t
-test___spirv_UConvert_Ruint4_sat(__clc_vec4_int16_t args_0) {
-  return __spirv_UConvert_Ruint4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint32_t
 test___spirv_UConvert_Ruint4_sat(__clc_vec4_uint16_t args_0) {
   return __spirv_UConvert_Ruint4_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_uint32_t
-test___spirv_UConvert_Ruint4_sat(__clc_vec4_int64_t args_0) {
-  return __spirv_UConvert_Ruint4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint32_t
 test___spirv_UConvert_Ruint4_sat(__clc_vec4_uint64_t args_0) {
   return __spirv_UConvert_Ruint4_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruint8.cl b/libclc/test/binding/core/UConvert_Ruint8.cl
index 66dddf6bf761c..4eb746b3a8cc8 100644
--- a/libclc/test/binding/core/UConvert_Ruint8.cl
+++ b/libclc/test/binding/core/UConvert_Ruint8.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec8_uint32_t
-test___spirv_UConvert_Ruint8(__clc_vec8_int8_t args_0) {
-  return __spirv_UConvert_Ruint8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint32_t
 test___spirv_UConvert_Ruint8(__clc_vec8_uint8_t args_0) {
   return __spirv_UConvert_Ruint8(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_uint32_t
-test___spirv_UConvert_Ruint8(__clc_vec8_int16_t args_0) {
-  return __spirv_UConvert_Ruint8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint32_t
 test___spirv_UConvert_Ruint8(__clc_vec8_uint16_t args_0) {
   return __spirv_UConvert_Ruint8(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_uint32_t
-test___spirv_UConvert_Ruint8(__clc_vec8_int64_t args_0) {
-  return __spirv_UConvert_Ruint8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint32_t
 test___spirv_UConvert_Ruint8(__clc_vec8_uint64_t args_0) {
   return __spirv_UConvert_Ruint8(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruint8_sat.cl b/libclc/test/binding/core/UConvert_Ruint8_sat.cl
index 207c50a240ada..eed7aa854f52c 100644
--- a/libclc/test/binding/core/UConvert_Ruint8_sat.cl
+++ b/libclc/test/binding/core/UConvert_Ruint8_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec8_uint32_t
-test___spirv_UConvert_Ruint8_sat(__clc_vec8_int8_t args_0) {
-  return __spirv_UConvert_Ruint8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint32_t
 test___spirv_UConvert_Ruint8_sat(__clc_vec8_uint8_t args_0) {
   return __spirv_UConvert_Ruint8_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_uint32_t
-test___spirv_UConvert_Ruint8_sat(__clc_vec8_int16_t args_0) {
-  return __spirv_UConvert_Ruint8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint32_t
 test___spirv_UConvert_Ruint8_sat(__clc_vec8_uint16_t args_0) {
   return __spirv_UConvert_Ruint8_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_uint32_t
-test___spirv_UConvert_Ruint8_sat(__clc_vec8_int64_t args_0) {
-  return __spirv_UConvert_Ruint8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint32_t
 test___spirv_UConvert_Ruint8_sat(__clc_vec8_uint64_t args_0) {
   return __spirv_UConvert_Ruint8_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Ruint_sat.cl b/libclc/test/binding/core/UConvert_Ruint_sat.cl
index a74a6459fd3fc..3529f5920e26e 100644
--- a/libclc/test/binding/core/UConvert_Ruint_sat.cl
+++ b/libclc/test/binding/core/UConvert_Ruint_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_uint32_t
-test___spirv_UConvert_Ruint_sat(__clc_int8_t args_0) {
-  return __spirv_UConvert_Ruint_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint32_t
 test___spirv_UConvert_Ruint_sat(__clc_uint8_t args_0) {
   return __spirv_UConvert_Ruint_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_uint32_t
-test___spirv_UConvert_Ruint_sat(__clc_int16_t args_0) {
-  return __spirv_UConvert_Ruint_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint32_t
 test___spirv_UConvert_Ruint_sat(__clc_uint16_t args_0) {
   return __spirv_UConvert_Ruint_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_uint32_t
-test___spirv_UConvert_Ruint_sat(__clc_int64_t args_0) {
-  return __spirv_UConvert_Ruint_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint32_t
 test___spirv_UConvert_Ruint_sat(__clc_uint64_t args_0) {
   return __spirv_UConvert_Ruint_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rulong.cl b/libclc/test/binding/core/UConvert_Rulong.cl
index ee1042730db46..8c826ff9ab705 100644
--- a/libclc/test/binding/core/UConvert_Rulong.cl
+++ b/libclc/test/binding/core/UConvert_Rulong.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_uint64_t
-test___spirv_UConvert_Rulong(__clc_int8_t args_0) {
-  return __spirv_UConvert_Rulong(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint64_t
 test___spirv_UConvert_Rulong(__clc_uint8_t args_0) {
   return __spirv_UConvert_Rulong(args_0);
 }
 
-__attribute__((overloadable)) __clc_uint64_t
-test___spirv_UConvert_Rulong(__clc_int16_t args_0) {
-  return __spirv_UConvert_Rulong(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint64_t
 test___spirv_UConvert_Rulong(__clc_uint16_t args_0) {
   return __spirv_UConvert_Rulong(args_0);
 }
 
-__attribute__((overloadable)) __clc_uint64_t
-test___spirv_UConvert_Rulong(__clc_int32_t args_0) {
-  return __spirv_UConvert_Rulong(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint64_t
 test___spirv_UConvert_Rulong(__clc_uint32_t args_0) {
   return __spirv_UConvert_Rulong(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rulong16.cl b/libclc/test/binding/core/UConvert_Rulong16.cl
index 4be1301a1d7dd..8d9cc7a30a24b 100644
--- a/libclc/test/binding/core/UConvert_Rulong16.cl
+++ b/libclc/test/binding/core/UConvert_Rulong16.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec16_uint64_t
-test___spirv_UConvert_Rulong16(__clc_vec16_int8_t args_0) {
-  return __spirv_UConvert_Rulong16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint64_t
 test___spirv_UConvert_Rulong16(__clc_vec16_uint8_t args_0) {
   return __spirv_UConvert_Rulong16(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_uint64_t
-test___spirv_UConvert_Rulong16(__clc_vec16_int16_t args_0) {
-  return __spirv_UConvert_Rulong16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint64_t
 test___spirv_UConvert_Rulong16(__clc_vec16_uint16_t args_0) {
   return __spirv_UConvert_Rulong16(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_uint64_t
-test___spirv_UConvert_Rulong16(__clc_vec16_int32_t args_0) {
-  return __spirv_UConvert_Rulong16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint64_t
 test___spirv_UConvert_Rulong16(__clc_vec16_uint32_t args_0) {
   return __spirv_UConvert_Rulong16(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rulong16_sat.cl b/libclc/test/binding/core/UConvert_Rulong16_sat.cl
index e52d225583c2b..102cc614b66b8 100644
--- a/libclc/test/binding/core/UConvert_Rulong16_sat.cl
+++ b/libclc/test/binding/core/UConvert_Rulong16_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec16_uint64_t
-test___spirv_UConvert_Rulong16_sat(__clc_vec16_int8_t args_0) {
-  return __spirv_UConvert_Rulong16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint64_t
 test___spirv_UConvert_Rulong16_sat(__clc_vec16_uint8_t args_0) {
   return __spirv_UConvert_Rulong16_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_uint64_t
-test___spirv_UConvert_Rulong16_sat(__clc_vec16_int16_t args_0) {
-  return __spirv_UConvert_Rulong16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint64_t
 test___spirv_UConvert_Rulong16_sat(__clc_vec16_uint16_t args_0) {
   return __spirv_UConvert_Rulong16_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_uint64_t
-test___spirv_UConvert_Rulong16_sat(__clc_vec16_int32_t args_0) {
-  return __spirv_UConvert_Rulong16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint64_t
 test___spirv_UConvert_Rulong16_sat(__clc_vec16_uint32_t args_0) {
   return __spirv_UConvert_Rulong16_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rulong2.cl b/libclc/test/binding/core/UConvert_Rulong2.cl
index 6e01ec0a3b880..92d6a8688bbda 100644
--- a/libclc/test/binding/core/UConvert_Rulong2.cl
+++ b/libclc/test/binding/core/UConvert_Rulong2.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec2_uint64_t
-test___spirv_UConvert_Rulong2(__clc_vec2_int8_t args_0) {
-  return __spirv_UConvert_Rulong2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint64_t
 test___spirv_UConvert_Rulong2(__clc_vec2_uint8_t args_0) {
   return __spirv_UConvert_Rulong2(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_uint64_t
-test___spirv_UConvert_Rulong2(__clc_vec2_int16_t args_0) {
-  return __spirv_UConvert_Rulong2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint64_t
 test___spirv_UConvert_Rulong2(__clc_vec2_uint16_t args_0) {
   return __spirv_UConvert_Rulong2(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_uint64_t
-test___spirv_UConvert_Rulong2(__clc_vec2_int32_t args_0) {
-  return __spirv_UConvert_Rulong2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint64_t
 test___spirv_UConvert_Rulong2(__clc_vec2_uint32_t args_0) {
   return __spirv_UConvert_Rulong2(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rulong2_sat.cl b/libclc/test/binding/core/UConvert_Rulong2_sat.cl
index 1a94f48d63168..746b20c8de502 100644
--- a/libclc/test/binding/core/UConvert_Rulong2_sat.cl
+++ b/libclc/test/binding/core/UConvert_Rulong2_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec2_uint64_t
-test___spirv_UConvert_Rulong2_sat(__clc_vec2_int8_t args_0) {
-  return __spirv_UConvert_Rulong2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint64_t
 test___spirv_UConvert_Rulong2_sat(__clc_vec2_uint8_t args_0) {
   return __spirv_UConvert_Rulong2_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_uint64_t
-test___spirv_UConvert_Rulong2_sat(__clc_vec2_int16_t args_0) {
-  return __spirv_UConvert_Rulong2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint64_t
 test___spirv_UConvert_Rulong2_sat(__clc_vec2_uint16_t args_0) {
   return __spirv_UConvert_Rulong2_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_uint64_t
-test___spirv_UConvert_Rulong2_sat(__clc_vec2_int32_t args_0) {
-  return __spirv_UConvert_Rulong2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint64_t
 test___spirv_UConvert_Rulong2_sat(__clc_vec2_uint32_t args_0) {
   return __spirv_UConvert_Rulong2_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rulong3.cl b/libclc/test/binding/core/UConvert_Rulong3.cl
index e462276686edf..7f30f21f1adfa 100644
--- a/libclc/test/binding/core/UConvert_Rulong3.cl
+++ b/libclc/test/binding/core/UConvert_Rulong3.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec3_uint64_t
-test___spirv_UConvert_Rulong3(__clc_vec3_int8_t args_0) {
-  return __spirv_UConvert_Rulong3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint64_t
 test___spirv_UConvert_Rulong3(__clc_vec3_uint8_t args_0) {
   return __spirv_UConvert_Rulong3(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_uint64_t
-test___spirv_UConvert_Rulong3(__clc_vec3_int16_t args_0) {
-  return __spirv_UConvert_Rulong3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint64_t
 test___spirv_UConvert_Rulong3(__clc_vec3_uint16_t args_0) {
   return __spirv_UConvert_Rulong3(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_uint64_t
-test___spirv_UConvert_Rulong3(__clc_vec3_int32_t args_0) {
-  return __spirv_UConvert_Rulong3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint64_t
 test___spirv_UConvert_Rulong3(__clc_vec3_uint32_t args_0) {
   return __spirv_UConvert_Rulong3(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rulong3_sat.cl b/libclc/test/binding/core/UConvert_Rulong3_sat.cl
index 53d013b44ad1c..c8bc886be8cff 100644
--- a/libclc/test/binding/core/UConvert_Rulong3_sat.cl
+++ b/libclc/test/binding/core/UConvert_Rulong3_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec3_uint64_t
-test___spirv_UConvert_Rulong3_sat(__clc_vec3_int8_t args_0) {
-  return __spirv_UConvert_Rulong3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint64_t
 test___spirv_UConvert_Rulong3_sat(__clc_vec3_uint8_t args_0) {
   return __spirv_UConvert_Rulong3_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_uint64_t
-test___spirv_UConvert_Rulong3_sat(__clc_vec3_int16_t args_0) {
-  return __spirv_UConvert_Rulong3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint64_t
 test___spirv_UConvert_Rulong3_sat(__clc_vec3_uint16_t args_0) {
   return __spirv_UConvert_Rulong3_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_uint64_t
-test___spirv_UConvert_Rulong3_sat(__clc_vec3_int32_t args_0) {
-  return __spirv_UConvert_Rulong3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint64_t
 test___spirv_UConvert_Rulong3_sat(__clc_vec3_uint32_t args_0) {
   return __spirv_UConvert_Rulong3_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rulong4.cl b/libclc/test/binding/core/UConvert_Rulong4.cl
index fdd4e4540a4be..902373c809589 100644
--- a/libclc/test/binding/core/UConvert_Rulong4.cl
+++ b/libclc/test/binding/core/UConvert_Rulong4.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec4_uint64_t
-test___spirv_UConvert_Rulong4(__clc_vec4_int8_t args_0) {
-  return __spirv_UConvert_Rulong4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint64_t
 test___spirv_UConvert_Rulong4(__clc_vec4_uint8_t args_0) {
   return __spirv_UConvert_Rulong4(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_uint64_t
-test___spirv_UConvert_Rulong4(__clc_vec4_int16_t args_0) {
-  return __spirv_UConvert_Rulong4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint64_t
 test___spirv_UConvert_Rulong4(__clc_vec4_uint16_t args_0) {
   return __spirv_UConvert_Rulong4(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_uint64_t
-test___spirv_UConvert_Rulong4(__clc_vec4_int32_t args_0) {
-  return __spirv_UConvert_Rulong4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint64_t
 test___spirv_UConvert_Rulong4(__clc_vec4_uint32_t args_0) {
   return __spirv_UConvert_Rulong4(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rulong4_sat.cl b/libclc/test/binding/core/UConvert_Rulong4_sat.cl
index cb6a04f6359bb..7543f1a92458e 100644
--- a/libclc/test/binding/core/UConvert_Rulong4_sat.cl
+++ b/libclc/test/binding/core/UConvert_Rulong4_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec4_uint64_t
-test___spirv_UConvert_Rulong4_sat(__clc_vec4_int8_t args_0) {
-  return __spirv_UConvert_Rulong4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint64_t
 test___spirv_UConvert_Rulong4_sat(__clc_vec4_uint8_t args_0) {
   return __spirv_UConvert_Rulong4_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_uint64_t
-test___spirv_UConvert_Rulong4_sat(__clc_vec4_int16_t args_0) {
-  return __spirv_UConvert_Rulong4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint64_t
 test___spirv_UConvert_Rulong4_sat(__clc_vec4_uint16_t args_0) {
   return __spirv_UConvert_Rulong4_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_uint64_t
-test___spirv_UConvert_Rulong4_sat(__clc_vec4_int32_t args_0) {
-  return __spirv_UConvert_Rulong4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint64_t
 test___spirv_UConvert_Rulong4_sat(__clc_vec4_uint32_t args_0) {
   return __spirv_UConvert_Rulong4_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rulong8.cl b/libclc/test/binding/core/UConvert_Rulong8.cl
index 1c0c902cbbb52..dd43bfda24b20 100644
--- a/libclc/test/binding/core/UConvert_Rulong8.cl
+++ b/libclc/test/binding/core/UConvert_Rulong8.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec8_uint64_t
-test___spirv_UConvert_Rulong8(__clc_vec8_int8_t args_0) {
-  return __spirv_UConvert_Rulong8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint64_t
 test___spirv_UConvert_Rulong8(__clc_vec8_uint8_t args_0) {
   return __spirv_UConvert_Rulong8(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_uint64_t
-test___spirv_UConvert_Rulong8(__clc_vec8_int16_t args_0) {
-  return __spirv_UConvert_Rulong8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint64_t
 test___spirv_UConvert_Rulong8(__clc_vec8_uint16_t args_0) {
   return __spirv_UConvert_Rulong8(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_uint64_t
-test___spirv_UConvert_Rulong8(__clc_vec8_int32_t args_0) {
-  return __spirv_UConvert_Rulong8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint64_t
 test___spirv_UConvert_Rulong8(__clc_vec8_uint32_t args_0) {
   return __spirv_UConvert_Rulong8(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rulong8_sat.cl b/libclc/test/binding/core/UConvert_Rulong8_sat.cl
index c050aebb4623a..15f72bc393d1c 100644
--- a/libclc/test/binding/core/UConvert_Rulong8_sat.cl
+++ b/libclc/test/binding/core/UConvert_Rulong8_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec8_uint64_t
-test___spirv_UConvert_Rulong8_sat(__clc_vec8_int8_t args_0) {
-  return __spirv_UConvert_Rulong8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint64_t
 test___spirv_UConvert_Rulong8_sat(__clc_vec8_uint8_t args_0) {
   return __spirv_UConvert_Rulong8_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_uint64_t
-test___spirv_UConvert_Rulong8_sat(__clc_vec8_int16_t args_0) {
-  return __spirv_UConvert_Rulong8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint64_t
 test___spirv_UConvert_Rulong8_sat(__clc_vec8_uint16_t args_0) {
   return __spirv_UConvert_Rulong8_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_uint64_t
-test___spirv_UConvert_Rulong8_sat(__clc_vec8_int32_t args_0) {
-  return __spirv_UConvert_Rulong8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint64_t
 test___spirv_UConvert_Rulong8_sat(__clc_vec8_uint32_t args_0) {
   return __spirv_UConvert_Rulong8_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rulong_sat.cl b/libclc/test/binding/core/UConvert_Rulong_sat.cl
index 8ba6e9e6f8d6a..d1561646ba385 100644
--- a/libclc/test/binding/core/UConvert_Rulong_sat.cl
+++ b/libclc/test/binding/core/UConvert_Rulong_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_uint64_t
-test___spirv_UConvert_Rulong_sat(__clc_int8_t args_0) {
-  return __spirv_UConvert_Rulong_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint64_t
 test___spirv_UConvert_Rulong_sat(__clc_uint8_t args_0) {
   return __spirv_UConvert_Rulong_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_uint64_t
-test___spirv_UConvert_Rulong_sat(__clc_int16_t args_0) {
-  return __spirv_UConvert_Rulong_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint64_t
 test___spirv_UConvert_Rulong_sat(__clc_uint16_t args_0) {
   return __spirv_UConvert_Rulong_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_uint64_t
-test___spirv_UConvert_Rulong_sat(__clc_int32_t args_0) {
-  return __spirv_UConvert_Rulong_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint64_t
 test___spirv_UConvert_Rulong_sat(__clc_uint32_t args_0) {
   return __spirv_UConvert_Rulong_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rushort.cl b/libclc/test/binding/core/UConvert_Rushort.cl
index c16db1c7e2628..84a9eb76afcf5 100644
--- a/libclc/test/binding/core/UConvert_Rushort.cl
+++ b/libclc/test/binding/core/UConvert_Rushort.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_uint16_t
-test___spirv_UConvert_Rushort(__clc_int8_t args_0) {
-  return __spirv_UConvert_Rushort(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint16_t
 test___spirv_UConvert_Rushort(__clc_uint8_t args_0) {
   return __spirv_UConvert_Rushort(args_0);
 }
 
-__attribute__((overloadable)) __clc_uint16_t
-test___spirv_UConvert_Rushort(__clc_int32_t args_0) {
-  return __spirv_UConvert_Rushort(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint16_t
 test___spirv_UConvert_Rushort(__clc_uint32_t args_0) {
   return __spirv_UConvert_Rushort(args_0);
 }
 
-__attribute__((overloadable)) __clc_uint16_t
-test___spirv_UConvert_Rushort(__clc_int64_t args_0) {
-  return __spirv_UConvert_Rushort(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint16_t
 test___spirv_UConvert_Rushort(__clc_uint64_t args_0) {
   return __spirv_UConvert_Rushort(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rushort16.cl b/libclc/test/binding/core/UConvert_Rushort16.cl
index 518de0bde7c6c..e97f252a3b125 100644
--- a/libclc/test/binding/core/UConvert_Rushort16.cl
+++ b/libclc/test/binding/core/UConvert_Rushort16.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec16_uint16_t
-test___spirv_UConvert_Rushort16(__clc_vec16_int8_t args_0) {
-  return __spirv_UConvert_Rushort16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint16_t
 test___spirv_UConvert_Rushort16(__clc_vec16_uint8_t args_0) {
   return __spirv_UConvert_Rushort16(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_uint16_t
-test___spirv_UConvert_Rushort16(__clc_vec16_int32_t args_0) {
-  return __spirv_UConvert_Rushort16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint16_t
 test___spirv_UConvert_Rushort16(__clc_vec16_uint32_t args_0) {
   return __spirv_UConvert_Rushort16(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_uint16_t
-test___spirv_UConvert_Rushort16(__clc_vec16_int64_t args_0) {
-  return __spirv_UConvert_Rushort16(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint16_t
 test___spirv_UConvert_Rushort16(__clc_vec16_uint64_t args_0) {
   return __spirv_UConvert_Rushort16(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rushort16_sat.cl b/libclc/test/binding/core/UConvert_Rushort16_sat.cl
index 0f0ac5676fb2c..9c3f804724247 100644
--- a/libclc/test/binding/core/UConvert_Rushort16_sat.cl
+++ b/libclc/test/binding/core/UConvert_Rushort16_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec16_uint16_t
-test___spirv_UConvert_Rushort16_sat(__clc_vec16_int8_t args_0) {
-  return __spirv_UConvert_Rushort16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint16_t
 test___spirv_UConvert_Rushort16_sat(__clc_vec16_uint8_t args_0) {
   return __spirv_UConvert_Rushort16_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_uint16_t
-test___spirv_UConvert_Rushort16_sat(__clc_vec16_int32_t args_0) {
-  return __spirv_UConvert_Rushort16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint16_t
 test___spirv_UConvert_Rushort16_sat(__clc_vec16_uint32_t args_0) {
   return __spirv_UConvert_Rushort16_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec16_uint16_t
-test___spirv_UConvert_Rushort16_sat(__clc_vec16_int64_t args_0) {
-  return __spirv_UConvert_Rushort16_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec16_uint16_t
 test___spirv_UConvert_Rushort16_sat(__clc_vec16_uint64_t args_0) {
   return __spirv_UConvert_Rushort16_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rushort2.cl b/libclc/test/binding/core/UConvert_Rushort2.cl
index 410fc82b6c8d9..e4b3b0b7c7ac6 100644
--- a/libclc/test/binding/core/UConvert_Rushort2.cl
+++ b/libclc/test/binding/core/UConvert_Rushort2.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec2_uint16_t
-test___spirv_UConvert_Rushort2(__clc_vec2_int8_t args_0) {
-  return __spirv_UConvert_Rushort2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint16_t
 test___spirv_UConvert_Rushort2(__clc_vec2_uint8_t args_0) {
   return __spirv_UConvert_Rushort2(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_uint16_t
-test___spirv_UConvert_Rushort2(__clc_vec2_int32_t args_0) {
-  return __spirv_UConvert_Rushort2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint16_t
 test___spirv_UConvert_Rushort2(__clc_vec2_uint32_t args_0) {
   return __spirv_UConvert_Rushort2(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_uint16_t
-test___spirv_UConvert_Rushort2(__clc_vec2_int64_t args_0) {
-  return __spirv_UConvert_Rushort2(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint16_t
 test___spirv_UConvert_Rushort2(__clc_vec2_uint64_t args_0) {
   return __spirv_UConvert_Rushort2(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rushort2_sat.cl b/libclc/test/binding/core/UConvert_Rushort2_sat.cl
index 780e3bfa551f8..50e9e54b3daa7 100644
--- a/libclc/test/binding/core/UConvert_Rushort2_sat.cl
+++ b/libclc/test/binding/core/UConvert_Rushort2_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec2_uint16_t
-test___spirv_UConvert_Rushort2_sat(__clc_vec2_int8_t args_0) {
-  return __spirv_UConvert_Rushort2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint16_t
 test___spirv_UConvert_Rushort2_sat(__clc_vec2_uint8_t args_0) {
   return __spirv_UConvert_Rushort2_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_uint16_t
-test___spirv_UConvert_Rushort2_sat(__clc_vec2_int32_t args_0) {
-  return __spirv_UConvert_Rushort2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint16_t
 test___spirv_UConvert_Rushort2_sat(__clc_vec2_uint32_t args_0) {
   return __spirv_UConvert_Rushort2_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec2_uint16_t
-test___spirv_UConvert_Rushort2_sat(__clc_vec2_int64_t args_0) {
-  return __spirv_UConvert_Rushort2_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec2_uint16_t
 test___spirv_UConvert_Rushort2_sat(__clc_vec2_uint64_t args_0) {
   return __spirv_UConvert_Rushort2_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rushort3.cl b/libclc/test/binding/core/UConvert_Rushort3.cl
index 1580b15f09e04..9a21942a349a6 100644
--- a/libclc/test/binding/core/UConvert_Rushort3.cl
+++ b/libclc/test/binding/core/UConvert_Rushort3.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec3_uint16_t
-test___spirv_UConvert_Rushort3(__clc_vec3_int8_t args_0) {
-  return __spirv_UConvert_Rushort3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint16_t
 test___spirv_UConvert_Rushort3(__clc_vec3_uint8_t args_0) {
   return __spirv_UConvert_Rushort3(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_uint16_t
-test___spirv_UConvert_Rushort3(__clc_vec3_int32_t args_0) {
-  return __spirv_UConvert_Rushort3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint16_t
 test___spirv_UConvert_Rushort3(__clc_vec3_uint32_t args_0) {
   return __spirv_UConvert_Rushort3(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_uint16_t
-test___spirv_UConvert_Rushort3(__clc_vec3_int64_t args_0) {
-  return __spirv_UConvert_Rushort3(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint16_t
 test___spirv_UConvert_Rushort3(__clc_vec3_uint64_t args_0) {
   return __spirv_UConvert_Rushort3(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rushort3_sat.cl b/libclc/test/binding/core/UConvert_Rushort3_sat.cl
index 8ad31b327f000..c96826c3bf19d 100644
--- a/libclc/test/binding/core/UConvert_Rushort3_sat.cl
+++ b/libclc/test/binding/core/UConvert_Rushort3_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec3_uint16_t
-test___spirv_UConvert_Rushort3_sat(__clc_vec3_int8_t args_0) {
-  return __spirv_UConvert_Rushort3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint16_t
 test___spirv_UConvert_Rushort3_sat(__clc_vec3_uint8_t args_0) {
   return __spirv_UConvert_Rushort3_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_uint16_t
-test___spirv_UConvert_Rushort3_sat(__clc_vec3_int32_t args_0) {
-  return __spirv_UConvert_Rushort3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint16_t
 test___spirv_UConvert_Rushort3_sat(__clc_vec3_uint32_t args_0) {
   return __spirv_UConvert_Rushort3_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec3_uint16_t
-test___spirv_UConvert_Rushort3_sat(__clc_vec3_int64_t args_0) {
-  return __spirv_UConvert_Rushort3_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec3_uint16_t
 test___spirv_UConvert_Rushort3_sat(__clc_vec3_uint64_t args_0) {
   return __spirv_UConvert_Rushort3_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rushort4.cl b/libclc/test/binding/core/UConvert_Rushort4.cl
index 92d5d1779e8dd..56a31bbb2df73 100644
--- a/libclc/test/binding/core/UConvert_Rushort4.cl
+++ b/libclc/test/binding/core/UConvert_Rushort4.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec4_uint16_t
-test___spirv_UConvert_Rushort4(__clc_vec4_int8_t args_0) {
-  return __spirv_UConvert_Rushort4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint16_t
 test___spirv_UConvert_Rushort4(__clc_vec4_uint8_t args_0) {
   return __spirv_UConvert_Rushort4(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_uint16_t
-test___spirv_UConvert_Rushort4(__clc_vec4_int32_t args_0) {
-  return __spirv_UConvert_Rushort4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint16_t
 test___spirv_UConvert_Rushort4(__clc_vec4_uint32_t args_0) {
   return __spirv_UConvert_Rushort4(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_uint16_t
-test___spirv_UConvert_Rushort4(__clc_vec4_int64_t args_0) {
-  return __spirv_UConvert_Rushort4(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint16_t
 test___spirv_UConvert_Rushort4(__clc_vec4_uint64_t args_0) {
   return __spirv_UConvert_Rushort4(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rushort4_sat.cl b/libclc/test/binding/core/UConvert_Rushort4_sat.cl
index 71bde2cb55756..8bfbc71ff4d75 100644
--- a/libclc/test/binding/core/UConvert_Rushort4_sat.cl
+++ b/libclc/test/binding/core/UConvert_Rushort4_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec4_uint16_t
-test___spirv_UConvert_Rushort4_sat(__clc_vec4_int8_t args_0) {
-  return __spirv_UConvert_Rushort4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint16_t
 test___spirv_UConvert_Rushort4_sat(__clc_vec4_uint8_t args_0) {
   return __spirv_UConvert_Rushort4_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_uint16_t
-test___spirv_UConvert_Rushort4_sat(__clc_vec4_int32_t args_0) {
-  return __spirv_UConvert_Rushort4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint16_t
 test___spirv_UConvert_Rushort4_sat(__clc_vec4_uint32_t args_0) {
   return __spirv_UConvert_Rushort4_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec4_uint16_t
-test___spirv_UConvert_Rushort4_sat(__clc_vec4_int64_t args_0) {
-  return __spirv_UConvert_Rushort4_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec4_uint16_t
 test___spirv_UConvert_Rushort4_sat(__clc_vec4_uint64_t args_0) {
   return __spirv_UConvert_Rushort4_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rushort8.cl b/libclc/test/binding/core/UConvert_Rushort8.cl
index f0b26c3c3b9cb..32790cbc2f334 100644
--- a/libclc/test/binding/core/UConvert_Rushort8.cl
+++ b/libclc/test/binding/core/UConvert_Rushort8.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec8_uint16_t
-test___spirv_UConvert_Rushort8(__clc_vec8_int8_t args_0) {
-  return __spirv_UConvert_Rushort8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint16_t
 test___spirv_UConvert_Rushort8(__clc_vec8_uint8_t args_0) {
   return __spirv_UConvert_Rushort8(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_uint16_t
-test___spirv_UConvert_Rushort8(__clc_vec8_int32_t args_0) {
-  return __spirv_UConvert_Rushort8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint16_t
 test___spirv_UConvert_Rushort8(__clc_vec8_uint32_t args_0) {
   return __spirv_UConvert_Rushort8(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_uint16_t
-test___spirv_UConvert_Rushort8(__clc_vec8_int64_t args_0) {
-  return __spirv_UConvert_Rushort8(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint16_t
 test___spirv_UConvert_Rushort8(__clc_vec8_uint64_t args_0) {
   return __spirv_UConvert_Rushort8(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rushort8_sat.cl b/libclc/test/binding/core/UConvert_Rushort8_sat.cl
index 41ca4f238b784..ffe09255fbc1f 100644
--- a/libclc/test/binding/core/UConvert_Rushort8_sat.cl
+++ b/libclc/test/binding/core/UConvert_Rushort8_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_vec8_uint16_t
-test___spirv_UConvert_Rushort8_sat(__clc_vec8_int8_t args_0) {
-  return __spirv_UConvert_Rushort8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint16_t
 test___spirv_UConvert_Rushort8_sat(__clc_vec8_uint8_t args_0) {
   return __spirv_UConvert_Rushort8_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_uint16_t
-test___spirv_UConvert_Rushort8_sat(__clc_vec8_int32_t args_0) {
-  return __spirv_UConvert_Rushort8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint16_t
 test___spirv_UConvert_Rushort8_sat(__clc_vec8_uint32_t args_0) {
   return __spirv_UConvert_Rushort8_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_vec8_uint16_t
-test___spirv_UConvert_Rushort8_sat(__clc_vec8_int64_t args_0) {
-  return __spirv_UConvert_Rushort8_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_vec8_uint16_t
 test___spirv_UConvert_Rushort8_sat(__clc_vec8_uint64_t args_0) {
   return __spirv_UConvert_Rushort8_sat(args_0);
diff --git a/libclc/test/binding/core/UConvert_Rushort_sat.cl b/libclc/test/binding/core/UConvert_Rushort_sat.cl
index 3b99ce023324c..da49cef805dea 100644
--- a/libclc/test/binding/core/UConvert_Rushort_sat.cl
+++ b/libclc/test/binding/core/UConvert_Rushort_sat.cl
@@ -15,31 +15,16 @@
 
 // CHECK-NOT: declare {{.*}} @_Z
 // CHECK-NOT: call {{[^ ]*}} bitcast
-__attribute__((overloadable)) __clc_uint16_t
-test___spirv_UConvert_Rushort_sat(__clc_int8_t args_0) {
-  return __spirv_UConvert_Rushort_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint16_t
 test___spirv_UConvert_Rushort_sat(__clc_uint8_t args_0) {
   return __spirv_UConvert_Rushort_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_uint16_t
-test___spirv_UConvert_Rushort_sat(__clc_int32_t args_0) {
-  return __spirv_UConvert_Rushort_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint16_t
 test___spirv_UConvert_Rushort_sat(__clc_uint32_t args_0) {
   return __spirv_UConvert_Rushort_sat(args_0);
 }
 
-__attribute__((overloadable)) __clc_uint16_t
-test___spirv_UConvert_Rushort_sat(__clc_int64_t args_0) {
-  return __spirv_UConvert_Rushort_sat(args_0);
-}
-
 __attribute__((overloadable)) __clc_uint16_t
 test___spirv_UConvert_Rushort_sat(__clc_uint64_t args_0) {
   return __spirv_UConvert_Rushort_sat(args_0);