Skip to content

Commit a4888b3

Browse files
JablonskiMateuszCompute-Runtime-Automation
JablonskiMateusz
authored and
Compute-Runtime-Automation
committed
build: add clang-tidy restriction for Enum case
Signed-off-by: Mateusz Jablonski <[email protected]>
1 parent 590418a commit a4888b3

File tree

107 files changed

+834
-1367
lines changed

Some content is hidden

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

107 files changed

+834
-1367
lines changed

‎.clang-tidy

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ CheckOptions:
2424
value: CamelCase
2525
- key: readability-identifier-naming.StructIgnoredRegexp
2626
value: '(_|TOKSTR_).+'
27+
- key: readability-identifier-naming.EnumCase
28+
value: CamelCase
2729
- key: readability-identifier-naming.MethodCase
2830
value: camelBack
2931
- key: readability-identifier-naming.PrivateMethodCase

‎level_zero/core/source/cmdqueue/cmdqueue.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -283,34 +283,34 @@ ze_result_t CommandQueueImp::CommandBufferManager::initialize(Device *device, si
283283
secondBuffer = device->getNEODevice()->getMemoryManager()->allocateGraphicsMemoryWithProperties(properties);
284284
}
285285

286-
buffers[BUFFER_ALLOCATION::FIRST] = firstBuffer;
287-
buffers[BUFFER_ALLOCATION::SECOND] = secondBuffer;
286+
buffers[BufferAllocation::first] = firstBuffer;
287+
buffers[BufferAllocation::second] = secondBuffer;
288288

289-
if (!buffers[BUFFER_ALLOCATION::FIRST] || !buffers[BUFFER_ALLOCATION::SECOND]) {
289+
if (!buffers[BufferAllocation::first] || !buffers[BufferAllocation::second]) {
290290
return ZE_RESULT_ERROR_OUT_OF_DEVICE_MEMORY;
291291
}
292292

293-
flushId[BUFFER_ALLOCATION::FIRST] = std::make_pair(0u, 0u);
294-
flushId[BUFFER_ALLOCATION::SECOND] = std::make_pair(0u, 0u);
293+
flushId[BufferAllocation::first] = std::make_pair(0u, 0u);
294+
flushId[BufferAllocation::second] = std::make_pair(0u, 0u);
295295
return ZE_RESULT_SUCCESS;
296296
}
297297

