Skip to content

[NFC][libclc] Replace redundant integer header files with clc, move relational.h into libspirv #17793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2025
Merged

[NFC][libclc] Replace redundant integer header files with clc, move relational.h into libspirv #17793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions libclc/generic/include/core/clc_core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@

#include <core/convert.h>

#include <core/integer/clc_add_sat.h>
#include <core/integer/clc_mad_sat.h>
#include <core/integer/clc_sub_sat.h>

#pragma OPENCL EXTENSION all : disable
10 changes: 0 additions & 10 deletions libclc/generic/include/core/integer/clc_add_sat.h
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions libclc/generic/include/core/integer/clc_add_sat.inc
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions libclc/generic/include/core/integer/clc_sub_sat.h
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions libclc/generic/include/core/integer/clc_sub_sat.inc
View file
Open in desktop

This file was deleted.

0 libclc/generic/include/relational.h → ...lc/libspirv/include/libspirv/relational.h
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions libclc/libspirv/lib/generic/core/integer/clc_mad_sat.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//===----------------------------------------------------------------------===//

#include <clc/clcmacro.h>
#include <clc/integer/clc_add_sat.h>
#include <clc/integer/clc_mad24.h>
#include <clc/integer/clc_mul_hi.h>
#include <clc/integer/clc_upsample.h>
Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/generic/integer/add_sat.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include <core/integer/clc_add_sat.h>
#include <clc/integer/clc_add_sat.h>
#include <libspirv/spirv.h>

#define __CLC_BODY <add_sat.inc>
Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/generic/relational/isequal.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include <relational.h>
#include <libspirv/relational.h>
#include <libspirv/spirv.h>

#define _CLC_SPIRV_BUILTIN __spirv_FUnordEqual
Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/generic/relational/isfinite.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include <relational.h>
#include <libspirv/relational.h>
#include <libspirv/spirv.h>

#define _CLC_SPIRV_BUILTIN __spirv_IsFinite
Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/generic/relational/isgreater.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include <relational.h>
#include <libspirv/relational.h>
#include <libspirv/spirv.h>

#define _CLC_SPIRV_BUILTIN __spirv_FOrdGreaterThan
Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/generic/relational/isgreaterequal.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include <relational.h>
#include <libspirv/relational.h>
#include <libspirv/spirv.h>

#define _CLC_SPIRV_BUILTIN __spirv_FOrdGreaterThanEqual
Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/generic/relational/isinf.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include <relational.h>
#include <libspirv/relational.h>
#include <libspirv/spirv.h>

#define _CLC_SPIRV_BUILTIN __spirv_IsInf
Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/generic/relational/isless.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include <relational.h>
#include <libspirv/relational.h>
#include <libspirv/spirv.h>

#define _CLC_SPIRV_BUILTIN __spirv_FOrdLessThan
Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/generic/relational/islessequal.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include <relational.h>
#include <libspirv/relational.h>
#include <libspirv/spirv.h>

#define _CLC_SPIRV_BUILTIN __spirv_FOrdLessThanEqual
Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/generic/relational/islessgreater.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include <relational.h>
#include <libspirv/relational.h>
#include <libspirv/spirv.h>

#define _CLC_SPIRV_BUILTIN __spirv_LessOrGreater
Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/generic/relational/isnan.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include <relational.h>
#include <libspirv/relational.h>
#include <libspirv/spirv.h>

#define _CLC_SPIRV_BUILTIN __spirv_IsNan
Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/generic/relational/isnormal.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include <relational.h>
#include <libspirv/relational.h>
#include <libspirv/spirv.h>

#define _CLC_SPIRV_BUILTIN __spirv_IsNormal
Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/generic/relational/isnotequal.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include <relational.h>
#include <libspirv/relational.h>
#include <libspirv/spirv.h>

#define _CLC_SPIRV_BUILTIN __spirv_FUnordNotEqual
Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/generic/relational/isordered.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include <relational.h>
#include <libspirv/relational.h>
#include <libspirv/spirv.h>

#define _CLC_SPIRV_BUILTIN __spirv_Ordered
Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/generic/relational/isunordered.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include <relational.h>
#include <libspirv/relational.h>
#include <libspirv/spirv.h>

#define _CLC_SPIRV_BUILTIN __spirv_Unordered
Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/generic/relational/signbit.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include <relational.h>
#include <libspirv/relational.h>
#include <libspirv/spirv.h>

#define _CLC_SPIRV_BUILTIN __spirv_SignBitSet
Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/ptx-nvidiacl/relational/isfinite.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <libspirv/spirv.h>

#include <libspirv/ptx-nvidiacl/libdevice.h>
#include <relational.h>
#include <libspirv/relational.h>

#ifdef cl_khr_fp64

Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/ptx-nvidiacl/relational/isinf.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <libspirv/spirv.h>

#include <libspirv/ptx-nvidiacl/libdevice.h>
#include <relational.h>
#include <libspirv/relational.h>

_CLC_DEF _CLC_OVERLOAD bool __spirv_IsInf(float x) { return __nv_isinff(x); }

Expand Down
2 changes: 1 addition & 1 deletion libclc/libspirv/lib/ptx-nvidiacl/relational/isnan.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <libspirv/spirv.h>

#include <libspirv/ptx-nvidiacl/libdevice.h>
#include <relational.h>
#include <libspirv/relational.h>

_CLC_DEF _CLC_OVERLOAD bool __spirv_IsNan(float x) { return __nv_isnanf(x); }

Expand Down