Skip to content

Commit cf0dd6b

Browse files
MichalMroz12igcbot
MichalMroz12
authored and
igcbot
committed
IGC Libraries no longer export LLVM Symbols
IGC Libraries no longer export LLVM symbols.
1 parent b67eed0 commit cf0dd6b

24 files changed

+372
-246
lines changed

‎IGC/AdaptorOCL/OCLAPI/oclapi.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/*========================== begin_copyright_notice ============================
2+
3+
Copyright (C) 2021 Intel Corporation
4+
5+
SPDX-License-Identifier: MIT
6+
7+
============================= end_copyright_notice ===========================*/
8+
9+
#ifndef OCL_API_CALLS_H
10+
#define OCL_API_CALLS_H
11+
12+
#if defined(_WIN32)
13+
#define OCL_API_CALL
14+
#else
15+
#define OCL_API_CALL __attribute__ ((visibility("default")))
16+
#endif
17+
18+
#endif // OCL_API_CALLS_H

‎IGC/AdaptorOCL/ocl_igc_interface/fcl_ocl_device_ctx.h

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ SPDX-License-Identifier: MIT
1818
#include <cinttypes>
1919

2020
#include "cif/macros/enable.h"
21+
#include "OCLAPI/oclapi.h"
2122

2223
// Interface : FCL_OCL_DEVC
2324
// "Frontent Compiler - OCL" Device Context
@@ -32,22 +33,22 @@ CIF_DEFINE_INTERFACE_VER(FclOclDeviceCtx, 1){
3233

3334
// oclApiVersion (as supported by OCL runtime) format : version = major_revision*100 + minor_revision*10 + sub_revision
3435
// e.g. OCL2.1 = 210
35-
virtual void SetOclApiVersion(uint32_t version);
36+
OCL_API_CALL virtual void SetOclApiVersion(uint32_t version);
3637

3738
template <typename FclOclTranslationCtxInterface = FclOclTranslationCtxTagOCL>
38-
CIF::RAII::UPtr_t<FclOclTranslationCtxInterface> CreateTranslationCtx(CodeType::CodeType_t inType, CodeType::CodeType_t outType) {
39+
OCL_API_CALL CIF::RAII::UPtr_t<FclOclTranslationCtxInterface> CreateTranslationCtx(CodeType::CodeType_t inType, CodeType::CodeType_t outType) {
3940
return CIF::RAII::Pack<FclOclTranslationCtxInterface>( CreateTranslationCtxImpl(FclOclTranslationCtxInterface::GetVersion(), inType, outType) );
4041
}
4142

4243
protected:
43-
virtual FclOclTranslationCtxBase *CreateTranslationCtxImpl(CIF::Version_t ver,
44+
OCL_API_CALL virtual FclOclTranslationCtxBase *CreateTranslationCtxImpl(CIF::Version_t ver,
4445
CodeType::CodeType_t inType,
4546
CodeType::CodeType_t outType);
4647
};
4748

4849
CIF_DEFINE_INTERFACE_VER_WITH_COMPATIBILITY(FclOclDeviceCtx, 2, 1) {
4950
CIF_INHERIT_CONSTRUCTOR();
50-
virtual CodeType::CodeType_t GetPreferredIntermediateRepresentation();
51+
OCL_API_CALL virtual CodeType::CodeType_t GetPreferredIntermediateRepresentation();
5152
};
5253

5354
CIF_DEFINE_INTERFACE_VER_WITH_COMPATIBILITY(FclOclDeviceCtx, 3, 2) {
@@ -56,12 +57,12 @@ CIF_DEFINE_INTERFACE_VER_WITH_COMPATIBILITY(FclOclDeviceCtx, 3, 2) {
5657
using FclOclDeviceCtx<1>::CreateTranslationCtx;
5758

5859
template <typename FclOclTranslationCtxInterface = FclOclTranslationCtxTagOCL>
59-
CIF::RAII::UPtr_t<FclOclTranslationCtxInterface> CreateTranslationCtx(CodeType::CodeType_t inType, CodeType::CodeType_t outType, CIF::Builtins::BufferSimple* err) {
60+
OCL_API_CALL CIF::RAII::UPtr_t<FclOclTranslationCtxInterface> CreateTranslationCtx(CodeType::CodeType_t inType, CodeType::CodeType_t outType, CIF::Builtins::BufferSimple* err) {
6061
return CIF::RAII::Pack<FclOclTranslationCtxInterface>(CreateTranslationCtxImpl(FclOclTranslationCtxInterface::GetVersion(), inType, outType, err));
6162
}
6263

6364
protected:
64-
virtual FclOclTranslationCtxBase* CreateTranslationCtxImpl(CIF::Version_t ver,
65+
OCL_API_CALL virtual FclOclTranslationCtxBase* CreateTranslationCtxImpl(CIF::Version_t ver,
6566
CodeType::CodeType_t inType,
6667
CodeType::CodeType_t outType,
6768
CIF::Builtins::BufferSimple* err);
@@ -71,12 +72,12 @@ CIF_DEFINE_INTERFACE_VER_WITH_COMPATIBILITY(FclOclDeviceCtx, 4, 3) {
7172
CIF_INHERIT_CONSTRUCTOR();
7273

7374
template <typename PlatformInterface = PlatformTagOCL>
74-
CIF::RAII::UPtr_t<PlatformInterface> GetPlatformHandle() {
75+
OCL_API_CALL CIF::RAII::UPtr_t<PlatformInterface> GetPlatformHandle() {
7576
return CIF::RAII::RetainAndPack<PlatformInterface>( GetPlatformHandleImpl(PlatformInterface::GetVersion()) );
7677
}
7778

7879
protected:
79-
virtual PlatformBase *GetPlatformHandleImpl(CIF::Version_t ver);
80+
OCL_API_CALL virtual PlatformBase *GetPlatformHandleImpl(CIF::Version_t ver);
8081
};
8182

8283
CIF_DEFINE_INTERFACE_VER_WITH_COMPATIBILITY(FclOclDeviceCtx, 5, 4) {

‎IGC/AdaptorOCL/ocl_igc_interface/fcl_ocl_translation_ctx.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ SPDX-License-Identifier: MIT
1717
#include "ocl_igc_interface/ocl_translation_output.h"
1818

1919
#include "cif/macros/enable.h"
20+
#include "OCLAPI/oclapi.h"
2021

2122
// Interface : FCL_OCL_TRAC
2223
// "Frontent Compiler - OCL" Translation Context
@@ -30,7 +31,7 @@ CIF_DEFINE_INTERFACE_VER(FclOclTranslationCtx, 1) {
3031
CIF_INHERIT_CONSTRUCTOR();
3132

3233
template <typename OclTranslationOutputInterface = OclTranslationOutputTagOCL>
33-
CIF::RAII::UPtr_t<OclTranslationOutputInterface> Translate(
34+
OCL_API_CALL CIF::RAII::UPtr_t<OclTranslationOutputInterface> Translate(
3435
CIF::Builtins::BufferSimple *src,
3536
CIF::Builtins::BufferSimple *options,
3637
CIF::Builtins::BufferSimple *internalOptions,
@@ -43,7 +44,7 @@ CIF_DEFINE_INTERFACE_VER(FclOclTranslationCtx, 1) {
4344
}
4445

4546
protected:
46-
virtual OclTranslationOutputBase *TranslateImpl(CIF::Version_t outVersion,
47+
OCL_API_CALL virtual OclTranslationOutputBase *TranslateImpl(CIF::Version_t outVersion,
4748
CIF::Builtins::BufferSimple *src,
4849
CIF::Builtins::BufferSimple *options,
4950
CIF::Builtins::BufferSimple *internalOptions,
@@ -53,8 +54,8 @@ CIF_DEFINE_INTERFACE_VER(FclOclTranslationCtx, 1) {
5354

5455
CIF_DEFINE_INTERFACE_VER_WITH_COMPATIBILITY(FclOclTranslationCtx, 2, 1) {
5556
CIF_INHERIT_CONSTRUCTOR();
56-
virtual void GetFclOptions(CIF::Builtins::BufferSimple *options);
57-
virtual void GetFclInternalOptions(CIF::Builtins::BufferSimple *internalOptions);
57+
OCL_API_CALL virtual void GetFclOptions(CIF::Builtins::BufferSimple *options);
58+
OCL_API_CALL virtual void GetFclInternalOptions(CIF::Builtins::BufferSimple *internalOptions);
5859
};
5960

6061
CIF_GENERATE_VERSIONS_LIST_AND_DECLARE_INTERFACE_DEPENDENCIES(FclOclTranslationCtx, IGC::OclTranslationOutput, CIF::Builtins::Buffer);

‎IGC/AdaptorOCL/ocl_igc_interface/gt_system_info.h

Lines changed: 54 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ SPDX-License-Identifier: MIT
1313

1414
#include "cif/macros/enable.h"
1515

16+
#include "OCLAPI/oclapi.h"
17+
1618
// Interface : GT_SYS_INFO
1719
// GT System Info
1820
// Interface for defining target device
@@ -24,54 +26,54 @@ CIF_DECLARE_INTERFACE(GTSystemInfo, "GT_SYS_INFO")
2426
CIF_DEFINE_INTERFACE_VER(GTSystemInfo, 1){
2527
CIF_INHERIT_CONSTRUCTOR();
2628

27-
virtual uint32_t GetEUCount() const;
28-
virtual void SetEUCount(uint32_t v);
29-
virtual uint32_t GetThreadCount() const;
30-
virtual void SetThreadCount(uint32_t v);
31-
virtual uint32_t GetSliceCount() const;
32-
virtual void SetSliceCount(uint32_t v);
33-
virtual uint32_t GetSubSliceCount() const;
34-
virtual void SetSubSliceCount(uint32_t v);
35-
virtual uint64_t GetL3CacheSizeInKb() const;
36-
virtual void SetL3CacheSizeInKb(uint64_t v);
37-
virtual uint64_t GetLLCCacheSizeInKb() const;
38-
virtual void SetLLCCacheSizeInKb(uint64_t v);
39-
virtual uint64_t GetEdramSizeInKb() const;
40-
virtual void SetEdramSizeInKb(uint64_t v);
41-
virtual uint32_t GetL3BankCount() const;
42-
virtual void SetL3BankCount(uint32_t v);
43-
virtual uint32_t GetMaxFillRate() const;
44-
virtual void SetMaxFillRate(uint32_t v);
45-
virtual uint32_t GetEuCountPerPoolMax() const;
46-
virtual void SetEuCountPerPoolMax(uint32_t v);
47-
virtual uint32_t GetEuCountPerPoolMin() const;
48-
virtual void SetEuCountPerPoolMin(uint32_t v);
49-
50-
virtual uint32_t GetTotalVsThreads() const;
51-
virtual void SetTotalVsThreads(uint32_t v);
52-
virtual uint32_t GetTotalHsThreads() const;
53-
virtual void SetTotalHsThreads(uint32_t v);
54-
virtual uint32_t GetTotalDsThreads() const;
55-
virtual void SetTotalDsThreads(uint32_t v);
56-
virtual uint32_t GetTotalGsThreads() const;
57-
virtual void SetTotalGsThreads(uint32_t v);
58-
virtual uint32_t GetTotalPsThreadsWindowerRange() const;
59-
virtual void SetTotalPsThreadsWindowerRange(uint32_t v);
60-
61-
virtual uint32_t GetCsrSizeInMb() const;
62-
virtual void SetCsrSizeInMb(uint32_t v);
63-
64-
virtual uint32_t GetMaxEuPerSubSlice() const;
65-
virtual void SetMaxEuPerSubSlice(uint32_t v);
66-
virtual uint32_t GetMaxSlicesSupported() const;
67-
virtual void SetMaxSlicesSupported(uint32_t v);
68-
virtual uint32_t GetMaxSubSlicesSupported() const;
69-
virtual void SetMaxSubSlicesSupported(uint32_t v);
70-
virtual bool GetIsL3HashModeEnabled() const;
71-
virtual void SetIsL3HashModeEnabled(bool v);
72-
73-
virtual bool GetIsDynamicallyPopulated() const;
74-
virtual void SetIsDynamicallyPopulated(bool v);
29+
OCL_API_CALL virtual uint32_t GetEUCount() const;
30+
OCL_API_CALL virtual void SetEUCount(uint32_t v);
31+
OCL_API_CALL virtual uint32_t GetThreadCount() const;
32+
OCL_API_CALL virtual void SetThreadCount(uint32_t v);
33+
OCL_API_CALL virtual uint32_t GetSliceCount() const;
34+
OCL_API_CALL virtual void SetSliceCount(uint32_t v);
35+
OCL_API_CALL virtual uint32_t GetSubSliceCount() const;
36+
OCL_API_CALL virtual void SetSubSliceCount(uint32_t v);
37+
OCL_API_CALL virtual uint64_t GetL3CacheSizeInKb() const;
38+
OCL_API_CALL virtual void SetL3CacheSizeInKb(uint64_t v);
39+
OCL_API_CALL virtual uint64_t GetLLCCacheSizeInKb() const;
40+
OCL_API_CALL virtual void SetLLCCacheSizeInKb(uint64_t v);
41+
OCL_API_CALL virtual uint64_t GetEdramSizeInKb() const;
42+
OCL_API_CALL virtual void SetEdramSizeInKb(uint64_t v);
43+
OCL_API_CALL virtual uint32_t GetL3BankCount() const;
44+
OCL_API_CALL virtual void SetL3BankCount(uint32_t v);
45+
OCL_API_CALL virtual uint32_t GetMaxFillRate() const;
46+
OCL_API_CALL virtual void SetMaxFillRate(uint32_t v);
47+
OCL_API_CALL virtual uint32_t GetEuCountPerPoolMax() const;
48+
OCL_API_CALL virtual void SetEuCountPerPoolMax(uint32_t v);
49+
OCL_API_CALL virtual uint32_t GetEuCountPerPoolMin() const;
50+
OCL_API_CALL virtual void SetEuCountPerPoolMin(uint32_t v);
51+
52+
OCL_API_CALL virtual uint32_t GetTotalVsThreads() const;
53+
OCL_API_CALL virtual void SetTotalVsThreads(uint32_t v);
54+
OCL_API_CALL virtual uint32_t GetTotalHsThreads() const;
55+
OCL_API_CALL virtual void SetTotalHsThreads(uint32_t v);
56+
OCL_API_CALL virtual uint32_t GetTotalDsThreads() const;
57+
OCL_API_CALL virtual void SetTotalDsThreads(uint32_t v);
58+
OCL_API_CALL virtual uint32_t GetTotalGsThreads() const;
59+
OCL_API_CALL virtual void SetTotalGsThreads(uint32_t v);
60+
OCL_API_CALL virtual uint32_t GetTotalPsThreadsWindowerRange() const;
61+
OCL_API_CALL virtual void SetTotalPsThreadsWindowerRange(uint32_t v);
62+
63+
OCL_API_CALL virtual uint32_t GetCsrSizeInMb() const;
64+
OCL_API_CALL virtual void SetCsrSizeInMb(uint32_t v);
65+
66+
OCL_API_CALL virtual uint32_t GetMaxEuPerSubSlice() const;
67+
OCL_API_CALL virtual void SetMaxEuPerSubSlice(uint32_t v);
68+
OCL_API_CALL virtual uint32_t GetMaxSlicesSupported() const;
69+
OCL_API_CALL virtual void SetMaxSlicesSupported(uint32_t v);
70+
OCL_API_CALL virtual uint32_t GetMaxSubSlicesSupported() const;
71+
OCL_API_CALL virtual void SetMaxSubSlicesSupported(uint32_t v);
72+
OCL_API_CALL virtual bool GetIsL3HashModeEnabled() const;
73+
OCL_API_CALL virtual void SetIsL3HashModeEnabled(bool v);
74+
75+
OCL_API_CALL virtual bool GetIsDynamicallyPopulated() const;
76+
OCL_API_CALL virtual void SetIsDynamicallyPopulated(bool v);
7577
};
7678

7779
CIF_DEFINE_INTERFACE_VER_WITH_COMPATIBILITY(GTSystemInfo, 2, 1) {
@@ -81,10 +83,10 @@ CIF_DEFINE_INTERFACE_VER_WITH_COMPATIBILITY(GTSystemInfo, 2, 1) {
8183
CIF_DEFINE_INTERFACE_VER_WITH_COMPATIBILITY(GTSystemInfo, 3, 1) {
8284
CIF_INHERIT_CONSTRUCTOR();
8385

84-
virtual uint32_t GetMaxDualSubSlicesSupported() const;
85-
virtual void SetMaxDualSubSlicesSupported(uint32_t v);
86-
virtual uint32_t GetDualSubSliceCount() const;
87-
virtual void SetDualSubSliceCount(uint32_t v);
86+
OCL_API_CALL virtual uint32_t GetMaxDualSubSlicesSupported() const;
87+
OCL_API_CALL virtual void SetMaxDualSubSlicesSupported(uint32_t v);
88+
OCL_API_CALL virtual uint32_t GetDualSubSliceCount() const;
89+
OCL_API_CALL virtual void SetDualSubSliceCount(uint32_t v);
8890
};
8991

9092
CIF_GENERATE_VERSIONS_LIST(GTSystemInfo);

‎IGC/AdaptorOCL/ocl_igc_interface/igc_builtins.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ SPDX-License-Identifier: MIT
1212
#include "cif/common/cif.h"
1313

1414
#include "cif/macros/enable.h"
15+
#include "OCLAPI/oclapi.h"
1516

1617
namespace IGC {
1718

@@ -50,7 +51,7 @@ CIF_DEFINE_INTERFACE_VER(IgcBuiltins, 1) {
5051
CIF_INHERIT_CONSTRUCTOR();
5152

5253
// Returns whether default work-group or sub-group sort is present in builtins
53-
virtual bool DefaultGroupSortSupported(GroupSortMemoryScope::MemoryScope_t scope,
54+
OCL_API_CALL virtual bool DefaultGroupSortSupported(GroupSortMemoryScope::MemoryScope_t scope,
5455
GroupSortKeyType::KeyType_t keyType,
5556
bool isKeyValue,
5657
bool isJointSort) const;
@@ -63,7 +64,7 @@ CIF_DEFINE_INTERFACE_VER(IgcBuiltins, 1) {
6364
// rangeSize -- work-group or sub-group size respectively
6465
//
6566
// For key-only sort pass valueTypeSizeInBytes = 0
66-
virtual long DefaultGroupJointSortMemoryRequired(GroupSortMemoryScope::MemoryScope_t scope,
67+
OCL_API_CALL virtual long DefaultGroupJointSortMemoryRequired(GroupSortMemoryScope::MemoryScope_t scope,
6768
long totalItems,
6869
long rangeSize,
6970
long keyTypeSizeInBytes,
@@ -77,7 +78,7 @@ CIF_DEFINE_INTERFACE_VER(IgcBuiltins, 1) {
7778
// rangeSize -- work-group or sub-group size respectively
7879
//
7980
// For key-only sort pass valueTypeSizeInBytes = 0
80-
virtual long DefaultGroupPrivateSortMemoryRequired(GroupSortMemoryScope::MemoryScope_t scope,
81+
OCL_API_CALL virtual long DefaultGroupPrivateSortMemoryRequired(GroupSortMemoryScope::MemoryScope_t scope,
8182
long itemsPerWorkItem,
8283
long rangeSize,
8384
long keyTypeSizeInBytes,

0 commit comments

Comments
 (0)