298298
void CommandQueueImp::CommandBufferManager::destroy(Device *device) {
299-
if (buffers[BUFFER_ALLOCATION::FIRST]) {
300-
device->storeReusableAllocation(*buffers[BUFFER_ALLOCATION::FIRST]);
301-
buffers[BUFFER_ALLOCATION::FIRST] = nullptr;
299+
if (buffers[BufferAllocation::first]) {
300+
device->storeReusableAllocation(*buffers[BufferAllocation::first]);
301+
buffers[BufferAllocation::first] = nullptr;
302302
}
303-
if (buffers[BUFFER_ALLOCATION::SECOND]) {
304-
device->storeReusableAllocation(*buffers[BUFFER_ALLOCATION::SECOND]);
305-
buffers[BUFFER_ALLOCATION::SECOND] = nullptr;
303+
if (buffers[BufferAllocation::second]) {
304+
device->storeReusableAllocation(*buffers[BufferAllocation::second]);
305+
buffers[BufferAllocation::second] = nullptr;
306306
}
307307
}
308308

309309
NEO::WaitStatus CommandQueueImp::CommandBufferManager::switchBuffers(NEO::CommandStreamReceiver *csr) {
310-
if (bufferUse == BUFFER_ALLOCATION::FIRST) {
311-
bufferUse = BUFFER_ALLOCATION::SECOND;
310+
if (bufferUse == BufferAllocation::first) {
311+
bufferUse = BufferAllocation::second;
312312
} else {
313-
bufferUse = BUFFER_ALLOCATION::FIRST;
313+
bufferUse = BufferAllocation::first;
314314
}
315315

316316
auto waitStatus{NEO::WaitStatus::ready};

‎level_zero/core/source/cmdqueue/cmdqueue_imp.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ struct Kernel;
3636
struct CommandQueueImp : public CommandQueue {
3737
class CommandBufferManager {
3838
public:
39-
enum BUFFER_ALLOCATION : uint32_t {
40-
FIRST = 0,
41-
SECOND,
42-
COUNT
39+
enum BufferAllocation : uint32_t {
40+
first = 0,
41+
second,
42+
count
4343
};
4444

4545
ze_result_t initialize(Device *device, size_t sizeRequested);
@@ -58,9 +58,9 @@ struct CommandQueueImp : public CommandQueue {
5858
}
5959

6060
private:
61-
NEO::GraphicsAllocation *buffers[BUFFER_ALLOCATION::COUNT]{};
62-
std::pair<TaskCountType, NEO::FlushStamp> flushId[BUFFER_ALLOCATION::COUNT];
63-
BUFFER_ALLOCATION bufferUse = BUFFER_ALLOCATION::FIRST;
61+
NEO::GraphicsAllocation *buffers[BufferAllocation::count]{};
62+
std::pair<TaskCountType, NEO::FlushStamp> flushId[BufferAllocation::count];
63+
BufferAllocation bufferUse = BufferAllocation::first;
6464
};
6565
static constexpr size_t defaultQueueCmdBufferSize = 128 * MemoryConstants::kiloByte;
6666
static constexpr size_t minCmdBufferPtrAlign = 8;

‎level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h

+4-6
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,10 @@ class Debugger;
2929

3030
namespace L0 {
3131

32-
typedef enum _ze_rtas_device_format_internal_t {
33-
ZE_RTAS_DEVICE_FORMAT_EXP_INVALID = 0, // invalid acceleration structure format
34-
ZE_RTAS_DEVICE_FORMAT_EXP_VERSION_1 = 1, // acceleration structure format version 1
35-
ZE_RTAS_DEVICE_FORMAT_EXP_VERSION_2 = 2, // acceleration structure format version 2
36-
ZE_RTAS_DEVICE_FORMAT_EXP_VERSION_MAX = 2
37-
} ze_rtas_device_format_internal_t;
32+
enum class RTASDeviceFormatInternal {
33+
version1 = 1,
34+
version2 = 2,
35+
};
3836

3937
struct Event;
4038
struct Device;

‎level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper_xehp_and_later.inl

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ NEO::HeapAddressModel L0GfxCoreHelperHw<Family>::getPlatformHeapAddressModel() c
7474

7575
template <typename Family>
7676
ze_rtas_format_exp_t L0GfxCoreHelperHw<Family>::getSupportedRTASFormat() const {
77-
return static_cast<ze_rtas_format_exp_t>(ZE_RTAS_DEVICE_FORMAT_EXP_VERSION_1);
77+
return static_cast<ze_rtas_format_exp_t>(RTASDeviceFormatInternal::version1);
7878
}
7979

8080
template <typename Family>

‎level_zero/core/test/unit_tests/fixtures/module_fixture.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void ModuleImmutableDataFixture::setUp() {
8888
DeviceFixture::setupWithExecutionEnvironment(*executionEnvironment);
8989
}
9090

91-
void ModuleImmutableDataFixture::createModuleFromMockBinary(uint32_t perHwThreadPrivateMemorySize, bool isInternal, MockImmutableData *mockKernelImmData, std::initializer_list<ZebinTestData::appendElfAdditionalSection> additionalSections) {
91+
void ModuleImmutableDataFixture::createModuleFromMockBinary(uint32_t perHwThreadPrivateMemorySize, bool isInternal, MockImmutableData *mockKernelImmData, std::initializer_list<ZebinTestData::AppendElfAdditionalSection> additionalSections) {
9292
DebugManagerStateRestore restore;
9393
debugManager.flags.FailBuildProgramWithStatefulAccess.set(0);
9494

‎level_zero/core/test/unit_tests/fixtures/module_fixture.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ struct ModuleImmutableDataFixture : public DeviceFixture {
108108
void setUp();
109109

110110
void createModuleFromMockBinary(uint32_t perHwThreadPrivateMemorySize, bool isInternal, MockImmutableData *mockKernelImmData,
111-
std::initializer_list<ZebinTestData::appendElfAdditionalSection> additionalSections = {});
111+
std::initializer_list<ZebinTestData::AppendElfAdditionalSection> additionalSections = {});
112112

113113
void createKernel(MockKernel *kernel);
114114

‎level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ TEST_F(CommandQueueInitTests, givenMultipleSubDevicesWhenInitializingThenAllocat
723723
}
724724
}
725725

726-
EXPECT_EQ(static_cast<uint32_t>(CommandQueueImp::CommandBufferManager::BUFFER_ALLOCATION::COUNT), cmdBufferAllocationsFound);
726+
EXPECT_EQ(static_cast<uint32_t>(CommandQueueImp::CommandBufferManager::BufferAllocation::count), cmdBufferAllocationsFound);
727727

728728
commandQueue->destroy();
729729
}

‎level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ HWTEST_F(NotifyModuleLoadTest, givenDebuggingEnabledWhenModuleIsCreatedAndFullyL
614614
auto debugger = MockDebuggerL0Hw<FamilyType>::allocate(neoDevice);
615615
neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->debugger.reset(debugger);
616616

617-
auto elfAdditionalSections = {ZebinTestData::appendElfAdditionalSection::constant}; // for const surface allocation copy
617+
auto elfAdditionalSections = {ZebinTestData::AppendElfAdditionalSection::constant}; // for const surface allocation copy
618618
auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), elfAdditionalSections);
619619
const auto &src = zebinData->storage;
620620

‎level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ TEST_F(KernelImmutableDataIsaCopyTests, whenUserKernelIsCreatedThenIsaIsCopiedWh
719719

720720
std::unique_ptr<MockImmutableData> mockKernelImmData = std::make_unique<MockImmutableData>(perHwThreadPrivateMemorySizeRequested);
721721

722-
auto additionalSections = {ZebinTestData::appendElfAdditionalSection::global};
722+
auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::global};
723723
createModuleFromMockBinary(perHwThreadPrivateMemorySizeRequested, isInternal, mockKernelImmData.get(), additionalSections);
724724

725725
size_t copyForGlobalSurface = 1u;
@@ -799,7 +799,7 @@ TEST_F(KernelImmutableDataTests, givenInternalModuleWhenKernelIsCreatedThenIsaIs
799799
size_t previouscopyMemoryToAllocationCalledTimes =
800800
mockMemoryManager->copyMemoryToAllocationCalledTimes;
801801

802-
auto additionalSections = {ZebinTestData::appendElfAdditionalSection::global};
802+
auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::global};
803803
createModuleFromMockBinary(perHwThreadPrivateMemorySizeRequested, isInternal, mockKernelImmData.get(), additionalSections);
804804

805805
size_t copyForGlobalSurface = 1u;

‎level_zero/core/test/unit_tests/sources/memory/linux/test_memory_linux.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class IpcImplicitScalingObtainFdMockGraphicsAllocation : public NEO::DrmAllocati
6161

6262
class MemoryManagerIpcImplicitScalingObtainFdMock : public NEO::DrmMemoryManager {
6363
public:
64-
MemoryManagerIpcImplicitScalingObtainFdMock(NEO::ExecutionEnvironment &executionEnvironment) : NEO::DrmMemoryManager(gemCloseWorkerMode::gemCloseWorkerInactive, false, false, executionEnvironment) {}
64+
MemoryManagerIpcImplicitScalingObtainFdMock(NEO::ExecutionEnvironment &executionEnvironment) : NEO::DrmMemoryManager(GemCloseWorkerMode::gemCloseWorkerInactive, false, false, executionEnvironment) {}
6565

6666
NEO::GraphicsAllocation *createGraphicsAllocationFromSharedHandle(osHandle handle, const AllocationProperties &properties, bool requireSpecificBitness, bool isHostIpcAllocation, bool reuseSharedAllocation, void *mapPointer) override { return nullptr; }
6767
void addAllocationToHostPtrManager(NEO::GraphicsAllocation *memory) override{};
@@ -477,7 +477,7 @@ class IpcObtainFdMockGraphicsAllocation : public NEO::DrmAllocation {
477477

478478
class MemoryManagerIpcObtainFdMock : public NEO::DrmMemoryManager {
479479
public:
480-
MemoryManagerIpcObtainFdMock(NEO::ExecutionEnvironment &executionEnvironment) : NEO::DrmMemoryManager(gemCloseWorkerMode::gemCloseWorkerInactive, false, false, executionEnvironment) {}
480+
MemoryManagerIpcObtainFdMock(NEO::ExecutionEnvironment &executionEnvironment) : NEO::DrmMemoryManager(GemCloseWorkerMode::gemCloseWorkerInactive, false, false, executionEnvironment) {}
481481

482482
NEO::GraphicsAllocation *createGraphicsAllocationFromSharedHandle(osHandle handle, const AllocationProperties &properties, bool requireSpecificBitness, bool isHostIpcAllocation, bool reuseSharedAllocation, void *mapPointer) override { return nullptr; }
483483
void addAllocationToHostPtrManager(NEO::GraphicsAllocation *memory) override{};

‎level_zero/core/test/unit_tests/sources/module/test_module.cpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ struct ModuleSpecConstantsFixture : public DeviceFixture {
643643
}
644644

645645
void runTest() {
646-
auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv};
646+
auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::spirv};
647647
zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), additionalSections);
648648
const auto &src = zebinData->storage;
649649

@@ -682,7 +682,7 @@ struct ModuleSpecConstantsFixture : public DeviceFixture {
682682
}
683683

684684
void runTestStatic() {
685-
auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv};
685+
auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::spirv};
686686
zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), additionalSections);
687687
const auto &src = zebinData->storage;
688688

@@ -775,7 +775,7 @@ TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWhenCompiler
775775
mockCompiler = new FailingMockCompilerInterfaceWithSpecConstants(moduleNumSpecConstants);
776776
auto rootDeviceEnvironment = neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[0].get();
777777
rootDeviceEnvironment->compilerInterface.reset(mockCompiler);
778-
auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv};
778+
auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::spirv};
779779
auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), additionalSections);
780780
const auto &src = zebinData->storage;
781781

