build: add clang-tidy restriction for Enum case

Signed-off-by: Mateusz Jablonski <[email protected]>
intel · Dec 21, 2023 · a4888b3 · a4888b3
1 parent 590418a
commit a4888b3
Show file tree

Hide file tree

Showing 107 changed files with 834 additions and 1,367 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -24,6 +24,8 @@ CheckOptions:
  value: CamelCase
  - key: readability-identifier-naming.StructIgnoredRegexp
  value: '(_|TOKSTR_).+'
+ - key: readability-identifier-naming.EnumCase
+ value: CamelCase
  - key: readability-identifier-naming.MethodCase
  value: camelBack
  - key: readability-identifier-naming.PrivateMethodCase

diff --git a/level_zero/core/source/cmdqueue/cmdqueue.cpp b/level_zero/core/source/cmdqueue/cmdqueue.cpp
@@ -283,34 +283,34 @@ ze_result_t CommandQueueImp::CommandBufferManager::initialize(Device *device, si
  secondBuffer = device->getNEODevice()->getMemoryManager()->allocateGraphicsMemoryWithProperties(properties);
  }
 
- buffers[BUFFER_ALLOCATION::FIRST] = firstBuffer;
- buffers[BUFFER_ALLOCATION::SECOND] = secondBuffer;
+ buffers[BufferAllocation::first] = firstBuffer;
+ buffers[BufferAllocation::second] = secondBuffer;
 
