Skip to content

Commit f348a6a

Browse files
frasercrmckjsji
authored andcommitted
[libclc] Fix recent merge issues (#16962)
* Clean up unnecessary CLC files * Fix signed char issues in libspirv * Align headers with upstream
1 parent 0318eaf commit f348a6a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+53
-506
lines changed

libclc/clc/include/clc/common/unary_def.inc

Lines changed: 0 additions & 9 deletions
This file was deleted.

libclc/clc/lib/generic/integer/clc_mul_hi.cl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ _CLC_OVERLOAD _CLC_DEF ulong __clc_mul_hi(ulong x, ulong y) {
113113

114114
#define __CLC_MUL_HI_TYPES() \
115115
__CLC_MUL_HI_DEC_IMPL(short, char, 8) \
116+
__CLC_MUL_HI_DEC_IMPL(short, schar, 8) \
116117
__CLC_MUL_HI_DEC_IMPL(ushort, uchar, 8) \
117118
__CLC_MUL_HI_DEC_IMPL(int, short, 16) \
118119
__CLC_MUL_HI_DEC_IMPL(uint, ushort, 16) \

libclc/generic/include/core/clc_core.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,8 @@
3838

3939
#include <core/convert.h>
4040

41-
#include <core/integer/clc_abs.h>
42-
#include <core/integer/clc_abs_diff.h>
4341
#include <core/integer/clc_add_sat.h>
44-
#include <core/integer/clc_hadd.h>
45-
#include <core/integer/clc_mad24.h>
46-
#include <core/integer/clc_mad_hi.h>
4742
#include <core/integer/clc_mad_sat.h>
48-
#include <core/integer/clc_mul24.h>
49-
#include <core/integer/clc_mul_hi.h>
50-
#include <core/integer/clc_rhadd.h>
5143
#include <core/integer/clc_sub_sat.h>
52-
#include <core/integer/clc_upsample.h>
53-
54-
#include <core/shared/clc_clamp.h>
55-
#include <core/shared/clc_max.h>
56-
#include <core/shared/clc_min.h>
5744

5845
#pragma OPENCL EXTENSION all : disable

libclc/generic/include/core/integer/clc_abs.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

libclc/generic/include/core/integer/clc_abs.inc

Lines changed: 0 additions & 9 deletions
This file was deleted.

libclc/generic/include/core/integer/clc_abs_diff.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

libclc/generic/include/core/integer/clc_abs_diff.inc

Lines changed: 0 additions & 10 deletions
This file was deleted.

libclc/generic/include/core/integer/clc_hadd.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

libclc/generic/include/core/integer/clc_hadd.inc

Lines changed: 0 additions & 10 deletions
This file was deleted.

libclc/generic/include/core/integer/clc_mad24.h

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)