Skip to content

Commit e0d7a78

Browse files
AlexeySachkovAlexeySachkov
committed
Rename UrOffloadEntry -> MockOffloadEntry
1 parent 099cecc commit e0d7a78

File tree

17 files changed

+31
-30
lines changed

17 files changed

+31
-30
lines changed

‎sycl/unittests/Extensions/DeviceGlobal.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ static sycl::unittest::MockDeviceImage generateDeviceGlobalImage() {
6969

7070
std::vector<unsigned char> Bin{10, 11, 12, 13, 14, 15}; // Random data
7171

72-
Array<UrOffloadEntry> Entries =
72+
Array<MockOffloadEntry> Entries =
7373
makeEmptyKernels({DeviceGlobalTestKernelName});
7474

7575
MockDeviceImage Img{SYCL_DEVICE_BINARY_TYPE_SPIRV, // Format
@@ -100,7 +100,7 @@ static sycl::unittest::MockDeviceImage generateDeviceGlobalImgScopeImage() {
100100

101101
std::vector<unsigned char> Bin{10, 11, 12, 13, 14, 15}; // Random data
102102

103-
Array<UrOffloadEntry> Entries =
103+
Array<MockOffloadEntry> Entries =
104104
makeEmptyKernels({DeviceGlobalImgScopeTestKernelName});
105105

106106
MockDeviceImage Img{SYCL_DEVICE_BINARY_TYPE_SPIRV, // Format

‎sycl/unittests/Extensions/USMMemcpy2D.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static sycl::unittest::MockDeviceImage generateMemopsImage() {
132132

133133
std::vector<unsigned char> Bin{10, 11, 12, 13, 14, 15}; // Random data
134134

135-
Array<UrOffloadEntry> Entries = makeEmptyKernels(
135+
Array<MockOffloadEntry> Entries = makeEmptyKernels(
136136
{USMFillHelperKernelNameLong, USMFillHelperKernelNameChar,
137137
USMMemcpyHelperKernelNameLong, USMMemcpyHelperKernelNameChar});
138138

‎sycl/unittests/Extensions/VirtualFunctions/RuntimeLinking.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ generateImage(std::initializer_list<std::string> KernelNames,
6969

7070
std::vector<unsigned char> Bin{Magic};
7171

72-
sycl::unittest::Array<sycl::unittest::UrOffloadEntry> Entries =
72+
sycl::unittest::Array<sycl::unittest::MockOffloadEntry> Entries =
7373
sycl::unittest::makeEmptyKernels(KernelNames);
7474

7575
sycl::unittest::MockDeviceImage Img{

‎sycl/unittests/SYCL2020/IsCompatible.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ generateDefaultImage(std::initializer_list<std::string> KernelNames,
3333

3434
std::vector<unsigned char> Bin{0, 1, 2, 3, 4, 5}; // Random data
3535

36-
Array<UrOffloadEntry> Entries = makeEmptyKernels(KernelNames);
36+
Array<MockOffloadEntry> Entries = makeEmptyKernels(KernelNames);
3737

3838
MockDeviceImage Img{SYCL_DEVICE_BINARY_TYPE_SPIRV, // Format
3939
__SYCL_DEVICE_BINARY_TARGET_SPIRV64, // DeviceTargetSpec

‎sycl/unittests/SYCL2020/KernelBundle.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ generateDefaultImage(std::initializer_list<std::string> KernelNames,
3737

3838
std::vector<unsigned char> Bin{0, 1, 2, 3, 4, 5}; // Random data
3939

40-
Array<UrOffloadEntry> Entries = makeEmptyKernels(KernelNames);
40+
Array<MockOffloadEntry> Entries = makeEmptyKernels(KernelNames);
4141

4242
MockDeviceImage Img{BinaryType, // Format
4343
DeviceTargetSpec,

‎sycl/unittests/SYCL2020/KernelBundleStateFiltering.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ generateDefaultImage(std::initializer_list<std::string> KernelNames,
4646
static unsigned char NImage = 0;
4747
std::vector<unsigned char> Bin{NImage++};
4848

49-
Array<UrOffloadEntry> Entries = makeEmptyKernels(KernelNames);
49+
Array<MockOffloadEntry> Entries = makeEmptyKernels(KernelNames);
5050

5151
MockDeviceImage Img{BinaryType, // Format
5252
DeviceTargetSpec,

‎sycl/unittests/SYCL2020/KernelID.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ generateDefaultImage(std::initializer_list<std::string> Kernels) {
5555

5656
std::vector<unsigned char> Bin{0, 1, 2, 3, 4, 5}; // Random data
5757

58-
Array<UrOffloadEntry> Entries = makeEmptyKernels(Kernels);
58+
Array<MockOffloadEntry> Entries = makeEmptyKernels(Kernels);
5959

6060
MockDeviceImage Img{SYCL_DEVICE_BINARY_TYPE_SPIRV, // Format
6161
__SYCL_DEVICE_BINARY_TARGET_SPIRV64, // DeviceTargetSpec

‎sycl/unittests/SYCL2020/SpecializationConstant.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static sycl::unittest::MockDeviceImage generateImageWithSpecConsts() {
5050

5151
std::vector<unsigned char> Bin{0, 1, 2, 3, 4, 5}; // Random data
5252

53-
Array<UrOffloadEntry> Entries =
53+
Array<MockOffloadEntry> Entries =
5454
makeEmptyKernels({"SpecializationConstant_TestKernel"});
5555
MockDeviceImage Img{SYCL_DEVICE_BINARY_TYPE_SPIRV, // Format
5656
__SYCL_DEVICE_BINARY_TARGET_SPIRV64, // DeviceTargetSpec

‎sycl/unittests/assert/assert.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static sycl::unittest::MockDeviceImage generateDefaultImage() {
8686

8787
std::vector<unsigned char> Bin{0, 1, 2, 3, 4, 5}; // Random data
8888

89-
Array<UrOffloadEntry> Entries = makeEmptyKernels({KernelName});
89+
Array<MockOffloadEntry> Entries = makeEmptyKernels({KernelName});
9090

9191
MockDeviceImage Img{SYCL_DEVICE_BINARY_TYPE_SPIRV, // Format
9292
__SYCL_DEVICE_BINARY_TARGET_SPIRV64, // DeviceTargetSpec
@@ -109,7 +109,7 @@ static sycl::unittest::MockDeviceImage generateCopierKernelImage() {
109109

110110
std::vector<unsigned char> Bin{10, 11, 12, 13, 14, 15}; // Random data
111111

112-
Array<UrOffloadEntry> Entries = makeEmptyKernels({CopierKernelName});
112+
Array<MockOffloadEntry> Entries = makeEmptyKernels({CopierKernelName});
113113

114114
MockDeviceImage Img{SYCL_DEVICE_BINARY_TYPE_SPIRV, // Format
115115
__SYCL_DEVICE_BINARY_TARGET_SPIRV64, // DeviceTargetSpec

‎sycl/unittests/helpers/MockDeviceImage.hpp‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,22 +72,23 @@ class MockProperty {
7272
};
7373

7474
/// Convinience wrapper for _ur_offload_entry_struct.
75-
class UrOffloadEntry {
75+
class MockOffloadEntry {
7676
public:
7777
using NativeType = _sycl_offload_entry_struct;
7878

79-
UrOffloadEntry(const std::string &Name, std::vector<char> Data, int32_t Flags)
79+
MockOffloadEntry(const std::string &Name, std::vector<char> Data,
80+
int32_t Flags)
8081
: MName(Name), MData(std::move(Data)), MFlags(Flags) {
8182
updateNativeType();
8283
}
8384

84-
UrOffloadEntry(const UrOffloadEntry &Src) {
85+
MockOffloadEntry(const MockOffloadEntry &Src) {
8586
MName = Src.MName;
8687
MData = Src.MData;
8788
MFlags = Src.MFlags;
8889
updateNativeType();
8990
}
90-
UrOffloadEntry &operator=(const UrOffloadEntry &Src) {
91+
MockOffloadEntry &operator=(const MockOffloadEntry &Src) {
9192
MName = Src.MName;
9293
MData = Src.MData;
9394
MFlags = Src.MFlags;
@@ -231,7 +232,7 @@ class MockDeviceImage {
231232
const std::string &CompileOptions,
232233
const std::string &LinkOptions, std::vector<char> Manifest,
233234
std::vector<unsigned char> Binary,
234-
Array<UrOffloadEntry> OffloadEntries,
235+
Array<MockOffloadEntry> OffloadEntries,
235236
MockPropertySet PropertySet)
236237
: MVersion(Version), MKind(Kind), MFormat(Format),
237238
MDeviceTargetSpec(DeviceTargetSpec), MCompileOptions(CompileOptions),
@@ -244,7 +245,7 @@ class MockDeviceImage {
244245
const std::string &CompileOptions,
245246
const std::string &LinkOptions,
246247
std::vector<unsigned char> Binary,
247-
Array<UrOffloadEntry> OffloadEntries,
248+
Array<MockOffloadEntry> OffloadEntries,
248249
MockPropertySet PropertySet)
249250
: MockDeviceImage(SYCL_DEVICE_BINARY_VERSION,
250251
SYCL_DEVICE_BINARY_OFFLOAD_KIND_SYCL, Format,
@@ -281,7 +282,7 @@ class MockDeviceImage {
281282
std::string MLinkOptions;
282283
std::vector<char> MManifest;
283284
std::vector<unsigned char> MBinary;
284-
Array<UrOffloadEntry> MOffloadEntries;
285+
Array<MockOffloadEntry> MOffloadEntries;
285286
MockPropertySet MPropertySet;
286287
};
287288

@@ -432,12 +433,12 @@ inline void addESIMDFlag(MockPropertySet &Props) {
432433
}
433434

434435
/// Utility function to generate offload entries for kernels without arguments.
435-
inline Array<UrOffloadEntry>
436+
inline Array<MockOffloadEntry>
436437
makeEmptyKernels(std::initializer_list<std::string> KernelNames) {
437-
Array<UrOffloadEntry> Entries;
438+
Array<MockOffloadEntry> Entries;
438439

439440
for (const auto &Name : KernelNames) {
440-
UrOffloadEntry E{Name, {}, 0};
441+
MockOffloadEntry E{Name, {}, 0};
441442
Entries.push_back(std::move(E));
442443
}
443444
return Entries;
@@ -550,7 +551,7 @@ generateDefaultImage(std::initializer_list<std::string> KernelNames) {
550551

551552
std::vector<unsigned char> Bin{0, 1, 2, 3, 4, 5}; // Random data
552553

553-
Array<UrOffloadEntry> Entries = makeEmptyKernels(KernelNames);
554+
Array<MockOffloadEntry> Entries = makeEmptyKernels(KernelNames);
554555

555556
MockDeviceImage Img{SYCL_DEVICE_BINARY_TYPE_SPIRV, // Format
556557
__SYCL_DEVICE_BINARY_TARGET_SPIRV64, // DeviceTargetSpec

0 commit comments

Comments
 (0)