- if (!buffers[BUFFER_ALLOCATION::FIRST] || !buffers[BUFFER_ALLOCATION::SECOND]) {
+ if (!buffers[BufferAllocation::first] || !buffers[BufferAllocation::second]) {
  return ZE_RESULT_ERROR_OUT_OF_DEVICE_MEMORY;
  }
 
- flushId[BUFFER_ALLOCATION::FIRST] = std::make_pair(0u, 0u);
- flushId[BUFFER_ALLOCATION::SECOND] = std::make_pair(0u, 0u);
+ flushId[BufferAllocation::first] = std::make_pair(0u, 0u);
+ flushId[BufferAllocation::second] = std::make_pair(0u, 0u);
  return ZE_RESULT_SUCCESS;
 }
 
 void CommandQueueImp::CommandBufferManager::destroy(Device *device) {
- if (buffers[BUFFER_ALLOCATION::FIRST]) {
- device->storeReusableAllocation(*buffers[BUFFER_ALLOCATION::FIRST]);
- buffers[BUFFER_ALLOCATION::FIRST] = nullptr;
+ if (buffers[BufferAllocation::first]) {
+ device->storeReusableAllocation(*buffers[BufferAllocation::first]);
+ buffers[BufferAllocation::first] = nullptr;
  }
- if (buffers[BUFFER_ALLOCATION::SECOND]) {
- device->storeReusableAllocation(*buffers[BUFFER_ALLOCATION::SECOND]);
- buffers[BUFFER_ALLOCATION::SECOND] = nullptr;
+ if (buffers[BufferAllocation::second]) {
+ device->storeReusableAllocation(*buffers[BufferAllocation::second]);
+ buffers[BufferAllocation::second] = nullptr;
  }
 }
 
 NEO::WaitStatus CommandQueueImp::CommandBufferManager::switchBuffers(NEO::CommandStreamReceiver *csr) {
- if (bufferUse == BUFFER_ALLOCATION::FIRST) {
- bufferUse = BUFFER_ALLOCATION::SECOND;
+ if (bufferUse == BufferAllocation::first) {
+ bufferUse = BufferAllocation::second;
  } else {
- bufferUse = BUFFER_ALLOCATION::FIRST;
+ bufferUse = BufferAllocation::first;
  }
 
  auto waitStatus{NEO::WaitStatus::ready};

diff --git a/level_zero/core/source/cmdqueue/cmdqueue_imp.h b/level_zero/core/source/cmdqueue/cmdqueue_imp.h
@@ -36,10 +36,10 @@ struct Kernel;
 struct CommandQueueImp : public CommandQueue {
  class CommandBufferManager {
  public:
- enum BUFFER_ALLOCATION : uint32_t {
- FIRST = 0,
- SECOND,
- COUNT
+ enum BufferAllocation : uint32_t {
+ first = 0,
+ second,
+ count
  };
 
  ze_result_t initialize(Device *device, size_t sizeRequested);
@@ -58,9 +58,9 @@ struct CommandQueueImp : public CommandQueue {
  }
 
  private:
- NEO::GraphicsAllocation *buffers[BUFFER_ALLOCATION::COUNT]{};
- std::pair<TaskCountType, NEO::FlushStamp> flushId[BUFFER_ALLOCATION::COUNT];
- BUFFER_ALLOCATION bufferUse = BUFFER_ALLOCATION::FIRST;
+ NEO::GraphicsAllocation *buffers[BufferAllocation::count]{};
+ std::pair<TaskCountType, NEO::FlushStamp> flushId[BufferAllocation::count];
+ BufferAllocation bufferUse = BufferAllocation::first;
  };
  static constexpr size_t defaultQueueCmdBufferSize = 128 * MemoryConstants::kiloByte;
  static constexpr size_t minCmdBufferPtrAlign = 8;

diff --git a/level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h b/level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h
@@ -29,12 +29,10 @@ class Debugger;
 
 namespace L0 {
 
-typedef enum _ze_rtas_device_format_internal_t {
- ZE_RTAS_DEVICE_FORMAT_EXP_INVALID = 0, // invalid acceleration structure format
- ZE_RTAS_DEVICE_FORMAT_EXP_VERSION_1 = 1, // acceleration structure format version 1
- ZE_RTAS_DEVICE_FORMAT_EXP_VERSION_2 = 2, // acceleration structure format version 2
- ZE_RTAS_DEVICE_FORMAT_EXP_VERSION_MAX = 2
-} ze_rtas_device_format_internal_t;
+enum class RTASDeviceFormatInternal {
+ version1 = 1,
+ version2 = 2,
+};
 
 struct Event;
 struct Device;

diff --git a/level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper_xehp_and_later.inl b/level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper_xehp_and_later.inl
@@ -74,7 +74,7 @@ NEO::HeapAddressModel L0GfxCoreHelperHw<Family>::getPlatformHeapAddressModel() c
 
 template <typename Family>
 ze_rtas_format_exp_t L0GfxCoreHelperHw<Family>::getSupportedRTASFormat() const {
- return static_cast<ze_rtas_format_exp_t>(ZE_RTAS_DEVICE_FORMAT_EXP_VERSION_1);
+ return static_cast<ze_rtas_format_exp_t>(RTASDeviceFormatInternal::version1);
 }
 
 template <typename Family>

diff --git a/level_zero/core/test/unit_tests/fixtures/module_fixture.cpp b/level_zero/core/test/unit_tests/fixtures/module_fixture.cpp
@@ -88,7 +88,7 @@ void ModuleImmutableDataFixture::setUp() {
  DeviceFixture::setupWithExecutionEnvironment(*executionEnvironment);
 }
 
-void ModuleImmutableDataFixture::createModuleFromMockBinary(uint32_t perHwThreadPrivateMemorySize, bool isInternal, MockImmutableData *mockKernelImmData, std::initializer_list<ZebinTestData::appendElfAdditionalSection> additionalSections) {
+void ModuleImmutableDataFixture::createModuleFromMockBinary(uint32_t perHwThreadPrivateMemorySize, bool isInternal, MockImmutableData *mockKernelImmData, std::initializer_list<ZebinTestData::AppendElfAdditionalSection> additionalSections) {
  DebugManagerStateRestore restore;
  debugManager.flags.FailBuildProgramWithStatefulAccess.set(0);
 

diff --git a/level_zero/core/test/unit_tests/fixtures/module_fixture.h b/level_zero/core/test/unit_tests/fixtures/module_fixture.h
@@ -108,7 +108,7 @@ struct ModuleImmutableDataFixture : public DeviceFixture {
  void setUp();
 
  void createModuleFromMockBinary(uint32_t perHwThreadPrivateMemorySize, bool isInternal, MockImmutableData *mockKernelImmData,
- std::initializer_list<ZebinTestData::appendElfAdditionalSection> additionalSections = {});
+ std::initializer_list<ZebinTestData::AppendElfAdditionalSection> additionalSections = {});
 
  void createKernel(MockKernel *kernel);
 

diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp
@@ -723,7 +723,7 @@ TEST_F(CommandQueueInitTests, givenMultipleSubDevicesWhenInitializingThenAllocat
  }
  }
 
- EXPECT_EQ(static_cast<uint32_t>(CommandQueueImp::CommandBufferManager::BUFFER_ALLOCATION::COUNT), cmdBufferAllocationsFound);
+ EXPECT_EQ(static_cast<uint32_t>(CommandQueueImp::CommandBufferManager::BufferAllocation::count), cmdBufferAllocationsFound);
 
  commandQueue->destroy();
 }

diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp
@@ -614,7 +614,7 @@ HWTEST_F(NotifyModuleLoadTest, givenDebuggingEnabledWhenModuleIsCreatedAndFullyL
  auto debugger = MockDebuggerL0Hw<FamilyType>::allocate(neoDevice);
  neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->debugger.reset(debugger);
 
- auto elfAdditionalSections = {ZebinTestData::appendElfAdditionalSection::constant}; // for const surface allocation copy
+ auto elfAdditionalSections = {ZebinTestData::AppendElfAdditionalSection::constant}; // for const surface allocation copy
  auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), elfAdditionalSections);
  const auto &src = zebinData->storage;
 

diff --git a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp
@@ -719,7 +719,7 @@ TEST_F(KernelImmutableDataIsaCopyTests, whenUserKernelIsCreatedThenIsaIsCopiedWh
 
  std::unique_ptr<MockImmutableData> mockKernelImmData = std::make_unique<MockImmutableData>(perHwThreadPrivateMemorySizeRequested);
 
- auto additionalSections = {ZebinTestData::appendElfAdditionalSection::global};
+ auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::global};
  createModuleFromMockBinary(perHwThreadPrivateMemorySizeRequested, isInternal, mockKernelImmData.get(), additionalSections);
 
  size_t copyForGlobalSurface = 1u;
@@ -799,7 +799,7 @@ TEST_F(KernelImmutableDataTests, givenInternalModuleWhenKernelIsCreatedThenIsaIs
  size_t previouscopyMemoryToAllocationCalledTimes =
  mockMemoryManager->copyMemoryToAllocationCalledTimes;
 
- auto additionalSections = {ZebinTestData::appendElfAdditionalSection::global};
+ auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::global};
  createModuleFromMockBinary(perHwThreadPrivateMemorySizeRequested, isInternal, mockKernelImmData.get(), additionalSections);
 
  size_t copyForGlobalSurface = 1u;

diff --git a/level_zero/core/test/unit_tests/sources/memory/linux/test_memory_linux.cpp b/level_zero/core/test/unit_tests/sources/memory/linux/test_memory_linux.cpp
@@ -61,7 +61,7 @@ class IpcImplicitScalingObtainFdMockGraphicsAllocation : public NEO::DrmAllocati
 
 class MemoryManagerIpcImplicitScalingObtainFdMock : public NEO::DrmMemoryManager {
  public:
- MemoryManagerIpcImplicitScalingObtainFdMock(NEO::ExecutionEnvironment &executionEnvironment) : NEO::DrmMemoryManager(gemCloseWorkerMode::gemCloseWorkerInactive, false, false, executionEnvironment) {}
+ MemoryManagerIpcImplicitScalingObtainFdMock(NEO::ExecutionEnvironment &executionEnvironment) : NEO::DrmMemoryManager(GemCloseWorkerMode::gemCloseWorkerInactive, false, false, executionEnvironment) {}
 
  NEO::GraphicsAllocation *createGraphicsAllocationFromSharedHandle(osHandle handle, const AllocationProperties &properties, bool requireSpecificBitness, bool isHostIpcAllocation, bool reuseSharedAllocation, void *mapPointer) override { return nullptr; }
  void addAllocationToHostPtrManager(NEO::GraphicsAllocation *memory) override{};
@@ -477,7 +477,7 @@ class IpcObtainFdMockGraphicsAllocation : public NEO::DrmAllocation {
 
 class MemoryManagerIpcObtainFdMock : public NEO::DrmMemoryManager {
  public:
- MemoryManagerIpcObtainFdMock(NEO::ExecutionEnvironment &executionEnvironment) : NEO::DrmMemoryManager(gemCloseWorkerMode::gemCloseWorkerInactive, false, false, executionEnvironment) {}
+ MemoryManagerIpcObtainFdMock(NEO::ExecutionEnvironment &executionEnvironment) : NEO::DrmMemoryManager(GemCloseWorkerMode::gemCloseWorkerInactive, false, false, executionEnvironment) {}
 
  NEO::GraphicsAllocation *createGraphicsAllocationFromSharedHandle(osHandle handle, const AllocationProperties &properties, bool requireSpecificBitness, bool isHostIpcAllocation, bool reuseSharedAllocation, void *mapPointer) override { return nullptr; }
  void addAllocationToHostPtrManager(NEO::GraphicsAllocation *memory) override{};

diff --git a/level_zero/core/test/unit_tests/sources/module/test_module.cpp b/level_zero/core/test/unit_tests/sources/module/test_module.cpp
@@ -643,7 +643,7 @@ struct ModuleSpecConstantsFixture : public DeviceFixture {
  }
 
  void runTest() {
- auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv};
+ auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::spirv};
  zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), additionalSections);
  const auto &src = zebinData->storage;
 
@@ -682,7 +682,7 @@ struct ModuleSpecConstantsFixture : public DeviceFixture {
  }
 
  void runTestStatic() {
- auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv};
+ auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::spirv};
  zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), additionalSections);
  const auto &src = zebinData->storage;
 
@@ -775,7 +775,7 @@ TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWhenCompiler
  mockCompiler = new FailingMockCompilerInterfaceWithSpecConstants(moduleNumSpecConstants);
  auto rootDeviceEnvironment = neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[0].get();
  rootDeviceEnvironment->compilerInterface.reset(mockCompiler);
- auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv};
+ auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::spirv};
  auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), additionalSections);
  const auto &src = zebinData->storage;
 
