https://github.com/frasercrmck created
https://github.com/llvm/llvm-project/pull/124779
This removes all remaining SPIR-V workarounds for CLC functions, in an effort
to streamline the CLC implementation and prevent further issues that #124614
had to fix. This commit fixes the same issue for the SPIR-V targets.
Target-specific CLC implementations can and will exist, but for now they're all
identical and so the target-specific SOURCES files have been removed. Target
implementations now always include the 'generic' CLC directory, meaning we can
avoid unnecessary duplication of SOURCES listings.
>From da311e7a62c2d7b0119971ee8970d1712eca5269 Mon Sep 17 00:00:00 2001
From: Fraser Cormack <fra...@codeplay.com>
Date: Tue, 28 Jan 2025 16:17:14 +0000
Subject: [PATCH] [libclc] Have all targets build all CLC functions
This removes all remaining SPIR-V workarounds for CLC functions, in an
effort to streamline the CLC implementation and prevent further issues
that #124614 had to fix. This commit fixes the same issue for the SPIR-V
targets.
Target-specific CLC implementations can and will exist, but for now
they're all identical and so the target-specific SOURCES files have been
removed. Target implementations now always include the 'generic' CLC
directory, meaning we can avoid unnecessary duplication of SOURCES
listings.
---
libclc/CMakeLists.txt | 12 +++++++-----
libclc/clc/include/clc/integer/clc_abs.h | 7 -------
libclc/clc/include/clc/integer/clc_abs_diff.h | 7 -------
libclc/clc/include/clc/relational/clc_all.h | 7 -------
libclc/clc/include/clc/relational/clc_any.h | 7 -------
libclc/clc/include/clc/relational/clc_isequal.h | 7 -------
libclc/clc/include/clc/relational/clc_isfinite.h | 7 -------
libclc/clc/include/clc/relational/clc_isgreater.h | 7 -------
.../include/clc/relational/clc_isgreaterequal.h | 7 -------
libclc/clc/include/clc/relational/clc_isinf.h | 7 -------
libclc/clc/include/clc/relational/clc_isless.h | 7 -------
.../clc/include/clc/relational/clc_islessequal.h | 7 -------
.../clc/include/clc/relational/clc_islessgreater.h | 7 -------
libclc/clc/include/clc/relational/clc_isnormal.h | 7 -------
libclc/clc/include/clc/relational/clc_isnotequal.h | 7 -------
libclc/clc/include/clc/relational/clc_isordered.h | 7 -------
.../clc/include/clc/relational/clc_isunordered.h | 7 -------
libclc/clc/include/clc/relational/clc_signbit.h | 7 -------
libclc/clc/include/clc/shared/clc_max.h | 7 -------
libclc/clc/include/clc/shared/clc_min.h | 7 -------
libclc/clc/lib/clspv/SOURCES | 11 -----------
libclc/clc/lib/clspv64 | 1 -
libclc/clc/lib/spirv/SOURCES | 14 --------------
libclc/clc/lib/spirv64/SOURCES | 14 --------------
24 files changed, 7 insertions(+), 178 deletions(-)
delete mode 100644 libclc/clc/lib/clspv/SOURCES
delete mode 120000 libclc/clc/lib/clspv64
delete mode 100644 libclc/clc/lib/spirv/SOURCES
delete mode 100644 libclc/clc/lib/spirv64/SOURCES
diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt
index 2c2c7f16e29442..3dd964c3d442b9 100644
--- a/libclc/CMakeLists.txt
+++ b/libclc/CMakeLists.txt
@@ -266,15 +266,15 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
list( GET TRIPLE 1 VENDOR )
list( GET TRIPLE 2 OS )
- set( dirs )
+ set( opencl_dirs )
if ( NOT ${ARCH} STREQUAL spirv AND NOT ${ARCH} STREQUAL spirv64 AND
NOT ${ARCH} STREQUAL clspv AND NOT ${ARCH} STREQUAL clspv64)
- LIST( APPEND dirs generic )
+ LIST( APPEND opencl_dirs generic )
endif()
if( ${ARCH} STREQUAL r600 OR ${ARCH} STREQUAL amdgcn )
- list( APPEND dirs amdgpu )
+ list( APPEND opencl_dirs amdgpu )
endif()
# nvptx is special
@@ -285,11 +285,13 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
endif()
set( clc_lib_files )
+ set( clc_dirs ${dirs} generic )
+
libclc_configure_lib_source(
clc_lib_files
CLC_INTERNAL
LIB_ROOT_DIR clc
- DIRS ${dirs} ${DARCH} ${DARCH}-${OS} ${DARCH}-${VENDOR}-${OS}
+ DIRS ${clc_dirs} ${DARCH} ${DARCH}-${OS} ${DARCH}-${VENDOR}-${OS}
)
set( opencl_lib_files )
@@ -306,7 +308,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
libclc_configure_lib_source(
opencl_lib_files
- DIRS ${dirs} ${DARCH} ${DARCH}-${OS} ${DARCH}-${VENDOR}-${OS}
+ DIRS ${opencl_dirs} ${DARCH} ${DARCH}-${OS} ${DARCH}-${VENDOR}-${OS}
)
foreach( d ${${t}_devices} )
diff --git a/libclc/clc/include/clc/integer/clc_abs.h
b/libclc/clc/include/clc/integer/clc_abs.h
index 31c62d311a006e..59bd807b96060e 100644
--- a/libclc/clc/include/clc/integer/clc_abs.h
+++ b/libclc/clc/include/clc/integer/clc_abs.h
@@ -1,14 +1,7 @@
#ifndef __CLC_INTEGER_CLC_ABS_H__
#define __CLC_INTEGER_CLC_ABS_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible abs
-#define __clc_abs abs
-#else
-
#define __CLC_BODY <clc/integer/clc_abs.inc>
#include <clc/integer/gentype.inc>
-#endif
-
#endif // __CLC_INTEGER_CLC_ABS_H__
diff --git a/libclc/clc/include/clc/integer/clc_abs_diff.h
b/libclc/clc/include/clc/integer/clc_abs_diff.h
index 9c33fcff23b791..021a9b6bc45a0e 100644
--- a/libclc/clc/include/clc/integer/clc_abs_diff.h
+++ b/libclc/clc/include/clc/integer/clc_abs_diff.h
@@ -1,14 +1,7 @@
#ifndef __CLC_INTEGER_CLC_ABS_DIFF_H__
#define __CLC_INTEGER_CLC_ABS_DIFF_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible abs_diff
-#define __clc_abs_diff abs_diff
-#else
-
#define __CLC_BODY <clc/integer/clc_abs_diff.inc>
#include <clc/integer/gentype.inc>
-#endif
-
#endif // __CLC_INTEGER_CLC_ABS_DIFF_H__
diff --git a/libclc/clc/include/clc/relational/clc_all.h
b/libclc/clc/include/clc/relational/clc_all.h
index 7be3d132dd53d0..2ffced19ba0e56 100644
--- a/libclc/clc/include/clc/relational/clc_all.h
+++ b/libclc/clc/include/clc/relational/clc_all.h
@@ -1,11 +1,6 @@
#ifndef __CLC_RELATIONAL_CLC_ALL_H__
#define __CLC_RELATIONAL_CLC_ALL_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible all
-#define __clc_all all
-#else
-
#include <clc/clcfunc.h>
#include <clc/clctypes.h>
@@ -27,6 +22,4 @@ _CLC_VECTOR_ALL_DECL(long)
#undef _CLC_ALL_DECL
#undef _CLC_VECTOR_ALL_DECL
-#endif
-
#endif // __CLC_RELATIONAL_CLC_ALL_H__
diff --git a/libclc/clc/include/clc/relational/clc_any.h
b/libclc/clc/include/clc/relational/clc_any.h
index 27dbffeb2eecd9..2f554334d9bac9 100644
--- a/libclc/clc/include/clc/relational/clc_any.h
+++ b/libclc/clc/include/clc/relational/clc_any.h
@@ -1,11 +1,6 @@
#ifndef __CLC_RELATIONAL_CLC_ANY_H__
#define __CLC_RELATIONAL_CLC_ANY_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible any
-#define __clc_any any
-#else
-
#include <clc/clcfunc.h>
#include <clc/clctypes.h>
@@ -27,6 +22,4 @@ _CLC_VECTOR_ANY_DECL(long)
#undef _CLC_ANY_DECL
#undef _CLC_VECTOR_ANY_DECL
-#endif
-
#endif // __CLC_RELATIONAL_CLC_ANY_H__
diff --git a/libclc/clc/include/clc/relational/clc_isequal.h
b/libclc/clc/include/clc/relational/clc_isequal.h
index 0f31fb9530a14e..84bf0974dbbf5d 100644
--- a/libclc/clc/include/clc/relational/clc_isequal.h
+++ b/libclc/clc/include/clc/relational/clc_isequal.h
@@ -1,11 +1,6 @@
#ifndef __CLC_RELATIONAL_CLC_ISEQUAL_H__
#define __CLC_RELATIONAL_CLC_ISEQUAL_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible isequal
-#define __clc_isequal isequal
-#else
-
#include <clc/clcfunc.h>
#include <clc/clctypes.h>
@@ -37,6 +32,4 @@ _CLC_VECTOR_ISEQUAL_DECL(half, short)
#undef _CLC_ISEQUAL_DECL
#undef _CLC_VECTOR_ISEQUAL_DECL
-#endif
-
#endif // __CLC_RELATIONAL_CLC_ISEQUAL_H__
diff --git a/libclc/clc/include/clc/relational/clc_isfinite.h
b/libclc/clc/include/clc/relational/clc_isfinite.h
index 3ed276e07a2f10..82bcc6ec2da273 100644
--- a/libclc/clc/include/clc/relational/clc_isfinite.h
+++ b/libclc/clc/include/clc/relational/clc_isfinite.h
@@ -1,11 +1,6 @@
#ifndef __CLC_RELATIONAL_CLC_ISFINITE_H__
#define __CLC_RELATIONAL_CLC_ISFINITE_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible isfinite
-#define __clc_isfinite isfinite
-#else
-
#define __CLC_FUNCTION __clc_isfinite
#define __CLC_BODY <clc/relational/unary_decl.inc>
@@ -14,6 +9,4 @@
#undef __CLC_BODY
#undef __CLC_FUNCTION
-#endif
-
#endif // __CLC_RELATIONAL_CLC_ISFINITE_H__
diff --git a/libclc/clc/include/clc/relational/clc_isgreater.h
b/libclc/clc/include/clc/relational/clc_isgreater.h
index b51d59aeb54998..31961e4c516791 100644
--- a/libclc/clc/include/clc/relational/clc_isgreater.h
+++ b/libclc/clc/include/clc/relational/clc_isgreater.h
@@ -1,11 +1,6 @@
#ifndef __CLC_RELATIONAL_CLC_ISGREATER_H__
#define __CLC_RELATIONAL_CLC_ISGREATER_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible isgreater
-#define __clc_isgreater isgreater
-#else
-
#define __CLC_FUNCTION __clc_isgreater
#define __CLC_BODY <clc/relational/binary_decl.inc>
@@ -14,6 +9,4 @@
#undef __CLC_BODY
#undef __CLC_FUNCTION
-#endif
-
#endif // __CLC_RELATIONAL_CLC_ISGREATER_H__
diff --git a/libclc/clc/include/clc/relational/clc_isgreaterequal.h
b/libclc/clc/include/clc/relational/clc_isgreaterequal.h
index b7ffce151847fd..0e072fad09655a 100644
--- a/libclc/clc/include/clc/relational/clc_isgreaterequal.h
+++ b/libclc/clc/include/clc/relational/clc_isgreaterequal.h
@@ -1,11 +1,6 @@
#ifndef __CLC_RELATIONAL_CLC_ISGREATEREQUAL_H__
#define __CLC_RELATIONAL_CLC_ISGREATEREQUAL_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible isgreaterequal
-#define __clc_isgreaterequal isgreaterequal
-#else
-
#define __CLC_FUNCTION __clc_isgreaterequal
#define __CLC_BODY <clc/relational/binary_decl.inc>
@@ -14,6 +9,4 @@
#undef __CLC_BODY
#undef __CLC_FUNCTION
-#endif
-
#endif // __CLC_RELATIONAL_CLC_ISGREATEREQUAL_H__
diff --git a/libclc/clc/include/clc/relational/clc_isinf.h
b/libclc/clc/include/clc/relational/clc_isinf.h
index 3f60bec5654a2e..b666953d4a8e6c 100644
--- a/libclc/clc/include/clc/relational/clc_isinf.h
+++ b/libclc/clc/include/clc/relational/clc_isinf.h
@@ -1,11 +1,6 @@
#ifndef __CLC_RELATIONAL_CLC_ISINF_H__
#define __CLC_RELATIONAL_CLC_ISINF_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible isinf
-#define __clc_isinf isinf
-#else
-
#include <clc/clcfunc.h>
#include <clc/clctypes.h>
@@ -37,6 +32,4 @@ _CLC_VECTOR_ISINF_DECL(short, half)
#undef _CLC_ISINF_DECL
#undef _CLC_VECTOR_ISINF_DECL
-#endif
-
#endif // __CLC_RELATIONAL_CLC_ISINF_H__
diff --git a/libclc/clc/include/clc/relational/clc_isless.h
b/libclc/clc/include/clc/relational/clc_isless.h
index c6950aa61ad908..482fddfe4f8af7 100644
--- a/libclc/clc/include/clc/relational/clc_isless.h
+++ b/libclc/clc/include/clc/relational/clc_isless.h
@@ -1,11 +1,6 @@
#ifndef __CLC_RELATIONAL_CLC_ISLESS_H__
#define __CLC_RELATIONAL_CLC_ISLESS_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible isless
-#define __clc_isless isless
-#else
-
#define __CLC_FUNCTION __clc_isless
#define __CLC_BODY <clc/relational/binary_decl.inc>
@@ -14,6 +9,4 @@
#undef __CLC_BODY
#undef __CLC_FUNCTION
-#endif
-
#endif // __CLC_RELATIONAL_CLC_ISLESS_H__
diff --git a/libclc/clc/include/clc/relational/clc_islessequal.h
b/libclc/clc/include/clc/relational/clc_islessequal.h
index 7efac163e106a2..520f3d9c6ffd6a 100644
--- a/libclc/clc/include/clc/relational/clc_islessequal.h
+++ b/libclc/clc/include/clc/relational/clc_islessequal.h
@@ -1,11 +1,6 @@
#ifndef __CLC_RELATIONAL_CLC_ISLESSEQUAL_H__
#define __CLC_RELATIONAL_CLC_ISLESSEQUAL_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible islessequal
-#define __clc_islessequal islessequal
-#else
-
#define __CLC_FUNCTION __clc_islessequal
#define __CLC_BODY <clc/relational/binary_decl.inc>
@@ -14,6 +9,4 @@
#undef __CLC_BODY
#undef __CLC_FUNCTION
-#endif
-
#endif // __CLC_RELATIONAL_CLC_ISLESSEQUAL_H__
diff --git a/libclc/clc/include/clc/relational/clc_islessgreater.h
b/libclc/clc/include/clc/relational/clc_islessgreater.h
index df3c5e513c86ce..e90eadbbca5e54 100644
--- a/libclc/clc/include/clc/relational/clc_islessgreater.h
+++ b/libclc/clc/include/clc/relational/clc_islessgreater.h
@@ -1,11 +1,6 @@
#ifndef __CLC_RELATIONAL_CLC_ISLESSGREATER_H__
#define __CLC_RELATIONAL_CLC_ISLESSGREATER_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible islessgreater
-#define __clc_islessgreater islessgreater
-#else
-
#define __CLC_FUNCTION __clc_islessgreater
#define __CLC_BODY <clc/relational/binary_decl.inc>
@@ -14,6 +9,4 @@
#undef __CLC_BODY
#undef __CLC_FUNCTION
-#endif
-
#endif // __CLC_RELATIONAL_CLC_ISLESSGREATER_H__
diff --git a/libclc/clc/include/clc/relational/clc_isnormal.h
b/libclc/clc/include/clc/relational/clc_isnormal.h
index 48ee6b83a5711b..269abf00374115 100644
--- a/libclc/clc/include/clc/relational/clc_isnormal.h
+++ b/libclc/clc/include/clc/relational/clc_isnormal.h
@@ -1,11 +1,6 @@
#ifndef __CLC_RELATIONAL_CLC_ISNORMAL_H__
#define __CLC_RELATIONAL_CLC_ISNORMAL_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible isnormal
-#define __clc_isnormal isnormal
-#else
-
#define __CLC_FUNCTION __clc_isnormal
#define __CLC_BODY <clc/relational/unary_decl.inc>
@@ -14,6 +9,4 @@
#undef __CLC_BODY
#undef __CLC_FUNCTION
-#endif
-
#endif // __CLC_RELATIONAL_CLC_ISNORMAL_H__
diff --git a/libclc/clc/include/clc/relational/clc_isnotequal.h
b/libclc/clc/include/clc/relational/clc_isnotequal.h
index 55c1bd91b2dd5d..598657658ec580 100644
--- a/libclc/clc/include/clc/relational/clc_isnotequal.h
+++ b/libclc/clc/include/clc/relational/clc_isnotequal.h
@@ -1,11 +1,6 @@
#ifndef __CLC_RELATIONAL_CLC_ISNOTEQUAL_H__
#define __CLC_RELATIONAL_CLC_ISNOTEQUAL_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible isnotequal
-#define __clc_isnotequal isnotequal
-#else
-
#define __CLC_FUNCTION __clc_isnotequal
#define __CLC_BODY <clc/relational/binary_decl.inc>
@@ -14,6 +9,4 @@
#undef __CLC_BODY
#undef __CLC_FUNCTION
-#endif
-
#endif // __CLC_RELATIONAL_CLC_ISNOTEQUAL_H__
diff --git a/libclc/clc/include/clc/relational/clc_isordered.h
b/libclc/clc/include/clc/relational/clc_isordered.h
index 5ce2bfe334027f..f4363d3d8a8322 100644
--- a/libclc/clc/include/clc/relational/clc_isordered.h
+++ b/libclc/clc/include/clc/relational/clc_isordered.h
@@ -1,11 +1,6 @@
#ifndef __CLC_RELATIONAL_CLC_ISORDERED_H__
#define __CLC_RELATIONAL_CLC_ISORDERED_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible isordered
-#define __clc_isordered isordered
-#else
-
#define __CLC_FUNCTION __clc_isordered
#define __CLC_BODY <clc/relational/binary_decl.inc>
@@ -14,6 +9,4 @@
#undef __CLC_BODY
#undef __CLC_FUNCTION
-#endif
-
#endif // __CLC_RELATIONAL_CLC_ISORDERED_H__
diff --git a/libclc/clc/include/clc/relational/clc_isunordered.h
b/libclc/clc/include/clc/relational/clc_isunordered.h
index 305d2b4e9131ff..e7f01826d5cc92 100644
--- a/libclc/clc/include/clc/relational/clc_isunordered.h
+++ b/libclc/clc/include/clc/relational/clc_isunordered.h
@@ -1,11 +1,6 @@
#ifndef __CLC_RELATIONAL_CLC_ISUNORDERED_H__
#define __CLC_RELATIONAL_CLC_ISUNORDERED_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible isunordered
-#define __clc_isunordered isunordered
-#else
-
#define __CLC_FUNCTION __clc_isunordered
#define __CLC_BODY <clc/relational/binary_decl.inc>
@@ -14,6 +9,4 @@
#undef __CLC_BODY
#undef __CLC_FUNCTION
-#endif
-
#endif // __CLC_RELATIONAL_CLC_ISUNORDERED_H__
diff --git a/libclc/clc/include/clc/relational/clc_signbit.h
b/libclc/clc/include/clc/relational/clc_signbit.h
index 45a7112c9eb969..55561dd8348717 100644
--- a/libclc/clc/include/clc/relational/clc_signbit.h
+++ b/libclc/clc/include/clc/relational/clc_signbit.h
@@ -1,11 +1,6 @@
#ifndef __CLC_RELATIONAL_CLC_SIGNBIT_H__
#define __CLC_RELATIONAL_CLC_SIGNBIT_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible signbit
-#define __clc_signbit signbit
-#else
-
#define __CLC_FUNCTION __clc_signbit
#define __CLC_BODY <clc/relational/unary_decl.inc>
@@ -14,6 +9,4 @@
#undef __CLC_BODY
#undef __CLC_FUNCTION
-#endif
-
#endif // __CLC_RELATIONAL_CLC_SIGNBIT_H__
diff --git a/libclc/clc/include/clc/shared/clc_max.h
b/libclc/clc/include/clc/shared/clc_max.h
index 388f001a277823..9bfa05552a3990 100644
--- a/libclc/clc/include/clc/shared/clc_max.h
+++ b/libclc/clc/include/clc/shared/clc_max.h
@@ -1,17 +1,10 @@
#ifndef __CLC_SHARED_CLC_MAX_H__
#define __CLC_SHARED_CLC_MAX_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible max
-#define __clc_max max
-#else
-
#define __CLC_BODY <clc/shared/clc_max.inc>
#include <clc/integer/gentype.inc>
#define __CLC_BODY <clc/shared/clc_max.inc>
#include <clc/math/gentype.inc>
-#endif
-
#endif // __CLC_SHARED_CLC_MAX_H__
diff --git a/libclc/clc/include/clc/shared/clc_min.h
b/libclc/clc/include/clc/shared/clc_min.h
index c8d920e1b4eb88..a10193885328fa 100644
--- a/libclc/clc/include/clc/shared/clc_min.h
+++ b/libclc/clc/include/clc/shared/clc_min.h
@@ -1,17 +1,10 @@
#ifndef __CLC_SHARED_CLC_MIN_H__
#define __CLC_SHARED_CLC_MIN_H__
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible min
-#define __clc_min min
-#else
-
#define __CLC_BODY <clc/shared/clc_min.inc>
#include <clc/integer/gentype.inc>
#define __CLC_BODY <clc/shared/clc_min.inc>
#include <clc/math/gentype.inc>
-#endif
-
#endif // __CLC_SHARED_CLC_MIN_H__
diff --git a/libclc/clc/lib/clspv/SOURCES b/libclc/clc/lib/clspv/SOURCES
deleted file mode 100644
index 66818590100630..00000000000000
--- a/libclc/clc/lib/clspv/SOURCES
+++ /dev/null
@@ -1,11 +0,0 @@
-../generic/math/clc_ceil.cl
-../generic/math/clc_copysign.cl
-../generic/math/clc_fabs.cl
-../generic/math/clc_floor.cl
-../generic/math/clc_mad.cl
-../generic/math/clc_nextafter.cl
-../generic/math/clc_rint.cl
-../generic/math/clc_trunc.cl
-../generic/relational/clc_isnan.cl
-../generic/relational/clc_select.cl
-../generic/shared/clc_clamp.cl
diff --git a/libclc/clc/lib/clspv64 b/libclc/clc/lib/clspv64
deleted file mode 120000
index ea01ba94bc6368..00000000000000
--- a/libclc/clc/lib/clspv64
+++ /dev/null
@@ -1 +0,0 @@
-clspv
\ No newline at end of file
diff --git a/libclc/clc/lib/spirv/SOURCES b/libclc/clc/lib/spirv/SOURCES
deleted file mode 100644
index 509236d587cd01..00000000000000
--- a/libclc/clc/lib/spirv/SOURCES
+++ /dev/null
@@ -1,14 +0,0 @@
-../generic/common/clc_degrees.cl
-../generic/common/clc_radians.cl
-../generic/common/clc_smoothstep.cl
-../generic/geometric/clc_dot.cl
-../generic/math/clc_ceil.cl
-../generic/math/clc_copysign.cl
-../generic/math/clc_fabs.cl
-../generic/math/clc_floor.cl
-../generic/math/clc_mad.cl
-../generic/math/clc_nextafter.cl
-../generic/math/clc_rint.cl
-../generic/math/clc_trunc.cl
-../generic/relational/clc_select.cl
-../generic/shared/clc_clamp.cl
diff --git a/libclc/clc/lib/spirv64/SOURCES b/libclc/clc/lib/spirv64/SOURCES
deleted file mode 100644
index 509236d587cd01..00000000000000
--- a/libclc/clc/lib/spirv64/SOURCES
+++ /dev/null
@@ -1,14 +0,0 @@
-../generic/common/clc_degrees.cl
-../generic/common/clc_radians.cl
-../generic/common/clc_smoothstep.cl
-../generic/geometric/clc_dot.cl
-../generic/math/clc_ceil.cl
-../generic/math/clc_copysign.cl
-../generic/math/clc_fabs.cl
-../generic/math/clc_floor.cl
-../generic/math/clc_mad.cl
-../generic/math/clc_nextafter.cl
-../generic/math/clc_rint.cl
-../generic/math/clc_trunc.cl
-../generic/relational/clc_select.cl
-../generic/shared/clc_clamp.cl
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