@@ -806,7 +806,7 @@ TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWhenCompiler
806806
}
807807

808808
TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWhenUserPassTooMuchConstsIdsThenModuleInitFails) {
809-
auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv};
809+
auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::spirv};
810810
auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), additionalSections);
811811
const auto &src = zebinData->storage;
812812

@@ -862,7 +862,7 @@ TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWhenCompiler
862862
mockCompiler = new FailingMockCompilerInterfaceWithSpecConstants(moduleNumSpecConstants);
863863
auto rootDeviceEnvironment = neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[0].get();
864864
rootDeviceEnvironment->compilerInterface.reset(mockCompiler);
865-
auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv};
865+
auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::spirv};
866866
auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), additionalSections);
867867
const auto &src = zebinData->storage;
868868

@@ -925,7 +925,7 @@ struct ModuleStaticLinkFixture : public DeviceFixture {
925925
}
926926

927927
void loadModules(bool multiple) {
928-
auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv};
928+
auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::spirv};
929929
zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), additionalSections);
930930
const auto &storage = zebinData->storage;
931931

@@ -2846,7 +2846,7 @@ HWTEST_F(ModuleTranslationUnitTest, GivenRebuildFlagWhenCreatingModuleFromNative
28462846
DebugManagerStateRestore dgbRestorer;
28472847
NEO::debugManager.flags.RebuildPrecompiledKernels.set(true);
28482848

2849-
auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv};
2849+
auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::spirv};
28502850
bool forceRecompilation = true;
28512851
auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), additionalSections, forceRecompilation);
28522852
const auto &src = zebinData->storage;
@@ -2881,7 +2881,7 @@ HWTEST_F(ModuleTranslationUnitTest, GivenRebuildFlagWhenCreatingModuleFromNative
28812881
DebugManagerStateRestore dgbRestorer;
28822882
NEO::debugManager.flags.RebuildPrecompiledKernels.set(true);
28832883

2884-
auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv};
2884+
auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::spirv};
28852885
bool forceRecompilation = true;
28862886
auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), additionalSections, forceRecompilation);
28872887
const auto &src = zebinData->storage;
@@ -3003,8 +3003,8 @@ HWTEST2_F(ModuleTranslationUnitTest, givenLargeGrfAndSimd16WhenProcessingBinaryT
30033003

30043004
uint8_t kernelIsa[8]{0U};
30053005
ZebinTestData::ValidEmptyProgram zebin;
3006-
zebin.removeSection(NEO::Zebin::Elf::SHT_ZEBIN::SHT_ZEBIN_ZEINFO, NEO::Zebin::Elf::SectionNames::zeInfo);
3007-
zebin.appendSection(NEO::Zebin::Elf::SHT_ZEBIN::SHT_ZEBIN_ZEINFO, NEO::Zebin::Elf::SectionNames::zeInfo, ArrayRef<const uint8_t>::fromAny(validZeInfo.data(), validZeInfo.size()));
3006+
zebin.removeSection(NEO::Zebin::Elf::SectionHeaderTypeZebin::SHT_ZEBIN_ZEINFO, NEO::Zebin::Elf::SectionNames::zeInfo);
3007+
zebin.appendSection(NEO::Zebin::Elf::SectionHeaderTypeZebin::SHT_ZEBIN_ZEINFO, NEO::Zebin::Elf::SectionNames::zeInfo, ArrayRef<const uint8_t>::fromAny(validZeInfo.data(), validZeInfo.size()));
30083008
zebin.appendSection(NEO::Elf::SHT_PROGBITS, NEO::Zebin::Elf::SectionNames::textPrefix.str() + "kernel_with_default_maxWGS", {kernelIsa, sizeof(kernelIsa)});
30093009
zebin.appendSection(NEO::Elf::SHT_PROGBITS, NEO::Zebin::Elf::SectionNames::textPrefix.str() + "kernel_with_reduced_maxWGS", {kernelIsa, sizeof(kernelIsa)});
30103010
zebin.elfHeader->machine = this->device->getNEODevice()->getHardwareInfo().platform.eProductFamily;
@@ -3050,8 +3050,8 @@ HWTEST2_F(ModuleTranslationUnitTest, givenLargeGrfAndSimd16WhenProcessingBinaryT
30503050

30513051
uint8_t kernelIsa[8]{0U};
30523052
ZebinTestData::ValidEmptyProgram zebin;
3053-
zebin.removeSection(NEO::Zebin::Elf::SHT_ZEBIN::SHT_ZEBIN_ZEINFO, NEO::Zebin::Elf::SectionNames::zeInfo);
3054-
zebin.appendSection(NEO::Zebin::Elf::SHT_ZEBIN::SHT_ZEBIN_ZEINFO, NEO::Zebin::Elf::SectionNames::zeInfo, ArrayRef<const uint8_t>::fromAny(validZeInfo.data(), validZeInfo.size()));
3053+
zebin.removeSection(NEO::Zebin::Elf::SectionHeaderTypeZebin::SHT_ZEBIN_ZEINFO, NEO::Zebin::Elf::SectionNames::zeInfo);
3054+
zebin.appendSection(NEO::Zebin::Elf::SectionHeaderTypeZebin::SHT_ZEBIN_ZEINFO, NEO::Zebin::Elf::SectionNames::zeInfo, ArrayRef<const uint8_t>::fromAny(validZeInfo.data(), validZeInfo.size()));
30553055
zebin.appendSection(NEO::Elf::SHT_PROGBITS, NEO::Zebin::Elf::SectionNames::textPrefix.str() + "kernel_with_default_maxWGS", {kernelIsa, sizeof(kernelIsa)});
30563056
zebin.appendSection(NEO::Elf::SHT_PROGBITS, NEO::Zebin::Elf::SectionNames::textPrefix.str() + "kernel_with_reduced_maxWGS", {kernelIsa, sizeof(kernelIsa)});
30573057
zebin.elfHeader->machine = this->device->getNEODevice()->getHardwareInfo().platform.eProductFamily;
@@ -3109,15 +3109,15 @@ TEST_F(ModuleTranslationUnitTest, WhenCreatingFromZeBinaryAndGlobalsAreExportedT
31093109
elfEncoder.appendSection(NEO::Elf::SHT_PROGBITS, NEO::Zebin::Elf::SectionNames::dataGlobal, std::string{"12345678"});
31103110
auto dataGlobalSectionIndex = elfEncoder.getLastSectionHeaderIndex();
31113111

3112-
NEO::Elf::ElfSymbolEntry<NEO::Elf::ELF_IDENTIFIER_CLASS::EI_CLASS_64> symbolTable[2] = {};
3112+
NEO::Elf::ElfSymbolEntry<NEO::Elf::ElfIdentifierClass::EI_CLASS_64> symbolTable[2] = {};
31133113
symbolTable[0].name = decltype(symbolTable[0].name)(elfEncoder.appendSectionName("const.data"));
3114-
symbolTable[0].info = NEO::Elf::SYMBOL_TABLE_TYPE::STT_OBJECT | NEO::Elf::SYMBOL_TABLE_BIND::STB_GLOBAL << 4;
3114+
symbolTable[0].info = NEO::Elf::SymbolTableType::STT_OBJECT | NEO::Elf::SymbolTableBind::STB_GLOBAL << 4;
31153115
symbolTable[0].shndx = decltype(symbolTable[0].shndx)(dataConstSectionIndex);
31163116
symbolTable[0].size = 4;
31173117
symbolTable[0].value = 0;
31183118

31193119
symbolTable[1].name = decltype(symbolTable[1].name)(elfEncoder.appendSectionName("global.data"));
3120-
symbolTable[1].info = NEO::Elf::SYMBOL_TABLE_TYPE::STT_OBJECT | NEO::Elf::SYMBOL_TABLE_BIND::STB_GLOBAL << 4;
3120+
symbolTable[1].info = NEO::Elf::SymbolTableType::STT_OBJECT | NEO::Elf::SymbolTableBind::STB_GLOBAL << 4;
31213121
symbolTable[1].shndx = decltype(symbolTable[1].shndx)(dataGlobalSectionIndex);
31223122
symbolTable[1].size = 4;
31233123
symbolTable[1].value = 0;
@@ -4525,7 +4525,7 @@ TEST_F(ModuleIsaCopyTest, whenModuleIsInitializedThenIsaIsCopied) {
45254525

45264526
uint32_t previouscopyMemoryToAllocationCalledTimes = mockMemoryManager->copyMemoryToAllocationCalledTimes;
45274527

4528-
auto additionalSections = {ZebinTestData::appendElfAdditionalSection::global};
4528+
auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::global};
45294529
createModuleFromMockBinary(perHwThreadPrivateMemorySizeRequested, isInternal, mockKernelImmData.get(), additionalSections);
45304530

45314531
uint32_t numOfKernels = static_cast<uint32_t>(module->getKernelImmutableDataVector().size());

‎level_zero/core/test/unit_tests/xe_hpc_core/test_l0_gfx_core_helper_xe_hpc_core.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ XE_HPC_CORETEST_F(L0GfxCoreHelperTestXeHpc, GivenXeHpcWhenGetRegsetTypeForLargeG
8080

8181
XE_HPC_CORETEST_F(L0GfxCoreHelperTestXeHpc, GivenXeHpcWhenGettingSupportedRTASFormatThenExpectedFormatIsReturned) {
8282
const auto &l0GfxCoreHelper = getHelper<L0GfxCoreHelper>();
83-
EXPECT_EQ(ZE_RTAS_DEVICE_FORMAT_EXP_VERSION_1, static_cast<ze_rtas_device_format_internal_t>(l0GfxCoreHelper.getSupportedRTASFormat()));
83+
EXPECT_EQ(RTASDeviceFormatInternal::version1, static_cast<RTASDeviceFormatInternal>(l0GfxCoreHelper.getSupportedRTASFormat()));
8484
}
8585

8686
} // namespace ult

‎level_zero/core/test/unit_tests/xe_hpg_core/test_l0_gfx_core_helper_xe_hpg_core.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ XE_HPG_CORETEST_F(L0GfxCoreHelperTestXeHpg, GivenXeHpgWhenCheckingL0HelperForPla
8282

8383
XE_HPG_CORETEST_F(L0GfxCoreHelperTestXeHpg, GivenXeHpgWhenGettingSupportedRTASFormatThenExpectedFormatIsReturned) {
8484
const auto &l0GfxCoreHelper = getHelper<L0GfxCoreHelper>();
85-
EXPECT_EQ(ZE_RTAS_DEVICE_FORMAT_EXP_VERSION_1, static_cast<ze_rtas_device_format_internal_t>(l0GfxCoreHelper.getSupportedRTASFormat()));
85+
EXPECT_EQ(RTASDeviceFormatInternal::version1, static_cast<RTASDeviceFormatInternal>(l0GfxCoreHelper.getSupportedRTASFormat()));
8686
}
8787

8888
} // namespace ult

0 commit comments

Comments
 (0)