Merge from 'main' to 'sycl-web' (1 commits)

  CONFLICT (modify/delete): libclc/generic/include/clc/async/gentype.inc deleted in 5b6fc61 and modified in HEAD.  Version HEAD of libclc/generic/include/clc/async/gentype.inc left in tree.

Author: fineg74

libclc/generic/include/clc/async/async_work_group_copy.h

@@ -9,15 +9,21 @@
 #define __CLC_DST_ADDR_SPACE local
 #define __CLC_SRC_ADDR_SPACE global
 #define __CLC_BODY <clc/async/async_work_group_copy.inc>
-#include <clc/async/gentype.inc>
+#include <clc/integer/gentype.inc>
+#undef __CLC_BODY
+#define __CLC_BODY <clc/async/async_work_group_copy.inc>
+#include <clc/math/gentype.inc>
+#undef __CLC_BODY
 #undef __CLC_DST_ADDR_SPACE
 #undef __CLC_SRC_ADDR_SPACE
-#undef __CLC_BODY
 
 #define __CLC_DST_ADDR_SPACE global
 #define __CLC_SRC_ADDR_SPACE local
 #define __CLC_BODY <clc/async/async_work_group_copy.inc>
-#include <clc/async/gentype.inc>
+#include <clc/integer/gentype.inc>
+#undef __CLC_BODY
+#define __CLC_BODY <clc/async/async_work_group_copy.inc>
+#include <clc/math/gentype.inc>
+#undef __CLC_BODY
 #undef __CLC_DST_ADDR_SPACE
 #undef __CLC_SRC_ADDR_SPACE
-#undef __CLC_BODY

libclc/generic/include/clc/async/async_work_group_strided_copy.h

@@ -9,15 +9,21 @@
 #define __CLC_DST_ADDR_SPACE local
 #define __CLC_SRC_ADDR_SPACE global
 #define __CLC_BODY <clc/async/async_work_group_strided_copy.inc>
-#include <clc/async/gentype.inc>
+#include <clc/integer/gentype.inc>
+#undef __CLC_BODY
+#define __CLC_BODY <clc/async/async_work_group_strided_copy.inc>
+#include <clc/math/gentype.inc>
+#undef __CLC_BODY
 #undef __CLC_DST_ADDR_SPACE
 #undef __CLC_SRC_ADDR_SPACE
-#undef __CLC_BODY
 
 #define __CLC_DST_ADDR_SPACE global
 #define __CLC_SRC_ADDR_SPACE local
 #define __CLC_BODY <clc/async/async_work_group_strided_copy.inc>
-#include <clc/async/gentype.inc>
+#include <clc/integer/gentype.inc>
+#undef __CLC_BODY
+#define __CLC_BODY <clc/async/async_work_group_strided_copy.inc>
+#include <clc/math/gentype.inc>
+#undef __CLC_BODY
 #undef __CLC_DST_ADDR_SPACE
 #undef __CLC_SRC_ADDR_SPACE
-#undef __CLC_BODY