Skip to content

Commit d9ab8ce

Browse files
authored
[NFC][libspirv] delete clc_core.h which is now irrelevant (#18092)
The file was intended to share code between SPIR-V and OpenCL. Now shared code are moving to clc. Also delete unused files: clc_add_sat.cl, clc_mad_sat.cl, clc_sub_sat.cl and clc_ldexp.cl. llvm-diff shows no change to libspirv-nvptx64--nvidiacl.bc and libspirv-amdgcn--amdhsa.bc.
1 parent 8f7406d commit d9ab8ce

File tree

11 files changed

+14
-230
lines changed

11 files changed

+14
-230
lines changed

libclc/generic/include/core/clc_core.h

-43
This file was deleted.

libclc/libspirv/lib/generic/SOURCES

-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ common/radians.cl
2727
common/sign.cl
2828
common/smoothstep.cl
2929
common/step.cl
30-
core/integer/clc_add_sat.cl
31-
core/integer/clc_mad_sat.cl
32-
core/integer/clc_sub_sat.cl
3330
geometric/cross.cl
3431
geometric/distance.cl
3532
geometric/dot.cl

libclc/libspirv/lib/generic/core/integer/clc_add_sat.cl

-10
This file was deleted.

libclc/libspirv/lib/generic/core/integer/clc_mad_sat.cl

-15
This file was deleted.

libclc/libspirv/lib/generic/core/integer/clc_sub_sat.cl

-10
This file was deleted.

libclc/libspirv/lib/generic/gen_convert.py

+11-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,17 @@
6666
===----------------------------------------------------------------------===
6767
*/
6868
69-
#include <core/clc_core.h>
69+
#ifdef cl_khr_fp64
70+
#pragma OPENCL EXTENSION cl_khr_fp64 : enable
71+
#endif
72+
73+
#ifdef cl_khr_fp16
74+
#pragma OPENCL EXTENSION cl_khr_fp16 : enable
75+
#endif
76+
77+
#include <clc/clcfunc.h>
78+
#include <clc/clctypes.h>
79+
#include <core/convert.h>
7080
#include <libspirv/spirv.h>
7181
7282
#ifdef cl_khr_fp16

libclc/libspirv/lib/generic/gen_core_convert.py

-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
THE SOFTWARE.
8585
*/
8686
87-
#include <core/clc_core.h>
8887
#include <clc/clc_as_type.h>
8988
#include <clc/integer/clc_abs.h>
9089
#include <clc/shared/clc_clamp.h>

libclc/libspirv/lib/generic/integer/mad_sat.cl

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include <core/clc_core.h>
9+
#include <core/integer/clc_mad_sat.h>
1010
#include <libspirv/spirv.h>
1111

1212
#define __CLC_BODY <mad_sat.inc>

libclc/libspirv/lib/generic/math/clc_ldexp.cl

-142
This file was deleted.

libclc/libspirv/lib/ptx-nvidiacl/integer/mul24.cl

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
//===----------------------------------------------------------------------===//
88

99
#include <clc/clcmacro.h>
10-
#include <core/clc_core.h>
11-
#include <libspirv/spirv.h>
1210
#include <libspirv/ptx-nvidiacl/libdevice.h>
11+
#include <libspirv/spirv.h>
1312

1413
_CLC_OVERLOAD _CLC_DEF int __spirv_ocl_s_mul24(int x, int y) {
1514
return __nv_mul24(x, y);

libclc/libspirv/lib/ptx-nvidiacl/integer/mul_hi.cl

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
//===----------------------------------------------------------------------===//
88

99
#include <clc/clcmacro.h>
10-
#include <core/clc_core.h>
11-
#include <libspirv/spirv.h>
1210
#include <libspirv/ptx-nvidiacl/intrinsics.h>
11+
#include <libspirv/spirv.h>
1312

1413
_CLC_OVERLOAD _CLC_DEF int __spirv_ocl_s_mul_hi(int x, int y) {
1514
return __nvvm_mulhi_i(x, y);

0 commit comments

Comments
 (0)