@@ -806,7 +806,7 @@ TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWhenCompiler
 }
 
 TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWhenUserPassTooMuchConstsIdsThenModuleInitFails) {
- auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv};
+ auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::spirv};
  auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), additionalSections);
  const auto &src = zebinData->storage;
 
@@ -862,7 +862,7 @@ TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWhenCompiler
  mockCompiler = new FailingMockCompilerInterfaceWithSpecConstants(moduleNumSpecConstants);
  auto rootDeviceEnvironment = neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[0].get();
  rootDeviceEnvironment->compilerInterface.reset(mockCompiler);
- auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv};
+ auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::spirv};
  auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), additionalSections);
  const auto &src = zebinData->storage;
 
@@ -925,7 +925,7 @@ struct ModuleStaticLinkFixture : public DeviceFixture {
  }
 
  void loadModules(bool multiple) {
- auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv};
+ auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::spirv};
  zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), additionalSections);
  const auto &storage = zebinData->storage;
 
@@ -2846,7 +2846,7 @@ HWTEST_F(ModuleTranslationUnitTest, GivenRebuildFlagWhenCreatingModuleFromNative
  DebugManagerStateRestore dgbRestorer;
  NEO::debugManager.flags.RebuildPrecompiledKernels.set(true);
 
- auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv};
+ auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::spirv};
  bool forceRecompilation = true;
  auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), additionalSections, forceRecompilation);
  const auto &src = zebinData->storage;
