[SYCL-PTX] Fix geometric and common builtin categories (#1832)

Remove old forward declared SPIR-V builtin from the geometric and common categories. Update the binding file using the header generator. Add relevant binding test. Remove XFAIL from related SYCL tests. Signed-off-by: Victor Lomuller <[email protected]> Co-authored-by: David Wood <[email protected]>
intel · Jun 25, 2020 · d9bad0b · d9bad0b
1 parent f998e6b
commit d9bad0b
Show file tree

Hide file tree

Showing 85 changed files with 3,210 additions and 535 deletions.
diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt
@@ -164,9 +164,9 @@ install( DIRECTORY generic/include/clc DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
 
 if( ENABLE_RUNTIME_SUBNORMAL )
 	add_library( subnormal_use_default STATIC
-		generic/lib/subnormal_use_default.ll )
+		generic/libspirv/subnormal_use_default.ll )
 	add_library( subnormal_disable STATIC
-		generic/lib/subnormal_disable.ll )
+		generic/libspirv/subnormal_disable.ll )
 	install( TARGETS subnormal_use_default subnormal_disable ARCHIVE
 		DESTINATION ${CMAKE_INSTALL_DATADIR}/clc )
 endif()

diff --git a/libclc/generic/include/clc/geometric/floatn.inc b/libclc/generic/include/clc/geometric/floatn.inc
@@ -1,3 +1,11 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
 #define __CLC_FLOAT float
 #define __CLC_FPSIZE 32
 

diff --git a/libclc/generic/include/spirv/common/mix.h b/libclc/generic/include/spirv/common/mix.h
diff --git a/libclc/generic/include/spirv/common/mix.inc b/libclc/generic/include/spirv/common/mix.inc
diff --git a/libclc/generic/include/spirv/common/radians.h b/libclc/generic/include/spirv/common/radians.h
diff --git a/libclc/generic/include/spirv/common/sign.h b/libclc/generic/include/spirv/common/sign.h
diff --git a/libclc/generic/include/spirv/common/smoothstep.h b/libclc/generic/include/spirv/common/smoothstep.h
diff --git a/libclc/generic/include/spirv/common/smoothstep.inc b/libclc/generic/include/spirv/common/smoothstep.inc
diff --git a/libclc/generic/include/spirv/common/step.h b/libclc/generic/include/spirv/common/step.h
diff --git a/libclc/generic/include/spirv/common/step.inc b/libclc/generic/include/spirv/common/step.inc
diff --git a/libclc/generic/include/spirv/geometric/cross.h b/libclc/generic/include/spirv/geometric/cross.h
diff --git a/libclc/generic/include/spirv/geometric/distance.h b/libclc/generic/include/spirv/geometric/distance.h
diff --git a/libclc/generic/include/spirv/geometric/dot.h b/libclc/generic/include/spirv/geometric/dot.h
diff --git a/libclc/generic/include/spirv/geometric/dot.inc b/libclc/generic/include/spirv/geometric/dot.inc
diff --git a/libclc/generic/include/spirv/geometric/fast_length.h b/libclc/generic/include/spirv/geometric/fast_length.h
diff --git a/libclc/generic/include/spirv/geometric/fast_length.inc b/libclc/generic/include/spirv/geometric/fast_length.inc
diff --git a/libclc/generic/include/spirv/geometric/fast_normalize.h b/libclc/generic/include/spirv/geometric/fast_normalize.h
diff --git a/libclc/generic/include/spirv/geometric/fast_normalize.inc b/libclc/generic/include/spirv/geometric/fast_normalize.inc
diff --git a/libclc/generic/include/spirv/geometric/floatn.inc b/libclc/generic/include/spirv/geometric/floatn.inc
diff --git a/libclc/generic/include/spirv/geometric/length.h b/libclc/generic/include/spirv/geometric/length.h
diff --git a/libclc/generic/include/spirv/geometric/length.inc b/libclc/generic/include/spirv/geometric/length.inc
diff --git a/libclc/generic/include/spirv/geometric/normalize.h b/libclc/generic/include/spirv/geometric/normalize.h
diff --git a/libclc/generic/include/spirv/geometric/normalize.inc b/libclc/generic/include/spirv/geometric/normalize.inc
diff --git a/libclc/generic/include/spirv/math/copysign.h b/libclc/generic/include/spirv/math/copysign.h
diff --git a/libclc/generic/include/spirv/math/half_rsqrt.h b/libclc/generic/include/spirv/math/half_rsqrt.h