@@ -2881,7 +2881,7 @@ HWTEST_F(ModuleTranslationUnitTest, GivenRebuildFlagWhenCreatingModuleFromNative
  DebugManagerStateRestore dgbRestorer;
  NEO::debugManager.flags.RebuildPrecompiledKernels.set(true);
 
- auto additionalSections = {ZebinTestData::appendElfAdditionalSection::spirv};
+ auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::spirv};
  bool forceRecompilation = true;
  auto zebinData = std::make_unique<ZebinTestData::ZebinWithL0TestCommonModule>(device->getHwInfo(), additionalSections, forceRecompilation);
  const auto &src = zebinData->storage;
@@ -3003,8 +3003,8 @@ HWTEST2_F(ModuleTranslationUnitTest, givenLargeGrfAndSimd16WhenProcessingBinaryT
 
  uint8_t kernelIsa[8]{0U};
  ZebinTestData::ValidEmptyProgram zebin;
- zebin.removeSection(NEO::Zebin::Elf::SHT_ZEBIN::SHT_ZEBIN_ZEINFO, NEO::Zebin::Elf::SectionNames::zeInfo);
- zebin.appendSection(NEO::Zebin::Elf::SHT_ZEBIN::SHT_ZEBIN_ZEINFO, NEO::Zebin::Elf::SectionNames::zeInfo, ArrayRef<const uint8_t>::fromAny(validZeInfo.data(), validZeInfo.size()));
+ zebin.removeSection(NEO::Zebin::Elf::SectionHeaderTypeZebin::SHT_ZEBIN_ZEINFO, NEO::Zebin::Elf::SectionNames::zeInfo);
+ zebin.appendSection(NEO::Zebin::Elf::SectionHeaderTypeZebin::SHT_ZEBIN_ZEINFO, NEO::Zebin::Elf::SectionNames::zeInfo, ArrayRef<const uint8_t>::fromAny(validZeInfo.data(), validZeInfo.size()));
  zebin.appendSection(NEO::Elf::SHT_PROGBITS, NEO::Zebin::Elf::SectionNames::textPrefix.str() + "kernel_with_default_maxWGS", {kernelIsa, sizeof(kernelIsa)});
  zebin.appendSection(NEO::Elf::SHT_PROGBITS, NEO::Zebin::Elf::SectionNames::textPrefix.str() + "kernel_with_reduced_maxWGS", {kernelIsa, sizeof(kernelIsa)});
  zebin.elfHeader->machine = this->device->getNEODevice()->getHardwareInfo().platform.eProductFamily;
@@ -3050,8 +3050,8 @@ HWTEST2_F(ModuleTranslationUnitTest, givenLargeGrfAndSimd16WhenProcessingBinaryT
 
  uint8_t kernelIsa[8]{0U};
  ZebinTestData::ValidEmptyProgram zebin;
- zebin.removeSection(NEO::Zebin::Elf::SHT_ZEBIN::SHT_ZEBIN_ZEINFO, NEO::Zebin::Elf::SectionNames::zeInfo);
- zebin.appendSection(NEO::Zebin::Elf::SHT_ZEBIN::SHT_ZEBIN_ZEINFO, NEO::Zebin::Elf::SectionNames::zeInfo, ArrayRef<const uint8_t>::fromAny(validZeInfo.data(), validZeInfo.size()));
+ zebin.removeSection(NEO::Zebin::Elf::SectionHeaderTypeZebin::SHT_ZEBIN_ZEINFO, NEO::Zebin::Elf::SectionNames::zeInfo);
+ zebin.appendSection(NEO::Zebin::Elf::SectionHeaderTypeZebin::SHT_ZEBIN_ZEINFO, NEO::Zebin::Elf::SectionNames::zeInfo, ArrayRef<const uint8_t>::fromAny(validZeInfo.data(), validZeInfo.size()));
  zebin.appendSection(NEO::Elf::SHT_PROGBITS, NEO::Zebin::Elf::SectionNames::textPrefix.str() + "kernel_with_default_maxWGS", {kernelIsa, sizeof(kernelIsa)});
  zebin.appendSection(NEO::Elf::SHT_PROGBITS, NEO::Zebin::Elf::SectionNames::textPrefix.str() + "kernel_with_reduced_maxWGS", {kernelIsa, sizeof(kernelIsa)});
  zebin.elfHeader->machine = this->device->getNEODevice()->getHardwareInfo().platform.eProductFamily;
@@ -3109,15 +3109,15 @@ TEST_F(ModuleTranslationUnitTest, WhenCreatingFromZeBinaryAndGlobalsAreExportedT
  elfEncoder.appendSection(NEO::Elf::SHT_PROGBITS, NEO::Zebin::Elf::SectionNames::dataGlobal, std::string{"12345678"});
  auto dataGlobalSectionIndex = elfEncoder.getLastSectionHeaderIndex();
 
- NEO::Elf::ElfSymbolEntry<NEO::Elf::ELF_IDENTIFIER_CLASS::EI_CLASS_64> symbolTable[2] = {};
+ NEO::Elf::ElfSymbolEntry<NEO::Elf::ElfIdentifierClass::EI_CLASS_64> symbolTable[2] = {};
  symbolTable[0].name = decltype(symbolTable[0].name)(elfEncoder.appendSectionName("const.data"));
- symbolTable[0].info = NEO::Elf::SYMBOL_TABLE_TYPE::STT_OBJECT | NEO::Elf::SYMBOL_TABLE_BIND::STB_GLOBAL << 4;
+ symbolTable[0].info = NEO::Elf::SymbolTableType::STT_OBJECT | NEO::Elf::SymbolTableBind::STB_GLOBAL << 4;
  symbolTable[0].shndx = decltype(symbolTable[0].shndx)(dataConstSectionIndex);
  symbolTable[0].size = 4;
  symbolTable[0].value = 0;
 
  symbolTable[1].name = decltype(symbolTable[1].name)(elfEncoder.appendSectionName("global.data"));
- symbolTable[1].info = NEO::Elf::SYMBOL_TABLE_TYPE::STT_OBJECT | NEO::Elf::SYMBOL_TABLE_BIND::STB_GLOBAL << 4;
+ symbolTable[1].info = NEO::Elf::SymbolTableType::STT_OBJECT | NEO::Elf::SymbolTableBind::STB_GLOBAL << 4;
  symbolTable[1].shndx = decltype(symbolTable[1].shndx)(dataGlobalSectionIndex);
  symbolTable[1].size = 4;
  symbolTable[1].value = 0;
@@ -4525,7 +4525,7 @@ TEST_F(ModuleIsaCopyTest, whenModuleIsInitializedThenIsaIsCopied) {
 
  uint32_t previouscopyMemoryToAllocationCalledTimes = mockMemoryManager->copyMemoryToAllocationCalledTimes;
 
- auto additionalSections = {ZebinTestData::appendElfAdditionalSection::global};
+ auto additionalSections = {ZebinTestData::AppendElfAdditionalSection::global};
  createModuleFromMockBinary(perHwThreadPrivateMemorySizeRequested, isInternal, mockKernelImmData.get(), additionalSections);
 
  uint32_t numOfKernels = static_cast<uint32_t>(module->getKernelImmutableDataVector().size());

diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_gfx_core_helper_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_gfx_core_helper_xe_hpc_core.cpp
@@ -80,7 +80,7 @@ XE_HPC_CORETEST_F(L0GfxCoreHelperTestXeHpc, GivenXeHpcWhenGetRegsetTypeForLargeG
 
 XE_HPC_CORETEST_F(L0GfxCoreHelperTestXeHpc, GivenXeHpcWhenGettingSupportedRTASFormatThenExpectedFormatIsReturned) {
  const auto &l0GfxCoreHelper = getHelper<L0GfxCoreHelper>();
- EXPECT_EQ(ZE_RTAS_DEVICE_FORMAT_EXP_VERSION_1, static_cast<ze_rtas_device_format_internal_t>(l0GfxCoreHelper.getSupportedRTASFormat()));
+ EXPECT_EQ(RTASDeviceFormatInternal::version1, static_cast<RTASDeviceFormatInternal>(l0GfxCoreHelper.getSupportedRTASFormat()));
 }
 
 } // namespace ult

diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/test_l0_gfx_core_helper_xe_hpg_core.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/test_l0_gfx_core_helper_xe_hpg_core.cpp
@@ -82,7 +82,7 @@ XE_HPG_CORETEST_F(L0GfxCoreHelperTestXeHpg, GivenXeHpgWhenCheckingL0HelperForPla
 
 XE_HPG_CORETEST_F(L0GfxCoreHelperTestXeHpg, GivenXeHpgWhenGettingSupportedRTASFormatThenExpectedFormatIsReturned) {
  const auto &l0GfxCoreHelper = getHelper<L0GfxCoreHelper>();
- EXPECT_EQ(ZE_RTAS_DEVICE_FORMAT_EXP_VERSION_1, static_cast<ze_rtas_device_format_internal_t>(l0GfxCoreHelper.getSupportedRTASFormat()));
+ EXPECT_EQ(RTASDeviceFormatInternal::version1, static_cast<RTASDeviceFormatInternal>(l0GfxCoreHelper.getSupportedRTASFormat()));
 }
 
 } // namespace ult